looksist 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8ea751e7e460f9cefd33a35bde5d1ec4e1b3be
-  data.tar.gz: 19a868515f44ac3daa6861b22f29a6ea7c67366a
+  metadata.gz: 917b96f2edca2099bafd294b7e2eee0df32bb0c7
+  data.tar.gz: b1de0ae1e63f3035a87963d689b7368e5092effd
 SHA512:
-  metadata.gz: d44bdc278b7e5f4d6fec53b2ba1954f10ce50f2580d594125ad0a3477133c7ecc055ede69cecc2da78a45d46b520d44552baa09d565889dd3d2b834f1ae36ab8
-  data.tar.gz: 6e0062819715018e8dd6dceeace7e94d7d3511d9d233d8fa1c09402043a625e6f2da46669ca52fb3566870e8c80481a6ab1fc12ac340f566bcacf95f20d04bf6
+  metadata.gz: 715905bf10eac5ba3961d3834692663014dc58cc5f5dc569aec580a265424b0069a53712b0b65a404f895e92b7c202b2723b3482a16d3d39bbbd490591be9722
+  data.tar.gz: cdda079c645c63cc019c46461e96b61d8f27bea4c2feb6745a95540906551f9abad14664f51cf60b9e1c12fa41948f90d3eebd64c83d6b631b3c2eace957d0fd

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.2
+ruby-2.0.0-p247

data/lib/looksist/hashed.rb

@@ -99,11 +99,11 @@ module Looksist
       def inject_attributes_for_array(array_of_hashes, opts)
         entity_name = __entity__(opts[:bucket_name] || opts[:using])
         modified_array = if opts[:at].nil?
-                array_of_hashes.map(&:values)
-              else
-                json_path = JsonPath.new("#{opts[:at]}..#{opts[:using]}")
-                json_path.on(array_of_hashes.to_json)
-              end
+                           array_of_hashes.map(&:values)
+                         else
+                           json_path = JsonPath.new("#{opts[:at]}..#{opts[:using]}")
+                           json_path.on(array_of_hashes.to_json)
+                         end
         keys = modified_array.flatten.compact.uniq
         values = Hash[keys.zip(Looksist.redis_service.send("#{entity_name}_for", keys))]
         opts[:populate].is_a?(Array) ? composite_attribute_lookup(array_of_hashes, opts, values) : single_attribute_lookup_for_array(array_of_hashes, opts, values)
@@ -136,11 +136,33 @@ module Looksist
       end
 
       def composite_attribute_lookup(array_of_hashes, opts, values)
-        array_of_hashes.each do |elt|
-          opts[:populate].each do |_key|
+        array_of_hashes.collect do |elt|
+          if opts[:at].present?
+            JsonPath.for(elt.with_indifferent_access).gsub!(opts[:at]) do |node|
+              if node.is_a? Array
+                node.collect do |x|
+                  opts[:populate].collect do |_key|
+                    alias_method = find_alias(opts[:as], _key)
+                    parsed_key = JSON.parse(values[x.with_indifferent_access[opts[:using]]]).deep_symbolize_keys
+                    x[alias_method] = parsed_key[_key]
+                  end
+                end
+              else
+                parsed_key = JSON.parse(values[node.with_indifferent_access[opts[:using]]]).deep_symbolize_keys
+                opts[:populate].collect do |_key|
+                  alias_method = find_alias(opts[:as], _key)
+                  node[alias_method] = parsed_key[_key]
+                end
+              end
+              node
+            end.to_hash.deep_symbolize_keys
+          else
             parsed_key = JSON.parse(values[elt[opts[:using]]]).deep_symbolize_keys
-            alias_method = find_alias(opts[:as], _key)
-            elt[alias_method] = parsed_key[_key]
+            opts[:populate].collect do |_key|
+              alias_method = find_alias(opts[:as], _key)
+              elt[alias_method] = parsed_key[_key]
+            end
+            elt
           end
         end
       end

data/lib/looksist/version.rb

@@ -1,3 +1,3 @@
 module Lookist
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/looksist.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/spec/looksist/hashed_spec.rb

@@ -439,7 +439,7 @@ describe Looksist::Hashed do
           ]
         end
 
-        inject after: :metrics, at: '$', using: :hero_id, populate: [:name, :mnemonic], as: {name: 'hero_name', mnemonic: 'hero_mnemonic'}
+        inject after: :metrics, using: :hero_id, populate: [:name, :mnemonic], as: {name: 'hero_name', mnemonic: 'hero_mnemonic'}
       end
       js1 = {name: 'Rajini', mnemonic: 'SuperStart'}.to_json
       js2 = {name: 'Kamal', mnemonic: 'Ulaganayagan'}.to_json
@@ -600,16 +600,34 @@ describe Looksist::Hashed do
       class DeepLookUpAtArrayOfHash
         include Looksist
         def self.articles
-          [{
-              articles:[{article_id: 1}, {article_id: 2}]
-           }]
+          [{:articles => [{:article_id => 1, :sub_category_id => 8001, :supplier_id => 158782, :sub_family_id => 18001}]}]
         end
-        inject after: :articles, at:'$..articles', using: :article_id, populate: :name
+        inject after: :articles, at:'$..articles', using: :article_id, populate: :name, as: {name: 'description'}
+        inject after: :articles, at:'$..articles', using: :sub_category_id, populate: :sub_category_name
       end
 
-      expect(@mock).to receive(:mget).once.with(*%w(articles/1 articles/2)).and_return(['a','b'])
+      expect(@mock).to receive(:mget).once.with(*%w(articles/1)).and_return(['A'])
+      expect(@mock).to receive(:mget).once.with(*%w(sub_categories/8001)).and_return(['B'])
 
-      expect(DeepLookUpAtArrayOfHash.articles).to eq([{articles:[{article_id: 1, name:'a'}, {article_id:2, name:'b'}]}])
+      expect(DeepLookUpAtArrayOfHash.articles).to eq([{:articles => [{:article_id => 1, :description=> 'A', :sub_category_id => 8001,
+                                                                      :sub_category_name => 'B',
+                                                                      :supplier_id => 158782, :sub_family_id => 18001}]}])
+
+    end
+
+    it'should work for nested injection for array of hash for multiple attributes' do
+      class DeepLookUpAtArrayOfHashMultiple
+        include Looksist
+        def self.articles
+          [{:articles => [{:article_id => 1, :sub_category_id => 8001, :supplier_id => 158782, :sub_family_id => 18001}]}]
+        end
+        inject after: :articles, at:'$..articles', using: :article_id, populate: [:name,:weight]
+      end
+
+      expect(@mock).to receive(:mget).once.with(*%w(articles/1)).and_return([{name:'A', weight:1}.to_json])
+
+      expect(DeepLookUpAtArrayOfHashMultiple.articles).to eq([{:articles => [{:article_id => 1, :name=> 'A',:weight=> 1, :sub_category_id => 8001,
+                                                                      :supplier_id => 158782, :sub_family_id => 18001}]}])
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: looksist
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - RC
@@ -15,168 +15,168 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: her
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jsonpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.6
 description: Redis backed lookup for your models
@@ -187,11 +187,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -230,17 +230,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Redis backed lookup for your models