custom_fielder 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648a2e684dae174f93a7d853c5b407938e1c8794
-  data.tar.gz: 595befc53d7a9bd52f472316d65e6f2c360c6a3c
+  metadata.gz: 57116a86043be57d309bdb3d0bf477e5bca1fc12
+  data.tar.gz: 09b44f4232247891266e7b088868dbc4594ea7d3
 SHA512:
-  metadata.gz: 4dc3de13896746fcede6569e862bc147e7952fc8238cc277e1cddae8ff763701f8a483750299cec6a8f2098c5bb2c5ae0d308d4a46f0a9fa0135379ff9e44979
-  data.tar.gz: cf8ec45b8d4068cabf2ce3620a513015f4acbc3d2cffed34d2033406534ddda6733dae4750ea24dfa234cf4046a42d2b1f4d31ebf1f13ffdc9249f94ada96682
+  metadata.gz: ed4013e514ea6bcad03c3e702b58e95baa94d19cf85109deddfb88c83e9f7bcc058aee51c06d112919749a6d7a7915e60c0a0e4ef33402b7ba3a06234edd859d
+  data.tar.gz: 5da4f4f282d96bcaefeef25bbe57d4270af6d6ccb6b731fe225461c8ae9da09f9f6114e8a711c9022fe6d4f9c72e66791fb871cf59741ef30a94706e4993232a

data/app/models/custom_fielder/custom_field.rb

@@ -9,8 +9,13 @@ module CustomFielder
     validate :check_allow_blank
     validate :check_allowed_values
 
-    belongs_to :field_attributes, dependent: :destroy, class_name: 'FieldAttributes'
     belongs_to :custom_fieldable, polymorphic: true
+    belongs_to :field_attributes, dependent: :destroy, class_name: 'FieldAttributes'
+
+    scope :active,   -> { where(active: true) }
+    scope :inactive, -> { where(active: false) }
+
+    scope :fields_with_attributes, -> (field_attrs) { where(field_attributes: field_attrs) }
 
     ##
     # Because everything is stored as string with ActiveRecord
@@ -22,22 +27,29 @@ module CustomFielder
     alias_method :raw_value, :value
     def value; deserialize_value; end;
 
-    ##
-    # Adds class methods to deactivate or activate all the fields
-    # that belong to the passed attribute object
-    #
     class << self
-      {
-        deactivate_field_for_all: false,
-        activate_field_for_all: true
-      }.each do |change_field_active_value, field_active_value|
-        define_method change_field_active_value do |field_attrs|
-          fields = all.where(field_attributes_id: field_attrs.id)
-          fields.each do |field|
-            field.active = field_active_value
-            field.save
-          end
-        end
+      ##
+      # Activates all CustomFields that belong to passed field attributes
+      #
+      # @param field_attrs [CustomField::FieldAttributes]
+      #
+      # @return [Nil]
+      #
+      def activate_field_for_all(field_attrs)
+        fields = all.where(field_attributes: field_attrs)
+        fields.each { |field| field.active = true; field.save }
+      end
+
+      ##
+      # Activates all CustomFields that belong to passed field attributes
+      #
+      # @param field_attrs [CustomField::FieldAttributes]
+      #
+      # @return [Nil]
+      #
+      def deactivate_field_for_all(field_attrs)
+        fields = all.where(field_attributes: field_attrs)
+        fields.each { |field| field.active = false; field.save }
       end
     end
 
@@ -100,57 +112,37 @@ module CustomFielder
     # @return [Nil]
     #
     def set_default
-      if (default and default != '') and (!raw_value or raw_value == '')
-        update_attribute(:value, default)
-      end
+      update_attribute(:value, default) if default? and raw_value_blank?
     end
 
     ##
-    # @return [Boolean|Nil] Adds error if invalid
+    # @return [Nil] Adds error if invalid
     #
     def check_type
-      if raw_value == nil or raw_value == ''
-        return true
-      end
-
-      unless is_correct_type?(type, raw_value)
-        value_mismatch_error
-      else
-        true
-      end
+      return if raw_value_blank?
+      value_mismatch_error unless is_correct_type?(type, raw_value)
     end
 
     ##
-    # @return [Boolean|Nil] Adds error if invalid
+    # @return [Nil] Adds error if invalid
     #
     def check_allow_blank
-      if allow_blank == false and (raw_value == nil or raw_value == '')
-        value_blank_error
-      else
-        true
-      end
+      value_blank_error if !allow_blank and raw_value_blank?
     end
 
     ##
-    # @return [Boolean|Nil] Adds error if invalid
+    # @return [Nil] Adds error if invalid
     #
     def check_allowed_values
-      if allowed_values == nil
-        return true
-      end
-
-      unless allowed_values.include?(value)
-        value_not_allowed_error
-      else
-        true
-      end
+      return true unless allowed_values
+      value_not_allowed_error unless allowed_values.include?(value)
     end
 
     ##
     # If a value is passed that does not match field type adds
     # a mismatch error
     #
-    # @return [nil]
+    # @return [Nil]
     #
     def value_mismatch_error
       errors.add(:value, 'value passed does not match field type')
@@ -160,7 +152,7 @@ module CustomFielder
     # If a value is passed that is blank and allow_blank is false
     # adds a value blank error
     #
-    # @return [nil]
+    # @return [Nil]
     #
     def value_blank_error
       errors.add(:value, 'blank value passed when allow blank is false')
@@ -170,11 +162,28 @@ module CustomFielder
     # If a value is passed that is not included in allowed values
     # adds a value not allowed error
     #
-    # @return [nil]
+    # @return [Nil]
     #
     def value_not_allowed_error
       errors.add(:value, 'value passed not in allowed values')
     end
 
+    ##
+    # Return true if raw_value is nil or an empty string
+    #
+    # @return [Boolean]
+    #
+    def raw_value_blank?
+      raw_value == nil or raw_value == ''
+    end
+
+    ##
+    # Return true if default is set and is not an empty string
+    #
+    # @return [Boolean]
+    #
+    def default?
+      default and default != ''
+    end
   end
 end

data/db/migrate/20160525133243_create_custom_fielder_custom_fields.rb

@@ -5,6 +5,7 @@ class CreateCustomFielderCustomFields < ActiveRecord::Migration
       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

data/db/migrate/20160525133922_create_custom_fielder_field_attributes.rb

@@ -5,7 +5,8 @@ class CreateCustomFielderFieldAttributes < ActiveRecord::Migration
       t.string  :field_type,      null: false
       t.string  :default
       t.boolean :allow_blank,     null: false
-      t.text    :allowed_values,  array: true
+      t.string  :allowed_values
+      t.text    :note
 
       t.timestamps null: false
     end

data/lib/custom_fielder/version.rb

@@ -1,3 +1,3 @@
 module CustomFielder
-  VERSION = "0.5.0"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fielder
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Nick Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - hurst.178@osu.edu