synvert 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 904cb80d27d9364b9521a6002db88319440d6cd0
-  data.tar.gz: b065e2a1aa186550d5051a1805aed0b0b36770bd
+  metadata.gz: c9b185412549d5579efb12b82033786c586cc6f7
+  data.tar.gz: cce0f663f05dc9a481edb2f46c41d4e3e0ee2ed2
 SHA512:
-  metadata.gz: 8470c708ef1bd0d97a360c3cfa7c49576311ae8a0f7197b3da69fe49a742c54d3b49e3b79784a9543c4cf5b7f2d649339bc24d885fb7f50f1ced7bdab628112d
-  data.tar.gz: 30f9727f898c103b693d46754f6e8c9317d35a98e3fed440ab7e5a8f4077b21fee2313b5670a999e9c7152333398f7e1b34e37009cdacd2a38a58a57dff1ff94
+  metadata.gz: 796bf4d58f0a30083a1522b70ff8d6cc746d5c982e0081df157a073278dc0e99c45e977390211adaea88979e12019b5da69972eac7fe667ff7df076ab4c2b5fe
+  data.tar.gz: 05d8b0d8c84a2141fa93c245f4d5a7be3095b86c1782bee74fa2656db3386f4e20e33c9d5e34d9d14e3853fd440869f8619fbbf5cce9c396a3edac4fe98705dd

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.0.13
+
+* Add keys and values rules for hash node
+* Add key and value rules for pair node
+* Add ruby new hash syntax snippet
+* Add ruby new lambda syntax snippet
+
 ## 0.0.12
 
 * Allow define multiple scopes and conditions in one instance

data/README.md

@@ -9,6 +9,8 @@ automatically.
 
 **synvert is still in alpha stage**
 
+synvert supports ruby >= 1.9.3
+
 ## Installation
 
 Install it using rubygems
@@ -21,11 +23,10 @@ $ gem install synvert
 
 ```
 $ synvert -h
-Usage: synvert [options] [project_path]
-        --load-snippets SNIPPET_PATHS
-                                     load additional snippets, snippet paths can be local file path or remote http url
-        --list-snippets              list all available snippets
-        --run-snippets SNIPPET_NAMES run specified snippets
+Usage: synvert [project_path]
+    -d, --load SNIPPET_PATHS         load additional snippets, snippet paths can be local file path or remote http url
+    -l, --list                       list all available snippets
+    -r, --run SNIPPET_NAMES          run specified snippets
 ```
 
 e.g.
@@ -60,6 +61,8 @@ rspec_new_syntax                         | Use RSpec new syntax, it contains all
 convert_rspec_one_liner_expectation      | RSpec converts one liner expectation
 convert_rspec_should_to_expect           | RSpec converts should to expect
 convert_rspec_stub_and_mock_to_double    | RSpec converts stub and mock to double
+ruby_new_hash_syntax                     | Ruby uses new hash syntax
+ruby_new_lambda_syntax                   | Ruby uses new lambda syntax
 
 ## Documentation
 

data/lib/synvert/cli.rb

@@ -16,13 +16,13 @@ module Synvert
       command = :run
       optparse = OptionParser.new do |opts|
         opts.banner = "Usage: synvert [project_path]"
-        opts.on '--load-snippets SNIPPET_PATHS', 'load additional snippets, snippet paths can be local file path or remote http url' do |snippet_paths|
+        opts.on '-d', '--load SNIPPET_PATHS', 'load additional snippets, snippet paths can be local file path or remote http url' do |snippet_paths|
           Configuration.instance.set 'snippet_paths', snippet_paths.split(',')
         end
-        opts.on '--list-snippets', 'list all available snippets' do
+        opts.on '-l', '--list', 'list all available snippets' do
           command = :list
         end
-        opts.on '--run-snippets SNIPPET_NAMES', 'run specified snippets' do |snippet_names|
+        opts.on '-r', '--run SNIPPET_NAMES', 'run specified snippets' do |snippet_names|
           Configuration.instance.set 'snippet_names', snippet_names.split(',')
         end
       end

data/lib/synvert/node_ext.rb

@@ -66,6 +66,38 @@ class Parser::AST::Node
     end
   end
 
+  def keys
+    if :hash == self.type
+      self.children.map { |child| child.children[0] }
+    else
+      raise NotImplementedError.new "keys is not handled for #{self.inspect}"
+    end
+  end
+
+  def values
+    if :hash == self.type
+      self.children.map { |child| child.children[1] }
+    else
+      raise NotImplementedError.new "keys is not handled for #{self.inspect}"
+    end
+  end
+
+  def key
+    if :pair == self.type
+      self.children.first
+    else
+      raise NotImplementedError.new "key is not handled for #{self.inspect}"
+    end
+  end
+
+  def value
+    if :pair == self.type
+      self.children.last
+    else
+      raise NotImplementedError.new "value is not handled for #{self.inspect}"
+    end
+  end
+
   def source(instance)
     if self.loc.expression
       instance.current_source[self.loc.expression.begin_pos...self.loc.expression.end_pos]

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

@@ -1,50 +1,82 @@
 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|
-      fields[i] + ": " + node.arguments[i].source(self)
-    }.join(", ")
+    if fields.length == node.arguments.length && :hash != node.arguments.first.type
+      fields.length.times.map { |i|
+        fields[i] + ": " + node.arguments[i].source(self)
+      }.join(", ")
+    else
+      "{{arguments}}"
+    end
   end
 
   within_files '**/*.rb' do
     # find_all_by_... => where(...)
     with_node type: 'send', message: /find_all_by_/ do
       hash_params = dynamic_finder_to_hash("find_all_by_")
-      replace_with "{{receiver}}.where(#{hash_params})"
+      if node.receiver
+        replace_with "{{receiver}}.where(#{hash_params})"
+      else
+        replace_with "where(#{hash_params})"
+      end
     end
 
     # find_by_... => where(...).first
     with_node type: 'send', message: /find_by_/ do
       if :find_by_id == node.message
-        replace_with "{{receiver}}.find({{arguments}})"
+        if node.receiver
+          replace_with "{{receiver}}.find({{arguments}})"
+        else
+          replace_with "find({{arguments}}"
+        end
       elsif :find_by_sql != node.message
         hash_params = dynamic_finder_to_hash("find_by_")
-        replace_with "{{receiver}}.where(#{hash_params}).first"
+        if node.receiver
+          replace_with "{{receiver}}.where(#{hash_params}).first"
+        else
+          replace_with "where(#{hash_params}).first"
+        end
       end
     end
 
     # 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"
+      if node.receiver
+        replace_with "{{receiver}}.where(#{hash_params}).last"
+      else
+        replace_with "where(#{hash_params}).last"
+      end
     end
 
     # 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})"
+      if node.receiver
+        replace_with "{{receiver}}.where(#{hash_params})"
+      else
+        replace_with "where(#{hash_params})"
+      end
     end
 
     # 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})"
+      if node.receiver
+        replace_with "{{receiver}}.find_or_initialize_by(#{hash_params})"
+      else
+        replace_with "find_or_initialize_by(#{hash_params})"
+      end
     end
 
     # 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_")
-      replace_with "{{receiver}}.find_or_create_by(#{hash_params})"
+      if node.receiver
+        replace_with "{{receiver}}.find_or_create_by(#{hash_params})"
+      else
+        replace_with "find_or_create_by(#{hash_params})"
+      end
     end
   end
 end

data/lib/synvert/snippets/ruby/new_hash_syntax.rb

@@ -0,0 +1,15 @@
+Synvert::Rewriter.new "ruby_new_hash_syntax", "Ruby uses new hash syntax" do
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("1.9.0")
+    within_files '**/*.rb' do
+      # {:foo => 'bar'} => {foo: 'bar'}
+      within_node type: 'hash' do
+        with_node type: 'pair' do
+          if :sym == node.key.type
+            new_key = node.key.source(self)[1..-1]
+            replace_with "#{new_key}: {{value}}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/synvert/snippets/ruby/new_lambda_syntax.rb

@@ -0,0 +1,14 @@
+Synvert::Rewriter.new "ruby_new_lambda_syntax", "Ruby uses new lambda syntax" do
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("1.9.0")
+    within_files '**/*.rb' do
+      # lambda { |a, b, c| a + b + c } => ->(a, b, c) { a + b + c }
+      within_node type: 'block', caller: {type: 'send', message: 'lambda'} do
+        if node.arguments.empty?
+          replace_with "-> { {{body}} }"
+        else
+          replace_with "->({{arguments}}) { {{body}} }"
+        end
+      end
+    end
+  end
+end

data/lib/synvert/version.rb

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

data/spec/synvert/node_ext_spec.rb

@@ -83,6 +83,34 @@ describe Parser::AST::Node do
     end
   end
 
+  describe "#keys" do
+    it 'gets for hash node' do
+      node = parse("{:foo => :bar, 'foo' => 'bar'}")
+      expect(node.keys).to eq [Parser::CurrentRuby.parse(':foo'), Parser::CurrentRuby.parse("'foo'")]
+    end
+  end
+
+  describe "#values" do
+    it 'gets for hash node' do
+      node = parse("{:foo => :bar, 'foo' => 'bar'}")
+      expect(node.values).to eq [Parser::CurrentRuby.parse(':bar'), Parser::CurrentRuby.parse("'bar'")]
+    end
+  end
+
+  describe "#key" do
+    it 'gets for pair node' do
+      node = parse("{:foo => 'bar'}").children[0]
+      expect(node.key).to eq Parser::CurrentRuby.parse(':foo')
+    end
+  end
+
+  describe "#value" do
+    it 'gets for hash node' do
+      node = parse("{:foo => 'bar'}").children[0]
+      expect(node.value).to eq Parser::CurrentRuby.parse("'bar'")
+    end
+  end
+
   describe "#condition" do
     it 'gets for if node' do
       node = parse('if defined?(Bundler); end')

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

@@ -11,63 +11,39 @@ describe 'Convert dynamic finders' do
   describe 'with fakefs', fakefs: true do
     let(:post_model_content) {'''
 class Post < ActiveRecord::Base
-  def active_users_by_email(email)
+  def active_users
     User.find_all_by_email_and_active(email, true)
-  end
-
-  def first_active_user_by_email(email)
     User.find_by_email_and_active(email, true)
-  end
-
-  def last_active_user_by_email(email)
     User.find_last_by_email_and_active(email, true)
-  end
-
-  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)
+    User.find_by_account_id(Account.find_by_email(account_email).id)
+    User.find_or_create_by_email_and_login(parmas)
+    User.find_or_initialize_by_account_id(:account_id => account_id)
   end
 
-  def active_user_by_account_email(account_email)
-    User.find_by_account_id(Account.find_by_email(account_email).id)
+  def self.active_admins
+    find_all_by_role_and_active("admin", true)
   end
 end
     '''}
     let(:post_model_rewritten_content) {'''
 class Post < ActiveRecord::Base
-  def active_users_by_email(email)
+  def active_users
     User.where(email: email, active: true)
-  end
-
-  def first_active_user_by_email(email)
     User.where(email: email, active: true).first
-  end
-
-  def last_active_user_by_email(email)
     User.where(email: email, active: true).last
-  end
-
-  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)
+    User.where(account_id: Account.where(email: account_email).first.id).first
+    User.find_or_create_by(parmas)
+    User.find_or_initialize_by(:account_id => account_id)
   end
 
-  def active_user_by_account_email(account_email)
-    User.where(account_id: Account.where(email: account_email).first.id).first
+  def self.active_admins
+    where(role: "admin", active: true)
   end
 end
     '''}

data/spec/synvert/snippets/rspec/new_syntax_spec.rb

@@ -13,7 +13,7 @@ describe 'Use RSpec new syntax' do
     end
   end
 
-  describe 'rspec', fakefs: true do
+  describe 'with fakefs', fakefs: true do
     let(:post_spec_content) {"""
 it 'case' do
   obj.should matcher

data/spec/synvert/snippets/ruby/new_hash_syntax_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'Ruby uses new hash synax' do
+  before do
+    Synvert::Configuration.instance.set :path, '.'
+    allow_any_instance_of(Synvert::Rewriter::GemSpec).to receive(:match?).and_return(true)
+    rewriter_path = File.join(File.dirname(__FILE__), '../../../../lib/synvert/snippets/ruby/new_hash_syntax.rb')
+    @rewriter = eval(File.read(rewriter_path))
+  end
+
+  describe 'with fakefs', fakefs: true do
+    let(:test_content) {"""
+{:foo => 'bar', 'foo' => 'bar'}
+{:key1 => 'value1', :key2 => 'value2'}
+    """}
+    let(:test_rewritten_content) {"""
+{foo: 'bar', 'foo' => 'bar'}
+{key1: 'value1', key2: 'value2'}
+    """}
+
+    it 'process' do
+      File.write 'test.rb', test_content
+      @rewriter.process
+      expect(File.read 'test.rb').to eq test_rewritten_content
+    end
+  end
+end

data/spec/synvert/snippets/ruby/new_lambda_syntax_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'Ruby uses new -> synax' do
+  before do
+    Synvert::Configuration.instance.set :path, '.'
+    allow_any_instance_of(Synvert::Rewriter::GemSpec).to receive(:match?).and_return(true)
+    rewriter_path = File.join(File.dirname(__FILE__), '../../../../lib/synvert/snippets/ruby/new_lambda_syntax.rb')
+    @rewriter = eval(File.read(rewriter_path))
+  end
+
+  describe 'with fakefs', fakefs: true do
+    let(:test_content) {"""
+lambda { test }
+lambda { |a, b, c| a + b + c }
+    """}
+    let(:test_rewritten_content) {"""
+-> { test }
+->(a, b, c) { a + b + c }
+    """}
+
+    it 'process' do
+      File.write 'test.rb', test_content
+      @rewriter.process
+      expect(File.read 'test.rb').to eq test_rewritten_content
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -140,6 +140,8 @@ files:
 - lib/synvert/snippets/rspec/one_liner_expectation.rb
 - lib/synvert/snippets/rspec/should_to_expect.rb
 - lib/synvert/snippets/rspec/stub_and_mock_to_double.rb
+- lib/synvert/snippets/ruby/new_hash_syntax.rb
+- lib/synvert/snippets/ruby/new_lambda_syntax.rb
 - lib/synvert/version.rb
 - spec/spec_helper.rb
 - spec/support/parser_helper.rb
@@ -157,6 +159,8 @@ files:
 - spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb
 - spec/synvert/snippets/rspec/new_syntax_spec.rb
+- spec/synvert/snippets/ruby/new_hash_syntax_spec.rb
+- spec/synvert/snippets/ruby/new_lambda_syntax_spec.rb
 - synvert.gemspec
 homepage: ''
 licenses:
@@ -199,3 +203,5 @@ test_files:
 - spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
 - spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb
 - spec/synvert/snippets/rspec/new_syntax_spec.rb
+- spec/synvert/snippets/ruby/new_hash_syntax_spec.rb
+- spec/synvert/snippets/ruby/new_lambda_syntax_spec.rb