custom_fielder 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9439a06e0eb1e9a999f50de592dbf8450e8337de
-  data.tar.gz: e4d3f9b9c1a4ff3ae81f35af6ae85bdf68d2e2da
+  metadata.gz: ba1a35b8ba0a749348e09d583d71ca7289338b1d
+  data.tar.gz: 0c82c5566b04597e87ec82659a4fa46fe36cc173
 SHA512:
-  metadata.gz: 2e4a9af79b87f83d457ce584d10231ea2dd7d15a2944be38dee663235c75d80d4666a83ed310a506f849252da35d6b29d620566af2019b66e5e42c8085fd3d9c
-  data.tar.gz: 7abc545e853aeafb53bed45ab0d1f45913835defa27fcb3cf85cabda595377a84140c3c2a82f745e170c7291355190780af996f1ac186941defbdaaa890c6f3f
+  metadata.gz: fb0fdd4f0c2cb97a7155a5753a939d63efe10b4d777a5acb5311caad7eda66630d3873ee1a9b95e239bd316d168b8c099197922ae407d1628aff9b449a9d6880
+  data.tar.gz: 1ab60451a738ac239bd040b7b9f91752cc46149cbb92637d4a374524d46ed6af5997dd15bfbf097a63a5618b351e1d4ae0ddf607a96ed5bb39fb3349aadbd82c

data/app/models/custom_fielder/field.rb

@@ -0,0 +1,11 @@
+module CustomFielder
+  class Field < ActiveRecord::Base
+    has_many :values
+
+    validates :name,                presence: true
+    validates :field_type,          presence: true,
+                                    inclusion: { in: %w[Array Integer Float Date DateTime Boolean String] }
+    validates :fieldable_type,      presence: true
+    validates :allow_blank,         inclusion: { in: [true, false] }
+  end
+end

data/app/models/custom_fielder/{custom_field.rb → value.rb}

@@ -1,5 +1,5 @@
 module CustomFielder
-  class CustomField < ActiveRecord::Base
+  class Value < ActiveRecord::Base
     include TypeCheckingHelper
     include DeserializationHelper
 
@@ -8,18 +8,16 @@ module CustomFielder
     validate :check_type
     validate :check_allow_blank
     validate :check_allowed_values
+    validate :check_fieldable_type
 
-    belongs_to :custom_fieldable, polymorphic: true
-    belongs_to :field_attributes, dependent: :destroy, class_name: 'FieldAttributes'
+    belongs_to :field, dependent: :destroy
+    belongs_to :fieldable, polymorphic: true
 
     scope :active,   -> { where(active: true) }
     scope :inactive, -> { where(active: false) }
 
-    scope :fields_with_class, -> (klass) { where(custom_fieldable_type: klass) }
-    scope :fields_with_attributes, -> (field_attrs) { where(field_attributes: field_attrs) }
-    scope :fields_with_class_and_attributes, -> (klass, field_attrs) do
-      where(custom_fieldable_type: klass, field_attributes: field_attrs)
-    end
+    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
@@ -35,25 +33,25 @@ module CustomFielder
       ##
       # Activates all CustomFields that belong to passed field attributes
       #
-      # @param field_attrs [CustomField::FieldAttributes]
+      # @param field_attrs [CustomFielder::Field]
       #
       # @return [Nil]
       #
-      def activate_field_for_all(field_attrs)
-        fields = all.where(field_attributes: field_attrs)
-        fields.each { |field| field.active = true; field.save }
+      def activate_field_for_all(field)
+        values = all.where(field: field)
+        values.each { |value| value.active = true; value.save }
       end
 
       ##
       # Deactivates all CustomFields that belong to passed field attributes
       #
-      # @param field_attrs [CustomField::FieldAttributes]
+      # @param field_attrs [CustomFielder::Field]
       #
       # @return [Nil]
       #
-      def deactivate_field_for_all(field_attrs)
-        fields = all.where(field_attributes: field_attrs)
-        fields.each { |field| field.active = false; field.save }
+      def deactivate_field_for_all(field)
+        values = all.where(field: field)
+        values.each { |value| value.active = false; value.save }
       end
     end
 
@@ -65,7 +63,16 @@ module CustomFielder
     # @return [String]
     #
     def type
-      @type ||= field_attributes.field_type
+      @type ||= field.field_type
+    end
+
+    ##
+    # Gets the fieldable type from the field
+    #
+    # @return [String]
+    #
+    def field_fieldable_type
+      @field_fieldable_type ||= field.fieldable_type
     end
 
     ##
@@ -74,7 +81,7 @@ module CustomFielder
     # @return [Boolean]
     #
     def allow_blank
-      @allow_blank ||= field_attributes.allow_blank
+      @allow_blank ||= field.allow_blank
     end
 
     ##
@@ -84,8 +91,8 @@ module CustomFielder
     #
     def allowed_values
       @allowed_values ||= begin
-        unless field_attributes.allowed_values.nil?
-          deserialize('Array', field_attributes.allowed_values)
+        unless field.allowed_values.nil?
+          deserialize('Array', field.allowed_values)
         else
           nil
         end
@@ -98,7 +105,7 @@ module CustomFielder
     # @return [String]
     #
     def default
-      @default ||= field_attributes.default
+      @default ||= field.default
     end
 
     ##
@@ -142,6 +149,13 @@ module CustomFielder
       value_not_allowed_error unless allowed_values.include?(value)
     end
 
+    ##
+    # @return [Nil] Adds error if invalid
+    #
+    def check_fieldable_type
+      value_fieldable_type_error unless field_fieldable_type == fieldable_type
+    end
+
     ##
     # If a value is passed that does not match field type adds
     # a mismatch error
@@ -149,7 +163,7 @@ module CustomFielder
     # @return [Nil]
     #
     def value_mismatch_error
-      errors.add(:value, 'value passed does not match field type')
+      errors.add(:value, 'Value passed does not match field type')
     end
 
     ##
@@ -159,7 +173,7 @@ module CustomFielder
     # @return [Nil]
     #
     def value_blank_error
-      errors.add(:value, 'blank value passed when allow blank is false')
+      errors.add(:value, 'Blank value not allowed')
     end
 
     ##
@@ -169,7 +183,17 @@ module CustomFielder
     # @return [Nil]
     #
     def value_not_allowed_error
-      errors.add(:value, 'value passed not in allowed values')
+      errors.add(:value, 'Value passed not in options')
+    end
+
+    ##
+    # If a value is trying to be assigned to a model that is different
+    # than the one the field was made for adds value fieldable type error
+    #
+    # @return [Nil]
+    #
+    def value_fieldable_type_error
+      errors.add(:value, "Can't assign value to a #{fieldable_type} when field is for #{field_fieldable_type}")
     end
 
     ##

data/db/migrate/20160525133243_create_custom_fielder_values.rb

@@ -0,0 +1,13 @@
+class CreateCustomFielderValues < ActiveRecord::Migration
+  def change
+    create_table :custom_fielder_values do |t|
+      t.references :fieldable,            polymorphic: true, null: false, index: { name: 'index_values_on_fieldable_type_and_fieldable_id' }
+      t.integer    :field_id,                                null: false
+      t.boolean    :active,                                  null: false, default: true
+      t.string     :value
+      t.text       :note
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/{20160525133922_create_custom_fielder_field_attributes.rb → 20160525133922_create_custom_fielder_fields.rb}

@@ -1,8 +1,9 @@
-class CreateCustomFielderFieldAttributes < ActiveRecord::Migration
+class CreateCustomFielderFields < ActiveRecord::Migration
   def change
-    create_table :custom_fielder_field_attributes do |t|
+    create_table :custom_fielder_fields do |t|
       t.string  :name,            null: false
       t.string  :field_type,      null: false
+      t.string  :fieldable_type,  null: false
       t.string  :default
       t.boolean :allow_blank,     null: false, default: false
       t.string  :allowed_values
@@ -10,5 +11,7 @@ class CreateCustomFielderFieldAttributes < ActiveRecord::Migration
 
       t.timestamps null: false
     end
+
+    add_index :custom_fielder_fields, [:name, :fieldable_type], unique: true
   end
 end

data/lib/custom_fielder/custom_fieldable.rb

@@ -3,21 +3,22 @@ module CustomFielder
     extend ActiveSupport::Concern
 
     included do
-      has_many :custom_fielder_custom_fields,
-        as: :custom_fieldable,
+      has_many :custom_fielder_fields,
+        through: :custom_fielder_values,
+        class_name: 'CustomFielder::Field',
+        source: :field
+
+      has_many :custom_fielder_values,
+        as: :fieldable,
         dependent: :destroy,
-        class_name: 'CustomFielder::CustomField'
+        class_name: 'CustomFielder::Value'
+
 
-      has_many :custom_fielder_field_attributes,
-        through: :custom_fielder_custom_fields,
-        class_name: 'CustomFielder::FieldAttributes',
-        source: :field_attributes
+      accepts_nested_attributes_for :custom_fielder_values, allow_destroy: true
+      accepts_nested_attributes_for :custom_fielder_fields, allow_destroy: false
 
-      accepts_nested_attributes_for :custom_fielder_custom_fields,    allow_destroy: true
-      accepts_nested_attributes_for :custom_fielder_field_attributes, allow_destroy: false
-      
-      alias_method :custom_fields,            :custom_fielder_custom_fields
-      alias_method :custom_field_attributes,  :custom_fielder_field_attributes
+      alias_method :custom_fields,       :custom_fielder_fields
+      alias_method :custom_field_values, :custom_fielder_values
 
       ##
       # Returns a hash where the keys are the field names
@@ -26,9 +27,9 @@ module CustomFielder
       # @return [Hash]
       #
       def get_custom_fields_with_values
-        custom_fields.inject(Hash.new) do |h, cf|
-          field_name = cf.field_attributes.name
-          h[field_name] = cf.value; h
+        custom_field_values.inject(Hash.new) do |h, field_value|
+          field_name = field_value.field.name
+          h[field_name] = field_value.value; h
         end
       end
     end

data/lib/custom_fielder/version.rb

@@ -1,3 +1,3 @@
 module CustomFielder
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fielder
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Nick Hurst
@@ -67,12 +67,12 @@ files:
 - app/helpers/custom_fielder/application_helper.rb
 - app/helpers/custom_fielder/deserialization_helper.rb
 - app/helpers/custom_fielder/type_checking_helper.rb
-- app/models/custom_fielder/custom_field.rb
-- app/models/custom_fielder/field_attributes.rb
+- app/models/custom_fielder/field.rb
+- app/models/custom_fielder/value.rb
 - app/views/layouts/custom_fielder/application.html.erb
 - config/routes.rb
-- db/migrate/20160525133243_create_custom_fielder_custom_fields.rb
-- db/migrate/20160525133922_create_custom_fielder_field_attributes.rb
+- db/migrate/20160525133243_create_custom_fielder_values.rb
+- db/migrate/20160525133922_create_custom_fielder_fields.rb
 - lib/custom_fielder.rb
 - lib/custom_fielder/custom_fieldable.rb
 - lib/custom_fielder/engine.rb

data/app/models/custom_fielder/field_attributes.rb

@@ -1,18 +0,0 @@
-module CustomFielder
-  class FieldAttributes < ActiveRecord::Base
-    has_many :custom_fields
-
-    before_save :serialize_allowed_values
-
-    validates :name,          presence: true
-    validates :field_type,    presence: true,
-                              inclusion: { in: %w[Array Integer Float Date DateTime Boolean String] }
-    validates :allow_blank,   inclusion: { in: [true, false] }
-
-    private
-
-    def serialize_allowed_values
-      allowed_values = allowed_values.to_s
-    end
-  end
-end

data/db/migrate/20160525133243_create_custom_fielder_custom_fields.rb

@@ -1,13 +0,0 @@
-class CreateCustomFielderCustomFields < ActiveRecord::Migration
-  def change
-    create_table :custom_fielder_custom_fields do |t|
-      t.references :custom_fieldable,     polymorphic: true, index: { name: 'index_custom_fields_on_fieldable_type_and_fieldable_id' }, null: false
-      t.integer    :field_attributes_id,  null: false
-      t.boolean    :active,               null: false, default: true
-      t.string     :value
-      t.text       :note
-
-      t.timestamps null: false
-    end
-  end
-end