custom_fielder 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25400fa066980421a9c8baec140f8b59b4eb1068
-  data.tar.gz: 83acde8a17a5ecdd4dfb0091a9e79d70d704649e
+  metadata.gz: 3e99d0877255c6feab7652bd4fa0cc3e5ae95a76
+  data.tar.gz: 0d825d0f7af1a89e0bf680b399b3e7e7168521c1
 SHA512:
-  metadata.gz: 070d4897d2cb4ee6f26b89cee76ff0ad7386d17a7fc2aad531625151ffb14af8fab80dff58eb7ff8547d0dfbd0f1cb17aed43f894290fb750744602cc3f56c3b
-  data.tar.gz: 4a8bf34693dd7cbaa8c15730a1362168ccd85ba79bbec0b49c971c022c0750ca6d5da5c5fd3a4f3964fb5e268fe1959190f80e3015db125a22e499cc17fa2654
+  metadata.gz: 86626bfeb0a08b957ffad288338260add169e423f57e6781792ee03404db2dd20db82b9ac223fccbeba3e1a3d6c9edfa4958d0751cad938d34b772ed4fabd74e
+  data.tar.gz: 881e26cf496358268982bc42381a973e4e50e033782e3547eeb8fa8a84b734c7ecb75ccae64ef66e56bbc62e52976e897f76208793ab2b1010506ca00eb245e2

data/app/helpers/custom_fielder/deserialization_helper.rb

@@ -39,7 +39,7 @@ module CustomFielder
     ##
     # @return [Integer]
     #
-    def integer(value)
+    def fixnum(value)
       value.to_i
     end
 

data/app/helpers/custom_fielder/type_checking_helper.rb

@@ -21,7 +21,7 @@ module CustomFielder
     ##
     # @return [Boolean]
     #
-    def is_integer?(value)
+    def is_fixnum?(value)
       value =~ /^\d+$/
     end
 

data/app/models/custom_fielder/field.rb

@@ -1,14 +1,49 @@
 module CustomFielder
   class Field < ActiveRecord::Base
+    include TypeCheckingHelper
     include DeserializationHelper
 
+    FIELD_TYPE_MAP = {
+      'Text' => 'String',
+      'Integer' => 'Fixnum',
+      'Decmial' => 'Float',
+      'Date' => 'Date',
+      'Date & Time' => 'DateTime',
+      'True/False' => 'Boolean',
+      'List' => 'Array'
+    }
+
+    FORM_FIELD_TYPES = ['Text Entry', 'Multiple Choice', 'Date', 'DateTime', 'Boolean', 'List']
+
     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] }
+    validates :name,                  presence: true
+    validates :field_type,            presence: true,
+                                      inclusion: { in: %w[Array Fixnum Float Date DateTime Boolean String] }
+    validates :fieldable_type,        presence: true
+    validates :allow_blank,           inclusion: { in: [true, false] }
+    validate  :type_of_allowed_values
+
+    scope :text_entry_fields, -> { all.where(field_type: ['String', 'Fixnum', 'Float'], allowed_values: nil) }
+    scope :multiple_choice_fields, -> { all.where.not(allowed_values: nil) }
+    scope :date_fields, -> { all.where(field_type: 'Date', allowed_values: nil) }
+    scope :date_time_fields, -> { all.where(field_type: 'DateTime', allowed_values: nil) }
+    scope :boolean_fields, -> { all.where(field_type: 'Boolean', allowed_values: nil) }
+    scope :list_fields, -> { all.where(field_type: 'Array') }
+
+    ##
+    # Creates a hash of form field types mapped to array of field, field id pairs
+    # meant for use in a form select dropdown with options group
+    #
+    # @return [Hash]
+    #
+    def self.all_fields_hashed_for_opt_group
+      FORM_FIELD_TYPES.inject(Hash.new) do |hash, form_field|
+        fields = send("#{form_field.delete(' ').underscore}_fields")
+        hash[form_field] = fields.map { |field| [field, field.id] }
+        hash
+      end.delete_if { |k, v| v == [] }
+    end
 
     ##
     # Returns the deserialized version of allowed_values
@@ -19,5 +54,27 @@ module CustomFielder
       allowed_values.nil? ? nil : deserialize('Array', allowed_values)
     end
 
+
+    private
+
+    ##
+    # Checks to make sure all values in allowed_values are of the correct type
+    #
+    # @return [Nil]
+    #
+    def type_of_allowed_values
+      return if allowed_values.nil?
+      options.each { |v| allowed_values_error unless v.class.to_s == field_type }
+    end
+
+    ##
+    # Adds error if there is an allowed_values_error
+    #
+    # @return [Nil]
+    #
+    def allowed_values_error
+      errors.add(:allowed_values, 'Value in options is not the correct type')
+    end
+
   end
 end

data/lib/custom_fielder/version.rb

@@ -1,3 +1,3 @@
 module CustomFielder
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fielder
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Nick Hurst