synvert-core 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3cff654eae485c77411077c8e1ee126a29afb6
-  data.tar.gz: 21dcd6b6f868b4ccc9c35176578d01a060971e4c
+  metadata.gz: d77822c52c87146007c9915c7ae6e6d4c3d539ee
+  data.tar.gz: 639a0bbc823cddb2476142ef3035b2ea73c954c8
 SHA512:
-  metadata.gz: 3ae01938e470eba926eaaa5d7564bdf2342ad6138938c67c400540f99872dcadf42fb5eb4363623edf133da1870c62b94cf12bf5112da01961730f561341ae5e
-  data.tar.gz: dab94a1c780431350248d454331144c72a11b4e26e63431a5fe9c5fc03f79f35d7cab1928ec9bf897ce7133a35b849005784120c0ec43008d8216ca5c4d90289
+  metadata.gz: 06127d574c1450a0689ab8f43d2403cee8e3aa859c4fd7ae645da98832112f5e70b3f7807f793762a6caae5c64d0f912259a65d945de220e4e92a697907fe529
+  data.tar.gz: 7a29c3fa1178fe44056460df4692c5a7b8af7fc7832fd3edd5b35e39f9ea57068faa818611ef2fa043a5244d3b9089e93b2e62e6ab7db8aafff6e32c136ec3b0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.4.2
+
+* do not rewrite code in {{ }} in synvert can't rewrite it
+* fix indent for replace_with action
+
 ## 0.4.1
 
 * add Rewriter::Helper module to provide common helper methods.

data/lib/synvert/core.rb

@@ -6,7 +6,7 @@ require 'bundler'
 require 'parser'
 require 'parser/current'
 require 'ast'
-require 'active_support/inflector'
+require 'active_support/core_ext/object'
 require 'erubis'
 require 'synvert/core/node_ext'
 

data/lib/synvert/core/node_ext.rb

@@ -254,22 +254,27 @@ class Parser::AST::Node
   # @raise [Synvert::Core::MethodNotSupported] if string in block {{ }} does not support.
   def rewritten_source(code)
     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]
-      when Array
-        if evaluated.size > 0
-          source = evaluated.first.loc.expression.source_buffer.source
-          source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
+      old_code = $1
+      if self.respond_to? old_code.split(/\.|\[/).first
+        evaluated = self.instance_eval old_code
+        case evaluated
+        when Parser::AST::Node
+          source = evaluated.loc.expression.source_buffer.source
+          source[evaluated.loc.expression.begin_pos...evaluated.loc.expression.end_pos]
+        when Array
+          if evaluated.size > 0
+            source = evaluated.first.loc.expression.source_buffer.source
+            source[evaluated.first.loc.expression.begin_pos...evaluated.last.loc.expression.end_pos]
+          end
+        when String
+          evaluated
+        when NilClass
+          'nil'
+        else
+          raise Synvert::Core::MethodNotSupported.new "rewritten_source is not handled for #{evaluated.inspect}"
         end
-      when String
-        evaluated
-      when NilClass
-        'nil'
       else
-        raise Synvert::Core::MethodNotSupported.new "rewritten_source is not handled for #{evaluated.inspect}"
+        "{{#{old_code}}}"
       end
     end
   end

data/lib/synvert/core/rewriter/action.rb

@@ -70,9 +70,11 @@ module Synvert::Core
     # @return [String] rewritten code.
     def rewritten_code
       if rewritten_source.split("\n").length > 1
-        "\n\n" + rewritten_source.split("\n").map { |line|
-          indent(@node) + line
-        }.join("\n")
+        new_code = []
+        rewritten_source.split("\n").each_with_index { |line, index|
+          new_code << (index == 0 ? line : indent(@node) + line)
+        }
+        new_code.join("\n")
       else
         rewritten_source
       end

data/lib/synvert/core/rewriter/helper.rb

@@ -31,7 +31,9 @@ module Synvert::Core
     #
     #   strip_brackets("(1..100)") #=> "1..100"
     def strip_brackets(code)
-      code.sub(/^[{(\[]/, '').sub(/[})\]]$/, '')
+      code.sub(/^\((.*)\)$/) { $1 }
+          .sub(/^\[(.*)\]$/) { $1 }
+          .sub(/^{(.*)}$/) { $1 }
     end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -267,4 +267,26 @@ describe Parser::AST::Node do
       expect(node).not_to be_match(type: 'class', name: {not: 'Synvert'})
     end
   end
+
+  describe '#rewritten_source' do
+    let(:instance) {
+      rewriter = Synvert::Rewriter.new('foobar')
+      Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
+    }
+    before { Synvert::Rewriter::Instance.current = instance }
+
+    it 'does not rewrite with unknown method' do
+      source = 'class Synvert; end'
+      instance.current_source = source
+      node = parse(source)
+      expect(node.rewritten_source('{{foobar}}')).to eq '{{foobar}}'
+    end
+
+    it 'rewrites with node known method' do
+      source = 'class Synvert; end'
+      instance.current_source = source
+      node = parse(source)
+      expect(node.rewritten_source('{{name}}')).to eq 'Synvert'
+    end
+  end
 end

data/spec/synvert/core/rewriter/action_spec.rb

@@ -56,7 +56,7 @@ end""")
       end
 
       it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq """\n\n  describe '#size' do
+        expect(subject.rewritten_code).to eq """describe '#size' do
     subject { super().size }
     it { should == 1 }
   end"""

data/spec/synvert/core/rewriter/helper_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+module Synvert::Core
+  describe Rewriter::Helper do
+    let(:dummy_instance) { Class.new { include Rewriter::Helper }.new }
+
+    describe "add_receiver_if_necessary" do
+      context "with receiver" do
+        let(:node) { parse("User.save(false)") }
+
+        it "adds reciever" do
+          allow(dummy_instance).to receive(:node).and_return(node)
+          expect(dummy_instance.add_receiver_if_necessary("save(validate: false)")).to eq "{{receiver}}.save(validate: false)"
+        end
+      end
+
+      context "without receiver" do
+        let(:node) { parse("save(false)") }
+
+        it "doesn't add reciever" do
+          allow(dummy_instance).to receive(:node).and_return(node)
+          expect(dummy_instance.add_receiver_if_necessary("save(validate: false)")).to eq "save(validate: false)"
+        end
+      end
+    end
+
+    describe "strip_brackets" do
+      it "strip ()" do
+        expect(dummy_instance.strip_brackets("(123)")).to eq "123"
+      end
+
+      it "strip {}" do
+        expect(dummy_instance.strip_brackets("{123}")).to eq "123"
+      end
+
+      it "strip []" do
+        expect(dummy_instance.strip_brackets("[123]")).to eq "123"
+      end
+
+      it "not strip unmatched (]" do
+        expect(dummy_instance.strip_brackets("(123]")).to eq "(123]"
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -132,6 +132,7 @@ files:
 - spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition_spec.rb
 - spec/synvert/core/rewriter/gem_spec_spec.rb
+- spec/synvert/core/rewriter/helper_spec.rb
 - spec/synvert/core/rewriter/instance_spec.rb
 - spec/synvert/core/rewriter/scope_spec.rb
 - spec/synvert/core/rewriter/warning_spec.rb
@@ -170,6 +171,7 @@ test_files:
 - spec/synvert/core/rewriter/action_spec.rb
 - spec/synvert/core/rewriter/condition_spec.rb
 - spec/synvert/core/rewriter/gem_spec_spec.rb
+- spec/synvert/core/rewriter/helper_spec.rb
 - spec/synvert/core/rewriter/instance_spec.rb
 - spec/synvert/core/rewriter/scope_spec.rb
 - spec/synvert/core/rewriter/warning_spec.rb