v3.0.0: introduces parsed json for response.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

lib/dhc/formats/json.rb

@@ -48,8 +48,6 @@ def to_sym
 
     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

lib/dhc/response.rb

@@ -5,7 +5,6 @@
 # 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 @@ def initialize(raw, request, from_cache: false)
   end
 
   def data
-    @data ||= body.present? ? DHC::Response::Data.new(self) : nil
+    @data ||= body.present? ? JSON.parse(body) : nil
   end
 
   def [](key)

lib/dhc/version.rb

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

spec/basic_methods/delete_spec.rb

@@ -21,9 +21,9 @@
       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

spec/basic_methods/get_spec.rb

@@ -24,9 +24,9 @@
       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 @@
 
     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

spec/basic_methods/post_spec.rb

@@ -29,9 +29,9 @@
       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

spec/basic_methods/put_spec.rb

@@ -35,9 +35,9 @@
       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

spec/basic_methods/request_spec.rb

@@ -13,7 +13,7 @@
 
     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

spec/interceptors/auth/bearer_spec.rb

@@ -39,7 +39,7 @@ def bearer_token
     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

spec/request/error_handling_spec.rb

@@ -59,7 +59,7 @@ def expect_status_code(status_code)
     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 @@ def expect_status_code(status_code)
       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

spec/response/data_accessor_spec.rb

@@ -22,7 +22,7 @@
 
     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

spec/response/data_spec.rb

@@ -14,23 +14,15 @@
       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 @@
         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 @@
         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