regressor 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da20145433fc7502546a3a4789311489eebbab9
-  data.tar.gz: c5a5810e0089934d2dd1fc783215d646b0112d1e
+  metadata.gz: 8c1246eaaa08816d2d69349994d07cdddebc4e9c
+  data.tar.gz: 07b40698c510b43f50596cf10d1f1979ace9fdff
 SHA512:
-  metadata.gz: d7f3221de3e0db9fe5486582c051ed2dbb38330df05517b24542484ee3c981acd7537fdb7cee724b28bc89471d2fd93d246279e60eb2f3b233e91756d9d6d241
-  data.tar.gz: 5ac2a8e062369acd1e7c239dbdd7cbc2c5174f3281420b88dcce947cf522a47f5055f54460f04d31e791260edb1e213670a70e43d1bd8018a7ec4f8646b625e2
+  metadata.gz: 30e7e590db8a891cfeb7bdfe50e5beffb4b00858fb135fc76eb103a24759956fb0168cbf719e0500246141f3ba7a2668d1877faa0bb86defb9736acd4d40bbcd
+  data.tar.gz: e99e35ed3082cefce63966fa55789cd6f1ea1064463ac7c351945ea3d40120f4a655dfde33bdd0d7f6afb74b7104b583cb41d476189a8d9995433e1bc86cc4b6

data/lib/generators/regressor/controller/routing/rest/routes.rb

@@ -8,7 +8,7 @@ module Regressor
             controller_path = @controller.constantize.controller_path
             @controller.constantize.action_methods.map do |action_method|
               begin
-                journey_route = extract_journey_route
+                journey_route = extract_journey_route(controller_path, action_method)
                 required_parts = extract_required_parts(journey_route)
                 url = url_for({controller: controller_path, action: action_method, only_path: true}.merge(required_parts))
                 generate_example(journey_route, controller_path, action_method, required_parts, url)
@@ -44,7 +44,7 @@ module Regressor
             end
           end
 
-          def extract_journey_route
+          def extract_journey_route(controller_path, action_method)
             Rails.application.routes.routes.routes.select do |route|
               if route.defaults.present?
                 route.defaults[:controller].to_sym == controller_path.to_sym && route.defaults[:action].to_sym == action_method.to_sym

data/lib/generators/regressor/model/util.rb

@@ -0,0 +1,11 @@
+module Regressor
+  module Model
+    module Util
+      def extract_validators(validator_type)
+        @model.constantize.validators.select do |validator|
+          validator.class.to_s == validator_type.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -3,28 +3,23 @@ module Regressor
     module Validation
       module Length
         def length_validators
-          extract_length_validators.inject([]) do |result, validator|
-            result << generate_validator_examples(validator, validator.options[:minimum]-1, validator.options[:minimum]) if validator.options[:minimum]
-            result << generate_validator_examples(validator, validator.options[:maximum] + 1, validator.options[:maximum]) if validator.options[:maximum]
+          extract_validators(ActiveModel::Validations::LengthValidator).inject([]) do |result, validator|
+            result << generate_length_examples(validator, validator.options[:minimum]-1, validator.options[:minimum]) if validator.options[:minimum]
+            result << generate_length_examples(validator, validator.options[:maximum] + 1, validator.options[:maximum]) if validator.options[:maximum]
             result
           end.flatten.compact.uniq.join("\n\t")
         end
 
         private
 
-        def extract_length_validators
-          @model.constantize.validators.select do |validator|
-            validator.class.to_s == ActiveModel::Validations::LengthValidator.to_s
-          end
-        end
-
-        def generate_validator_examples(validator, upper_bound, lower_bound)
+        def generate_length_examples(validator, upper_bound, lower_bound)
           validator.attributes.inject([]) do |result, attribute|
             result << "it { is_expected.to allow_value(Faker::Lorem.characters(#{lower_bound})).for :#{attribute} }"
             result << "it { is_expected.not_to allow_value(Faker::Lorem.characters(#{upper_bound})).for :#{attribute} }"
             result
           end
         end
+
       end
     end
   end

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

@@ -0,0 +1,65 @@
+module Regressor
+  module Model
+    module Validation
+      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
+            end
+            result
+          end.uniq.join("\n\t")
+        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>
+#

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

@@ -3,13 +3,11 @@ module Regressor
     module Validation
       module Presence
         def presence_validators
-          @model.constantize.validators.select do |validator|
-            validator.class.to_s == ActiveRecord::Validations::PresenceValidator.to_s
-          end.map(&:attributes).flatten.map do |attribute|
+          extract_validators(ActiveRecord::Validations::PresenceValidator).map(&:attributes).flatten.map do |attribute|
             "it { is_expected.to validate_presence_of :#{attribute} }"
           end.uniq.join("\n\t")
         end
       end
     end
   end
-end
+end

data/lib/generators/regressor/regression_model.rb

@@ -1,8 +1,10 @@
+require_relative 'model/util'
 require_relative 'model/relation/belong_to'
 require_relative 'model/relation/has_one'
 require_relative 'model/relation/has_many'
 require_relative 'model/validation/presence'
 require_relative 'model/validation/length'
+require_relative 'model/validation/numericality'
 require_relative 'model/database/column'
 require_relative 'model/database/index'
 require_relative 'model/nested/attribute'
@@ -14,10 +16,12 @@ class Regressor::RegressionModel
   include Regressor::Model::Relation::HasMany
   include Regressor::Model::Validation::Presence
   include Regressor::Model::Validation::Length
+  include Regressor::Model::Validation::Numericality
   include Regressor::Model::Database::Column
   include Regressor::Model::Database::Index
   include Regressor::Model::Nested::Attribute
   include Regressor::Model::Enum
+  include Regressor::Model::Util
 
   attr_accessor :model
 

data/lib/generators/templates/spec_regression_template.erb

@@ -22,6 +22,9 @@ RSpec.describe <%= @model.model %> do
   # === Validations (Presence) ===
   <%= @model.presence_validators %>
 
+  # === Validations (Numericality) ===
+  <%= @model.numericality_validators %>
+
   <% if Regressor.configuration.include_enums %>
   # === Enums ===
   <%= @model.enums %>

data/lib/regressor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regressor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Erwin Schens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
@@ -118,7 +118,9 @@ files:
 - lib/generators/regressor/model/relation/belong_to.rb
 - lib/generators/regressor/model/relation/has_many.rb
 - lib/generators/regressor/model/relation/has_one.rb
+- lib/generators/regressor/model/util.rb
 - lib/generators/regressor/model/validation/length.rb
+- lib/generators/regressor/model/validation/numericality.rb
 - lib/generators/regressor/model/validation/presence.rb
 - lib/generators/regressor/model_generator.rb
 - lib/generators/regressor/regression_controller.rb