looksist 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8526c6730f1f78436abccf895c6b9c66afdf0d40
-  data.tar.gz: 49abb35ed9f3dfdf904694b25be5c48d21537e5d
+  metadata.gz: 46c6ea1a931ae0e7367b6448d23c37cb12d73cf2
+  data.tar.gz: 0d6ff0d198ece2ec4a3b8f4cdf1e60e7748e3ff5
 SHA512:
-  metadata.gz: 6b15b2d989a8a5f0a71292112e5eb0abfbb120f277b6e15f0b1d38545b3c2d17e3f1583ea8985b18aba42d8f728410c5166ee2b074c1cf21d561c0f1d64ee946
-  data.tar.gz: 541a9d243b0d3f9b1721020e5d91e8650562fe10f9774f0d7ba0bd2270d93f55458374c75c194679eedfd55a76702d0eb2eb080cbac8fe5f69d073b890ae6ba1
+  metadata.gz: 11993fd0f01590a1ad5cc85f64d1cda21608cc8a74f380501dd1b935aa43ce810cee112167dc36b9c3f7e176de65263ceb487386c7a1e654963af2fd01c5cdde
+  data.tar.gz: 4fd89a0710c78b8626886d67fc15f6455a9f1e7b8b5545e8252075c789d7958820298273820614bdc804c093edcbb34ca97d0bf3dc63ee02e6c5ef14eb578409

data/lib/looksist.rb

@@ -1,10 +1,9 @@
 require 'looksist/version'
 require 'jsonpath'
-require 'json'
+require 'looksist/common'
 require 'looksist/core'
 require 'looksist/redis_service'
 require 'looksist/hashed'
-require 'looksist/her_collection'
 require 'looksist/safe_lru_cache'
 
 

data/lib/looksist/common.rb

@@ -0,0 +1,7 @@
+module Looksist
+  module Common
+    def entity(entity)
+      entity.to_s.gsub('_id', '')
+    end
+  end
+end

data/lib/looksist/core.rb

@@ -1,48 +1,23 @@
 module Looksist
   module Core
     extend ActiveSupport::Concern
+    include Looksist::Common
 
     module ClassMethods
-
-      def bucket_name(entity_id)
-        entity = entity_id.to_s.gsub('_id', '')
-        entity.pluralize
-      end
-
-      def memoized(key)
-        self.storage ||= OpenStruct.new
-        self.storage[key] = self.storage[key] || Looksist.lookup_store.get(key)
-      end
-
-      def mmemoized(key, values)
-        key_and_bucket = id_and_buckets.find{|h| h[:id] == key}
-        return if key_and_bucket.nil?
-        redis_keys = values.collect{|v| redis_key(key_and_bucket[:bucket], v)}
-        left_keys_to_lookup = redis_keys.select{|k| self.storage[k].nil?}
-        Looksist.lookup_store.mapped_mget(left_keys_to_lookup).each do |key, value|
-          self.storage[key] = value
-        end
-
-      end
-
-      def redis_key bucket, value
-        [bucket, '/', value].join('')
-      end
-
-      def lookup(what, using, bucket = bucket_name(using))
+      def lookup(what, using, bucket = using)
         self.lookup_attributes ||= []
         self.id_and_buckets ||= []
         self.id_and_buckets << {id: using, bucket: bucket}
         if what.is_a? Array
           what.each do |method_name|
             define_method(method_name) do
-              JSON.parse(self.class.memoized(self.class.redis_key(bucket, self.send(using).try(:to_s))) || '{}')[method_name.to_s]
+              JSON.parse(Looksist.redis_service.send("#{entity(bucket)}_for", self.send(using).try(:to_s)) || '{}')[method_name.to_s]
             end
             self.lookup_attributes << method_name
           end
         else
           define_method(what) do
-            self.class.memoized(self.class.redis_key(bucket, self.send(using).try(:to_s)))
+            Looksist.redis_service.send("#{entity(bucket)}_for", self.send(using).try(:to_s))
           end
           self.lookup_attributes << what.to_sym
         end

data/lib/looksist/hashed.rb

@@ -4,6 +4,7 @@ require 'json'
 module Looksist
   module Hashed
     extend ActiveSupport::Concern
+    include Looksist::Common
 
     module ClassMethods
       def inject(opts)
@@ -38,9 +39,6 @@ module Looksist
     end
 
     private
-    def entity(entity_id)
-      entity_id.to_s.gsub('_id', '')
-    end
 
     def inject_attributes_at(hash_offset, opts)
       return nil unless hash_offset

data/lib/looksist/version.rb

@@ -1,3 +1,3 @@
 module Lookist
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/looksist/looksist_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 
 
 describe Looksist do
-  before :each do
+  before(:each) do
+    @mock = {}
     Looksist.configure do |looksist|
-      looksist.lookup_store = double('store_lookup_client')
-      looksist.driver =  Looksist::Serializers::Her
+      looksist.lookup_store = @mock
+      looksist.driver = Looksist::Serializers::Her
     end
   end
 
@@ -24,7 +25,7 @@ describe Looksist do
           end
         end
       end
-      expect(Looksist.lookup_store).to receive(:get).with('employees/1').and_return('Employee Name')
+      expect(@mock).to receive(:get).once.with('employees/1').and_return('Employee Name')
       e = Her::Employee.new({employee_id: 1})
       expect(e.name).to eq('Employee Name')
       expect(e.to_json).to eq({:employee_id => 1, :name => 'Employee Name', :another_attr => 'Hello World'}.to_json)
@@ -44,7 +45,7 @@ describe Looksist do
           end
         end
       end
-      expect(Looksist.lookup_store).to receive(:get).with('employees/1').and_return('Employee Name')
+      expect(@mock).to receive(:get).once.with('employees/1').and_return('Employee Name')
       e = ExplicitBucket::Employee.new(1)
       expect(e.name).to eq('Employee Name')
     end
@@ -63,7 +64,7 @@ describe Looksist do
       end
     end
     it 'should not eager evaluate' do
-      expect(Looksist.lookup_store).to_not receive(:get)
+      expect(@mock).to_not receive(:get)
       LazyEval::Employee.new(1)
     end
   end
@@ -83,8 +84,8 @@ describe Looksist do
         end
       end
 
-      expect(Looksist.lookup_store).to receive(:get).with('ids/1').and_return('Employee Name')
-      expect(Looksist.lookup_store).to receive(:get).with('employees/1').and_return(nil)
+      expect(@mock).to receive(:get).once.with('ids/1').and_return('Employee Name')
+      expect(@mock).to receive(:get).once.with('employees/1').and_return(nil)
       e = SimpleLookup::Employee.new(1)
       expect(e.name).to eq('Employee Name')
       expect(e.unavailable).to be(nil)
@@ -94,28 +95,31 @@ describe Looksist do
       module CompositeLookup
         class Employee
           include Looksist
-          attr_accessor :id, :employee_id
+          attr_accessor :id, :employee_id, :contact_id
 
           lookup [:name, :location], using=:id
           lookup [:age, :sex], using=:employee_id
+          lookup [:pager, :cell], using=:contact_id
 
           def initialize(id)
-            @id = @employee_id = id
+            @contact_id = @id = @employee_id = id
           end
         end
       end
 
-      expect(Looksist.lookup_store).to receive(:get).with('ids/1')
-                                              .and_return({name: 'Employee Name', location: 'Chennai'}.to_json)
-      expect(Looksist.lookup_store).to receive(:get).twice.with('employees/1')
-                                              .and_return(nil)
+      expect(@mock).to receive(:get).once.with('ids/1').and_return({name: 'Employee Name', location: 'Chennai'}.to_json)
+      expect(@mock).to receive(:get).once.with('contacts/1').and_return({pager: 'pager', cell: 'cell'}.to_json)
+      expect(@mock).to receive(:get).twice.with('employees/1').and_return(nil)
       e = CompositeLookup::Employee.new(1)
 
       expect(e.name).to eq('Employee Name')
       expect(e.location).to eq('Chennai')
 
-      expect(e.age).to be(nil)
-      expect(e.sex).to be(nil)
+      expect(e.age).to eq(nil)
+      expect(e.sex).to eq(nil)
+
+      expect(e.pager).to eq('pager')
+      expect(e.cell).to eq('cell')
     end
   end
 
@@ -132,48 +136,14 @@ describe Looksist do
     end
     it 'should share storage between instances to improve performance' do
       employee_first_instance = Employee.new(1)
-      expect(Looksist.lookup_store).to receive(:get).with('ids/1')
-                                              .and_return({name: 'Employee Name', location: 'Chennai'}.to_json)
+      expect(@mock).to receive(:get).once.with('ids/1')
+                                       .and_return({name: 'Employee Name', location: 'Chennai'}.to_json)
       employee_first_instance.name
 
       employee_second_instance = Employee.new(1)
-      expect(Looksist.lookup_store).not_to receive(:get).with('ids/1')
+      expect(@mock).not_to receive(:get).with('ids/1')
 
       employee_second_instance.name
     end
   end
-
-  context '.id_and_buckets' do
-    class Developer
-      include Looksist
-      lookup [:city], using=:city_id
-      lookup [:role], using=:role_id
-    end
-    it 'should hold all the id and buckets' do
-       expect(Developer.id_and_buckets).to eq([{id: :city_id, bucket: 'cities'}, {id: :role_id, bucket: 'roles'}])
-    end
-  end
-
-  context '.mmemoized' do
-    class AnotherDeveloperClass
-      include Looksist
-      lookup [:city], using=:city_id
-      lookup [:role], using=:role_id
-    end
-
-    AnotherDeveloperClass.storage = OpenStruct.new
-    AnotherDeveloperClass.storage['cities/1'] = 'Chennai'
-    AnotherDeveloperClass.storage['cities/2'] = 'Delhi'
-
-    it 'make single request for multiple values' do
-      expect(Looksist.lookup_store).to receive(:mapped_mget).with(%w(cities/4 cities/5))
-                        .and_return({'cities/4' => 'Bangalore', 'cities/5' => 'Kolkata'})
-      AnotherDeveloperClass.mmemoized(:city_id, [1, 4, 5])
-
-      expect(AnotherDeveloperClass.storage.to_h.length).to eq(4)
-      expect(AnotherDeveloperClass.storage['cities/5']).to eq('Kolkata')
-      expect(AnotherDeveloperClass.storage['cities/4']).to eq('Bangalore')
-
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: looksist
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - RC
@@ -169,9 +169,9 @@ files:
 - README.md
 - Rakefile
 - lib/looksist.rb
+- lib/looksist/common.rb
 - lib/looksist/core.rb
 - lib/looksist/hashed.rb
-- lib/looksist/her_collection.rb
 - lib/looksist/redis_service.rb
 - lib/looksist/safe_lru_cache.rb
 - lib/looksist/version.rb

data/lib/looksist/her_collection.rb

@@ -1,13 +0,0 @@
-module Her
-  class Collection
-    def load_all_meta
-      klass = a.first.class
-      return unless klass.respond_to?(:id_and_buckets)
-      id_attributes = klass.id_and_buckets.collect{|h| h[:id]}
-      id_attributes.each do |attribute|
-        id_attribute_values = self.collect(&attribute.to_sym)
-        klass.mmemoized(attribute, id_attribute_values)
-      end
-    end
-  end
-end