custom_fielder 0.7.4 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef4ed2576e189267c7e86bb4c3ef897f2d77fc9d
-  data.tar.gz: 23bc7808ab46e735234def81d25161c0bde22fae
+  metadata.gz: 8efc430192e902dcb9c7fb03094ff07a0f0352fd
+  data.tar.gz: f64aa52d1ff99c0d55564f2994ad0daaf613abf6
 SHA512:
-  metadata.gz: e0ed8215b71d76e425653c48c2922a82f8cfb7b1624620ea850af94f0ab27c41922a1fd7291a9fcbdf8ca4594199577572640078a2ecd0f00bf132331a0001ed
-  data.tar.gz: d0bd074f63efd8272cd5c7ca8e86590b04075536439bfe53fdc044e5ebe4f29dff67ad5827f9ed32c93463eb73b041bb466a86db37d66a47162a895ba90219e6
+  metadata.gz: 44274b541b02acba72f55f1af3cf99fdcecac934ec35a742379696988d22d23eb1cd9b9e9ce893d0f3c9df15e01d928fdfd3f486f0c51f2eb13f1cfb3ca7c178
+  data.tar.gz: b2e9f556c91e8b1f8422e8e58bdaff85ff481ab598cf876995842d1f162578e693f7b7b4c7497493b54bd883da65e34ce08a7d88c074816a76489ee73cff7b4c

data/lib/custom_fielder/custom_fieldable.rb

@@ -43,7 +43,7 @@ module CustomFielder
       #
       # @return [Array]
       #
-      def self.custom_fielder_columns
+      def self.custom_fieldable_columns
         [:id]
       end
 
@@ -57,45 +57,20 @@ module CustomFielder
       #
       # @return [ActiveRecord::Relation]
       #
-      def self.custom_fielder_search
+      def self.custom_fieldable_search
         all
       end
 
       ##
-      # Provides an array of hashes of objects and Custom Field values (if they exist)
-      # using custom_fielder_search as the means of generating
-      # the sub query to find objects and then using this query
-      # to join the values with the objects if they exist (in one transaction)
+      # Gets all the avaiable fieldable objects for a model
+      # that do not already have a value defined on them
       #
       # @param field [CustomFielder::Field] field to search for values on
       #
       # @return [Array<Hash>]
       #
-      def self.custom_fielder_objects(field)
-        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
-          \ #{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}'
-        SQL
-
-        objects = ActiveRecord::Base.connection.execute(query)
-
-        if objects.class == PG::Result
-          objects = objects.values.map { |values| Hash[objects.fields.zip(values)] }
-        end
-
-        return objects
+      def self.custom_fieldable_objects(field)
+        custom_fieldable_search.where.not(id: field.values.select(:fieldable_id))
       end
 
       ##

data/lib/custom_fielder/version.rb

@@ -1,3 +1,3 @@
 module CustomFielder
-  VERSION = "0.7.4"
+  VERSION = "0.7.8"
 end

metadata

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