deep_pluck 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349c7b04d2d9ccae350dca8881d3ef4ea0df5c3d
-  data.tar.gz: ec237b551c395325b18cfd6e7c9e6e661568644a
+  metadata.gz: 44d38789b1249442a2a97cf7206309ce2a5125e3
+  data.tar.gz: 5e07435ba363c3fbe2a325dc8cd1fec1791228b8
 SHA512:
-  metadata.gz: 931c73f32ea5d5ab45968ccacbfa711c0c16fb2a96f3e7fe4fa872faae240741fa906f7927a51c5fcf1d7cd702dc53287b69f70051ec9df297411d109825b2a5
-  data.tar.gz: 32fb59b2124621239f9b469b07e93b1defbd866c672cc391430ea31634997f95f1e30a11f0a28594797155c65de03d2d4fcf5d3cdd04bf80107c8cc4bd0ec296
+  metadata.gz: 44b321b33fdadcefd60a4d1b2319c8b03cb57cd2331888921f7082b830bc664a1d3d66e9533b0f0f12b70a7991b3da888aedb11e68e7532463604a7f5a6c66bc
+  data.tar.gz: c28edcfd210948743d1e883f44d2e40f73db88ae92f05d8efd48e423006566e6c5903f3f255688e609438852a6306bec8725b13d968d636165a23aa8d827e128

data/lib/deep_pluck/model.rb

@@ -14,12 +14,12 @@ module DeepPluck
   #  Reader
   #---------------------------------------
     def reflect_on_association(association_key)
-      @relation.klass.reflect_on_association(association_key)
+      @relation.klass.reflect_on_association(association_key.to_sym) #add to_sym since rails 3 only support symbol
     end
     def get_foreign_key(association_key, reverse = false)
       reflect = reflect_on_association(association_key)
-      return (reflect.belongs_to? ? 'id' : reflect.foreign_key) if reverse
-      return (reflect.belongs_to? ? reflect.foreign_key : 'id')
+      return (reflect.belongs_to? ? @relation.klass.primary_key : reflect.foreign_key) if reverse
+      return (reflect.belongs_to? ? reflect.foreign_key : @relation.klass.primary_key)
     end
   #---------------------------------------
   #  Contruction OPs
@@ -81,15 +81,16 @@ module DeepPluck
       all_need_columns = [*prev_need_columns, *next_need_columns, *@need_columns].uniq
       @extra_columns = all_need_columns - @need_columns
       @relation = yield(@relation) if block_given?
-      return (@data = @relation.pluck_all(*all_need_columns))
-    end
-    def load_all
-      data = load_data
+      @data = @relation.pluck_all(*all_need_columns)
       @associations.each do |key, model|
-        set_includes_data(data, key, model)
+        set_includes_data(@data, key, model)
       end
+      return @data
+    end
+    def load_all
+      load_data
       delete_extra_column_data!
-      return data
+      return @data
     end
     def delete_extra_column_data!
       @data.each{|s| s.except!(*@extra_columns) } if @data

data/lib/deep_pluck/version.rb

@@ -1,3 +1,3 @@
 module DeepPluck
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_pluck
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - khiav reoy