regressor 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfdcab4e5984a23cebaa698fe65888d2e9133cac
-  data.tar.gz: 11333c03404c2d9744abc14eb11f317d3d0dec96
+  metadata.gz: 3ccfb10d1fd8a5fdc9ad01688d0467054945c949
+  data.tar.gz: dd774a46ce48e915590195e0044947cc36231240
 SHA512:
-  metadata.gz: 4acccb1b860384c10200da8c5c38da8f21700a6d7245866971de24d40be9aaf27c9ebfcc8d0fd863d51ad5d980e0d24a490c6cbd5b337d1b876e4da4ed012593
-  data.tar.gz: ed378bf13882af17043aec5f78ee22fa314802a9629a082d19b3fb7a1f7f00f8a0b60231c09c7768f30b2c80972f49029b234025f21928dfb96434df290ddf4f
+  metadata.gz: 514cf199208a5835383a4ae2cb034510b55f1507a87953ea0339e3b00180501ac7eeefe5de6cf88dc5fc74357fb84d27228867dfba17377a58bcf04d0b1b4873
+  data.tar.gz: 51080b07d9aeece110b6fa6bb7b66c6bd57f7abf06d35bd19973c4eb05ff607acfcd7dd2f269c017b619f533edd0ee7dec799a5307660607ca94fc260b8dfd7e

data/lib/controller/callback/after_filter.rb

@@ -4,7 +4,7 @@ module Regressor
       module AfterFilter
         def after_callbacks
           after_filters.map do |filter_name|
-            "it { should use_after_filter(:#{filter_name}) }"
+            "it { should use_after_filter(#{filter_name}) }"
           end.compact.uniq.join("\n  ")
         end
       end

data/lib/controller/callback/around_filter.rb

@@ -4,7 +4,7 @@ module Regressor
       module AroundFilter
         def around_callbacks
           around_filters.map do |filter_name|
-            "it { should use_around_filter(:#{filter_name}) }"
+            "it { should use_around_filter(#{filter_name}) }"
           end.compact.uniq.join("\n  ")
         end
       end

data/lib/controller/callback/before_filter.rb

@@ -4,7 +4,7 @@ module Regressor
       module BeforeFilter
         def before_callbacks
           before_filters.map do |filter_name|
-            "it { should use_before_filter(:#{filter_name}) }"
+            "it { should use_before_filter(#{filter_name}) }"
           end.compact.uniq.join("\n  ")
         end
       end

data/lib/controller/util.rb

@@ -20,7 +20,8 @@ module Regressor
         all_filters = controller._process_action_callbacks
         all_filters = all_filters.select { |f| f.kind == kind } if kind
         # Reject procs
-        all_filters.map(&:raw_filter).reject{|filter| filter.class == Proc}
+        all_filters = all_filters.map(&:raw_filter).reject{|filter| filter.class == Proc}
+        all_filters.map {|filter| filter.is_a?(Symbol) ? ":#{filter}" : filter.to_s}
       end
     end
   end

data/lib/generators/regressor/factory_generator.rb

@@ -0,0 +1,45 @@
+require 'model/factory_model'
+
+module Regressor
+  class FactoryGenerator < Rails::Generators::Base
+    source_root(File.expand_path(File.dirname(__FILE__)))
+
+    def create_regression_files
+      load_application
+      generate_factories
+    end
+
+    private
+
+    def generate_factories
+      load_ar_models.each do |model|
+        save_generate(model) do
+          @model = ::Regressor::Model::FactoryModel.new(model)
+          create_file "#{Regressor.configuration.regression_factory_path}/#{model.underscore.singularize}_factory.rb",
+                      ERB.new(File.new(File.expand_path('../../templates/factory/factory_template.erb', File.dirname(__FILE__))).read).result(binding)
+        end
+      end
+    end
+
+    def load_application
+      Rails.application.try(:eager_load!)
+    end
+
+    def load_ar_models
+      if defined?(::ActiveRecord::Base)
+        ActiveRecord::Base.descendants.map(&:name).reject { |x| Regressor.configuration.excluded_models.include? x }
+      else
+        []
+      end
+    end
+
+    def save_generate(model)
+      begin
+        yield
+      rescue => e
+        puts "Cannot create factory for #{model}. Reason #{e.message}"
+      end
+    end
+
+  end
+end

data/lib/model/active_record/validation.rb

@@ -0,0 +1,31 @@
+module Regressor
+  module Model
+    module Validation
+      def wrap_conditional_validations validator, specs
+        if_mock = if_condition_mock validator
+        unless_mock = unless_condition_mock validator
+        padding = if_mock.blank? && unless_mock.blank? ? '' : '    '
+        specs = specs.map do |spec|
+          "#{padding}#{spec}"
+        end.uniq.join("\n  ")
+        if if_mock.blank? && unless_mock.blank?
+          specs
+        else
+          "context \"with conditions\" do\n    before do\n#{if_mock}#{unless_mock}    end\n\n#{specs}\n  end\n"
+        end
+      end
+
+      def if_condition_mock validator
+        if_condition = validator.options[:if]
+        return '' unless if_condition && if_condition.is_a?(Symbol)
+        "      allow(subject).to receive(:#{if_condition.to_s}).and_return(true)\n"
+      end
+
+      def unless_condition_mock validator
+        unless_condition = validator.options[:unless]
+        return '' unless unless_condition && unless_condition.is_a?(Symbol)
+        "      allow(subject).to receive(:#{unless_condition.to_s}).and_return(false)\n"
+      end
+    end
+  end
+end

data/lib/model/active_record/validation/length.rb

@@ -3,23 +3,24 @@ module Regressor
     module Validation
       module Length
         def length_validators
-          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  ")
+          extract_validators(::ActiveModel::Validations::LengthValidator).flatten.map do |validator|
+            specs = []
+            specs.concat generate_length_examples(validator, validator.options[:minimum]-1, validator.options[:minimum]) if validator.options[:minimum]
+            specs.concat generate_length_examples(validator, validator.options[:maximum] + 1, validator.options[:maximum]) if validator.options[:maximum]
+            wrap_conditional_validations validator, specs.flatten.compact.uniq
+          end.join("\n  ")
         end
 
         private
 
         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
+          validator.attributes.map do |attribute|
+            [
+                "it { is_expected.to allow_value(Faker::Lorem.characters(#{lower_bound})).for :#{attribute} }",
+                "it { is_expected.not_to allow_value(Faker::Lorem.characters(#{upper_bound})).for :#{attribute} }"
+            ]
           end
         end
-
       end
     end
   end

data/lib/model/active_record/validation/numericality.rb

@@ -3,14 +3,15 @@ module Regressor
     module Validation
       module Numericality
         def numericality_validators
-          extract_validators(::ActiveModel::Validations::NumericalityValidator).inject([]) do |result, validator|
+          extract_validators(::ActiveModel::Validations::NumericalityValidator).flatten.map do |validator|
+            specs = []
             if validator.options.blank?
-              result += validator_without_options(validator)
+              specs.concat validator_without_options(validator)
             else
-              result += validator_with_options(validator)
+              specs.concat validator_with_options(validator)
             end
-            result
-          end.uniq.join("\n  ")
+            wrap_conditional_validations validator, specs.flatten.compact.uniq
+          end.join("\n  ")
         end
 
         private

data/lib/model/active_record/validation/presence.rb

@@ -3,9 +3,12 @@ module Regressor
     module Validation
       module Presence
         def presence_validators
-          extract_validators(::ActiveRecord::Validations::PresenceValidator).map(&:attributes).flatten.map do |attribute|
-            "it { is_expected.to validate_presence_of :#{attribute} }"
-          end.uniq.join("\n  ")
+          extract_validators(::ActiveRecord::Validations::PresenceValidator).flatten.map do |validator|
+            specs = validator.attributes.map do |attribute|
+              "it { is_expected.to validate_presence_of :#{attribute} }"
+            end.uniq
+            wrap_conditional_validations validator, specs
+          end.join("\n  ")
         end
       end
     end

data/lib/model/active_record_model.rb

@@ -9,6 +9,8 @@ require_relative 'active_record/database/column'
 require_relative 'active_record/database/index'
 require_relative 'active_record/nested/attribute'
 require_relative 'active_record/enum'
+require_relative 'active_record/validation'
+
 
 module Regressor
   module Model
@@ -17,6 +19,7 @@ module Regressor
       include Relation::BelongTo
       include Relation::HasOne
       include Relation::HasMany
+      include Validation
       include Validation::Presence
       include Validation::Length
       include Validation::Numericality

data/lib/model/factory_model.rb

@@ -0,0 +1,13 @@
+module Regressor
+  module Model
+    class FactoryModel
+      # === Attribute Accessors ===
+      attr_accessor :model
+
+      # === Methods ===
+      def initialize(model)
+        @model = model
+      end
+    end
+  end
+end

data/lib/regressor.rb

@@ -11,6 +11,7 @@ module Regressor
   class Configuration
     attr_accessor :regression_path,
                   :regression_controller_path,
+                  :regression_factory_path,
                   :excluded_models,
                   :excluded_controllers,
                   :include_enums
@@ -18,6 +19,7 @@ module Regressor
     def initialize
       @regression_path = 'spec/models/regression'
       @regression_controller_path = 'spec/controllers/regression'
+      @regression_factory_path = 'spec/factories'
       @excluded_models = []
       @excluded_controllers = []
       @include_enums = true

data/lib/regressor/version.rb

@@ -1,3 +1,3 @@
 module Regressor
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/lib/templates/factory/factory_template.erb

@@ -0,0 +1,8 @@
+require 'faker'
+
+FactoryGirl.define do
+
+    factory :<%= @model.model.to_s.underscore.gsub('/', '_') %>, class: <%= @model.model %> do
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regressor
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Erwin Schens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
@@ -137,6 +137,7 @@ files:
 - lib/controller/routing/rest/routes.rb
 - lib/controller/util.rb
 - lib/generators/regressor/controller_generator.rb
+- lib/generators/regressor/factory_generator.rb
 - lib/generators/regressor/install_generator.rb
 - lib/generators/regressor/model_generator.rb
 - lib/generators/regressor/mongoid/model_generator.rb
@@ -148,11 +149,13 @@ files:
 - lib/model/active_record/relation/has_many.rb
 - lib/model/active_record/relation/has_one.rb
 - lib/model/active_record/util.rb
+- lib/model/active_record/validation.rb
 - lib/model/active_record/validation/length.rb
 - lib/model/active_record/validation/numericality.rb
 - lib/model/active_record/validation/presence.rb
 - lib/model/active_record_model.rb
 - lib/model/expression.rb
+- lib/model/factory_model.rb
 - lib/model/mongoid/database/field.rb
 - lib/model/mongoid/document/timestamp.rb
 - lib/model/mongoid/document/version.rb
@@ -164,6 +167,7 @@ files:
 - lib/regressor.rb
 - lib/regressor/version.rb
 - lib/templates/controller/controller_spec_template.erb
+- lib/templates/factory/factory_template.erb
 - lib/templates/model/active_record/model_template.erb
 - lib/templates/model/mongoid/model_template.erb
 - lib/templates/regressor.rb