lib/looksist/hashed.rb in looksist-0.2.8 vs lib/looksist/hashed.rb in looksist-0.2.9

@@ -17,11 +17,11 @@
         unless @rules[after].length > 1
           define_method("#{after}_with_inject") do |*args|
             hash = send("#{after}_without_inject".to_sym, *args)
             self.class.instance_variable_get(:@rules)[after].each do |opts|
               if opts[:at].is_a? String
-                hash = update_using_json_path(hash, opts).to_hash.deep_symbolize_keys
+                hash = update_using_json_path(hash, opts)
               else
                 inject_attributes_at(hash[opts[:at]], opts)
               end
             end
             hash
@@ -48,14 +48,19 @@
       hash_offset[opts[:populate]] = values
       hash_offset
     end
 
     def update_using_json_path(hash, opts)
-      JsonPath.for(hash.with_indifferent_access).gsub!(opts[:at]) do |i|
-        i.is_a?(Array) ? inject_attributes_for(i, opts) : inject_attributes_at(i, opts) unless i.empty?
-        i
+      if hash.is_a?(Hash)
+        JsonPath.for(hash.with_indifferent_access).gsub!(opts[:at]) do |i|
+          i.is_a?(Array) ? inject_attributes_for(i, opts) : inject_attributes_at(i, opts) unless (i.nil? or i.empty?)
+          i
+        end.to_hash.deep_symbolize_keys
+      else
+        inject_attributes_for(hash, opts)
       end
     end
+
 
     def inject_attributes_for(arry_of_hashes, opts)
       entity_name = __entity__(opts[:bucket_name] || opts[:using])
       keys = (arry_of_hashes.collect { |i| i[opts[:using]] }).compact.uniq
       values = Hash[keys.zip(Looksist.redis_service.send("#{entity_name}_for", keys))]