synvert 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf669115cf6d65444d15559b42836533143c76e2
-  data.tar.gz: b89a1714b73c29a5f66b4a320a3fa5c76b6feeb8
+  metadata.gz: ee5d52cf95df07b26f5bb50cbee385209ce3b59d
+  data.tar.gz: b077dd95e2e34be6c39af959ca9d9a7fc3352ecb
 SHA512:
-  metadata.gz: 3d4dac67ebafd169d5f44e4022d2102fa4de6d6d35954830583ce8277851eb945c7039263eda058992979814c6e10945bcde74533c59f4872dedad304b61fbbf
-  data.tar.gz: cbd540c9732b62c3fb6fdd6897fdc538aa17dbde38b037acfae1240bd3b89617485ac32631d9e1a381cbaa48bb940d02044f0163185a096d86e715f548257d28
+  metadata.gz: e3b9411dc8752fada8cd1a86eebb995d38e82fcdcc4169f6ef69941b743bbb025c3bf2e29015af3827f6d9116e7564b235f6d32ced48728ad30762e8380e389d
+  data.tar.gz: 372f93f527fa4d6a22c07f5b8c1bca2b178d9589df2155f1ec67b67486ea8abacd47a269ffecc9dbe931d2a45f56df2c2532fae4f2c2f78ade50cc18bbc49b5e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.0.3
+
+* Add snippet to upgrade rails 3.2 to rails 4.0
+
 ## 0.0.2
 
 * Rewrite all stuff, dsl style rather than inherit Parser::Rewriter

data/README.md

@@ -25,7 +25,8 @@ Or install it yourself as:
 
 Currently it supports
 
-* FactoryGirl short syntax
+* convert to FactoryGirl short syntax
+* upgrade rails from 3.2.x to 4.0.0
 
 ## Contributing
 

data/lib/synvert.rb

@@ -1,12 +1,12 @@
 # coding: utf-8
 require "synvert/version"
+require 'bundler'
 require 'parser'
 require 'parser/current'
 require 'ast'
 require 'synvert/node_ext'
 
 module Synvert
-  autoload :BaseConverter, 'synvert/base_converter'
   autoload :CheckingVisitor, 'synvert/checking_visitor'
   autoload :Configuration, 'synvert/configuration'
   autoload :Rewriter, 'synvert/rewriter'

data/lib/synvert/cli.rb

@@ -15,10 +15,8 @@ module Synvert
       paths = optparse.parse(args)
       Configuration.instance.set :path, paths.first || Dir.pwd
 
-      load(File.join(File.dirname(__FILE__), 'factory_girl/syntax_methods.rb'))
-
-      ObjectSpace.each_object Synvert::Rewriter do |rewriter|
-        rewriter.process
+      Dir.glob(File.join(File.dirname(__FILE__), 'snippets/**/*.rb')).each do |file|
+        eval(File.read(file)).process
       end
     end
   end

data/lib/synvert/node_ext.rb

@@ -29,6 +29,8 @@ class Parser::AST::Node
       self.children[2..-1]
     when :block
       self.children[1].children
+    when :defined?
+      self.children
     else
       raise NotImplementedError.new "arguments is not handled for #{self.inspect}"
     end
@@ -42,14 +44,40 @@ class Parser::AST::Node
     end
   end
 
+  def body
+    if :block == self.type
+      self.children[2]
+    else
+      raise NotImplementedError.new "body is not handled for #{self.inspect}"
+    end
+  end
+
+  def condition
+    if :if == self.type
+      self.children[0]
+    else
+      raise NotImplementedError.new "condition is not handled for #{self.inspect}"
+    end
+  end
+
+  def to_ast
+    self
+  end
+
   def to_s
     case self.type
     when :const
       self.children.compact.map(&:to_s).join('::')
     when :sym
       ':' + self.children[0].to_s
-    when :str, :arg, :lvar, :ivar
+    when :str
+      "'" + self.children[0].to_s + "'"
+    when :arg, :lvar, :ivar
       self.children[0].to_s
+    when :self
+      'self'
+    when :send
+      self.children[1].to_s
     else
     end
   end
@@ -74,23 +102,33 @@ class Parser::AST::Node
   end
 
   def match?(options)
-    flat_hash(options).keys.all? do |key|
-      actual = actual_value(self, key)
-      expected = expected_value(options, key)
-      match_value?(actual, expected)
+    flat_hash(options).keys.all? do |multi_keys|
+      if multi_keys.last == :any
+        actual_values = actual_value(self, multi_keys[0...-1])
+        expected = expected_value(options, multi_keys)
+        actual_values.any? { |actual| match_value?(actual, expected) }
+      else
+        actual = actual_value(self, multi_keys)
+        expected = expected_value(options, multi_keys)
+        match_value?(actual, expected)
+      end
     end
   end
 
   def to_source(code)
-    code.gsub(/{{(.*)}}/) do
-      node = self # node is used in eval
-      evaluated = eval($1)
-      if Parser::AST::Node === evaluated
+    code.gsub(/{{(.*?)}}/m) do
+      evaluated = self.instance_eval $1
+      case evaluated
+      when Parser::AST::Node
         source = evaluated.loc.expression.source_buffer.source
         source[evaluated.loc.expression.begin_pos...evaluated.loc.expression.end_pos]
-      else # Array
+      when Array
         source = evaluated.first.loc.expression.source_buffer.source
         source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
+      when String
+        evaluated
+      else
+        raise NotImplementedError.new "to_source is not handled for #{evaluated.inspect}"
       end
     end
   end
@@ -98,13 +136,21 @@ class Parser::AST::Node
 private
 
   def match_value?(actual, expected)
-    case actual
+    case expected
     when Symbol
-      actual == expected.to_sym
+      actual.to_sym == expected
+    when String
+      actual.to_s == expected || actual.to_s == "'#{expected}'"
+    when Regexp
+      actual.to_s =~ Regexp.new(expected.to_s, Regexp::MULTILINE)
     when Array
       actual.zip(expected).all? { |a, e| match_value?(a, e) }
+    when NilClass
+      actual.nil?
+    when Parser::AST::Node
+      actual == expected
     else
-      actual.to_s == expected
+      raise NotImplementedError.new "#{expected.class} is not handled for match_value?"
     end
   end
 
@@ -121,14 +167,10 @@ private
   end
 
   def actual_value(node, multi_keys)
-    multi_keys.inject(node) { |n, key| n.send(key) }
+    multi_keys.inject(node) { |n, key| n.send(key) if n }
   end
 
   def expected_value(options, multi_keys)
     multi_keys.inject(options) { |o, key| o[key] }
   end
-
-  #def to_ast(str)
-    #Parser::CurrentRuby.parse(str)
-  #end
 end

data/lib/synvert/rewriter.rb

@@ -1,56 +1,45 @@
 module Synvert
   class Rewriter
     autoload :Action, 'synvert/rewriter/action'
-    autoload :ReplaceWithAction, 'synvert/rewriter/action'
     autoload :InsertAction, 'synvert/rewriter/action'
+    autoload :InsertAfterAction, 'synvert/rewriter/action'
+    autoload :ReplaceWithAction, 'synvert/rewriter/action'
+    autoload :RemoveAction, 'synvert/rewriter/action'
+
+    autoload :Instance, 'synvert/rewriter/instance'
 
-    autoload :Instances, 'synvert/rewriter/instances'
+    autoload :Scope, 'synvert/rewriter/scope'
 
-    autoload :Scopes, 'synvert/rewriter/scopes'
-    autoload :Scope, 'synvert/rewriter/scopes'
+    autoload :Condition, 'synvert/rewriter/condition'
+    autoload :UnlessExistCondition, 'synvert/rewriter/condition'
+    autoload :IfOnlyExistCondition, 'synvert/rewriter/condition'
 
-    autoload :Conditions, 'synvert/rewriter/conditions'
-    autoload :Condition, 'synvert/rewriter/conditions'
-    autoload :UnlessExistCondition, 'synvert/rewriter/conditions'
+    autoload :GemSpec, 'synvert/rewriter/gem_spec'
 
-    attr_reader :description, :version, :instances
+    attr_reader :description
 
     def initialize(description, &block)
       @description = description
-      @instances = Instances.new
+      @instances = []
       instance_eval &block if block_given?
     end
 
     def process
-      @instances.process
-    end
-
-    def from_version(version)
-      @version = Version.from_string(version)
+      if @gem_spec.match?
+        @instances.each { |instance| instance.process }
+      end
     end
 
-    def within_file(file, &block)
-      @instances.add(file, &block)
+    def gem_spec(name, version)
+      @gem_spec = Rewriter::GemSpec.new(name, version)
     end
 
-    def within_files(files, &block)
-      @instances.add(files, &block)
+    def within_file(file_pattern, &block)
+      instance = Rewriter::Instance.new(file_pattern)
+      instance.instance_eval &block if block_given?
+      @instances << instance
     end
 
-    class Version
-      def self.from_string(version)
-        self.new *version.split('.')
-      end
-
-      def initialize(major, minor, patch)
-        @major = major
-        @minor = minor
-        @patch = patch
-      end
-
-      def to_s
-        [@major, @minor, @patch].join('.')
-      end
-    end
+    alias within_files within_file
   end
 end

data/lib/synvert/rewriter/action.rb

@@ -45,4 +45,40 @@ module Synvert
       end
     end
   end
+
+  class Rewriter::InsertAfterAction < Rewriter::Action
+    def rewrite(source, node)
+      source[node.loc.expression.end_pos, 0] = "\n" + insert_indent(node) + node.to_source(@code)
+      source
+    end
+
+    def insert_indent(node)
+      ' ' * node.indent
+    end
+  end
+
+  class Rewriter::RemoveAction < Rewriter::Action
+    def initialize
+    end
+
+    def rewrite(source, node)
+      begin_pos = node.loc.expression.begin_pos
+      end_pos = node.loc.expression.end_pos
+      line = node.loc.expression.line
+      source[begin_pos...end_pos] = ''
+      remove_code_or_whole_line(source, line)
+    end
+
+  private
+    def remove_code_or_whole_line(source, line)
+      newline_at_end_of_line = source[-1] == "\n"
+      source_arr = source.split("\n")
+      if source_arr[line - 1] && source_arr[line - 1].strip.empty?
+        source_arr.delete_at(line - 1)
+        source_arr.join("\n") + (newline_at_end_of_line ? "\n" : '')
+      else
+        source
+      end
+    end
+  end
 end

data/lib/synvert/rewriter/{conditions.rb → condition.rb}

@@ -1,24 +1,6 @@
 # encoding: utf-8
 
 module Synvert
-  class Rewriter::Conditions
-    def initialize
-      @conditions = []
-    end
-
-    def add(condition)
-      @conditions << condition
-    end
-
-    def matching_nodes(nodes)
-      @conditions.each do |condition|
-        break if nodes.empty?
-        nodes = condition.matching_nodes(nodes)
-      end
-      nodes
-    end
-  end
-
   class Rewriter::Condition
     def initialize(options)
       @options = options
@@ -36,4 +18,12 @@ module Synvert
       }
     end
   end
+
+  class Rewriter::IfOnlyExistCondition < Rewriter::Condition
+    def matching_nodes(nodes)
+      nodes.find_all { |node|
+        :begin != node.body.type && node.body.match?(@options)
+      }
+    end
+  end
 end

data/lib/synvert/rewriter/gem_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+module Synvert
+  class Rewriter::GemSpec
+    def initialize(name, version)
+      @name = name
+      @version = Gem::Version.new version
+    end
+
+    def match?
+      gemfile_lock_path = File.join(Configuration.instance.get(:path), 'Gemfile.lock')
+      if File.exists? gemfile_lock_path
+        parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
+        Gem::Version.new(parser.specs.find { |spec| spec.name == @name }.version) >= @version
+      else
+        raise LoadError.new 'Gemfile.lock does not exist'
+      end
+    end
+  end
+end

data/lib/synvert/rewriter/{instances.rb → instance.rb}

@@ -1,27 +1,10 @@
 # encoding: utf-8
 
 module Synvert
-  class Rewriter::Instances
-    def initialize
-      @instances = []
-    end
-
-    def add(file_pattern, &block)
-      instance = Rewriter::Instance.new(file_pattern)
-      instance.instance_eval &block if block_given?
-      @instances << instance
-    end
-
-    def process
-      @instances.each { |instance| instance.process }
-    end
-  end
-
   class Rewriter::Instance
     def initialize(file_pattern)
       @file_pattern = file_pattern
-      @scopes = Rewriter::Scopes.new
-      @conditions = Rewriter::Conditions.new
+      @scopes_or_conditions = []
     end
 
     def process
@@ -35,8 +18,10 @@ module Synvert
         parser.reset
         ast = parser.parse buffer
 
-        scoped_nodes = @scopes.matching_nodes(ast)
-        matching_nodes = @conditions.matching_nodes(scoped_nodes)
+        matching_nodes = [ast]
+        @scopes_or_conditions.each do |scope_or_condition|
+          matching_nodes = scope_or_condition.matching_nodes(matching_nodes)
+        end
         matching_nodes.reverse.each do |node|
           source = @action.rewrite(source, node)
         end
@@ -45,14 +30,19 @@ module Synvert
     end
 
     def within_node(options, &block)
-      @scopes.add(options)
+      @scopes_or_conditions << Rewriter::Scope.new(options)
       instance_eval &block if block_given?
     end
 
     alias with_node within_node
 
     def unless_exist_node(options, &block)
-      @conditions.add(Rewriter::UnlessExistCondition.new(options))
+      @scopes_or_conditions << Rewriter::UnlessExistCondition.new(options)
+      instance_eval &block if block_given?
+    end
+
+    def if_only_exist_node(options, &block)
+      @scopes_or_conditions << Rewriter::IfOnlyExistCondition.new(options)
       instance_eval &block if block_given?
     end
 
@@ -60,8 +50,16 @@ module Synvert
       @action = Rewriter::InsertAction.new(code)
     end
 
+    def insert_after(node)
+      @action = Rewriter::InsertAfterAction.new(node)
+    end
+
     def replace_with(code)
       @action = Rewriter::ReplaceWithAction.new(code)
     end
+
+    def remove
+      @action = Rewriter::RemoveAction.new
+    end
   end
 end

data/lib/synvert/rewriter/{scopes.rb → scope.rb}

@@ -1,25 +1,6 @@
 # encoding: utf-8
 
 module Synvert
-  class Rewriter::Scopes
-    def initialize
-      @scopes = []
-    end
-
-    def add(options)
-      @scopes << Rewriter::Scope.new(options)
-    end
-
-    def matching_nodes(node)
-      nodes = [node]
-      @scopes.each do |scope|
-        break if nodes.empty?
-        nodes = scope.matching_nodes(nodes)
-      end
-      nodes
-    end
-  end
-
   class Rewriter::Scope
     def initialize(options)
       @options = options

data/lib/synvert/{factory_girl → snippets/factory_girl}/syntax_methods.rb

@@ -1,10 +1,10 @@
-Synvert::Rewriter.new "use short syntax" do
-  from_version '2.0.0'
+Synvert::Rewriter.new "FactoryGirl uses short syntax" do
+  gem_spec 'factory_girl', '2.0.0'
 
   within_file 'spec/spec_helper.rb' do
     within_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do
       unless_exist_node type: 'send', message: 'include', arguments: {first: {to_s: 'FactoryGirl::Syntax::Methods'}} do
-        insert "{{node.arguments.first}}.include FactoryGirl::Syntax::Methods"
+        insert "{{self.arguments.first}}.include FactoryGirl::Syntax::Methods"
       end
     end
   end
@@ -29,7 +29,7 @@ Synvert::Rewriter.new "use short syntax" do
     %w(create build attributes_for build_stubbed create_list build_list ccreate_pair build_pair).each do |message|
       within_files file_pattern do
         with_node type: 'send', receiver: 'FactoryGirl', message: message do
-          replace_with "#{message}({{node.arguments}})"
+          replace_with "#{message}({{self.arguments}})"
         end
       end
     end

data/lib/synvert/snippets/rails/upgrade_3_2_to_4_0.rb

@@ -0,0 +1,157 @@
+require 'securerandom'
+
+def dynamic_finder_to_hash(node, prefix)
+  fields = node.message.to_s[prefix.length..-1].split("_and_")
+  fields.length.times.map { |i|
+    fields[i] + ": " + node.arguments[i].to_s
+  }.join(", ")
+end
+
+Synvert::Rewriter.new "Upgrade from rails 3.2 to rails 4.0" do
+  gem_spec 'rails', '3.2.0'
+
+  within_file 'config/application.rb' do
+    # if defined?(Bundler)
+    #   Bundler.require(*Rails.groups(:assets => %w(development test)))
+    # end
+    # => Bundler.require(:default, Rails.env)
+    with_node type: 'if', condition: {type: 'defined?', arguments: {first: 'Bundler'}} do
+      replace_with 'Bundler.require(:default, Rails.env)'
+    end
+  end
+
+  within_file 'config/environments/production.rb' do
+    # remove config.active_record.identity_map = true
+    with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'identity_map=' do
+      remove
+    end
+  end
+
+  within_file 'app/models/**/*.rb' do
+    # self.serialized_attributes => self.class.serialized_attributes
+    with_node type: 'send', receiver: 'self', message: 'serialized_attributes' do
+      replace_with 'self.class.serialized_attributes'
+    end
+  end
+
+  within_file 'app/models/**/*.rb' do
+    # scope :active, where(active: true) => scope :active, -> { where(active: true) }
+    with_node type: 'send', receiver: nil, message: 'scope' do
+      replace_with 'scope {{self.arguments.first}}, -> { {{self.arguments.last}} }'
+    end
+  end
+
+  within_file 'test/unit/**/*.rb' do
+    # ActiveRecord::TestCase => ActiveSupport::TestCase
+    with_node type: 'const', to_s: 'ActiveRecord::TestCase' do
+      replace_with 'ActiveSupport::TestCase'
+    end
+  end
+
+  within_file 'app/**/*.rb' do
+    # find_all_by_... => where(...)
+    with_node type: 'send', message: /find_all_by_(.*)/ do
+      hash_params = '{{find_all_by(self, "find_last_by_")}}'
+      replace_with "{{self.receiver}}.where(#{hash_params})"
+    end
+  end
+
+  within_file 'app/**/*.rb' do
+    # find_last_by_... => where(...).last
+    with_node type: 'send', message: /find_last_by_(.*)/ do
+      hash_params = '{{dynamic_finder_to_hash(self, "find_last_by_")}}'
+      replace_with "{{self.receiver}}.where(#{hash_params}).last"
+    end
+  end
+
+  within_file 'app/**/*.rb' do
+    # scoped_by_... => where(...)
+    with_node type: 'send', message: /scoped_by_(.*)/ do
+      hash_params = '{{dynamic_finder_to_hash(self, "scoped_by_")}}'
+      replace_with "{{self.receiver}}.where(#{hash_params})"
+    end
+  end
+
+  within_file 'app/**/*.rb' do
+    # find_or_initialize_by_... => find_or_initialize_by(...)
+    with_node type: 'send', message: /find_or_initialize_by_(.*)/ do
+      hash_params = '{{dynamic_finder_to_hash(self, "find_or_initialize_by_")}}'
+      replace_with "{{self.receiver}}.find_or_initialize_by(#{hash_params})"
+    end
+  end
+
+  within_file 'app/**/*.rb' do
+    # find_or_create_by_... => find_or_create_by(...)
+    with_node type: 'send', message: /find_or_create_by_(.*)/ do
+      hash_params = '{{dynamic_finder_to_hash(self, "find_or_create_by_")}}'
+      replace_with "{{self.receiver}}.find_or_create_by(#{hash_params})"
+    end
+  end
+
+  within_file 'config/initializers/wrap_parameters.rb' do
+    # remove self.include_root_in_json = false
+    with_node type: 'block', caller: {receiver: 'ActiveSupport', message: 'on_load', arguments: {first: ':active_record'}} do
+      if_only_exist_node to_ast: Parser::CurrentRuby.parse('self.include_root_in_json = false') do
+        remove
+      end
+    end
+  end
+
+  within_file 'config/initializers/secret_token.rb' do
+    # insert Application.config.secret_key_base = '...'
+    unless_exist_node type: 'send', message: 'secret_key_base=' do
+      with_node type: 'send', message: 'secret_token=' do
+        secret = SecureRandom.hex(64)
+        insert_after "{{self.receiver}}.secret_key_base = '#{secret}'"
+      end
+    end
+  end
+
+  within_file 'config/**/*.rb' do
+    # remove ActionController::Base.page_cache_extension => ActionController::Base.default_static_extension
+    with_node type: 'send', message: 'page_cache_extension=' do
+      replace_with 'ActionController::Base.default_static_extension = {{self.arguments}}'
+    end
+  end
+
+  within_file 'config/routes.rb' do
+    # Rack::Utils.escape('こんにちは') => 'こんにちは'
+    with_node type: 'send', receiver: 'Rack::Utils', message: 'escape' do
+      replace_with '{{self.arguments}}'
+    end
+  end
+
+  within_file 'config/routes.rb' do
+    # match "/" => "root#index" => get "/" => "root#index"
+    with_node type: 'send', message: 'match' do
+      replace_with 'get {{self.arguments}}'
+    end
+  end
+
+  within_file 'config/**/*.rb' do
+    with_node type: 'send', arguments: {any: 'ActionDispatch::BestStandardsSupport'} do
+      remove
+    end
+  end
+
+  within_file 'config/**/*.rb' do
+    with_node type: 'send', message: 'best_standards_support=' do
+      remove
+    end
+  end
+
+  {'ActionController::Integration' => 'ActionDispatch::Integration',
+   'ActionController::IntegrationTest' => 'ActionDispatch::IntegrationTest',
+   'ActionController::PerformanceTest' => 'ActionDispatch::PerformanceTest',
+   'ActionController::AbstractRequest' => 'ActionDispatch::Request',
+   'ActionController::Request' => 'ActionDispatch::Request',
+   'ActionController::AbstractResponse' => 'ActionDispatch::Response',
+   'ActionController::Response' => 'ActionDispatch::Response',
+   'ActionController::Routing' => 'ActionDispatch::Routing'}.each do |deprecated, favor|
+    within_file '**/*.rb' do
+      with_node to_s: deprecated do
+        replace_with favor
+      end
+    end
+  end
+end

data/lib/synvert/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Synvert
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/synvert/node_ext_spec.rb

@@ -35,6 +35,11 @@ describe Parser::AST::Node do
       node = parse('RSpec.configure do |config|; end')
       expect(node.arguments.map(&:to_s)).to eq ['config']
     end
+
+    it 'gets for defined? node' do
+      node = parse('defined?(Bundler)')
+      expect(node.arguments).to eq [parse('Bundler')]
+    end
   end
 
   describe '#caller' do
@@ -44,6 +49,20 @@ describe Parser::AST::Node do
     end
   end
 
+  describe '#body' do
+    it 'gets for block node' do
+      node = parse('RSpec.configure do |config|; include EmailSpec::Helpers; end')
+      expect(node.body).to eq parse('include EmailSpec::Helpers')
+    end
+  end
+
+  describe "#condition" do
+    it 'gets for if node' do
+      node = parse('if defined?(Bundler); end')
+      expect(node.condition).to eq parse('defined?(Bundler)')
+    end
+  end
+
   describe '#to_s' do
     it 'gets for const node' do
       node = parse('Synvert')
@@ -60,7 +79,7 @@ describe Parser::AST::Node do
 
     it 'gets for str node' do
       node = parse("'synvert'")
-      expect(node.to_s).to eq 'synvert'
+      expect(node.to_s).to eq "'synvert'"
     end
 
     it 'gets for lvar node' do
@@ -77,6 +96,16 @@ describe Parser::AST::Node do
       node = parse("RSpec.configure do |config|; end").grep_node(type: 'arg')
       expect(node.to_s).to eq 'config'
     end
+
+    it 'gets for self node' do
+      node = parse('self')
+      expect(node.to_s).to eq 'self'
+    end
+
+    it 'gets for send node' do
+      node = parse('email')
+      expect(node.to_s).to eq 'email'
+    end
   end
 
   describe '#indent' do

data/spec/synvert/rewriter/action_spec.rb

@@ -4,7 +4,7 @@ module Synvert
   describe Rewriter::ReplaceWithAction do
     describe '#rewrite' do
       it 'replaces code' do
-        action = Rewriter::ReplaceWithAction.new('create_list {{node.arguments}}')
+        action = Rewriter::ReplaceWithAction.new('create_list {{self.arguments}}')
         source = "post = FactoryGirl.create_list :post, 2"
         send_node = Parser::CurrentRuby.parse(source).children[1]
         output = action.rewrite(source, send_node)
@@ -16,7 +16,7 @@ module Synvert
   describe Rewriter::InsertAction do
     describe '#rewrite' do
       it 'insert code to block node' do
-        action = Rewriter::InsertAction.new('{{node.arguments.first}}.include FactoryGirl::Syntax::Methods')
+        action = Rewriter::InsertAction.new('{{self.arguments.first}}.include FactoryGirl::Syntax::Methods')
         source = "RSpec.configure do |config|\nend"
         block_node = Parser::CurrentRuby.parse(source)
         output = action.rewrite(source, block_node)
@@ -48,4 +48,28 @@ module Synvert
       end
     end
   end
+
+  describe Rewriter::InsertAfterAction do
+    describe '#rewrite' do
+      it 'insert_after code' do
+        action = Rewriter::InsertAfterAction.new('include Bar')
+        source = "  include Foo"
+        node = Parser::CurrentRuby.parse(source)
+        output = action.rewrite(source, node)
+        expect(output).to eq "  include Foo\n  include Bar"
+      end
+    end
+  end
+
+  describe Rewriter::RemoveAction do
+    describe '#rewrite' do
+      it 'remove code' do
+        action = Rewriter::RemoveAction.new
+        source = "user = User.new params[:user]\nuser.save\nrender\n"
+        send_node = Parser::CurrentRuby.parse(source).children[1]
+        output = action.rewrite(source, send_node)
+        expect(output).to eq "user = User.new params[:user]\nrender\n"
+      end
+    end
+  end
 end

data/spec/synvert/rewriter/condition_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module Synvert
+  describe Rewriter::UnlessExistCondition do
+    let(:source) {
+      """
+      RSpec.configure do |config|
+        config.include EmailSpec::Helpers
+        config.include EmailSpec::Methods
+      end
+      """
+    }
+    let(:node) { Parser::CurrentRuby.parse(source) }
+
+    describe '#matching_nodes' do
+      it 'gets empty array if does not matchi anything' do
+        condition = Rewriter::UnlessExistCondition.new type: 'send', message: 'include', arguments: {first: {to_s: 'FactoryGirl::Syntax::Methods'} }
+        expect(condition.matching_nodes([node]).size).to eq 1
+      end
+
+      it 'gets matching nodes' do
+        condition = Rewriter::UnlessExistCondition.new type: 'send', message: 'include', arguments: {first: {to_s: 'EmailSpec::Helpers'} }
+        expect(condition.matching_nodes([node])).to eq []
+      end
+    end
+  end
+
+  describe Rewriter::IfOnlyExistCondition do
+    describe '#matching_nodes' do
+      it 'gets matching nodes' do
+        source = """
+          RSpec.configure do |config|
+            config.include EmailSpec::Helpers
+          end
+        """
+        node = Parser::CurrentRuby.parse(source)
+
+        condition = Rewriter::IfOnlyExistCondition.new type: 'send', message: 'include', arguments: {first: 'EmailSpec::Helpers'}
+        expect(condition.matching_nodes([node])).to eq [node]
+      end
+
+      it 'gets empty array if does not match' do
+        source = """
+          RSpec.configure do |config|
+            config.include EmailSpec::Helpers
+            config.include EmailSpec::Methods
+          end
+        """
+        node = Parser::CurrentRuby.parse(source)
+
+        condition = Rewriter::IfOnlyExistCondition.new type: 'send', message: 'include', arguments: {first: {to_s: 'EmailSpec::Helpers'} }
+        expect(condition.matching_nodes([node])).to eq []
+      end
+    end
+  end
+end

data/spec/synvert/rewriter/gem_spec_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Synvert
+  describe Rewriter::GemSpec do
+    before { Configuration.instance.set :path, '.' }
+    let(:gemfile_lock_content) { """
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (1.1.0)
+    parser (2.1.7)
+      ast (~> 1.1)
+      slop (~> 3.4, >= 3.4.5)
+    rake (10.1.1)
+    slop (3.4.7)
+      """}
+
+    it 'returns true if version in Gemfile.lock is greater than definition' do
+      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      gem_spec = Rewriter::GemSpec.new('ast', '1.0.0')
+      expect(gem_spec).to be_match
+    end
+
+    it 'returns true if version in Gemfile.lock is equal to definition' do
+      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
+      expect(gem_spec).to be_match
+    end
+
+    it 'returns false if version in Gemfile.lock is less than definition' do
+      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      gem_spec = Rewriter::GemSpec.new('ast', '1.2.0')
+      expect(gem_spec).not_to be_match
+    end
+
+    it 'raise LoadError if Gemfile.lock does not exist' do
+      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(false)
+      gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
+      expect { gem_spec.match? }.to raise_error(LoadError)
+    end
+  end
+end

data/spec/synvert/rewriter/{instances_spec.rb → instance_spec.rb}

@@ -1,38 +1,34 @@
 require 'spec_helper'
 
 module Synvert
-  describe Rewriter::Instances do
-
-  end
-
   describe Rewriter::Instance do
     let(:instance) { Rewriter::Instance.new('file pattern') }
 
-    describe '#within_node' do
-      it 'adds a scope'do
-        expect_any_instance_of(Rewriter::Scopes).to receive(:add).with(type: 'block', caller: {receiver: 'RSpec', message: 'configure'})
-        instance.within_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do; end
+    describe '#insert' do
+      it 'sets an action' do
+        expect(Rewriter::InsertAction).to receive(:new).with('{{self.arguments.first}}.include FactoryGirl::Syntax::Methods')
+        instance.insert "{{self.arguments.first}}.include FactoryGirl::Syntax::Methods"
       end
     end
 
-    describe '#with_node' do
-      it 'adds a scope' do
-        expect_any_instance_of(Rewriter::Scopes).to receive(:add).with(type: 'send', receiver: 'FactoryGirl', message: 'create')
-        instance.with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do; end
+    describe '#insert_after' do
+      it 'sets an action' do
+        expect(Rewriter::InsertAfterAction).to receive(:new).with('{{self.arguments.first}}.include FactoryGirl::Syntax::Methods')
+        instance.insert_after "{{self.arguments.first}}.include FactoryGirl::Syntax::Methods"
       end
     end
 
-    describe '#insert' do
+    describe '#replace_with' do
       it 'sets an action' do
-        expect(Rewriter::InsertAction).to receive(:new).with('{{node.arguments.first}}.include FactoryGirl::Syntax::Methods')
-        instance.insert "{{node.arguments.first}}.include FactoryGirl::Syntax::Methods"
+        expect(Rewriter::ReplaceWithAction).to receive(:new).with('create {{self.arguments}}')
+        instance.replace_with 'create {{self.arguments}}'
       end
     end
 
-    describe '#replace_with' do
+    describe '#remove' do
       it 'sets an action' do
-        expect(Rewriter::ReplaceWithAction).to receive(:new).with('create {{node.arguments}}')
-        instance.replace_with 'create {{node.arguments}}'
+        expect(Rewriter::RemoveAction).to receive(:new)
+        instance.remove
       end
     end
 
@@ -42,7 +38,7 @@ module Synvert
       it 'FactoryGirl uses short syntax' do
         instance = Rewriter::Instance.new('spec/**/*_spec.rb')
         instance.with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
-          replace_with 'create {{node.arguments}}'
+          replace_with 'create {{self.arguments}}'
         end
         input = """
 it 'uses factory_girl' do
@@ -68,7 +64,7 @@ end
         instance = Rewriter::Instance.new('spec/spec_helper.rb')
         instance.with_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do
           unless_exist_node type: 'send', message: 'include', arguments: {first: {to_s: 'FactoryGirl::Syntax::Methods'}} do
-            insert "{{node.arguments.first}}.include FactoryGirl::Syntax::Methods"
+            insert "{{self.arguments.first}}.include FactoryGirl::Syntax::Methods"
           end
         end
         input = """
@@ -90,7 +86,7 @@ end
         instance = Rewriter::Instance.new('spec/spec_helper.rb')
         instance.with_node type: 'block', caller: {receiver: 'RSpec', message: 'configure'} do
           unless_exist_node type: 'send', message: 'include', arguments: {first: {to_s: 'FactoryGirl::Syntax::Methods'}} do
-            insert "{{node.arguments.first}}.include FactoryGirl::Syntax::Methods"
+            insert "{{self.arguments.first}}.include FactoryGirl::Syntax::Methods"
           end
         end
         input = """
@@ -108,6 +104,19 @@ end
         expect(File).to receive(:write).with('spec/spec_helper.rb', output)
         instance.process
       end
+
+      it 'process nested send nodes' do
+        instance = Rewriter::Instance.new('config/*.rb')
+        instance.with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'identity_map=' do
+          remove
+        end
+        input = 'config.active_record.identity_map = true'
+        output = ''
+        expect(Dir).to receive(:glob).with('./config/*.rb').and_return(['config/environments/production.rb'])
+        expect(File).to receive(:read).with('config/environments/production.rb').and_return(input)
+        expect(File).to receive(:write).with('config/environments/production.rb', output)
+        instance.process
+      end
     end
   end
 end

data/spec/synvert/rewriter/scope_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Synvert
+  describe Rewriter::Scope do
+    let(:source) {
+"""
+describe Post do
+  before :each do
+    @user = FactoryGirl.create :user
+  end
+
+  it 'gets posts' do
+    post1 = FactoryGirl.create :post
+    post2 = FactoryGirl.create :post
+  end
+end
+"""
+    }
+    let(:node) { Parser::CurrentRuby.parse(source) }
+
+    describe '#matching_nodes' do
+      it 'gets empty array if does not match anything' do
+        scope = Rewriter::Scope.new type: 'send', message: 'missing'
+        expect(scope.matching_nodes([node])).to eq []
+      end
+
+      it 'gets matching nodes' do
+        scope = Rewriter::Scope.new type: 'send', receiver: 'FactoryGirl', message: 'create', arguments: [':post']
+        expect(scope.matching_nodes([node]).size).to eq 2
+      end
+
+      it 'gets matching nodes witch block caller' do
+        scope = Rewriter::Scope.new type: 'block', caller: {message: 'it', arguments: ['gets posts']}
+        expect(scope.matching_nodes([node]).size).to eq 1
+      end
+    end
+  end
+end

data/spec/synvert/rewriter_spec.rb

@@ -7,24 +7,32 @@ module Synvert
       expect(rewriter.description).to eq 'this is description'
     end
 
-    it 'parses from_version' do
-      rewriter = Rewriter.new 'description' do
-        from_version '1.0.0'
+    it 'parses gem_spec' do
+      expect(Rewriter::GemSpec).to receive(:new).with('synvert', '1.0.0')
+      Rewriter.new 'description' do
+        gem_spec 'synvert', '1.0.0'
       end
-      expect(rewriter.version.to_s).to eq '1.0.0'
     end
 
-    it 'parses within_file' do
-      expect_any_instance_of(Rewriter::Instances).to receive(:add).with('spec/spec_helper.rb')
-      Rewriter.new 'description' do
-        within_file 'spec/spec_helper.rb' do; end
+    describe '#process' do
+      it 'does nothing if gem_spec not match' do
+        expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(false)
+        expect_any_instance_of(Rewriter::Instance).not_to receive(:process)
+        rewriter = Rewriter.new 'description' do
+          gem_spec 'synvert', '1.0.0'
+          within_file 'config/routes.rb' do; end
+        end
+        rewriter.process
       end
-    end
 
-    it 'parses within_files' do
-      expect_any_instance_of(Rewriter::Instances).to receive(:add).with('spec/**/*_spec.rb')
-      Rewriter.new 'description' do
-        within_files 'spec/**/*_spec.rb' do; end
+      it 'delegates process to instances' do
+        expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(true)
+        expect_any_instance_of(Rewriter::Instance).to receive(:process)
+        rewriter = Rewriter.new 'description' do
+          gem_spec 'synvert', '1.0.0'
+          within_file 'config/routes.rb' do; end
+        end
+        rewriter.process
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -85,21 +85,24 @@ files:
 - lib/synvert.rb
 - lib/synvert/cli.rb
 - lib/synvert/configuration.rb
-- lib/synvert/factory_girl/syntax_methods.rb
 - lib/synvert/node_ext.rb
 - lib/synvert/rewriter.rb
 - lib/synvert/rewriter/action.rb
-- lib/synvert/rewriter/conditions.rb
-- lib/synvert/rewriter/instances.rb
-- lib/synvert/rewriter/scopes.rb
+- lib/synvert/rewriter/condition.rb
+- lib/synvert/rewriter/gem_spec.rb
+- lib/synvert/rewriter/instance.rb
+- lib/synvert/rewriter/scope.rb
+- lib/synvert/snippets/factory_girl/syntax_methods.rb
+- lib/synvert/snippets/rails/upgrade_3_2_to_4_0.rb
 - lib/synvert/version.rb
 - spec/spec_helper.rb
 - spec/support/parser_helper.rb
 - spec/synvert/node_ext_spec.rb
 - spec/synvert/rewriter/action_spec.rb
-- spec/synvert/rewriter/conditions_spec.rb
-- spec/synvert/rewriter/instances_spec.rb
-- spec/synvert/rewriter/scopes_spec.rb
+- spec/synvert/rewriter/condition_spec.rb
+- spec/synvert/rewriter/gem_spec_spec.rb
+- spec/synvert/rewriter/instance_spec.rb
+- spec/synvert/rewriter/scope_spec.rb
 - spec/synvert/rewriter_spec.rb
 - synvert.gemspec
 homepage: ''
@@ -131,7 +134,8 @@ test_files:
 - spec/support/parser_helper.rb
 - spec/synvert/node_ext_spec.rb
 - spec/synvert/rewriter/action_spec.rb
-- spec/synvert/rewriter/conditions_spec.rb
-- spec/synvert/rewriter/instances_spec.rb
-- spec/synvert/rewriter/scopes_spec.rb
+- spec/synvert/rewriter/condition_spec.rb
+- spec/synvert/rewriter/gem_spec_spec.rb
+- spec/synvert/rewriter/instance_spec.rb
+- spec/synvert/rewriter/scope_spec.rb
 - spec/synvert/rewriter_spec.rb

data/spec/synvert/rewriter/conditions_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-module Synvert
-  describe Rewriter::Conditions do
-
-  end
-
-  describe Rewriter::UnlessExistCondition do
-    let(:source) {
-"""
-RSpec.configure do |config|
-  config.include EmailSpec::Helpers
-  config.include EmailSpec::Methods
-end
-"""
-    }
-    let(:node) { Parser::CurrentRuby.parse(source) }
-
-    describe '#matching_nodes' do
-      it 'gets empty array if does not matchi anything' do
-        condition = Rewriter::UnlessExistCondition.new type: 'send', message: 'include', arguments: {first: {to_s: 'FactoryGirl::Syntax::Methods'} }
-        expect(condition.matching_nodes([node]).size).to eq 1
-      end
-
-      it 'gets matching nodes' do
-        condition = Rewriter::UnlessExistCondition.new type: 'send', message: 'include', arguments: {first: {to_s: 'EmailSpec::Helpers'} }
-        expect(condition.matching_nodes([node])).to eq []
-      end
-    end
-  end
-end

data/spec/synvert/rewriter/scopes_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-module Synvert
-  describe Rewriter::Scopes do
-    let(:source) {
-"""
-describe Post do
-  before :each do
-    @user = FactoryGirl.create :user
-  end
-
-  it 'gets posts' do
-    post1 = FactoryGirl.create :post
-    post2 = FactoryGirl.create :post
-  end
-end
-"""
-    }
-    let(:node) { Parser::CurrentRuby.parse(source) }
-
-    before(:each) { @scopes = Rewriter::Scopes.new }
-
-    describe '#matching_nodes' do
-      it 'gets original node if scopes are empty' do
-        scoped_nodes = @scopes.matching_nodes(node)
-        expect(scoped_nodes).to eq [node]
-      end
-
-      it 'gets all matching nodes with one scope' do
-        @scopes.add type: 'send', receiver: 'FactoryGirl', message: 'create'
-        scoped_nodes = @scopes.matching_nodes(node)
-        expect(scoped_nodes.size).to eq 3
-      end
-
-      it 'gets all matching nodes with multi scopes' do
-        @scopes.add type: 'block', caller: {message: 'describe', arguments: ['Post']}
-        @scopes.add type: 'block', caller: {message: 'before', arguments: [':each']}
-        @scopes.add type: 'send', receiver: 'FactoryGirl', message: 'create'
-        scoped_nodes = @scopes.matching_nodes(node)
-        expect(scoped_nodes.size).to eq 1
-      end
-    end
-  end
-
-  describe Rewriter::Scope do
-    let(:source) {
-"""
-describe Post do
-  before :each do
-    @user = FactoryGirl.create :user
-  end
-
-  it 'gets posts' do
-    post1 = FactoryGirl.create :post
-    post2 = FactoryGirl.create :post
-  end
-end
-"""
-    }
-    let(:node) { Parser::CurrentRuby.parse(source) }
-
-    describe '#matching_nodes' do
-      it 'gets empty array if does not match anything' do
-        scope = Rewriter::Scope.new type: 'send', message: 'missing'
-        expect(scope.matching_nodes([node])).to eq []
-      end
-
-      it 'gets matching nodes' do
-        scope = Rewriter::Scope.new type: 'send', receiver: 'FactoryGirl', message: 'create', arguments: [':post']
-        expect(scope.matching_nodes([node]).size).to eq 2
-      end
-
-      it 'gets matching nodes witch block caller' do
-        scope = Rewriter::Scope.new type: 'block', caller: {message: 'it', arguments: ['gets posts']}
-        expect(scope.matching_nodes([node]).size).to eq 1
-      end
-    end
-  end
-end