custom_fielder 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57116a86043be57d309bdb3d0bf477e5bca1fc12
-  data.tar.gz: 09b44f4232247891266e7b088868dbc4594ea7d3
+  metadata.gz: cdacf42418abc8f142f9b1d3bb6c5b56bc7b6f6e
+  data.tar.gz: 96102550d49e1010be766ad6b5a14c74af122306
 SHA512:
-  metadata.gz: ed4013e514ea6bcad03c3e702b58e95baa94d19cf85109deddfb88c83e9f7bcc058aee51c06d112919749a6d7a7915e60c0a0e4ef33402b7ba3a06234edd859d
-  data.tar.gz: 5da4f4f282d96bcaefeef25bbe57d4270af6d6ccb6b731fe225461c8ae9da09f9f6114e8a711c9022fe6d4f9c72e66791fb871cf59741ef30a94706e4993232a
+  metadata.gz: 59419c9269107788d0d037b31aebc4f8759aa20cec191c48941efa638ab0cb78d486f03b325763dd18298d73381563a2853f481c3521085b14e49c652e45ec19
+  data.tar.gz: e10506a2625bc86801a0eb7d0141522dd4e2acb85faa1450d154d59d37a769bde82930940c7d0db2b65ed4a32a5f51fd0d96b0ec8f2d40a4b7bb0b385147039a

data/app/helpers/custom_fielder/deserialization_helper.rb

@@ -68,8 +68,7 @@ module CustomFielder
     # @return [Boolean]
     #
     def boolean(value)
-      return false if FALSE_VALUES.include?(value)
-      true
+      FALSE_VALUES.include?(value) ? false : true
     end
 
     ##

data/app/helpers/custom_fielder/type_checking_helper.rb

@@ -15,66 +15,42 @@ module CustomFielder
     # @return [Boolean]
     #
     def is_array?(value)
-      unless value =~ /^\[(.(, )?)+\]$/
-        false
-      else
-        true
-      end
+      value =~ /^\[(.(, )?)+\]$/
     end
 
     ##
     # @return [Boolean]
     #
     def is_integer?(value)
-      unless value =~ /^\d+$/
-        false
-      else
-        true
-      end
+      value =~ /^\d+$/
     end
 
     ##
     # @return [Boolean]
     #
     def is_float?(value)
-      unless value =~ /^\d+\.\d+$/
-        false
-      else
-        true
-      end
+      value =~ /^\d+\.\d+$/
     end
 
     ##
     # @return [Boolean]
     #
     def is_date?(value)
-      unless value =~ /^\d{4}-\d{2}-\d{2}$/
-        false
-      else
-        true
-      end
+      value =~ /^\d{4}-\d{2}-\d{2}$/
     end
 
     ##
     # @return [Boolean]
     #
     def is_date_time?(value)
-      unless value =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}-\d{2}:\d{2}$/
-        false
-      else
-        true
-      end
+      value =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}-\d{2}:\d{2}$/
     end
 
     ##
     # @return [Boolean]
     #
     def is_boolean?(value)
-      unless TRUTH_VALUES.include?(value) or FALSE_VALUES.include?(value)
-        false
-      else
-        true
-      end
+      TRUTH_VALUES.include?(value) or FALSE_VALUES.include?(value)
     end
 
     ##

data/app/models/custom_fielder/custom_field.rb

@@ -15,7 +15,11 @@ module CustomFielder
     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
 
     ##
     # Because everything is stored as string with ActiveRecord
@@ -41,7 +45,7 @@ module CustomFielder
       end
 
       ##
-      # Activates all CustomFields that belong to passed field attributes
+      # Deactivates all CustomFields that belong to passed field attributes
       #
       # @param field_attrs [CustomField::FieldAttributes]
       #
@@ -134,7 +138,7 @@ module CustomFielder
     # @return [Nil] Adds error if invalid
     #
     def check_allowed_values
-      return true unless allowed_values
+      return unless allowed_values
       value_not_allowed_error unless allowed_values.include?(value)
     end
 
@@ -185,5 +189,6 @@ module CustomFielder
     def default?
       default and default != ''
     end
+
   end
 end

data/lib/custom_fielder/custom_fieldable.rb

@@ -25,8 +25,7 @@ module CustomFielder
       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
+          h[field_name] = cf.value; h
         end
       end
     end

data/lib/custom_fielder/version.rb

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

metadata

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