dhc 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9547c0b934f2ac6841be72e6f63213dc50d005c6f8559909869dd2ecb12e1e60
-  data.tar.gz: 3b7335a60aaffe92da269dd0a8fb7a51e66471136a506f0ae4de651a2ac95d8d
+  metadata.gz: 38b1300c7240268c0d2d3d571d86dc70e1d9015440a9a600c65fcf4bb2532cce
+  data.tar.gz: 3aff5b7adbd2d7150cc4aa68f28fe728d248a53c3a4fd2db7875ea3919bc45c3
 SHA512:
-  metadata.gz: 39ed2e1baec1153872532441114157e7c7170f76746c4f8e9f77b585c36d0999f3047298d05daee2128dd13b74f21c87ba7b3822bbc703c5aa0c4da390511f4f
-  data.tar.gz: 9a6ae9ca323bf5d69d1668e72ceaa5969d79e2dc315a575df805b53d48c24321f537d6ab135d4e1412840cc52c7d400e71fbf121b985fe9eefbc86dfd38f7e91
+  metadata.gz: e25e5a034157c23c9da5792ace6e560f44623f767ec9b63d7a1d2b3895a9a0a49489256eee6eddaafd59e37e77bb8eb80711e30968075b8669919e52f39c2065
+  data.tar.gz: d01e8730f5b9d28a4ed933a4aec7bca68be14888ee45c7cffd4990e97e6fcd9627213f458b1cc171d214ea6a01eabeade3348db3e2530691c5cc84a4b684fa12

data/README.md

@@ -21,8 +21,8 @@ use it like:
 
 ```ruby
   response = DHC.get('http://datastore/v2/feedbacks')
-  response.data.items[0]
-  response.data.items[0].recommended
+  response.data.dig('items', 0)
+  response.data.dig('items', 0, 'recommended')
   response.body
   response.headers
 ```
@@ -236,8 +236,8 @@ User-Agent DHC (9.4.2; MyRailsApplicationName) [https://github.com/DePayFi/dhc]
 ```ruby
   response.request #<DHC::Request> the associated request.
 
-  response.data #<OpenStruct> in case response body contains parsable JSON.
-  response.data.something.nested
+  response.data # JSON
+  response.data.dig('something', 'nested')
 
   response.body #<String>
 
@@ -256,9 +256,6 @@ The response data can be access with dot-notation and square-bracket notation. Y
 
 ```ruby
   response = DHC.request(url: 'http://datastore/entry/1')
-  response.data.as_open_struct #<OpenStruct name='depay.fi'>
-  response.data.as_json # { name: 'depay.fi' }
-  response.data.name # 'depay.fi'
   response.data[:name] # 'depay.fi'
 ```
 
@@ -347,7 +344,7 @@ If your error handler returns anything else but `nil` it replaces the response b
 ```ruby
 handler = ->(response){ do_something_with_response; return {name: 'unknown'} }
 response = DHC.get('http://something', rescue: handler)
-response.data.name # 'unknown'
+response.data[:name] # 'unknown'
 ```
 
 ### Ignore certain errors
@@ -481,7 +478,7 @@ If you configure `expires_at` and `refresh` proc in addition to `bearer`, DHC wi
 ```ruby
 refresh = ->(response = nil){
   if response
-    if response.code == 401 && response.data && response.data.error_code == 'ACCESS_TOKEN_EXPIRED'
+    if response.code == 401 && response.data && response.data[:error_code] == 'ACCESS_TOKEN_EXPIRED'
       session[:access_token] = new_access_token
     end
   else

data/lib/dhc/formats/json.rb

@@ -48,8 +48,6 @@ module DHC::Formats
 
     def parse(input, object_class)
       ::JSON.parse(input, object_class: object_class)
-    rescue ::JSON::ParserError => e
-      raise DHC::ParserError.new(e.message, input)
     end
   end
 end

data/lib/dhc/interceptors/default_timeout.rb

@@ -9,7 +9,7 @@ class DHC::DefaultTimeout < DHC::Interceptor
   TIMEOUT = 15 # seconds
 
   def before_init
-    request_options = (request.options || {})
+    request_options = request.options || {}
     request_options[:timeout] ||= timeout || TIMEOUT
     request_options[:connecttimeout] ||= connecttimeout || CONNECTTIMEOUT
   end

data/lib/dhc/interceptors/throttle.rb

@@ -45,9 +45,8 @@ class DHC::Throttle < DHC::Interceptor
   end
 
   def track?
-    (options.dig(:remaining) && [options.dig(:track), response.headers].none?(&:blank?) ||
+    options.dig(:remaining) && [options.dig(:track), response.headers].none?(&:blank?) ||
       options.dig(:track).present?
-    )
   end
 
   def break?

data/lib/dhc/response.rb

@@ -5,7 +5,6 @@ require 'active_support/core_ext/module'
 # The response contains the raw response (typhoeus)
 # and provides functionality to access response data.
 class DHC::Response
-  autoload :Data, 'dhc/response/data'
 
   attr_accessor :request, :body_replacement
   attr_reader :from_cache
@@ -23,7 +22,7 @@ class DHC::Response
   end
 
   def data
-    @data ||= body.present? ? DHC::Response::Data.new(self) : nil
+    @data ||= body.present? ? JSON.parse(body) : nil
   end
 
   def [](key)

data/lib/dhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHC
-  VERSION ||= '2.4.0'
+  VERSION ||= '3.0.0'
 end

data/spec/basic_methods/delete_spec.rb

@@ -21,9 +21,9 @@ describe DHC do
       DHC.delete('http://datastore/v2/feedbacks/12121')
     end
 
-    it 'makes response data available in a rails way' do
+    it 'makes response data available' do
       response = DHC.delete('http://datastore/v2/feedbacks/12121')
-      expect(response.data.recommended).to eq true
+      expect(response.data['recommended']).to eq true
     end
 
     it 'provides response headers' do

data/spec/basic_methods/get_spec.rb

@@ -24,9 +24,9 @@ describe DHC do
       DHC.get(:feedbacks, params: parameters)
     end
 
-    it 'makes response data available in a rails way' do
+    it 'makes response data available' do
       response = DHC.get('http://datastore/v2/feedbacks', params: parameters)
-      expect(response.data.total).to eq 99
+      expect(response.data['total']).to eq 99
     end
 
     it 'provides response headers' do
@@ -43,7 +43,7 @@ describe DHC do
 
     it 'requests json and parses response body' do
       data = DHC.json.get('http://datastore/v2/feedbacks').data
-      expect(data.some).to eq 'json'
+      expect(data['some']).to eq 'json'
     end
   end
 end

data/spec/basic_methods/post_spec.rb

@@ -29,9 +29,9 @@ describe DHC do
       DHC.post(:feedbacks, body: feedback)
     end
 
-    it 'makes response data available in a rails way' do
+    it 'makes response data available' do
       response = DHC.post('http://datastore/v2/feedbacks', body: feedback)
-      expect(response.data.source_id).to eq 'aaa'
+      expect(response.data['source_id']).to eq 'aaa'
     end
 
     it 'provides response headers' do

data/spec/basic_methods/put_spec.rb

@@ -35,9 +35,9 @@ describe DHC do
       DHC.put(:feedbacks, body: change)
     end
 
-    it 'makes response data available in a rails way' do
+    it 'makes response data available' do
       response = DHC.put('http://datastore/v2/feedbacks', body: change)
-      expect(response.data.recommended).to eq false
+      expect(response.data['recommended']).to eq false
     end
 
     it 'provides response headers' do

data/spec/basic_methods/request_spec.rb

@@ -13,7 +13,7 @@ describe DHC do
 
     it 'does a request returning a response' do
       response = DHC.request(url: 'http://datastore/v2/feedbacks', params: { has_reviews: true }, method: :get)
-      expect(response.data.total).to eq total
+      expect(response.data['total']).to eq total
     end
   end
 end

data/spec/interceptors/auth/bearer_spec.rb

@@ -39,7 +39,7 @@ describe DHC::Auth do
     before do
       refresh = ->(response = nil) {
         if response
-          if response.code == 401 && response.data && response.data.error_code == 'ACCESS_TOKEN_EXPIRED'
+          if response.code == 401 && response.data && response.data['error_code'] == 'ACCESS_TOKEN_EXPIRED'
             session[:access_token] = third_access_token
           end
         else

data/spec/interceptors/logging/main_spec.rb

@@ -17,7 +17,7 @@ describe DHC::Logging do
       %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?}}
     )
     expect(logger).to have_received(:info).once.with(
-      %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=0ms URL=http://depay.fi:80/}
+      %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=\d+(\.\d+)?ms URL=http://depay.fi:80/}
     )
   end
 
@@ -27,10 +27,10 @@ describe DHC::Logging do
     it 'does log the source if provided as option' do
       DHC.get('http://depay.fi', source: source)
       expect(logger).to have_received(:info).once.with(
-        %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?} \nCalled from #{source}}
+        %r{Before DHC request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Params={} Headers={.*?} \nCalled from #{Regexp.escape(source)}}
       )
       expect(logger).to have_received(:info).once.with(
-        %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=0ms URL=http://depay.fi:80/ \nCalled from #{source}}
+        %r{After DHC response for request <\d+> GET http://depay.fi at \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2} Time=\d+(\.\d+)?ms URL=http://depay.fi:80/ \nCalled from #{Regexp.escape(source)}}
       )
     end
   end

data/spec/request/error_handling_spec.rb

@@ -59,7 +59,7 @@ describe DHC::Request do
     it 'requests json and parses response body' do
       expect(-> {
         DHC.json.get('http://datastore/v2/feedbacks').data
-      }).to raise_error(DHC::ParserError)
+      }).to raise_error(JSON::ParserError)
     end
   end
 
@@ -75,14 +75,14 @@ describe DHC::Request do
       stub_request(:get, 'http://something').to_return(status: 400)
       handler = ->(_response) { { name: 'unknown' }.to_json }
       request = DHC::Request.new(url: 'http://something', rescue: handler)
-      expect(request.response.data.name).to eq 'unknown'
+      expect(request.response.data['name']).to eq 'unknown'
     end
 
     it 'does not exchange body with handlers return if the handler returns nil' do
       stub_request(:get, 'http://something').to_return(status: 400, body: { message: 'an error occurred' }.to_json)
       handler = ->(_response) { nil }
       request = DHC::Request.new(url: 'http://something', rescue: handler)
-      expect(request.response.data.message).to eq 'an error occurred'
+      expect(request.response.data['message']).to eq 'an error occurred'
     end
   end
 end

data/spec/response/data_accessor_spec.rb

@@ -22,7 +22,7 @@ describe DHC do
 
     it 'makes data accessible with square bracket accessor (symbol)' do
       expect(
-        DHC.json.get('http://depay.fi')[:MyProp]
+        DHC.json.get('http://depay.fi')['MyProp']
       ).to eq 'MyValue'
     end
   end

data/spec/response/data_spec.rb

@@ -14,23 +14,15 @@ describe DHC::Response do
       let(:body) { { some_key: { nested: value } } }
 
       it 'makes data from response body available' do
-        expect(response.data.some_key.nested).to eq value
-      end
-
-      it 'makes data from response body available with hash bracket notation' do
-        expect(response.data[:some_key][:nested]).to eq value
+        expect(response.data.dig('some_key', 'nested')).to eq value
       end
 
       it 'can be converted to json with the as_json method' do
         expect(response.data.as_json).to eq body.as_json
       end
 
-      it 'can be converted to an open struct with the as_open_struct method' do
-        expect(response.data.as_open_struct).to eq JSON.parse(response.body, object_class: OpenStruct)
-      end
-
       it 'returns nil when data is not available' do
-        expect(response.data.something).to be_nil
+        expect(response.data['something']).to be_nil
       end
     end
 
@@ -41,20 +33,8 @@ describe DHC::Response do
         expect(response.data.as_json).to eq body.as_json
       end
 
-      it 'can be converted to an open struct with the as_open_struct method' do
-        expect(response.data.as_open_struct).to eq JSON.parse(response.body, object_class: OpenStruct)
-      end
-
-      it 'is a collection of items' do
-        expect(response.data.size).to eq(1)
-      end
-
       it 'makes item data from response body available' do
-        expect(response.data.first.some_key.nested).to eq value
-      end
-
-      it 'makes item data from response body available with hash bracket notation' do
-        expect(response.data.first[:some_key][:nested]).to eq value
+        expect(response.data.dig(0, 'some_key', 'nested')).to eq value
       end
     end
   end
@@ -77,7 +57,7 @@ describe DHC::Response do
         DHC.get('http://listings')
       rescue DHC::Error => error
         expect(
-          error.response.request.response.data.meta.errors.detect { |item| item.code == 2000 }.msg
+          error.response.request.response.data.dig('meta', 'errors').detect { |item| item['code'] == 2000 }['msg']
         ).to eq 'I like to hide error messages (this is meta).'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhc
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhc/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -215,7 +215,6 @@ files:
 - lib/dhc/endpoint.rb
 - lib/dhc/error.rb
 - lib/dhc/errors/client_error.rb
-- lib/dhc/errors/parser_error.rb
 - lib/dhc/errors/server_error.rb
 - lib/dhc/errors/timeout.rb
 - lib/dhc/errors/unknown_error.rb
@@ -241,10 +240,6 @@ files:
 - lib/dhc/railtie.rb
 - lib/dhc/request.rb
 - lib/dhc/response.rb
-- lib/dhc/response/data.rb
-- lib/dhc/response/data/base.rb
-- lib/dhc/response/data/collection.rb
-- lib/dhc/response/data/item.rb
 - lib/dhc/rspec.rb
 - lib/dhc/test/cache_helper.rb
 - lib/dhc/version.rb
@@ -399,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.0.0
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors

data/lib/dhc/errors/parser_error.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class DHC::ParserError < DHC::Error
-end

data/lib/dhc/response/data/base.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-# Response data is data provided through the response body
-# but made accssible in the ruby world
-module DHC::Response::Data::Base
-  def as_json
-    @json ||= (@data || @response.format.as_json(@response.body))
-  end
-
-  def as_open_struct
-    @open_struct ||=
-      if @data
-        JSON.parse(@data.to_json, object_class: OpenStruct)
-      else
-        @response.format.as_open_struct(@response.body)
-      end
-  end
-end

data/lib/dhc/response/data/collection.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class DHC::Response::Data::Collection < Array
-  include DHC::Response::Data::Base
-
-  def initialize(response, data: nil)
-    @response = response
-    @data = data
-
-    super(
-      as_json.map do |i|
-        DHC::Response::Data.new(response, data: i)
-      end
-    )
-  end
-end

data/lib/dhc/response/data/item.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-class DHC::Response::Data::Item < OpenStruct
-  include DHC::Response::Data::Base
-
-  def initialize(response, data: nil)
-    @response = response
-    @data = data
-
-    set_dynamic_accessor_methods
-
-    super(as_json)
-  end
-
-  def [](key)
-    @hash ||= as_json.with_indifferent_access
-    @hash[key]
-  end
-
-  private
-
-  def set_dynamic_accessor_methods
-    as_json.keys.each do |key|
-      define_singleton_method key do |*args|
-        as_open_struct.send key, *args
-      end
-    end
-  end
-end

data/lib/dhc/response/data.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class DHC::Response::Data
-  autoload :Base, 'dhc/response/data/base'
-  autoload :Item, 'dhc/response/data/item'
-  autoload :Collection, 'dhc/response/data/collection'
-
-  include DHC::Response::Data::Base
-
-  def initialize(response, data: nil)
-    @response = response
-    @data = data
-
-    if as_json.is_a?(Hash)
-      @base = DHC::Response::Data::Item.new(@response, data: data)
-    elsif as_json.is_a?(Array)
-      @base = DHC::Response::Data::Collection.new(@response, data: data)
-    end
-  end
-
-  def method_missing(method, *args, &block)
-    @base.send(method, *args, &block)
-  end
-
-  def respond_to_missing?(method_name, include_private = false)
-    @base.respond_to?(method_name, include_private) || super
-  end
-end