hash19 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b9042abb5650e9ee4e247e0c3539b6c5acf2f2
-  data.tar.gz: dbf0b31e2185441e35994eb2635dc3283e301edb
+  metadata.gz: 24ad3203a40f611e4dd1377fec530dd5e84addcb
+  data.tar.gz: 5a3248058a8423c5c91b9c4a83a69a0b3616ea78
 SHA512:
-  metadata.gz: 1baa6df02fbd4ad2e90ae39ebc36cfdf9db31f4302a0664864275b24d975c46bd9056ed9137d91fed65430a5a4e9148733dbf2e9e1aa8326653fd76e1523a2ba
-  data.tar.gz: 902ca441b549ff9a037fd80dbf755acbf0e8309d3d198632f086d2e6cf32732244c99bdb59d098e4f65d8a31427da8505de38420ddcda9927d3a4b2e39b6292b
+  metadata.gz: 4aa7526345de10af58deaf60936dc9e0ed2badeffbb0e4d28bfb5bfd2547f766f5744123f2f992f39c22293e198ec0ee4f9576fbb875943f4e85d5dc5eded933
+  data.tar.gz: bb06e9787149d039bec360a156d770a5ab355cbb700299aa509bad05cb4f643ca3189c0449ea8283c8bce217e0b87443c43d943b3216a544a633813822f9029d

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - ruby-2.1.1
   - ruby-2.1.2
-  - ruby-2.1.3
+  - ruby-2.1.3
+  - ruby-2.2.0

data/README.md

@@ -198,9 +198,9 @@ super_heroes.to_h #[{'name' => 'iron man', 'power' => 'none', 'weapon' => {'name
                   #{'name' => 'hulk', 'power' => 'bulk', 'weapon' => {'name' => 'hands', 'id' => 3}}
 ```
 
-Note that `injection` always overrides the association trigger since the former is eager loaded and latter is lazy loaded thus avoiding the `N+1` calls. 
+Note that `injection` always overrides the association trigger since the former is eager loaded and latter is lazy loaded thus avoiding the `N+1` calls.
 
-One other important thing to remember is that all the injections will happen in parallel. Hash19 uses [eldritch](https://github.com/beraboris/eldritch) gem to trigger multiple injections concurrently.
+One other important thing to remember is that all the injections will happen in parallel. Hash19 uses [eldritch](https://github.com/beraboris/eldritch) gem to trigger multiple injections concurrently. If one inject is dependent on another or if you want the injections to happen in sequence add `async: false` to make calls synchronously.
 
 Please refer to the [tests](https://github.com/rcdexta/hash19/tree/master/spec/hash19) for more examples and documentation.
 

data/lib/hash19/resolvers.rb

@@ -27,7 +27,7 @@ module Hash19
           end
           puts "warning: Key:<#{opts[:using]}> not present in #{self.class.name}. Cannot map association:<#{name}>" unless @hash19.has_key? opts[:using]
           if opts[:trigger] and @hash19.has_key? opts[:using]
-            @hash19[opts[:alias] || name] = LazyValue.new(-> { opts[:trigger].call(@hash19.delete(opts[:using])) }) 
+            @hash19[opts[:alias] || name] = LazyValue.new(-> { opts[:trigger].call(@hash19.delete(opts[:using])) })
           end
         end
       end
@@ -41,22 +41,11 @@ module Hash19
 
     def resolve_injections(hash)
       together do
-        self.class.injections.each do |opts|
-          async do
-            entries = JsonPath.new(opts[:at]).on(hash).flatten
-            ids = entries.map { |el| el[opts[:using]] }.compact
-            next unless ids.present?
-            to_inject = opts[:trigger].call(ids).map(&:with_indifferent_access)
-            key = opts[:as] || opts[:using].to_s.gsub(/_id$|Id$/, '')
-            entries.each do |entry|
-              id = entry.delete(opts[:using])
-              next unless id.present?
-              target = to_inject.find { |el| el[opts[:reference] || opts[:using]] == id }
-              entry[key] = target
-            end
-          end
+        async_injections.each do |opts|
+          async { call_and_inject(opts, hash) }
         end
       end
+      synchronous_injections.each { |opts| call_and_inject(opts, hash) }
     end
 
     def resolve_class(assoc_name)
@@ -71,5 +60,32 @@ module Hash19
       end
     end
 
+    private
+
+    def async_injections
+      self.class.injections.select { |e| e[:async].nil? }
+    end
+
+    def synchronous_injections
+      self.class.injections.select { |e| e[:async] == false }
+    end
+
+    def call_and_inject(opts, hash)
+      entries = JsonPath.new(opts[:at]).on(hash).flatten
+      ids = entries.map { |el| el[opts[:using]] }.compact
+      return unless ids.present?
+      to_inject = opts[:trigger].call(ids).map(&:with_indifferent_access)
+      key = opts[:as] || opts[:using].to_s.gsub(/_id$|Id$/, '')
+      entries.each do |entry|
+        id = entry[opts[:using]]
+        next unless id.present?
+        target = to_inject.find { |el| el[opts[:reference] || opts[:using]] == id }
+        if target
+          entry.delete(opts[:using])
+          entry[key] = target
+        end
+      end
+    end
+
   end
 end

data/lib/hash19/version.rb

@@ -1,3 +1,3 @@
 module Hash19
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/hash19/injection_spec.rb

@@ -37,7 +37,7 @@ describe 'Injections' do
                                                  ])
     end
 
-    it "should not fail when no keys for injection present" do
+    it 'should not fail when no keys for injection present' do
       gru_team = SuperVillain.new(name: 'Gru', minions: [{name: 'Poppadom'},
                                                          {name: 'Gelato'},
                                                          {name: 'Kanpai'}])
@@ -47,7 +47,7 @@ describe 'Injections' do
                                                  ])
     end
 
-    it "should only map associations with keys" do
+    it 'should only map associations with keys' do
       gru_team = SuperVillain.new(name: 'Gru', minions: [{name: 'Poppadom', fruit_id: 1},
                                                          {name: 'Gelato'},
                                                          {name: 'Kanpai'}])
@@ -57,6 +57,31 @@ describe 'Injections' do
                                                  ])
     end
 
+    class SuperDuperVillain < Testable
+      attribute :name
+      has_many :minions
+      inject at: '$.minions', using: :fruit_id, reference: :id, trigger: lambda { |ids| Fruit.find_all ids }, as: 'eats'
+      inject at: '$.minions..eats', using: :name, reference: :fruit_name, trigger: lambda { |names| Vitamin.find_all names }, as: 'vitamin', async: false
+    end
+
+    class Vitamin < Testable
+      attributes :has, :fruit_name
+
+      def self.find_all(names)
+        [{fruit_name: 'banana', has: 'D'}, {fruit_name: 'orange', has: 'E'}]
+      end
+    end
+
+    it 'should be to do injections synchronously' do
+      gru_team = SuperDuperVillain.new(name: 'Gru', minions: [{name: 'Poppadom', fruit_id: 1},
+                                                              {name: 'Gelato', fruit_id: 2},
+                                                              {name: 'Kanpai', fruit_id: 3}])
+      expect(gru_team.to_h).to eq('name' => 'Gru', 'minions' => [{'name' => 'Poppadom', 'eats' => {'id' => 1, 'vitamin' => {'fruit_name' => 'banana', 'has' => 'D'}}},
+                                                                 {'name' => 'Gelato', 'eats' => {'id' => 2, 'name' => 'apple'}},
+                                                                 {'name' => 'Kanpai', 'eats' => {'id' => 3, 'vitamin' => {'fruit_name' => 'orange', 'has' => 'E'}}}
+                                                 ])
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash19
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - RC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler