custom_fielder 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84eda915c5b54c9fc89c80acf7b86fab38de9e6
-  data.tar.gz: d911d74856f866effa1b53cb8ca94c7b56741b9a
+  metadata.gz: cde4f35dc44de01993b5b7107a63ec6963f147ee
+  data.tar.gz: 87ffa9c46a22e22ba36136b97629a54a28cdc96b
 SHA512:
-  metadata.gz: 3d46b753eb9927efbd1bc7ff824c313d3a9feb86956bb72ec7993253951bee2db0853e12c2d227ee87e733005e07769941240b24e50a6da50a29f78ba003d4c1
-  data.tar.gz: db3d3722917352c5b58c1a83fd52935c416926b29fa173af40cc8d5e8311c687279a998968b5120baad2207ce5a1d28d7dd108df3c5ff1f3350bdf77ff448fed
+  metadata.gz: fd6d7741b354fbf3b6d7412475668cdbe8fa23739e148d2df5e42eaab4eaffb6efe4f79cfb6790e20073308b9554d66211be2e8a4b3113d978f71b381cc5afdd
+  data.tar.gz: bd6ef62263ea5da0b94fe8bc0957d9a2d68b6a8a9c65473d6567b7bf71766978a104226c69b7b79dcd323c2de457c97bfcc75982bba20cba29da9685b90908c1

data/app/models/custom_fielder/value.rb

@@ -15,7 +15,7 @@ module CustomFielder
 
     scope :values_with_field, -> (field) { where(field: field) }
     scope :values_with_class, -> (klass) { where(fieldable_type: klass) }
-
+    
     ##
     # Because everything is stored as string with ActiveRecord
     # we use a alias method chain to rename the value method that

data/lib/custom_fielder/custom_fieldable.rb

@@ -72,20 +72,28 @@ module CustomFielder
       # @return [Array<Hash>]
       #
       def self.custom_fielder_objects(field)
-        columns   = custom_fielder_columns
-        sub_query = custom_fielder_search.select(columns).to_sql
-        columns.map! { |column| "objects.#{column} as #{column}" }
+        object_columns   = custom_fielder_columns
+        sub_query        = custom_fielder_search.select(object_columns).to_sql
+
+        object_columns.map! { |column| "objects.#{column} AS #{column}" }
 
         query = <<-SQL
-          SELECT #{columns.join(', ')}, cfv.id AS value_id, cfv.value AS value
+          SELECT
+          \ #{object_columns.join(', ')},
+            cfv.id        AS value_id,
+            cfv.value     AS value,
+            '#{field.id}' AS field_id
           FROM (#{sub_query}) objects
           LEFT OUTER JOIN custom_fielder_values cfv
             ON  objects.id   = cfv.fieldable_id
-            AND cfv.field_id = '#{field.id}'
+            AND cfv.field_id = field_id
         SQL
 
         objects = ActiveRecord::Base.connection.execute(query)
-        objects = objects.values.map { |values| Hash[objects.fields.zip(values)] } if objects.class == PG::Result
+
+        if objects.class == PG::Result
+          objects = objects.values.map { |values| Hash[objects.fields.zip(values)] }
+        end
 
         return objects
       end

data/lib/custom_fielder/version.rb

@@ -1,3 +1,3 @@
 module CustomFielder
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fielder
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Nick Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails