lhs 7.3.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af216b090a45a83dea5acd0a3af1492932999f59
-  data.tar.gz: a46a8f31fe3f31f577fcb97585c13f23739128da
+  metadata.gz: 4587fc1585c5d53dcbe9470a65cb49af38c965da
+  data.tar.gz: 97345090e54f551ea4361c97f03b566c160c72ca
 SHA512:
-  metadata.gz: ca258fd031bec87565cc8db528d7aeb6887719cba1bc96eb62b6a9ed09b3c70d0b3c9d99c92750bd187cf26ea70e1d381c7be641ee8c27e1fe772ef5eead1fcd
-  data.tar.gz: 863c29e31f101e9b8acb69d274998e48503d71176ac26bcd3001e18d6f05fce49daf0c85462fec705e12482b1589aedfaee8bc626056c62afea7f99e8caa21fd
+  metadata.gz: cb6d9e6fa5ee7585bb7af456ee60f521b322cc484dba2a4714896a1ffc1ef9ed40a1d1ed914446335dc487a486d042f596e9c08d30fad301b685dde75b51f254
+  data.tar.gz: 7915323a720894ffd38e4810ae3f0bce107692f3db2df801b8d092918b7698d33b2ec4879788c15bcf0711371d1daadabae2893443714ea18e1d9011ad6a5300

data/lib/lhs/collection.rb

@@ -37,13 +37,18 @@ class LHS::Collection < LHS::Proxy
   protected
 
   def method_missing(name, *args, &block)
-    value = _collection.send(name, *args, &block)
-    return enclose_in_data(value) if value.is_a? Hash
-    value
+    if _collection.respond_to?(name)
+      value = _collection.send(name, *args, &block)
+      return enclose_in_data(value) if value.is_a? Hash
+      value
+    elsif _data._raw.is_a?(Hash)
+      get(name, *args)
+    end
   end
 
-  def respond_to_missing?(name, include_all = false)
-    _collection.respond_to?(name, include_all)
+  def respond_to_missing?(name, _include_all = false)
+    # We accept every message that does not belong to set of keywords and is not a setter
+    BLACKLISTED_KEYWORDS.exclude?(name.to_s) && !name.to_s[/=$/]
   end
 
   private

data/lib/lhs/concerns/proxy/accessors.rb

@@ -0,0 +1,74 @@
+require 'active_support'
+
+class LHS::Proxy
+  module Accessors
+    extend ActiveSupport::Concern
+
+    # Keywords that would not be forwarded via method missing
+    # FIXME: Extend the set of keywords
+    BLACKLISTED_KEYWORDS = %w(new proxy_association)
+
+    private
+
+    def set(name, value)
+      key = name.to_s.gsub(/=$/, '')
+      _data._raw[key.to_sym] = value
+    end
+
+    def get(name, *args)
+      name = args.first if name == :[]
+      value = _data._raw[name.to_s]
+      if value.nil? && _data._raw.present?
+        value = _data._raw[name.to_sym]
+        value = _data._raw[name.to_s.classify.to_sym] if value.nil?
+      end
+
+      return access_item(value) if value.is_a?(Hash)
+      return access_collection(value) if value.is_a?(Array)
+      convert(value)
+    end
+
+    def convert(value)
+      return value unless value.is_a?(String)
+      if date_time?(value)
+        Time.zone.parse(value)
+      elsif date?(value)
+        Date.parse(value)
+      else
+        value
+      end
+    end
+
+    def access_item(value)
+      record = LHS::Record.for_url(value[:href]) if value[:href]
+      data = LHS::Data.new(value, _data)
+      if record
+        record.new(data)
+      else
+        data
+      end
+    end
+
+    def access_collection(value)
+      data = LHS::Data.new(value, _data)
+      collection = LHS::Collection.new(data)
+      LHS::Data.new(collection, _data)
+    end
+
+    def date?(value)
+      value[date_time_regex, :date].presence
+    end
+
+    def time?(value)
+      value[date_time_regex, :time].presence
+    end
+
+    def date_time?(value)
+      date?(value) && time?(value)
+    end
+
+    def date_time_regex
+      /(?<date>\d{4}-\d{2}-\d{2})?(?<time>T\d{2}:\d{2}:\d{2}(\.\d*.\d{2}:\d{2})*)?/
+    end
+  end
+end

data/lib/lhs/item.rb

@@ -34,72 +34,11 @@ class LHS::Item < LHS::Proxy
 
   def method_missing(name, *args, &_block)
     return set(name, args.try(&:first)) if name.to_s[/=$/]
-    name = args.first if name == :[]
-    value = _data._raw[name.to_s]
-    if value.nil? && _data._raw.present?
-      value = _data._raw[name.to_sym]
-      value = _data._raw[name.to_s.classify.to_sym] if value.nil?
-    end
-    if value.is_a?(Hash)
-      handle_hash(value)
-    elsif value.is_a?(Array)
-      data = LHS::Data.new(value, _data)
-      collection = LHS::Collection.new(data)
-      LHS::Data.new(collection, _data)
-    else
-      convert(value)
-    end
+    get(name, *args)
   end
 
   def respond_to_missing?(name, _include_all = false)
     # We accept every message that does not belong to set of keywords
     BLACKLISTED_KEYWORDS.exclude?(name.to_s)
   end
-
-  private
-
-  # FIXME: Extend the set of keywords
-  BLACKLISTED_KEYWORDS = %w(new proxy_association)
-
-  def convert(value)
-    return value unless value.is_a?(String)
-    if date_time?(value)
-      Time.zone.parse(value)
-    elsif date?(value)
-      Date.parse(value)
-    else
-      value
-    end
-  end
-
-  def handle_hash(value)
-    record = LHS::Record.for_url(value[:href]) if value[:href]
-    data = LHS::Data.new(value, _data)
-    if record
-      record.new(data)
-    else
-      data
-    end
-  end
-
-  def set(name, value)
-    key = name.to_s.gsub(/=$/, '')
-    _data._raw[key.to_sym] = value
-  end
-
-  def date?(value)
-    value[date_time_regex, :date].presence
-  end
-
-  def time?(value)
-    value[date_time_regex, :time].presence
-  end
-
-  def date_time?(value)
-    date?(value) && time?(value)
-  end
-
-  def date_time_regex
-    /(?<date>\d{4}-\d{2}-\d{2})?(?<time>T\d{2}:\d{2}:\d{2}(\.\d*.\d{2}:\d{2})*)?/
-  end
 end

data/lib/lhs/proxy.rb

@@ -4,6 +4,7 @@ Dir[File.dirname(__FILE__) + '/concerns/proxy/*.rb'].each { |file| require file
 # If href is present it also alows loading/reloading
 class LHS::Proxy
 
+  include Accessors
   include Create
   include Link
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "7.3.0"
+  VERSION = "7.4.0"
 end

data/spec/collection/accessors_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+describe LHS::Collection do
+  let(:items) { [{ name: 'Steve' }] }
+  let(:extra) { 'extra' }
+  let(:collection) { Record.where }
+
+  context 'accessors' do
+    let(:response_data) do
+      {
+        items: items,
+        extra: extra,
+        total: 1
+      }
+    end
+
+    before(:each) do
+      class Record < LHS::Record
+        endpoint 'http://datastore/records`'
+      end
+      stub_request(:get, %r{http://datastore/records})
+        .to_return(body: response_data.to_json)
+    end
+
+    it 'allows access to extra data passed with collection' do
+      expect(collection.extra).to eq(extra)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.4.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -202,6 +202,7 @@ files:
 - lib/lhs/concerns/item/save.rb
 - lib/lhs/concerns/item/update.rb
 - lib/lhs/concerns/item/validation.rb
+- lib/lhs/concerns/proxy/accessors.rb
 - lib/lhs/concerns/proxy/create.rb
 - lib/lhs/concerns/proxy/link.rb
 - lib/lhs/concerns/record/all.rb
@@ -230,6 +231,7 @@ files:
 - lib/lhs/version.rb
 - script/ci/build.sh
 - spec/.DS_Store
+- spec/collection/accessors_spec.rb
 - spec/collection/collection_items_spec.rb
 - spec/collection/configurable_spec.rb
 - spec/collection/delegate_spec.rb
@@ -378,11 +380,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services
 test_files:
+- spec/collection/accessors_spec.rb
 - spec/collection/collection_items_spec.rb
 - spec/collection/configurable_spec.rb
 - spec/collection/delegate_spec.rb