regressor 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0984425573a1e4cd428276b17ae736cf570008
-  data.tar.gz: e5e4e56f8a4c0336f2b76c10ddef6947712981a8
+  metadata.gz: 0b6976e039d3e3cb93759a984eadcdc617f2bcf9
+  data.tar.gz: 6c20bbc08b4f80b0aa6662d1fb782183aa094e13
 SHA512:
-  metadata.gz: dd777bcfe7d77e595cf106a62b5f5fbbb7a47e112976f33438837c152b6ec97acf974a1319d39cbde745801c57836fd7ba70eb9768b541c80b7bc7e25f0ee3b6
-  data.tar.gz: 5c09d5d3ed4747f1144d66bca17633c0bc2aaa551de2e5a2648c9a98ca2d6d0c4782043c75605bf4e184d7375244500083db185a2d71440500c5360ba53a962e
+  metadata.gz: 13219132e9fdf9aca87ebf8c431bc2f6525318adde7ab469a5c64476bd6efa9dc57d4228715d8856fd426fe9076f9cab50660340833e2a7c43eb8431200db9b9
+  data.tar.gz: 29575ffc4aeb4067035cd0947ff68096497caf6519c1e5cac4dcee3a4c32aade857a364804c973677f1dd4b8419dbecba0ee89e003a9e1a6d522765f01138897

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

@@ -8,38 +8,52 @@ module Regressor
             controller_path = @controller.constantize.controller_path
             @controller.constantize.action_methods.map do |action_method|
               begin
-                journey_route = 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
-                  else
-                    false
-                  end
-                end.first
-
-                required_parts = journey_route.required_parts.inject({}) do |required_part_hash, required_part|
-                  required_part_hash.merge!({
-                                                required_part => 1
-                                            })
-                end
+                journey_route = extract_journey_route
+                required_parts = extract_required_parts(journey_route)
                 url = url_for({controller: controller_path, action: action_method, only_path: true}.merge(required_parts))
-
-                if journey_route.constraints[:request_method].match('GET')
-                  "it { should route(:get, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
-                elsif journey_route.constraints[:request_method].match('POST')
-                  "it { should route(:post, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
-                elsif journey_route.constraints[:request_method].match('PUT')
-                  "it { should route(:put, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
-                elsif journey_route.constraints[:request_method].match('PATCH')
-                  "it { should route(:patch, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
-                elsif journey_route.constraints[:request_method].match('DELETE')
-                  "it { should route(:delete, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
-                end
+                generate_example(journey_route, controller_path, action_method, required_parts, url)
               rescue
                 puts "Could not generate regression spec for controller #{controller_path} with action: #{action_method}"
                 nil
               end
             end.uniq.compact.join("\n\t")
           end
+
+          private
+
+          def generate_example(journey_route, controller_path, action_method, required_parts, url)
+            request_method = journey_route.constraints[:request_method]
+            if request_method.match('GET')
+              "it { should route(:get, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
+            elsif request_method.match('POST')
+              "it { should route(:post, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
+            elsif request_method.match('PUT')
+              "it { should route(:put, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
+            elsif request_method.match('PATCH')
+              "it { should route(:patch, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
+            elsif request_method.match('DELETE')
+              "it { should route(:delete, '#{url}').to(#{{controller: controller_path, action: action_method}.merge(required_parts).to_s}) } "
+            end
+          end
+
+          def extract_required_parts(journey_route)
+            journey_route.required_parts.inject({}) do |required_part_hash, required_part|
+              required_part_hash.merge!({
+                                            required_part => 1
+                                        })
+            end
+          end
+
+          def extract_journey_route
+            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
+              else
+                false
+              end
+            end.first
+          end
+
         end
       end
     end

data/lib/generators/regressor/model_generator.rb

@@ -7,8 +7,12 @@ module Regressor
     def create_regression_files
       Rails.application.eager_load!
       ActiveRecord::Base.descendants.map(&:name).reject { |x| Regressor.configuration.excluded_models.include? x }.each do |model|
-        @model = Regressor::RegressionModel.new(model)
-        create_file "#{Regressor.configuration.regression_path}/#{model.tableize.gsub("/", "_").singularize}_spec.rb", ERB.new(File.new(File.expand_path('../templates/spec_regression_template.erb', File.dirname(__FILE__))).read).result(binding)
+        begin
+          @model = Regressor::RegressionModel.new(model)
+          create_file "#{Regressor.configuration.regression_path}/#{model.tableize.gsub("/", "_").singularize}_spec.rb", ERB.new(File.new(File.expand_path('../templates/spec_regression_template.erb', File.dirname(__FILE__))).read).result(binding)
+        rescue Exception
+          puts "Cannot create Model Regression for: #{model}"
+        end
       end
     end
 

data/lib/regressor/version.rb

@@ -1,3 +1,3 @@
 module Regressor
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

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