flexirest 1.10.12 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ffddde69dc7fb5e5e16c7de3e881f4c913d573170c8ddefcdc799da6a2139e
-  data.tar.gz: 370540fa78e3d99f8a9ac798104e21a1f8d0f5bb8ff54e99d398b682f0a58be9
+  metadata.gz: e3c99c9dcb4b2b2d6b4992a53d138877f251f0810bb94dc11faf9d9e1b89f9cb
+  data.tar.gz: 22554cafc10d12337c1511828ab27471dbadf36de4e211c5383eae96c4fb4c34
 SHA512:
-  metadata.gz: 253e46a23429c4f0ec77fe9bb223ec80ab758bf352232559e68ae63f1462710af268bee3d9662c5cf104b5f262ff3bea112f03991be8f08ec76777f5c45c021a
-  data.tar.gz: 65a2576d868804a56147227cddb604d3ade6c91960bcd5f59778e3aaad3489682bbc725942a4c1f6f93148333b9929d27238280eb9c8f76b1c9f98b770ea3bdd
+  metadata.gz: 3cf855f9fbc7d4f213a19840e11cfa9b816de9b1a0750726538f288f559ec150c7a05a4ae8b63297e8aedcf8002103e2e4ae275cb497793144c83aebc7f7577e
+  data.tar.gz: e1a5b90ace51f341a340e5ed32f5c8afc30f2784a38cf7281c621157a8b1233da9b81180ed6a5dc0694f4ac72933793b9e47dcf01d9389583b02bdd7dc3aefbd

data/.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.11.0
+
+Major change:
+
+- Dropped support for Ruby 2.x. Ruby 2.7 will be EOL in 27 days, and anyone can use the previous version 1.10 if they need 2.x support for the last month.
+
+Enhancement:
+
+- Added caching lines to the quiet! feature (thanks to Romain Gisiger for the issue and PR)
+
 ## 1.10.12
 
 Enhancement:

data/flexirest.gemspec

@@ -4,15 +4,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'flexirest/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "flexirest"
-  spec.version       = Flexirest::VERSION
-  spec.platform      = Gem::Platform::RUBY
-  spec.authors       = ["Andy Jeffries"]
-  spec.email         = ["andy@andyjeffries.co.uk"]
-  spec.description   = %q{Accessing REST services in a flexible way}
-  spec.summary       = %q{This gem is for accessing REST services in a flexible way.  ActiveResource already exists for this, but it doesn't work where the resource naming doesn't follow Rails conventions, it doesn't have in-built caching and it's not as flexible in general.}
-  spec.homepage      = "https://andyjeffries.co.uk/"
-  spec.license       = "MIT"
+  spec.name                  = "flexirest"
+  spec.version               = Flexirest::VERSION
+  spec.required_ruby_version = ">= 3.0.0"
+  spec.platform              = Gem::Platform::RUBY
+  spec.authors               = ["Andy Jeffries"]
+  spec.email                 = ["andy@andyjeffries.co.uk"]
+  spec.description           = %q{Accessing REST services in a flexible way}
+  spec.summary               = %q{This gem is for accessing REST services in a flexible way.  ActiveResource already exists for this, but it doesn't work where the resource naming doesn't follow Rails conventions, it doesn't have in-built caching and it's not as flexible in general.}
+  spec.homepage              = "https://andyjeffries.co.uk/"
+  spec.license               = "MIT"
 
   if spec.respond_to?(:metadata)
     spec.metadata["source_code_uri"] = "https://github.com/flexirest/flexirest"
@@ -26,31 +27,21 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3"
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
-    spec.add_development_dependency "webmock", "~> 2.1.0"
-    spec.add_development_dependency "rspec_junit_formatter", "= 0.2.3"
-  else
-    spec.add_development_dependency "webmock"
-    spec.add_development_dependency "rspec_junit_formatter"
-  end
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency "api-auth", ">= 1.3.1", "< 2.4"
-  spec.add_development_dependency 'typhoeus'
+  spec.add_development_dependency "api-auth", ">= 2.4"
+  spec.add_development_dependency 'faraday-typhoeus'
   spec.add_development_dependency 'activemodel'
   spec.add_development_dependency 'rest-client'
 
   spec.add_runtime_dependency "mime-types"
   spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "crack"
-  spec.add_runtime_dependency "faraday", "~> 1.0"
+  spec.add_runtime_dependency "faraday", "~> 2.7"
 
-  # Use Gem::Version to parse the Ruby version for reliable comparison
-  # ActiveSupport 5+ requires Ruby 2.2.2
-  if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.2.2')
-    spec.add_runtime_dependency "activesupport"
-  else
-    spec.add_runtime_dependency "activesupport", "< 5.0.0"
-  end
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "actionpack"
 end

data/lib/flexirest/base_without_validation.rb

@@ -220,7 +220,7 @@ module Flexirest
       if value.is_a?(String) && value.length > 50
         "#{value[0..50]}...".inspect
       elsif value.is_a?(Date) || value.is_a?(Time)
-        %("#{value.to_s(:db)}")
+        %("#{value.respond_to?(:to_fs) ? value.to_fs(:db) : value.to_s(:db)}")
       else
         value.inspect
       end

data/lib/flexirest/caching.rb

@@ -57,7 +57,7 @@ module Flexirest
         end
       end
 
-      def write_cached_response(request, response, result)
+      def write_cached_response(request, response, result, quiet)
         return if result.is_a? Symbol
         return unless perform_caching
         return unless !result.respond_to?(:_status) || [200, 304].include?(result._status)
@@ -69,7 +69,7 @@ module Flexirest
 
         if cache_store && (headers[:etag] || headers[:expires])
           key = "#{request.class_name}:#{request.original_url}"
-          Flexirest::Logger.debug "  \033[1;4;32m#{Flexirest.name}\033[0m #{key} - Writing to cache"
+          Flexirest::Logger.debug "  \033[1;4;32m#{Flexirest.name}\033[0m #{key} - Writing to cache" unless quiet
           cached_response = CachedResponse.new(status:response.status, result:result, response_headers: headers)
           cached_response.etag = "#{headers[:etag]}" if headers[:etag]
           cached_response.expires = Time.parse(headers[:expires]) rescue nil if headers[:expires]

data/lib/flexirest/connection_manager.rb

@@ -20,7 +20,7 @@ module Flexirest
     def self.in_parallel(base_url)
       begin
         require 'typhoeus'
-        require 'typhoeus/adapters/faraday'
+        require 'typhoeus/adapters/faraday' unless Gem.loaded_specs["faraday-typhoeus"].present?
       rescue LoadError
         raise MissingOptionalLibraryError.new("To call '::Flexirest::ConnectionManager.in_parallel' you must include the gem 'Typhoeus' in your Gemfile.")
       end

data/lib/flexirest/request.rb

@@ -320,7 +320,7 @@ module Flexirest
 
           result = handle_response(response_env, cached)
           @response_delegate.__setobj__(result)
-          original_object_class.write_cached_response(self, response_env, result) unless @method[:options][:skip_caching]
+          original_object_class.write_cached_response(self, response_env, result, quiet?) unless @method[:options][:skip_caching]
         end
 
         # If this was not a parallel request just return the original result

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.10.12"
+  VERSION = "1.11.0"
 end

data/spec/lib/connection_manager_spec.rb

@@ -35,13 +35,15 @@ describe Flexirest::ConnectionManager do
   end
 
   it "should call 'in_parallel' for a session and yield procedure inside that block" do
+    require 'faraday/typhoeus' if Gem.loaded_specs["faraday-typhoeus"].present?
     Flexirest::Base.adapter = :typhoeus
     Flexirest::ConnectionManager.get_connection("http://www.example.com").session
     expect { |b| Flexirest::ConnectionManager.in_parallel("http://www.example.com", &b)}.to yield_control
     Flexirest::Base._reset_configuration!
   end
 
-  it "should raise Flexirest::MissingOptionalLibraryError if Typhous isn't available" do
+  it "should raise Flexirest::MissingOptionalLibraryError if Typhoeus isn't available" do
+    require 'faraday/typhoeus' if Gem.loaded_specs["faraday-typhoeus"].present?
     Flexirest::Base.adapter = :typhoeus
     Flexirest::ConnectionManager.get_connection("http://www.example.com").session
     expect(Flexirest::ConnectionManager).to receive(:require).and_raise(LoadError)

data/spec/lib/connection_spec.rb

@@ -175,13 +175,24 @@ describe Flexirest::Connection do
       expect(auth_header == "APIAuth id123:TQiQIW6vVaDC5jvh99uTNkxIg6Q=" || auth_header == "APIAuth id123:PMWBThkB8vKbvUccHvoqu9G3eVk=").to be_truthy
     end
 
-    it 'should have an Content-MD5 header' do
-      stub_request(:put, "www.example.com/foo").
-        with(body: "body", :headers => @default_headers).
-        to_return(body: "{result:true}")
-
-      result = @connection.put("/foo", "body", @options)
-      expect(result.env.request_headers['Content-MD5']).to eq("hBotaJrYa9FhFEdFPCLG/A==")
+    if Gem.loaded_specs["api-auth"].present? && Gem.loaded_specs["api-auth"].version.to_s < "2.5.0"
+      it 'should have an Content-MD5 header' do
+        stub_request(:put, "www.example.com/foo").
+          with(body: "body", :headers => @default_headers).
+          to_return(body: "{result:true}")
+
+        result = @connection.put("/foo", "body", @options)
+        expect(result.env.request_headers['Content-MD5']).to eq("hBotaJrYa9FhFEdFPCLG/A==")
+      end
+    else
+      it 'should have an X-AUTHORIZATION-CONTENT-SHA256 header' do
+        stub_request(:put, "www.example.com/foo").
+          with(body: "body", :headers => @default_headers).
+          to_return(body: "{result:true}")
+
+        result = @connection.put("/foo", "body", @options)
+        expect(result.env.request_headers['X-AUTHORIZATION-CONTENT-SHA256']).to eq("Iw2DWNyOiJC0xY3utikS7i8gNXrpKlzIYbmOaP4xrLU=")
+      end
     end
   end
 

data/spec/lib/instrumentation_spec.rb

@@ -10,6 +10,9 @@ describe Flexirest::Instrumentation do
   it "should save a load hook to include the instrumentation" do
     hook_tester = double("HookTester")
     expect(hook_tester).to receive(:include).with(Flexirest::ControllerInstrumentation)
+    if Gem.loaded_specs["api-auth"].present? && Gem.loaded_specs["api-auth"].version.to_s >= "2.5.0"
+      require "action_controller"
+    end
     ActiveSupport.run_load_hooks(:action_controller, hook_tester)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.10.12
+  version: 1.11.0
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,9 +127,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
@@ -137,13 +134,10 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-    - - "<"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: faraday-typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -232,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Accessing REST services in a flexible way
 email:
 - andy@andyjeffries.co.uk
@@ -378,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="