looksist 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b167f1cd856e78371a8a08eb7a16c9b2b05146fa
-  data.tar.gz: b77389994a04d4527386ed0a9d30594a6e721599
+  metadata.gz: 3505080addc197736b40fd6384223c3f116d94bc
+  data.tar.gz: 9a3303eb8dd99a337dfb74e669ce9cfd970294ce
 SHA512:
-  metadata.gz: 388347f3c8a1d053f9c0a82a19d5561dcb604088198637792e264719a86aed7aa6839245827fcf8d4e9ffee2f91f216cb43919c08da1a60837f7afe3b9b07a40
-  data.tar.gz: 04893bbe31f866211bde64c6b84d1f394285aeccdec1ee6b39cdfa051a8b2b296def0aceed9dffaae4e6d671f50e2baa9bde9e7a57b1958f1691bcf113a6affc
+  metadata.gz: e1606ba5e94a4a323a6ce83b4c7804519bb169ba670bba6d7fc29da7488ac972d459815277b904c631b0932d62a54bab8f4bf34d8a5fbc6257daf3d822437446
+  data.tar.gz: f72d42711b96d872d972f397b94c6104724e32cb93d2b4cb7bfdf159522f1d11d8bcbbfa6aff5a65b9bc7dc73f26f53ef96c20d9e59f2d5bf17ac72760ffe7c8

data/lib/looksist/core.rb

@@ -4,7 +4,11 @@ module Looksist
     include Looksist::Common
 
     module ClassMethods
+
+      attr_accessor :lookup_attributes
+
       def lookup(what, opts)
+        @lookup_attributes ||= {}
         unless opts.keys.all? { |k| [:using, :bucket_name, :as].include? k }
           raise 'Incorrect usage: Invalid parameter specified'
         end
@@ -13,7 +17,7 @@ module Looksist
           setup_composite_lookup(bucket_name, using, what, as)
         else
           alias_what = find_alias(as, what)
-          self.lookup_attributes << alias_what
+          @lookup_attributes[alias_what] = opts[:using]
           define_method(alias_what) do
             Looksist.redis_service.send("#{__entity__(bucket_name)}_for", self.send(using).try(:to_s))
           end
@@ -27,7 +31,7 @@ module Looksist
           define_method(alias_method_name) do
             JSON.parse(Looksist.redis_service.send("#{__entity__(bucket)}_for", self.send(using).try(:to_s)) || '{}')[method_name.to_s]
           end
-          self.lookup_attributes << alias_method_name
+          @lookup_attributes[alias_method_name] = using
         end
       end
 
@@ -41,18 +45,18 @@ module Looksist
       Looksist.driver.json_opts(self, opts)
     end
 
-    included do |base|
-      base.class_attribute :lookup_attributes
-      base.lookup_attributes = []
-    end
-
   end
 
   module Serializers
     class Her
       class << self
         def json_opts(obj, _)
-          obj.attributes.merge(obj.class.lookup_attributes.each_with_object({}) { |a, acc| acc[a] = obj.send(a) })
+          lookup_attributes = obj.class.lookup_attributes || {}
+          other_attributes = lookup_attributes.keys.each_with_object({}) do |a, acc|
+            using = lookup_attributes[a]
+            acc[a] = obj.send(a) if obj.respond_to?(using)
+          end
+          obj.attributes.merge(other_attributes)
         end
       end
     end

data/lib/looksist/version.rb

@@ -1,3 +1,3 @@
 module Lookist
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/looksist/looksist_spec.rb

@@ -51,6 +51,27 @@ describe Looksist do
     end
   end
 
+  context 'Tolerant lookup' do
+    it 'should not do a lookup when the key attribute is not defined' do
+      module TolerantLookUp
+        class Employee
+          include Her::Model
+          use_api TEST_API
+          include Looksist
+
+          lookup :name, using: :employee_id
+
+          def as_json(opts)
+            super(opts)
+          end
+        end
+      end
+      expect(@mock).to receive(:get).never.with('employees_/1')
+      e = TolerantLookUp::Employee.new
+      expect(e.to_json).to eq('{}')
+    end
+  end
+
   context 'Alias support for lookup' do
     it 'should fetch attributes and use the alias specified in the api' do
       module AliasLookup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: looksist
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - RC