rails_best_practices 0.7.2 → 0.7.3

data/lib/rails_best_practices/core/runner.rb

@@ -15,7 +15,7 @@ module RailsBestPractices
     # 2. review process, it does real check, if the source code violates some best practices, the violations will be notified.
     class Runner
       attr_reader :checks
-      attr_accessor :debug, :color
+      attr_accessor :debug, :whiny, :color
 
       # set the base path.
       #
@@ -48,6 +48,7 @@ module RailsBestPractices
 
         @checker ||= CheckingVisitor.new(:prepares => @prepares, :reviews => @reviews, :lexicals => @lexicals)
         @debug = false
+        @whiny = false
       end
 
       # lexical analysis the file.
@@ -107,6 +108,7 @@ module RailsBestPractices
               warning = warning.red if self.color
               puts warning
             end
+            raise e if @whiny
             nil
           end
         end

data/lib/rails_best_practices/prepares/model_prepare.rb

@@ -50,9 +50,10 @@ module RailsBestPractices
       def remember_association(association_node)
         association_meta = association_node.message
         association_name = association_node.arguments[1].to_s
-        if association_node.arguments[2] && :hash == association_node.arguments[2].node_type
-          association_options = eval(association_node.arguments[2].to_s)
-          association_class = association_options["class_name"]
+        arguments_node = association_node.arguments[2]
+        if arguments_node && :hash == arguments_node.node_type
+          index = arguments_node.index(s(:lit, :class_name))
+          association_class = arguments_node[index + 1].to_s if index
         end
         @model_associations.add_association(@last_klazz, association_name, association_meta, association_class)
       end

data/lib/rails_best_practices/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module RailsBestPractices
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end
 

data/spec/rails_best_practices/prepares/model_prepare_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe RailsBestPractices::Prepares::ModelPrepare do
   let(:runner) { RailsBestPractices::Core::Runner.new(:prepares => RailsBestPractices::Prepares::ModelPrepare.new) }
 
+  before :each do
+    runner.whiny = true
+  end
+
   it "should parse model associations" do
     content =<<-EOF
     class Project < ActiveRecord::Base
@@ -20,6 +24,16 @@ describe RailsBestPractices::Prepares::ModelPrepare do
     model_associations.get_association("Project", "categories").should == {:meta => :has_and_belongs_to_many, :class_name => "Category"}
   end
 
+  it "should not raise error for finder_sql option" do
+    content =<<-EOF
+    class EventSubscription < ActiveRecord::Base
+      has_many :event_notification_template, :finder_sql => ?
+    end
+    EOF
+    content.sub!('?', '\'SELECT event_notification_templates.* from event_notification_templates where event_type_id=#{event_type_id} and delivery_method_id=#{delivery_method_id}\'')
+    lambda { runner.prepare('app/models/event_subscription.rb', content) }.should_not raise_error
+  end
+
   context "class_name" do
     it "should parse belongs_to" do
       content =<<-EOF

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_best_practices
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Richard Huang
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +08:00
+date: 2011-03-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +30,11 @@ dependencies:
         - 0
         - 4
         version: 2.0.4
+  prerelease: false
   version_requirements: *id001
+  type: :runtime
   name: ruby_parser
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 0
         - 9
         version: 0.0.9
+  prerelease: false
   version_requirements: *id002
+  type: :runtime
   name: ruby-progressbar
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +61,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
+  prerelease: false
   version_requirements: *id003
+  type: :runtime
   name: colored
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +77,11 @@ dependencies:
         - 6
         - 6
         version: 2.6.6
+  prerelease: false
   version_requirements: *id004
+  type: :runtime
   name: erubis
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,11 +93,11 @@ dependencies:
         - 0
         - 18
         version: 3.0.18
+  prerelease: false
   version_requirements: *id005
+  type: :runtime
   name: haml
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,11 +107,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   version_requirements: *id006
+  type: :runtime
   name: i18n
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -123,11 +121,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   version_requirements: *id007
+  type: :runtime
   name: activesupport
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -137,11 +135,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   version_requirements: *id008
+  type: :development
   name: rake
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -153,11 +151,11 @@ dependencies:
         - 4
         - 0
         version: 2.4.0
+  prerelease: false
   version_requirements: *id009
+  type: :development
   name: rspec
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -168,11 +166,11 @@ dependencies:
         - 0
         - 6
         version: "0.6"
+  prerelease: false
   version_requirements: *id010
+  type: :development
   name: watchr
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -184,7 +182,9 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
   version_requirements: *id011
+  type: :development
   name: bundler
 description: a code metric tool for rails codes, written in Ruby.
 email: 
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: a code metric tool for rails codes.