code_analyzer 0.3.0 → 0.3.1

data/.rvmrc

@@ -1,2 +1,2 @@
 rvm_gemset_create_on_use_flag=1
-rvm gemset use ruby-1.9.3-p194@code_analyzer
+rvm gemset use code_analyzer

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,6 +1,13 @@
 # CodeAnalyzer
 
-code_analyzer is extracted from [rails_best_practices][0], it helps you
+| Project  | code_analyzer
+|:---------|:--------------------------------------------
+| Homepage | https://github.com/flyerhzm/code_analyzer
+| Document | http://rubydoc.info/gems/code_analyzer/frames
+| CI       | [![Build Status](https://travis-ci.org/flyerhzm/code_analyzer.png)](https://travis-ci.org/flyerhzm/code_analyzer)
+| Author   | [Richard Huang][0]
+
+code_analyzer is extracted from [rails_best_practices][1], it helps you
 easily build your own code analyzer tool.
 
 ## Installation
@@ -29,4 +36,5 @@ Or install it yourself as:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[0]: https://github.com/railsbp/rails_best_practices
+[0]: http://huangzhimin.com
+[1]: https://github.com/railsbp/rails_best_practices

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w( --color )
+end
+task :default => :spec

data/code_analyzer.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "sexp_processor"
   gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake"
 end

data/lib/code_analyzer/sexp.rb

@@ -16,7 +16,8 @@ class Sexp
   def line
     case sexp_type
     when :def, :defs, :command, :command_call, :call, :fcall, :method_add_arg, :method_add_block,
-         :var_ref, :vcall, :const_ref, :const_path_ref, :class, :module, :if, :unless, :elsif, :ifop, :binary,
+         :var_ref, :vcall, :const_ref, :const_path_ref, :class, :module,
+         :if, :unless, :elsif, :ifop, :if_mod, :unless_mod, :binary,
          :alias, :symbol_literal, :symbol, :aref, :hash, :assoc_new, :string_literal,
          :massign
       self[1].line
@@ -329,7 +330,7 @@ class Sexp
   #
   # @return [Sexp] conditional statement of if node
   def conditional_statement
-    if [:if, :unless, :elsif, :ifop].include? sexp_type
+    if [:if, :unless, :elsif, :ifop, :if_mod, :unless_mod].include? sexp_type
       self[1]
     end
   end
@@ -431,7 +432,7 @@ class Sexp
     case sexp_type
     when :else
       self[1]
-    when :module, :if, :elsif, :unless
+    when :module, :if, :elsif, :unless, :if_mod, :unless_mod, :ifop
       self[2]
     when :class, :def
       self[3]

data/lib/code_analyzer/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module CodeAnalyzer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/code_analyzer/sexp_spec.rb

@@ -16,6 +16,12 @@ describe Sexp do
         def opassign(a, b)
           a+= b
         end
+        def condition
+          if success?
+            puts "unknown" if output?
+          elsif fail?
+          end
+        end
       end
       EOF
       @node = parse_content(content)
@@ -52,6 +58,18 @@ describe Sexp do
     it "should return opassign line" do
       @node.grep_node(sexp_type: :opassign).line.should == 11
     end
+
+    it "should return if line" do
+      expect(@node.grep_node(sexp_type: :if).line).to eq 14
+    end
+
+    it "should return elsif line" do
+      expect(@node.grep_node(sexp_type: :elsif).line).to eq 16
+    end
+
+    it "should return if_mod line" do
+      expect(@node.grep_node(sexp_type: :if_mod).line).to eq 15
+    end
   end
 
   describe "grep_nodes" do
@@ -313,30 +331,32 @@ describe Sexp do
   describe "conditional_statement" do
     it "should get conditional statement of if" do
       node = parse_content("if true; end").grep_node(sexp_type: :if)
-      node.conditional_statement.to_s.should == "true"
+      expect(node.conditional_statement.to_s).to eq "true"
     end
 
     it "should get conditional statement of unless" do
-      node = parse_content("unless true; end").grep_node(sexp_type: :unless)
-      node.conditional_statement.to_s.should == "true"
+      node = parse_content("unless false; end").grep_node(sexp_type: :unless)
+      expect(node.conditional_statement.to_s).to eq "false"
     end
 
     it "should get conditional statement of elsif" do
-      content =<<-EOF
-      if true
-      elsif false
-      end
-      EOF
-      node = parse_content(content).grep_node(sexp_type: :elsif)
-      node.conditional_statement.to_s.should == "false"
+      node = parse_content("if true; elsif false; end").grep_node(sexp_type: :elsif)
+      expect(node.conditional_statement.to_s).to eq "false"
+    end
+
+    it "should get conditional statement of if_mod" do
+      node = parse_content("'OK' if true").grep_node(sexp_type: :if_mod)
+      expect(node.conditional_statement.to_s).to eq "true"
+    end
+
+    it "should get conditional statement of unless_mod" do
+      node = parse_content("'OK' unless false").grep_node(sexp_type: :unless_mod)
+      expect(node.conditional_statement.to_s).to eq "false"
     end
 
     it "should get conditional statement of ifop" do
-      content =<<-EOF
-      user ? user.name : nil
-      EOF
-      node = parse_content(content).grep_node(sexp_type: :ifop)
-      node.conditional_statement.to_s.should == "user"
+      node = parse_content("true ? 'OK' : 'NO'").grep_node(sexp_type: :ifop)
+      expect(node.conditional_statement.to_s).to eq "true"
     end
   end
 
@@ -381,23 +401,38 @@ describe Sexp do
     end
 
     it "should get body of if" do
-      node = parse_content("if true; puts 'hello world'; end").grep_node(sexp_type: :if)
-      node.body.sexp_type.should == :stmts_add
+      node = parse_content("if true; 'OK'; end").grep_node(sexp_type: :if)
+      expect(node.body.sexp_type).to eq :stmts_add
     end
 
     it "should get body of elsif" do
-      node = parse_content("if true; elsif true; puts 'hello world'; end").grep_node(sexp_type: :elsif)
-      node.body.sexp_type.should == :stmts_add
+      node = parse_content("if true; elsif true; 'OK'; end").grep_node(sexp_type: :elsif)
+      expect(node.body.sexp_type).to eq :stmts_add
     end
 
     it "should get body of unless" do
-      node = parse_content("unless true; puts 'hello world'; end").grep_node(sexp_type: :unless)
-      node.body.sexp_type.should == :stmts_add
+      node = parse_content("unless true; 'OK'; end").grep_node(sexp_type: :unless)
+      expect(node.body.sexp_type).to eq :stmts_add
     end
 
     it "should get body of else" do
-      node = parse_content("if true; else; puts 'hello world'; end").grep_node(sexp_type: :else)
-      node.body.sexp_type.should == :stmts_add
+      node = parse_content("if true; else; 'OK'; end").grep_node(sexp_type: :else)
+      expect(node.body.sexp_type).to eq :stmts_add
+    end
+
+    it "should get body of if_mod" do
+      node = parse_content("'OK' if true").grep_node(sexp_type: :if_mod)
+      expect(node.body.to_s).to eq "OK"
+    end
+
+    it "should get body of unless_mod" do
+      node = parse_content("'OK' unless false").grep_node(sexp_type: :unless_mod)
+      expect(node.body.to_s).to eq "OK"
+    end
+
+    it "should get body of if_op" do
+      node = parse_content("true ? 'OK' : 'NO'").grep_node(sexp_type: :ifop)
+      expect(node.body.to_s).to eq "OK"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_analyzer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a code analyzer tool which extracted from rails_best_practices, it helps
   you easily build your own code analyzer tool.
 email:
@@ -54,6 +70,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -90,12 +107,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3700642731172846945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3700642731172846945
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -111,4 +134,3 @@ test_files:
 - spec/code_analyzer/sexp_spec.rb
 - spec/code_analyzer/warning_spec.rb
 - spec/spec_helper.rb
-has_rdoc: