regressor 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c1246eaaa08816d2d69349994d07cdddebc4e9c
-  data.tar.gz: 07b40698c510b43f50596cf10d1f1979ace9fdff
+  metadata.gz: 8d64cf73d04c20acd51f9b2f556402f4db8bc5e7
+  data.tar.gz: a374e36cf41028092a97cdd2b80af909b4db39e2
 SHA512:
-  metadata.gz: 30e7e590db8a891cfeb7bdfe50e5beffb4b00858fb135fc76eb103a24759956fb0168cbf719e0500246141f3ba7a2668d1877faa0bb86defb9736acd4d40bbcd
-  data.tar.gz: e99e35ed3082cefce63966fa55789cd6f1ea1064463ac7c351945ea3d40120f4a655dfde33bdd0d7f6afb74b7104b583cb41d476189a8d9995433e1bc86cc4b6
+  metadata.gz: 4a468ed532fc84c26dcde872e0685b4ccfda97d2b95d3557a1889d27d67f302c10804d2da88f1714ef060c08c1f97f77e5df79f26ddeadcdc5b0a8f127c73f76
+  data.tar.gz: d7df289bfc83b549cdde66e98bab21c6a36c4bd26d410f4d556a0a9f4d53c8de3d4a3daf058fe74aeda25c440a09997d491fa112d0047511071eeaadfd9cfcc3

data/lib/generators/regressor/model/validation/numericality.rb

@@ -4,62 +4,63 @@ module Regressor
       module Numericality
         def numericality_validators
           extract_validators(ActiveModel::Validations::NumericalityValidator).inject([]) do |result, validator|
-            validator.options.each do |k, v|
-              case k
-                when :even
-                  validator.attributes.each do |attribute|
-                    result << "it { is_expected.to validate_numericality_of(:#{attribute}).even}"
-                  end
-                when :only_integer
-                  validator.attributes.each do |attribute|
-                    result << "it { is_expected.to validate_numericality_of(:#{attribute}).only_integer}"
-                  end
-                when :allow_nil
-                  validator.attributes.each do |attribute|
-                    result << "it { is_expected.to validate_numericality_of(:#{attribute}).allow_nil}"
-                  end
-              end
+            if validator.options.blank?
+              result += validator_without_options(validator)
+            else
+              result += validator_with_options(validator)
             end
             result
           end.uniq.join("\n\t")
         end
+
+        private
+
+        def validator_without_options(validator)
+          validator.attributes.map do |attribute|
+            "it { is_expected.to validate_numericality_of(:#{attribute})}"
+          end.flatten
+        end
+
+        def validator_with_options(validator)
+          validator.options.map do |k, v|
+            assertion = (v ? :to : :not_to)
+            case k
+              when :even
+                generate_spec_with_option(validator, :even, assertion)
+              when :only_integer
+                generate_spec_with_option(validator, :only_integer, assertion)
+              when :allow_nil
+                generate_spec_with_option(validator, :allow_nil, assertion)
+              when :less_than
+                generate_spec_with_option(validator, "is_less_than(#{v})") +
+                    generate_spec_with_option(validator, "is_less_than(#{v + 1})", :not_to)
+              when :less_than_or_equal_to
+                generate_spec_with_option(validator, "is_less_than_or_equal_to(#{v})") +
+                    generate_spec_with_option(validator, "is_less_than_or_equal_to(#{v + 1})", :not_to)
+              when :equal_to
+                generate_spec_with_option(validator, "is_equal_to(#{v})") +
+                    generate_spec_with_option(validator, "is_equal_to(#{v + 1})", :not_to)
+              when :greater_than_or_equal_to
+                generate_spec_with_option(validator, "is_greater_than_or_equal_to(#{v})") +
+                    generate_spec_with_option(validator, "is_greater_than_or_equal_to(#{v - 1})", :not_to)
+              when :greater_than
+                generate_spec_with_option(validator, "is_greater_than(#{v})") +
+                    generate_spec_with_option(validator, "is_greater_than(#{v - 1})", :not_to)
+              when :odd
+                generate_spec_with_option(validator, :odd, assertion)
+              when :message
+                generate_spec_with_option(validator, "with_message('#{v}')")
+            end
+          end.flatten
+        end
+
+        def generate_spec_with_option(validator, matcher, assertion = :to)
+          validator.attributes.map do |attribute|
+            "it { is_expected.#{assertion} validate_numericality_of(:#{attribute}).#{matcher} }"
+          end
+        end
+
       end
     end
   end
-end
-
-# * <tt>:message</tt> - A custom error message (default is: "is not a number").
-# * <tt>:only_integer</tt> - Specifies whether the value has to be an
-#   integer, e.g. an integral value (default is +false+).
-# * <tt>:allow_nil</tt> - Skip validation if attribute is +nil+ (default is
-#   +false+). Notice that for fixnum and float columns empty strings are
-#   converted to +nil+.
-# * <tt>:greater_than</tt> - Specifies the value must be greater than the
-#   supplied value.
-# * <tt>:greater_than_or_equal_to</tt> - Specifies the value must be
-#   greater than or equal the supplied value.
-# * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied
-#   value.
-# * <tt>:less_than</tt> - Specifies the value must be less than the
-#   supplied value.
-# * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less
-#   than or equal the supplied value.
-# * <tt>:other_than</tt> - Specifies the value must be other than the
-#   supplied value.
-# * <tt>:odd</tt> - Specifies the value must be an odd number.
-# * <tt>:even</tt> - Specifies the value must be an even number.
-#
-# There is also a list of default options supported by every validator:
-# +:if+, +:unless+, +:on+, +:allow_nil+, +:allow_blank+, and +:strict+ .
-# See <tt>ActiveModel::Validation#validates</tt> for more information
-#
-# The following checks can also be supplied with a proc or a symbol which
-# corresponds to a method:
-#
-# * <tt>:greater_than</tt>
-# * <tt>:greater_than_or_equal_to</tt>
-# * <tt>:equal_to</tt>
-# * <tt>:less_than</tt>
-# * <tt>:less_than_or_equal_to</tt>
-# * <tt>:only_integer</tt>
-#
+end

data/lib/regressor/version.rb

@@ -1,3 +1,3 @@
 module Regressor
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regressor
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Erwin Schens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers