synvert 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8950014c1ee881965625f25681c35b66b28234da
-  data.tar.gz: 5abd928e4478a5830a35488884cfcb6c85325d3d
+  metadata.gz: 904cb80d27d9364b9521a6002db88319440d6cd0
+  data.tar.gz: b065e2a1aa186550d5051a1805aed0b0b36770bd
 SHA512:
-  metadata.gz: 62e2fc5bb3639aea6a190feba903f7566ef30d5150ad13d7731aa4952e15de676bc83ff6ab9aa5119b4e12b2122019b6e941a4f03bdb1718994cd034e1e84aab
-  data.tar.gz: 89fa91f3f7c0275c85ba29942b5211ede25ba0576a0c89b0978930f372c464ad215f4e20a8ec4749abcc102c4d2fa9c35c9c2ce6596c1dd11481f6aac510bd39
+  metadata.gz: 8470c708ef1bd0d97a360c3cfa7c49576311ae8a0f7197b3da69fe49a742c54d3b49e3b79784a9543c4cf5b7f2d649339bc24d885fb7f50f1ced7bdab628112d
+  data.tar.gz: 30f9727f898c103b693d46754f6e8c9317d35a98e3fed440ab7e5a8f4077b21fee2313b5670a999e9c7152333398f7e1b34e37009cdacd2a38a58a57dff1ff94

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.12
+
+* Allow define multiple scopes and conditions in one instance
+* Polish snippets
+
 ## 0.0.11
 
 * Rename gem_spec to if_gem dsl

data/README.md

@@ -43,7 +43,7 @@ $ synvert --run-snippets factory_girl_short_syntax,upgrade_rails_3_2_to_4_0 ~/Si
 name | description
 --- | ---
 factory_girl_short_syntax                | FactoryGirl uses short syntax
-convert_dynamic_finders                  | Convert dynamic finders
+convert_rails_dynamic_finders            | Convert rails dynamic finders
 strong_parameters                        | Use strong_parameters syntax
 upgrade_rails_3_0_to_3_1                 | Upgrade rails from 3.0 to 3.1
 upgrade_rails_3_1_to_3_2                 | Upgrade rails from 3.1 to 3.2

data/lib/synvert/rewriter/instance.rb

@@ -14,26 +14,30 @@ module Synvert
       parser = Parser::CurrentRuby.new
       file_pattern = File.join(Configuration.instance.get(:path), @file_pattern)
       Dir.glob(file_pattern).each do |file_path|
-        source = File.read(file_path)
-        buffer = Parser::Source::Buffer.new file_path
-        buffer.source = source
-
-        parser.reset
-        ast = parser.parse buffer
-
-        @current_file = file_path
-        @current_source = source
-        @current_node = ast
-        instance_eval &@block
-        @current_node = ast
-
-        @actions.sort.reverse.each do |action|
-          source[action.begin_pos...action.end_pos] = action.rewritten_code
-          source = remove_code_or_whole_line(source, action.line)
-        end
-        @actions = []
-
-        File.write file_path, source
+        begin
+          source = File.read(file_path)
+          buffer = Parser::Source::Buffer.new file_path
+          buffer.source = source
+
+          parser.reset
+          ast = parser.parse buffer
+
+          @current_file = file_path
+          @current_source = source
+          @current_node = ast
+          instance_eval &@block
+          @current_node = ast
+
+          @actions.sort!
+          check_conflict_actions
+          @actions.reverse.each do |action|
+            source[action.begin_pos...action.end_pos] = action.rewritten_code
+            source = remove_code_or_whole_line(source, action.line)
+          end
+          @actions = []
+
+          File.write file_path, source
+        end while !@conflict_actions.empty?
       end
     end
 
@@ -81,6 +85,18 @@ module Synvert
 
   private
 
+    def check_conflict_actions
+      i = @actions.length - 1
+      @conflict_actions = []
+      while i > 0
+        if @actions[i].begin_pos <= @actions[i - 1].end_pos
+          @conflict_actions << @actions.delete_at(i)
+        end
+        i -= 1
+      end
+      @conflict_actions
+    end
+
     def remove_code_or_whole_line(source, line)
       newline_at_end_of_line = source[-1] == "\n"
       source_arr = source.split("\n")

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

@@ -1,4 +1,4 @@
-Synvert::Rewriter.new "convert_dynamic_finders", "Convert dynamic finders" do
+Synvert::Rewriter.new "convert_rails_dynamic_finders", "Convert rails dynamic finders" do
   helper_method 'dynamic_finder_to_hash' do |prefix|
     fields = node.message.to_s[prefix.length..-1].split("_and_")
     fields.length.times.map { |i|
@@ -12,41 +12,35 @@ Synvert::Rewriter.new "convert_dynamic_finders", "Convert dynamic finders" do
       hash_params = dynamic_finder_to_hash("find_all_by_")
       replace_with "{{receiver}}.where(#{hash_params})"
     end
-  end
 
-  within_files '**/*.rb' do
     # find_by_... => where(...).first
     with_node type: 'send', message: /find_by_/ do
-      hash_params = dynamic_finder_to_hash("find_by_")
-      replace_with "{{receiver}}.where(#{hash_params}).first"
+      if :find_by_id == node.message
+        replace_with "{{receiver}}.find({{arguments}})"
+      elsif :find_by_sql != node.message
+        hash_params = dynamic_finder_to_hash("find_by_")
+        replace_with "{{receiver}}.where(#{hash_params}).first"
+      end
     end
-  end
 
-  within_files '**/*.rb' do
     # find_last_by_... => where(...).last
     with_node type: 'send', message: /find_last_by_/ do
       hash_params = dynamic_finder_to_hash("find_last_by_")
       replace_with "{{receiver}}.where(#{hash_params}).last"
     end
-  end
 
-  within_files '**/*.rb' do
     # scoped_by_... => where(...)
     with_node type: 'send', message: /scoped_by_/ do
       hash_params = dynamic_finder_to_hash("scoped_by_")
       replace_with "{{receiver}}.where(#{hash_params})"
     end
-  end
 
-  within_files '**/*.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("find_or_initialize_by_")
       replace_with "{{receiver}}.find_or_initialize_by(#{hash_params})"
     end
-  end
 
-  within_files '**/*.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("find_or_create_by_")

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

@@ -4,9 +4,7 @@ Synvert::Rewriter.new "strong_parameters", "Use strong_parameters syntax" do
     with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'whitelist_attributes=' do
       remove
     end
-  end
 
-  within_files 'config/**/*.rb' do
     # remove config.active_record.mass_assignment_sanitizer = ...
     with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'active_record'}, message: 'mass_assignment_sanitizer=' do
       remove
@@ -32,9 +30,10 @@ Synvert::Rewriter.new "strong_parameters", "Use strong_parameters syntax" do
         if parameters[object_name]
           # append def xxx_params; ...; end
           unless_exist_node type: 'def', name: "#{object_name}_params" do
-            append """def #{object_name}_params
-  params.require(:#{object_name}).permit(#{parameters[object_name]})
-end"""
+            new_code =  "def #{object_name}_params\n"
+            new_code << "  params.require(:#{object_name}).permit(#{parameters[object_name]})\n"
+            new_code << "end"
+            append new_code
           end
 
           # params[:xxx] => xxx_params

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

@@ -6,16 +6,12 @@ Synvert::Rewriter.new 'upgrade_rails_3_0_to_3_1', 'Upgrade rails from 3.0 to 3.1
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'version=' do
       insert "config.assets.version = '1.0'"
     end
-  end
 
-  within_file 'config/application.rb' do
     # insert config.assets.enabled = true
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'enabled=' do
       insert 'config.assets.enabled = true'
     end
-  end
 
-  within_file 'config/application.rb' do
     # config.assets.prefix = '/assets' => config.assets.prefix = '/asset-files'
     with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'prefix=', arguments: ['/assets'] do
       replace_with "config.assets.prefix = '/asset-files'"
@@ -27,16 +23,12 @@ Synvert::Rewriter.new 'upgrade_rails_3_0_to_3_1', 'Upgrade rails from 3.0 to 3.1
     with_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'action_view'}, message: 'debug_rjs=' do
       remove
     end
-  end
 
-  within_file 'config/environments/development.rb' do
     # insert config.assets.debug = true
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'debug=' do
       insert "config.assets.debug = true"
     end
-  end
 
-  within_file 'config/environments/development.rb' do
     # insert config.assets.compress = false
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compress=' do
       insert "config.assets.compress = false"
@@ -48,16 +40,12 @@ Synvert::Rewriter.new 'upgrade_rails_3_0_to_3_1', 'Upgrade rails from 3.0 to 3.1
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'digest=' do
       insert "config.assets.digest = true"
     end
-  end
 
-  within_file 'config/environments/production.rb' do
     # insert config.assets.compile = false
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compile=' do
       insert "config.assets.compile = false"
     end
-  end
 
-  within_file 'config/environments/production.rb' do
     # insert config.assets.compress = true
     unless_exist_node type: 'send', receiver: {type: 'send', receiver: {type: 'send', message: 'config'}, message: 'assets'}, message: 'compress=' do
       insert "config.assets.compress = true"
@@ -66,27 +54,24 @@ Synvert::Rewriter.new 'upgrade_rails_3_0_to_3_1', 'Upgrade rails from 3.0 to 3.1
 
   within_file 'config/environments/test.rb' do
     # insert config.static_cache_control = "public, max-age=3600"
-    unless_exist_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'serve_static_assets=' do
+    unless_exist_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'static_cache_control=' do
       insert 'config.static_cache_control = "public, max-age=3600"'
     end
-  end
 
-  within_file 'config/environments/test.rb' do
     # insert config.serve_static_assets = true
     unless_exist_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'serve_static_assets=' do
       insert "config.serve_static_assets = true"
     end
   end
 
-  add_file 'config/initializers/wrap_parameters.rb', """
-ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
-end
-
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
-end
-  """.strip
+  new_code =  "ActiveSupport.on_load(:action_controller) do\n"
+  new_code << "  wrap_parameters format: [:json]\n"
+  new_code << "end\n"
+  new_code << "\n"
+  new_code << "ActiveSupport.on_load(:active_record) do\n"
+  new_code << "  self.include_root_in_json = false\n"
+  new_code << "end"
+  add_file 'config/initializers/wrap_parameters.rb', new_code
 
   within_file 'config/initializers/session_store.rb' do
     with_node type: 'send', receiver: {type: 'send', message: 'config'}, message: 'session_store', arguments: {first: :cookie_store} do

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

@@ -150,7 +150,7 @@ Synvert::Rewriter.new "upgrade_rails_3_2_to_4_0", "Upgrade rails from 3.2 to 4.0
     end
   end
 
-  add_snippet 'convert_dynamic_finders'
+  add_snippet 'convert_rails_dynamic_finders'
   add_snippet 'strong_parameters'
 
   todo <<-EOF

data/lib/synvert/snippets/rspec/block_to_expect.rb

@@ -1,11 +1,11 @@
 Synvert::Rewriter.new "convert_rspec_block_to_expect", "RSpec converts block to expect" do
   if_gem 'rspec', {gte: '2.11.0'}
 
-  {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
-    within_files 'spec/**/*.rb' do
-      # lambda { do_something }.should raise_error => expect { do_something }.to raise_error
-      # proc { do_something }.should raise_error => expect { do_something }.to raise_error
-      # -> { do_something }.should raise_error => expect { do_something }.to raise_error
+  within_files 'spec/**/*.rb' do
+    # lambda { do_something }.should raise_error => expect { do_something }.to raise_error
+    # proc { do_something }.should raise_error => expect { do_something }.to raise_error
+    # -> { do_something }.should raise_error => expect { do_something }.to raise_error
+    {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
       with_node type: 'send', receiver: {type: 'block'}, message: old_message do
         replace_with "expect { {{receiver.body}} }.#{new_message} {{arguments}}"
       end

data/lib/synvert/snippets/rspec/boolean_matcher.rb

@@ -1,10 +1,10 @@
 Synvert::Rewriter.new "convert_rspec_boolean_matcher", "RSpec converts boolean matcher" do
   if_gem 'rspec', {gte: '2.99.0'}
 
-  {be_true: 'be_truthy', be_false: 'be_falsey'}.each do |old_matcher, new_matcher|
-    within_files 'spec/**/*_spec.rb' do
-      # be_true => be_truthy
-      # be_false => be_falsey
+  within_files 'spec/**/*_spec.rb' do
+    # be_true => be_truthy
+    # be_false => be_falsey
+    {be_true: 'be_truthy', be_false: 'be_falsey'}.each do |old_matcher, new_matcher|
       with_node type: 'send', receiver: nil, message: old_matcher do
         replace_with new_matcher
       end

data/lib/synvert/snippets/rspec/collection_matcher.rb

@@ -1,14 +1,14 @@
 Synvert::Rewriter.new "convert_rspec_collection_matcher", "RSpec converts collection matcher" do
   if_gem 'rspec', {gte: '2.11.0'}
 
-  {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}.each do |old_matcher, new_matcher|
-    within_files 'spec/**/*_spec.rb' do
-      # expect(collection).to have(3).items => expect(collection.size).to eq(3)
-      # expect(collection).to have_exactly(3).items => expect(collection.size).to eq(3)
-      # expect(collection).to have_at_least(3).items => expect(collection.size).to be >= 3
-      # expect(collection).to have_at_most(3).items => expect(collection.size).to be <= 3
-      #
-      # expect(team).to have(3).players => expect(team.players.size).to eq 3
+  within_files 'spec/**/*_spec.rb' do
+    # expect(collection).to have(3).items => expect(collection.size).to eq(3)
+    # expect(collection).to have_exactly(3).items => expect(collection.size).to eq(3)
+    # expect(collection).to have_at_least(3).items => expect(collection.size).to be >= 3
+    # expect(collection).to have_at_most(3).items => expect(collection.size).to be <= 3
+    #
+    # expect(team).to have(3).players => expect(team.players.size).to eq 3
+    {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}.each do |old_matcher, new_matcher|
       with_node type: 'send', message: 'to', arguments: {first: {type: 'send', receiver: {type: 'send', message: old_matcher}}} do
         times = node.arguments.first.receiver.arguments.first.source(self)
         items_name = node.arguments.first.message

data/lib/synvert/snippets/rspec/its_to_it.rb

@@ -1,36 +1,36 @@
 Synvert::Rewriter.new "convert_rspec_its_to_it", "RSpec converts its to it" do
   if_gem 'rspec', {gte: '2.99.0'}
 
-  [:should, :should_not].each do |message|
-    within_files 'spec/**/*.rb' do
-      # describe 'example' do
-      #   subject { { foo: 1, bar: 2 } }
-      #   its(:size) { should == 2 }
-      #   its([:foo]) { should == 1 }
-      #   its('keys.first') { should == :foo }
-      # end
-      # =>
-      # describe 'example' do
-      #   subject { { foo: 1, bar: 2 } }
-      #
-      #   describe '#size' do
-      #     subject { super().size }
-      #     it { should == 2 }
-      #   end
-      #
-      #   describe '[:foo]' do
-      #     subject { super()[:foo] }
-      #     it { should == 1 }
-      #   end
-      #
-      #   describe '#keys' do
-      #     subject { super().keys }
-      #     describe '#first' do
-      #       subject { super().first }
-      #       it { should == :foo }
-      #     end
-      #   end
-      # end
+  within_files 'spec/**/*.rb' do
+    # describe 'example' do
+    #   subject { { foo: 1, bar: 2 } }
+    #   its(:size) { should == 2 }
+    #   its([:foo]) { should == 1 }
+    #   its('keys.first') { should == :foo }
+    # end
+    # =>
+    # describe 'example' do
+    #   subject { { foo: 1, bar: 2 } }
+    #
+    #   describe '#size' do
+    #     subject { super().size }
+    #     it { should == 2 }
+    #   end
+    #
+    #   describe '[:foo]' do
+    #     subject { super()[:foo] }
+    #     it { should == 1 }
+    #   end
+    #
+    #   describe '#keys' do
+    #     subject { super().keys }
+    #     describe '#first' do
+    #       subject { super().first }
+    #       it { should == :foo }
+    #     end
+    #   end
+    # end
+    [:should, :should_not].each do |message|
       with_node type: 'block', caller: {message: 'its'} do
         if node.body.length == 1
           its_arg = node.caller.arguments.first.source(self)

data/lib/synvert/snippets/rspec/method_stub.rb

@@ -9,9 +9,7 @@ Synvert::Rewriter.new "convert_rspec_method_stub", "RSpec converts method stub"
         replace_with "{{receiver}}.#{new_message}({{arguments}})"
       end
     end
-  end
 
-  within_files 'spec/**/*.rb' do
     # obj.stub(:message).any_number_of_times => allow(obj).to receive(:message)
     # obj.stub(:message).at_least(0) => allow(obj).to receive(:message)
     with_node type: 'send', message: 'any_number_of_times' do
@@ -21,9 +19,7 @@ Synvert::Rewriter.new "convert_rspec_method_stub", "RSpec converts method stub"
     with_node type: 'send', message: 'at_least', arguments: [0] do
       replace_with "{{receiver}}"
     end
-  end
 
-  within_files 'spec/**/*.rb' do
     # obj.stub(:message) => allow(obj).to receive(:message)
     # Klass.any_instance.stub(:message) => allow_any_instance_of(Klass).to receive(:message)
     with_node type: 'send', message: 'stub', arguments: {first: {type: {not: 'hash'}}} do
@@ -48,16 +44,12 @@ Synvert::Rewriter.new "convert_rspec_method_stub", "RSpec converts method stub"
         replace_with "allow({{receiver}}).to receive_message_chain({{arguments}})"
       end
     end
-  end
 
-  within_files 'spec/**/*.rb' do
     # obj.stub(:foo => 1, :bar => 2) => allow(obj).to receive_messages(:foo => 1, :bar => 2)
     with_node type: 'send', message: 'stub', arguments: {first: {type: 'hash'}} do
       replace_with "allow({{receiver}}).to receive_messages({{arguments}})"
     end
-  end
 
-  within_files 'spec/**/*.rb' do
     # allow(obj).to receive(:message).and_return { 1 } => allow(obj).to receive(:message) { 1 }
     with_node type: 'send', receiver: {type: 'send', message: 'allow'}, arguments: {first: {type: 'block', caller: {type: 'send', message: 'and_return', arguments: []}}} do
       replace_with "{{receiver}}.to {{arguments.first.caller.receiver}} { {{arguments.first.body}} }"

data/lib/synvert/snippets/rspec/one_liner_expectation.rb

@@ -1,51 +1,52 @@
 Synvert::Rewriter.new "convert_rspec_one_liner_expectation", "RSpec converts one liner expectation" do
   if_gem 'rspec', {gte: '2.99.0'}
 
-  {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
-    matcher_converters = {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}
-    matcher_converters.each do |old_matcher, new_matcher|
-      within_files 'spec/**/*.rb' do
-        # it { should have(3).items }
-        # =>
-        # it 'has 3 items' do
-        #   expect(subject.size).to eq(3)
-        # end
-        #
-        # it { should have_at_least(3).players }
-        # =>
-        # it 'has at least 3 players' do
-        #   expect(subject.players.size).to be >= 3
-        # end
+  matcher_converters = {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}
+  within_files 'spec/**/*.rb' do
+    {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
+      # it { should matcher } => it { is_expected.to matcher }
+      # it { should_not matcher } => it { is_expected.not_to matcher }
+      with_node type: 'block', caller: {message: 'it'} do
+        if_only_exist_node type: 'send', receiver: nil, message: old_message do
+          receiver = node.body.first.arguments.first.receiver
+          unless receiver && matcher_converters.include?(receiver.message)
+            matcher = node.body.first.arguments.first.source(self)
+            replace_with "it { is_expected.#{new_message} #{matcher} }"
+          end
+        end
+      end
+
+      # it { should have(3).items }
+      # =>
+      # it 'has 3 items' do
+      #   expect(subject.size).to eq(3)
+      # end
+      #
+      # it { should have_at_least(3).players }
+      # =>
+      # it 'has at least 3 players' do
+      #   expect(subject.players.size).to be >= 3
+      # end
+      matcher_converters.each do |old_matcher, new_matcher|
         with_node type: 'block', caller: {message: 'it'} do
           if_only_exist_node type: 'send', receiver: nil, message: old_message, arguments: {first: {type: 'send', receiver: {type: 'send', message: old_matcher}}} do
             times = node.body.first.arguments.first.receiver.arguments.first.source(self)
             items_name = node.body.first.arguments.first.message
+            new_code = ""
             if :items == items_name
-              replace_with """it 'has #{times} items' do
-  expect(subject.size).#{new_message} #{new_matcher}(#{times})
-end"""
+              new_code << "it 'has #{times} items' do\n"
+              new_code << "  expect(subject.size).#{new_message} #{new_matcher}(#{times})\n"
+              new_code << "end"
             else
               it_message = "#{old_matcher.to_s.sub('have', 'has').gsub('_', ' ')} #{times} #{items_name}"
-              replace_with """it '#{it_message}' do
-  expect(subject.#{items_name}.size).#{new_message} #{new_matcher} #{times}
-end"""
+              new_code << "it '#{it_message}' do\n"
+              new_code << "  expect(subject.#{items_name}.size).#{new_message} #{new_matcher} #{times}\n"
+              new_code << "end"
             end
+            replace_with new_code
           end
         end
       end
     end
   end
-
-  {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
-    within_files 'spec/**/*.rb' do
-      # it { should matcher } => it { is_expected.to matcher }
-      # it { should_not matcher } => it { is_expected.not_to matcher }
-      with_node type: 'block', caller: {message: 'it'} do
-        if_only_exist_node type: 'send', receiver: nil, message: old_message do
-          matcher = node.body.first.arguments.first.source(self)
-          replace_with "it { is_expected.#{new_message} #{matcher} }"
-        end
-      end
-    end
-  end
 end

data/lib/synvert/snippets/rspec/should_to_expect.rb

@@ -1,31 +1,27 @@
 Synvert::Rewriter.new "convert_rspec_should_to_expect", "RSpec converts should to expect" do
   if_gem 'rspec', {gte: '2.11.0'}
 
-  {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
-    within_files 'spec/**/*.rb' do
-      # obj.should matcher => expect(obj).to matcher
-      # obj.should_not matcher => expect(obj).not_to matcher
+  within_files 'spec/**/*.rb' do
+    # obj.should matcher => expect(obj).to matcher
+    # obj.should_not matcher => expect(obj).not_to matcher
+    {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
       with_node type: 'send', receiver: {type: {not: 'block'}}, message: old_message do
         if node.receiver && node.arguments.size > 0
           replace_with "expect({{receiver}}).#{new_message} {{arguments}}"
         end
       end
-    end
 
-    {'==' => 'eq', '<' => 'be <', '>' => 'be >', '<=' => 'be <=', '>=' => 'be >=', '===' => 'be ==='}.each do |old_matcher, new_matcher|
-      within_files 'spec/**/*.rb' do
-        # 1.should == 1 => expect(1).to eq 1
-        # 1.should < 1 => expect(1).to be < 2
-        # Integer.should === 1 => expect(Integer).to be === 1
+      # 1.should == 1 => expect(1).to eq 1
+      # 1.should < 1 => expect(1).to be < 2
+      # Integer.should === 1 => expect(Integer).to be === 1
+      {'==' => 'eq', '<' => 'be <', '>' => 'be >', '<=' => 'be <=', '>=' => 'be >=', '===' => 'be ==='}.each do |old_matcher, new_matcher|
         with_node type: 'send', receiver: {type: 'send', message: old_message}, message: old_matcher do
           if node.receiver.receiver
             replace_with "expect({{receiver.receiver}}).#{new_message} #{new_matcher} {{arguments}}"
           end
         end
       end
-    end
 
-    within_files 'spec/**/*.rb' do
       # 'string'.should =~ /^str/ => expect('string').to match /^str/
       # [1, 2, 3].should =~ [2, 1, 3] => expect([1, 2, 3]).to match_array [2, 1, 3]
       with_node type: 'send', receiver: {type: 'send', message: old_message}, message: '=~' do

data/lib/synvert/version.rb

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

data/spec/synvert/rewriter/gem_spec_spec.rb

@@ -32,7 +32,7 @@ GEM
     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', {lt: '1.2.0'})
+      gem_spec = Rewriter::GemSpec.new('ast', {gt: '1.2.0'})
       expect(gem_spec).not_to be_match
     end
 

data/spec/synvert/snippets/rails/convert_dynamic_finders_spec.rb

@@ -26,6 +26,18 @@ class Post < ActiveRecord::Base
   def scoped_active_user_by_email(email)
     User.scoped_by_email_and_active(email, true)
   end
+
+  def active_users_by_sql(email)
+    User.find_by_sql(["select * from  users where email = ?", email])
+  end
+
+  def active_user_by_id(id)
+    User.find_by_id(id)
+  end
+
+  def active_user_by_account_email(account_email)
+    User.find_by_account_id(Account.find_by_email(account_email).id)
+  end
 end
     '''}
     let(:post_model_rewritten_content) {'''
@@ -45,6 +57,18 @@ class Post < ActiveRecord::Base
   def scoped_active_user_by_email(email)
     User.where(email: email, active: true)
   end
+
+  def active_users_by_sql(email)
+    User.find_by_sql(["select * from  users where email = ?", email])
+  end
+
+  def active_user_by_id(id)
+    User.find(id)
+  end
+
+  def active_user_by_account_email(account_email)
+    User.where(account_id: Account.where(email: account_email).first.id).first
+  end
 end
     '''}
     let(:users_controller_content) {'''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser