rails_best_practices 1.7.0 → 1.7.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_best_practices (1.7.0)
+    rails_best_practices (1.7.1)
       activesupport
       colored
       erubis

data/README.md

@@ -7,15 +7,17 @@ rails_best_practices
 
 rails_best_practices is a code metric tool to check the quality of rails codes.
 
-rails_best_practices supports
+it supports following ORM/ODMs:
 
-activerecord
-mongoid
-mongomapper
+* activerecord
+* mongoid
+* mongomapper
 
-erb
-haml
-slim
+following template engines:
+
+* erb
+* haml
+* slim
 
 Usage
 -----

data/lib/rails_best_practices/prepares/route_prepare.rb

@@ -31,6 +31,8 @@ module RailsBestPractices
           else
             if :bare_assoc_hash == first_argument.sexp_type
               route_node = first_argument.hash_values.first
+              # do not parse redirect block
+              return if :method_add_arg == route_node.sexp_type
               controller_name, action_name = route_node.to_s.split('#')
             else
               controller_name, action_name = first_argument.to_s.split('/')
@@ -39,18 +41,26 @@ module RailsBestPractices
           end
         when "match", "root"
           options = node.arguments.all.last
-          return if :string_literal == options.sexp_type
-          if options.hash_value("controller").present?
-            return if :regexp_literal == options.hash_value("controller").sexp_type
-            controller_name = options.hash_value("controller").to_s
-            action_name = options.hash_value("action").present? ? options.hash_value("action").to_s : "*"
-            @routes.add_route(current_namespaces, controller_name, action_name)
-          else
-            route_node = options.hash_values.find { |value_node| :string_literal == value_node.sexp_type && value_node.to_s.include?('#') }
-            if route_node.present?
-              controller_name, action_name = route_node.to_s.split('#')
-              @routes.add_route(current_namespaces, controller_name.underscore, action_name)
+          case options.sexp_type
+          when :bare_assoc_hash
+            if options.hash_value("controller").present?
+              return if :regexp_literal == options.hash_value("controller").sexp_type
+              controller_name = options.hash_value("controller").to_s
+              action_name = options.hash_value("action").present? ? options.hash_value("action").to_s : "*"
+              @routes.add_route(current_namespaces, controller_name, action_name)
+            else
+              route_node = options.hash_values.find { |value_node| :string_literal == value_node.sexp_type && value_node.to_s.include?('#') }
+              if route_node.present?
+                controller_name, action_name = route_node.to_s.split('#')
+                @routes.add_route(current_namespaces, controller_name.underscore, action_name)
+              end
+            end
+          when :string_literal, :symbol_literal
+            if current_controller_name
+              @routes.add_route(current_namespaces, current_controller_name, options.to_s)
             end
+          else
+            # do nothing
           end
         else
           # nothing to do
@@ -78,20 +88,34 @@ module RailsBestPractices
 
       # remember the namespace.
       def start_method_add_block(node)
-        if "namespace" == node.message.to_s
+        case node.message.to_s
+        when "namespace"
           @namespaces << node.arguments.all.first.to_s
-        elsif "with_options" == node.message.to_s
+        when "scope"
+          if node.arguments.all.last.hash_value("module").present?
+            @namespaces << node.arguments.all.last.hash_value("module").to_s
+          end
+        when "with_options"
           argument = node.arguments.all.last
           if :bare_assoc_hash == argument.sexp_type && argument.hash_value("controller").present?
             @controller_name = argument.hash_value("controller").to_s
           end
+        else
+          # do nothing
         end
       end
 
       # end of namespace call.
       def end_method_add_block(node)
-        if "namespace" == node.message.to_s
+        case node.message.to_s
+        when "namespace"
           @namespaces.pop
+        when "scope"
+          if node.arguments.all.last.hash_value("module").present?
+            @namespaces.pop
+          end
+        else
+          # do nothing
         end
       end
 
@@ -102,6 +126,9 @@ module RailsBestPractices
           resource_names.each do |resource_name|
             @controller_name = node.arguments.all.first.to_s
             options = node.arguments.all.last
+            if options.hash_value("module").present?
+              @namespaces << options.hash_value("module").to_s
+            end
             if options.hash_value("controller").present?
               @controller_name = options.hash_value("controller").to_s
             end
@@ -131,6 +158,9 @@ module RailsBestPractices
                 @routes.add_route(current_namespaces, current_controller_name, action_name)
               end
             end
+            if options.hash_value("module").present?
+              @namespaces.pop
+            end
           end
         end
 

data/lib/rails_best_practices/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

data/spec/rails_best_practices/prepares/route_prepare_spec.rb

@@ -438,16 +438,21 @@ describe RailsBestPractices::Prepares::RoutePrepare do
         RailsBestPracticesCom::Application.routes.draw do
           resources :posts, :only => [:show] do
             get :list, :on => :collection
+            collection do
+              get :search
+              match :available
+            end
             post :create, :on => :member
-            put :update, :on => :member
-            delete :destroy, :on => :memeber
+            member do
+              put :update
+            end
           end
         end
         EOF
         runner.prepare('config/routes.rb', content)
         routes = RailsBestPractices::Prepares.routes
-        routes.size.should == 5
-        routes.map(&:to_s).should == ["PostsController#show", "PostsController#list", "PostsController#create", "PostsController#update", "PostsController#destroy"]
+        routes.size.should == 6
+        routes.map(&:to_s).should == ["PostsController#show", "PostsController#list", "PostsController#search", "PostsController#available", "PostsController#create", "PostsController#update"]
       end
 
       it "should add route with nested routes" do
@@ -477,6 +482,23 @@ describe RailsBestPractices::Prepares::RoutePrepare do
         routes = RailsBestPractices::Prepares.routes
         routes.map(&:to_s).should == ["Admin::Test::PostsController#index"]
       end
+
+      it "should add route with scope" do
+        content =<<-EOF
+          RailsBestPracticesCom::Application.routes.draw do
+            scope :module => "admin" do
+              resources :posts, :only => [:index]
+            end
+            resources :discussions, :only => [:index], :module => "admin"
+            scope "/admin" do
+              resources :comments, :only => [:index]
+            end
+          end
+        EOF
+        runner.prepare('config/routes.rb', content)
+        routes = RailsBestPractices::Prepares.routes
+        routes.map(&:to_s).should == ["Admin::PostsController#index", "Admin::DiscussionsController#index", "CommentsController#index"]
+      end
     end
 
     it "should add route for direct get/post" do
@@ -538,5 +560,17 @@ describe RailsBestPractices::Prepares::RoutePrepare do
       routes = RailsBestPractices::Prepares.routes
       routes.size.should == 0
     end
+
+    it "should do nothing for redirect" do
+      content =<<-EOF
+      RailsBestPracticesCom::Application.routes.draw do
+        match "/stories/:name" => redirect("/posts/%{name}")
+        match "/stories" => redirect {|p, req| "/posts/\#{req.subdomain}" }
+      end
+      EOF
+      runner.prepare('config/routes.rb', content)
+      routes = RailsBestPractices::Prepares.routes
+      routes.size.should == 0
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_best_practices
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
-  requirement: &70336822187040 !ruby/object:Gem::Requirement
+  requirement: &70129980375200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822187040
+  version_requirements: *70129980375200
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70336822186240 !ruby/object:Gem::Requirement
+  requirement: &70129980374200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822186240
+  version_requirements: *70129980374200
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70336822184720 !ruby/object:Gem::Requirement
+  requirement: &70129980372820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822184720
+  version_requirements: *70129980372820
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70336822184080 !ruby/object:Gem::Requirement
+  requirement: &70129980371640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822184080
+  version_requirements: *70129980371640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70336822183280 !ruby/object:Gem::Requirement
+  requirement: &70129980371140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822183280
+  version_requirements: *70129980371140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70336822182380 !ruby/object:Gem::Requirement
+  requirement: &70129980370380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336822182380
+  version_requirements: *70129980370380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70336822181360 !ruby/object:Gem::Requirement
+  requirement: &70129980369260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822181360
+  version_requirements: *70129980369260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70336822180700 !ruby/object:Gem::Requirement
+  requirement: &70129980368480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822180700
+  version_requirements: *70129980368480
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70336822179980 !ruby/object:Gem::Requirement
+  requirement: &70129980367900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822179980
+  version_requirements: *70129980367900
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70336822179300 !ruby/object:Gem::Requirement
+  requirement: &70129980367200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822179300
+  version_requirements: *70129980367200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70336822178600 !ruby/object:Gem::Requirement
+  requirement: &70129980366380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336822178600
+  version_requirements: *70129980366380
 description: a code metric tool for rails codes, written in Ruby.
 email:
 - flyerhzm@gmail.com
@@ -303,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2040907872987852778
+      hash: -1979137183600671453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: