lhs 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f70cff889440ba4d2bca3c7b4d9480a763a2af
-  data.tar.gz: b8d18ad5a5a3951b24d96e9de37073fbd199267a
+  metadata.gz: 0fea30df48822225921db5b070d8b3581c64451e
+  data.tar.gz: b29781282f62a5a68e97b0f4643af68b221c6bf1
 SHA512:
-  metadata.gz: eebcb68bb74d56f301e44928874e72fc9e02c6754a21bd4a92bdec2200d26de45e49199bfc29366e2b3e8063ee28108eaf1cb3d9df1040e6c5f5a7027c09f323
-  data.tar.gz: 1a402c99a72282ecac133bb3de3627851cbe9ee79378ab8dbac9792fdaa4aff429064d653b7e011cbe1e0c3e6ccf850c035ccb76bcbcd17e62f776c599e743f1
+  metadata.gz: b1a1529a764d30f17a15346b102ac3a68c3a52709fc12d55fd6454f6dfae9131f30baa61a7bb67931217748f34804b5715cbda3438ba2702d655137f7b153812
+  data.tar.gz: 321a76d203b0d7122af4ad1d38bf4c6feb0bf848c8991dd14c33205267d39deef3cf4ce931b5e6f7941471ddef6c44e5aa9c0958bea362f9012bdff6257cedd6

data/lib/lhs/collection.rb

@@ -1,8 +1,10 @@
 require File.join(__dir__, 'proxy.rb')
+Dir[File.dirname(__FILE__) + '/concerns/collection/*.rb'].each { |file| require file }
 
 # A collection is a special type of data
 # that contains multiple items
 class LHS::Collection < LHS::Proxy
+  include InternalCollection
 
   delegate :select, to: :_collection
 
@@ -34,41 +36,19 @@ class LHS::Collection < LHS::Proxy
 
   def method_missing(name, *args, &block)
     value = _collection.send(name, *args, &block)
-    if value.is_a? Hash
-      data = LHS::Data.new(value, _data)
-      item = LHS::Item.new(data)
-      LHS::Data.new(item, _data)
-    else
-      value
-    end
+    return enclose_in_data(value) if value.is_a? Hash
+    value
   end
 
   def respond_to_missing?(name, include_all = false)
     _collection.respond_to?(name, include_all)
   end
 
-  # The internal collection class that includes enumerable
-  # and insures to return LHS::Items in case of iterating items
-  class Collection
-    include Enumerable
+  private
 
-    attr_accessor :raw
-    delegate :last, :sample, :[], :present?, :blank?, :empty?, to: :raw
-
-    def initialize(raw, parent, record)
-      self.raw = raw
-      @parent = parent
-      @record = record
-    end
-
-    def each(&_block)
-      raw.each do |item|
-        if item.is_a? Hash
-          yield LHS::Data.new(item, @parent, @record)
-        else
-          yield item
-        end
-      end
-    end
+  def enclose_in_data(value)
+    data = LHS::Data.new(value, _data)
+    item = LHS::Item.new(data)
+    LHS::Data.new(item, _data)
   end
 end

data/lib/lhs/concerns/collection/internal_collection.rb

@@ -0,0 +1,41 @@
+require 'active_support'
+
+class LHS::Collection < LHS::Proxy
+
+  module InternalCollection
+    extend ActiveSupport::Concern
+
+    # The internal collection class that includes enumerable
+    # and insures to return LHS::Items in case of iterating items
+    class Collection
+      include Enumerable
+
+      attr_accessor :raw
+      delegate :last, :sample, :[], :present?, :blank?, :empty?, to: :raw
+
+      def initialize(raw, parent, record)
+        self.raw = raw
+        @parent = parent
+        @record = record
+      end
+
+      def each(&_block)
+        raw.each do |item|
+          if item.is_a? Hash
+            yield cast_item(item)
+          else
+            yield item
+          end
+        end
+      end
+
+      private
+
+      def cast_item(item)
+        data = LHS::Data.new(item, @parent, @record)
+        return @record.new(data) if @record
+        data
+      end
+    end
+  end
+end

data/lib/lhs/concerns/record/find.rb

@@ -14,6 +14,7 @@ class LHS::Record
           else
             find_by_id(args)
           end
+        return data unless data._record_class
         data._record_class.new(data)
       end
 

data/lib/lhs/concerns/record/find_by.rb

@@ -23,13 +23,11 @@ class LHS::Record
       def _find_by(params)
         params = params.dup.merge(limit: 1)
         data = request(params: params)
-        data =
-          if data._proxy.is_a?(LHS::Collection)
-            data.first || fail(LHC::NotFound.new('No item was found.', data._request.response))
-          else
-            data
-          end
-        data._record_class.new(data)
+        if data._proxy.is_a?(LHS::Collection)
+          data.first || fail(LHC::NotFound.new('No item was found.', data._request.response))
+        else
+          data._record_class.new(data)
+        end
       end
     end
   end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "3.1.1"
+  VERSION = "3.1.3"
 end

data/spec/collection/collection_items_spec.rb

@@ -22,6 +22,10 @@ describe LHS::Collection do
     it 'initalises a collection' do
       expect(collection.first.name).to eq 'Steve'
     end
+
+    it 'casts items to be instance of defined LHS::Record' do
+      expect(collection.first).to be_kind_of Account
+    end
   end
 
   context 'items key' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -150,6 +150,7 @@ files:
 - lhs.gemspec
 - lib/lhs.rb
 - lib/lhs/collection.rb
+- lib/lhs/concerns/collection/internal_collection.rb
 - lib/lhs/concerns/data/json.rb
 - lib/lhs/concerns/item/destroy.rb
 - lib/lhs/concerns/item/save.rb