From c1a508c2c00b792515031ea42c0e62fa93e35782 Mon Sep 17 00:00:00 2001 From: Michael Bumann Date: Fri, 20 Mar 2020 19:04:20 +0100 Subject: [PATCH 1/3] Relax and update dependencies --- Gemfile.lock | 80 ++++++++++++++++++++++++--------------------- GiphyClient.gemspec | 19 +++++------ 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c1fcf6e..0f248eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,68 +2,72 @@ PATH remote: . specs: GiphyClient (1.0.0) - json (~> 1.8, >= 1.8.3) - typhoeus (~> 1.0, >= 1.0.1) + typhoeus (~> 1.3, >= 1.0.1) GEM remote: https://rubygems.org/ specs: - ZenTest (4.11.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - autotest (4.4.6) - ZenTest (>= 4.4.1) - autotest-fsevent (0.2.12) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + autotest (5.0.0) + minitest-autotest (~> 1.0) + autotest-fsevent (0.2.17) sys-uname autotest-growl (0.2.16) autotest-rails-pure (4.1.2) crack (0.4.3) safe_yaml (~> 1.0.0) diff-lcs (1.3) - ethon (0.10.1) + ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.9.18) - hashdiff (0.3.4) - json (1.8.6) - public_suffix (2.0.5) + ffi (1.12.2) + hashdiff (1.0.1) + minitest (5.14.0) + minitest-autotest (1.1.1) + minitest-server (~> 1.0) + path_expander (~> 1.0) + minitest-server (1.0.6) + minitest (~> 5.0) + path_expander (1.1.0) + public_suffix (4.0.3) rake (12.0.0) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - safe_yaml (1.0.4) - sys-uname (1.0.3) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) + safe_yaml (1.0.5) + sys-uname (1.2.1) ffi (>= 1.0.0) - typhoeus (1.1.2) + typhoeus (1.3.1) ethon (>= 0.9.0) - vcr (3.0.3) - webmock (1.24.6) + vcr (5.1.0) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS ruby DEPENDENCIES GiphyClient! - autotest (~> 4.4, >= 4.4.6) - autotest-fsevent (~> 0.2, >= 0.2.11) - autotest-growl (~> 0.2, >= 0.2.16) - autotest-rails-pure (~> 4.1, >= 4.1.2) + autotest (>= 4.4.6) + autotest-fsevent (>= 0.2.11) + autotest-growl (>= 0.2.16) + autotest-rails-pure (>= 4.1.2) rake (~> 12.0.0) - rspec (~> 3.4, >= 3.4.0) - vcr (~> 3.0, >= 3.0.1) - webmock (~> 1.24, >= 1.24.3) + rspec (>= 3.4.0) + vcr (>= 3.0.1) + webmock (>= 1.24.3) BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/GiphyClient.gemspec b/GiphyClient.gemspec index 0d70d72..86cbb29 100644 --- a/GiphyClient.gemspec +++ b/GiphyClient.gemspec @@ -26,16 +26,15 @@ Gem::Specification.new do |s| s.license = "MPLv2" s.required_ruby_version = ">= 1.9" - s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1' - s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.3' - - s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0' - s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1' - s.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.3' - s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6' - s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2' - s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16' - s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.11' + s.add_runtime_dependency 'typhoeus', '~> 1.3', '>= 1.0.1' + + s.add_development_dependency 'rspec', '>= 3.4.0' + s.add_development_dependency 'vcr', '>= 3.0.1' + s.add_development_dependency 'webmock', '>= 1.24.3' + s.add_development_dependency 'autotest', '>= 4.4.6' + s.add_development_dependency 'autotest-rails-pure','>= 4.1.2' + s.add_development_dependency 'autotest-growl', '>= 0.2.16' + s.add_development_dependency 'autotest-fsevent', '>= 0.2.11' s.files = `find *`.split("\n").uniq.sort.select{|f| !f.empty? } s.test_files = `find spec/*`.split("\n") From 156f7ff463b7c2736ae5dd65c37fe9e4754de9c7 Mon Sep 17 00:00:00 2001 From: Wil Gieseler Date: Sun, 21 Nov 2021 19:42:52 -0800 Subject: [PATCH 2/3] try to fix uri encode errors --- Gemfile.lock | 13 +++++++------ GiphyClient.gemspec | 1 + lib/GiphyClient/api_client.rb | 2 +- lib/GiphyClient/configuration.rb | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0f248eb..c30c547 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ PATH remote: . specs: GiphyClient (1.0.0) + addressable typhoeus (~> 1.3, >= 1.0.1) GEM @@ -11,7 +12,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) autotest (5.0.0) minitest-autotest (~> 1.0) - autotest-fsevent (0.2.17) + autotest-fsevent (0.2.18) sys-uname autotest-growl (0.2.16) autotest-rails-pure (4.1.2) @@ -20,9 +21,9 @@ GEM diff-lcs (1.3) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.12.2) + ffi (1.15.4) hashdiff (1.0.1) - minitest (5.14.0) + minitest (5.14.4) minitest-autotest (1.1.1) minitest-server (~> 1.0) path_expander (~> 1.0) @@ -45,8 +46,8 @@ GEM rspec-support (~> 3.9.0) rspec-support (3.9.2) safe_yaml (1.0.5) - sys-uname (1.2.1) - ffi (>= 1.0.0) + sys-uname (1.2.2) + ffi (~> 1.1) typhoeus (1.3.1) ethon (>= 0.9.0) vcr (5.1.0) @@ -70,4 +71,4 @@ DEPENDENCIES webmock (>= 1.24.3) BUNDLED WITH - 1.17.2 + 2.2.31 diff --git a/GiphyClient.gemspec b/GiphyClient.gemspec index 86cbb29..e5f3f1c 100644 --- a/GiphyClient.gemspec +++ b/GiphyClient.gemspec @@ -27,6 +27,7 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 1.9" s.add_runtime_dependency 'typhoeus', '~> 1.3', '>= 1.0.1' + s.add_runtime_dependency 'addressable' s.add_development_dependency 'rspec', '>= 3.4.0' s.add_development_dependency 'vcr', '>= 3.0.1' diff --git a/lib/GiphyClient/api_client.rb b/lib/GiphyClient/api_client.rb index 3e22ab7..0c07021 100644 --- a/lib/GiphyClient/api_client.rb +++ b/lib/GiphyClient/api_client.rb @@ -250,7 +250,7 @@ def sanitize_filename(filename) def build_request_url(path) # Add leading and trailing slashes to path path = "/#{path}".gsub(/\/+/, '/') - URI.encode(@config.base_url + path) + Addressable::URI.encode(@config.base_url + path) end # Builds the HTTP request body diff --git a/lib/GiphyClient/configuration.rb b/lib/GiphyClient/configuration.rb index 31ba75a..5c0acab 100644 --- a/lib/GiphyClient/configuration.rb +++ b/lib/GiphyClient/configuration.rb @@ -168,7 +168,7 @@ def base_path=(base_path) def base_url url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '') - URI.encode(url) + Addressable::URI.encode(url) end # Gets API key (with prefix if set). From 26b6e0c3eb63d4793567bacea9221cc8dc49e19e Mon Sep 17 00:00:00 2001 From: Wil Gieseler Date: Sun, 21 Nov 2021 19:47:26 -0800 Subject: [PATCH 3/3] update typhoeus in an attempt to fix crap --- Gemfile.lock | 48 ++++++++++++++++++++++----------------------- GiphyClient.gemspec | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c30c547..ea4ae31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,12 @@ PATH specs: GiphyClient (1.0.0) addressable - typhoeus (~> 1.3, >= 1.0.1) + typhoeus (>= 1.3) GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) autotest (5.0.0) minitest-autotest (~> 1.0) @@ -16,11 +16,11 @@ GEM sys-uname autotest-growl (0.2.16) autotest-rails-pure (4.1.2) - crack (0.4.3) - safe_yaml (~> 1.0.0) - diff-lcs (1.3) - ethon (0.12.0) - ffi (>= 1.3.0) + crack (0.4.5) + rexml + diff-lcs (1.4.4) + ethon (0.15.0) + ffi (>= 1.15.0) ffi (1.15.4) hashdiff (1.0.1) minitest (5.14.4) @@ -30,29 +30,29 @@ GEM minitest-server (1.0.6) minitest (~> 5.0) path_expander (1.1.0) - public_suffix (4.0.3) + public_suffix (4.0.6) rake (12.0.0) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - safe_yaml (1.0.5) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) sys-uname (1.2.2) ffi (~> 1.1) - typhoeus (1.3.1) + typhoeus (1.4.0) ethon (>= 0.9.0) - vcr (5.1.0) - webmock (3.8.3) - addressable (>= 2.3.6) + vcr (6.0.0) + webmock (3.14.0) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/GiphyClient.gemspec b/GiphyClient.gemspec index e5f3f1c..361c0ed 100644 --- a/GiphyClient.gemspec +++ b/GiphyClient.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.license = "MPLv2" s.required_ruby_version = ">= 1.9" - s.add_runtime_dependency 'typhoeus', '~> 1.3', '>= 1.0.1' + s.add_runtime_dependency 'typhoeus', '>= 1.3' s.add_runtime_dependency 'addressable' s.add_development_dependency 'rspec', '>= 3.4.0'