lhc 6.4.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f4055f440bc7f36343e387c27cbe4526e2969e
-  data.tar.gz: 50b0cb3ae16bc7cc9098a2e9069d03d91314304b
+  metadata.gz: a1870e7f765bd88ab8d601bf98828dec1dad3578
+  data.tar.gz: 2ee4018796f6db877e144888e3211c7cae3cd72c
 SHA512:
-  metadata.gz: e71ceba6f6f43b0112aecf6d8b92470628cbdf29e855c237a8ec26a2cf22f13ed24add47230268daf4e74a16574fb4e5b23f72744e7ef36bece5b1945d953e7a
-  data.tar.gz: 6f1d15f6cb8b7aff8cfc64553d8366a951f4d8bd579e57c182003be2011955bf8da967de2fb1e9fc0af8c4648e7c285928f2d8a5a7a6ba4fc19b76245bbd019a
+  metadata.gz: 8868211d499b67b58d67abbeadfd4fd12aabbf61d2a99f18a7f4e06ff5f51856b0203997e914e43143503c02315448913253b914b87c51c830ecbc1955b95aec
+  data.tar.gz: 8f558506283ca904cda4c0db565f24f1728dd9976778523dcd7b74ed155aa82dce6eb4a28a5156dd4bcaea5f9b301dd2d4ee720beae1fca6a8aeee2ad615251c

data/lib/lhc/response/data.rb

@@ -1,36 +1,26 @@
-require 'ostruct'
-# Response data is data provided through the response body
-# but made accssible in the ruby world
-class LHC::Response::Data < OpenStruct
+class LHC::Response::Data
+  autoload :Base, 'lhc/response/data/base'
+  autoload :Item, 'lhc/response/data/item'
+  autoload :Collection, 'lhc/response/data/collection'
 
-  def initialize(response)
-    @response = response
-    set_dynamic_accessor_methods
-    super(as_json)
-  end
+  include LHC::Response::Data::Base
 
-  def as_json
-    response.format.as_json(response)
-  end
+  def initialize(response, data: nil)
+    @response = response
+    @data = data
 
-  def as_open_struct
-    response.format.as_open_struct(response)
+    if as_json.is_a?(Hash)
+      @base = LHC::Response::Data::Item.new(response, data: data)
+    elsif as_json.is_a?(Array)
+      @base = LHC::Response::Data::Collection.new(response, data: data)
+    end
   end
 
-  def [](key)
-    @hash ||= as_json.with_indifferent_access
-    @hash[key]
+  def method_missing(method, *args, &block)
+    @base.send(method, *args, &block)
   end
 
-  private
-
-  attr_reader :response
-
-  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
+  def respond_to_missing?(method_name, include_private = false)
+    @base.respond_to?(method_name, include_private) || super
   end
 end

data/lib/lhc/response/data/base.rb

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

data/lib/lhc/response/data/collection.rb

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

data/lib/lhc/response/data/item.rb

@@ -0,0 +1,27 @@
+class LHC::Response::Data::Item < OpenStruct
+  include LHC::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/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION ||= "6.4.0"
+  VERSION ||= "6.5.0"
 end

data/spec/response/data_spec.rb

@@ -4,30 +4,56 @@ describe LHC::Response do
   context 'data' do
     let(:value) { 'some_value' }
 
-    let(:body) { { some_key: { nested: value } } }
-
     let(:raw_response) { OpenStruct.new(body: body.to_json) }
 
     let(:response) { LHC::Response.new(raw_response, nil) }
 
-    it 'makes data from response body available' do
-      expect(response.data.some_key.nested).to eq value
-    end
+    context 'for item' do
+      let(:body) { { some_key: { nested: value } } }
 
-    it 'makes data from response body available with hash bracket notation' do
-      expect(response.data[:some_key][:nested]).to eq value
-    end
+      it 'makes data from response body available' do
+        expect(response.data.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 'makes data from response body available with hash bracket notation' do
+        expect(response.data[: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 '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)
+      it 'returns nil when data is not available' do
+        expect(response.data.something).to be_nil
+      end
     end
 
-    it 'returns nil when data is not available' do
-      expect(response.data.something).to be_nil
+    context 'for collection' do
+      let(:body) { [{ some_key: { nested: value } }] }
+
+      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 '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
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.5.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -195,6 +195,9 @@ files:
 - lib/lhc/request.rb
 - lib/lhc/response.rb
 - lib/lhc/response/data.rb
+- lib/lhc/response/data/base.rb
+- lib/lhc/response/data/collection.rb
+- lib/lhc/response/data/item.rb
 - lib/lhc/test/cache_helper.rb
 - lib/lhc/version.rb
 - script/ci/build.sh
@@ -321,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: LocalHttpClient