From 68636dc799a9002b6fc1d072617aa8160a338448 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 1 Jul 2025 19:16:54 +0300 Subject: [PATCH] update ruby 3.0 --- .circleci/config.yml | 2 +- dot.env.example => .env.example | 0 .gitignore | 1 + .travis.yml | 2 +- lib/tripletexer/api_client.rb | 8 +++++--- spec/spec_helper.rb | 4 ++-- tripletexer.gemspec | 30 ++++++++++++++---------------- 7 files changed, 24 insertions(+), 23 deletions(-) rename dot.env.example => .env.example (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2fe0349..08c8449 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - run: name: setup .env file command: | - cp dot.env.example .env + cp .env.example .env - run: name: install dependencies diff --git a/dot.env.example b/.env.example similarity index 100% rename from dot.env.example rename to .env.example diff --git a/.gitignore b/.gitignore index 5653e7a..99215bd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ Gemfile.lock /*.gem /coverage .env +vendor/ diff --git a/.travis.yml b/.travis.yml index ccc8715..da91896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ matrix: - rvm: jruby-head before_install: - - 'cp "dot.env.example" ".env"' + - 'cp ".env.example" ".env"' script: bundle exec rspec spec diff --git a/lib/tripletexer/api_client.rb b/lib/tripletexer/api_client.rb index 83a7697..67afae9 100644 --- a/lib/tripletexer/api_client.rb +++ b/lib/tripletexer/api_client.rb @@ -3,7 +3,6 @@ require 'uri' require 'json' require 'faraday' -require 'faraday_middleware' class Tripletexer::APIClient @@ -59,13 +58,13 @@ def init_connection 'Content-Type' => 'application/json' } faraday.adapter :net_http - faraday.basic_auth(0, session_token) if session_token + faraday.request(:authorization, :basic, 0, session_token) if session_token faraday.proxy = proxy if proxy # https://github.com/lostisland/faraday/issues/733 end end def call(method, path, *args, &block) - normalized_path = URI.escape(path) + normalized_path = uri_escape(path) response = connection.public_send(method, normalized_path, *args, &block) handle_response(response) end @@ -92,4 +91,7 @@ def handle_response(response) end end + def uri_escape(uri) + URI::DEFAULT_PARSER.escape(uri) + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 18640a6..924db90 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ require 'coveralls' -Coveralls.wear! - require 'simplecov' + +SimpleCov.formatter = Coveralls::SimpleCov::Formatter SimpleCov.start do add_filter %r{^/spec/} add_group 'Endpoints', 'lib/tripletexer/endpoints' diff --git a/tripletexer.gemspec b/tripletexer.gemspec index f6af696..a40a3b4 100644 --- a/tripletexer.gemspec +++ b/tripletexer.gemspec @@ -14,23 +14,21 @@ Gem::Specification.new do |s| s.files = Dir['README.md', 'LICENSE', 'lib/**/*'] s.test_files = Dir['spec/**/*'] - s.required_ruby_version = '>= 2.2.2' + s.required_ruby_version = '>= 3.0' - s.add_dependency 'faraday', '>= 0.10.0' - s.add_dependency 'faraday_middleware', '>= 0.10.1' - s.add_dependency 'json', '>= 1.8.5' + s.add_dependency 'faraday', '~> 2.9' + s.add_dependency 'json', '>= 2.7.0' - s.add_development_dependency 'reek', '~> 4' - s.add_development_dependency 'rubocop', '~> 0.50' - s.add_development_dependency 'pry', '~> 0.10' - s.add_development_dependency 'pry-nav', '~> 0.2' - s.add_development_dependency 'yard', '~> 0.9' - s.add_development_dependency 'rubycritic', '~> 3.2' - s.add_development_dependency 'rspec', '~> 3.6' - s.add_development_dependency 'simplecov', '~> 0.15.1' - s.add_development_dependency 'dotenv', '~> 2.2', '>= 2.2.1' - s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3' - s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1' - s.add_development_dependency 'rspec_junit_formatter', '~> 0.3' + s.add_development_dependency 'rubocop' + s.add_development_dependency 'reek' + s.add_development_dependency 'rubycritic' + s.add_development_dependency 'pry' + s.add_development_dependency 'yard' + s.add_development_dependency 'rspec' + s.add_development_dependency 'simplecov' + s.add_development_dependency 'dotenv' + s.add_development_dependency 'vcr' + s.add_development_dependency 'webmock' + s.add_development_dependency 'rspec_junit_formatter' s.add_development_dependency 'coveralls' end