Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- run:
name: setup .env file
command: |
cp dot.env.example .env
cp .env.example .env

- run:
name: install dependencies
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Gemfile.lock
/*.gem
/coverage
.env
vendor/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ matrix:
- rvm: jruby-head

before_install:
- 'cp "dot.env.example" ".env"'
- 'cp ".env.example" ".env"'

script: bundle exec rspec spec
8 changes: 5 additions & 3 deletions lib/tripletexer/api_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'uri'
require 'json'
require 'faraday'
require 'faraday_middleware'


class Tripletexer::APIClient
Expand Down Expand Up @@ -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
Expand All @@ -92,4 +91,7 @@ def handle_response(response)
end
end

def uri_escape(uri)
URI::DEFAULT_PARSER.escape(uri)
end
end
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
30 changes: 14 additions & 16 deletions tripletexer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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