synvert-core 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908d88152aaea79eafba824db6d91351f6b02394
-  data.tar.gz: b68026829b49fd6a6b78295f8c8abae77a0812b2
+  metadata.gz: 2eacc4ed46475f1e8f697a68f0014a51f8652a6a
+  data.tar.gz: c2ca725e2348c8bb4cc4ee06fd05eb3d82b2eb53
 SHA512:
-  metadata.gz: b5bbe05c11edcc9b1f4688f962850851b07a9e5a2a01871f8455a3213823ff15a565c686e73eae92f6045eba29f810993a2e4a2ab1cecc5340b5838e707b728f
-  data.tar.gz: 5808b8122edd185de72864ac178e64bae3888a8be284774bd3e5bc274dfebc43d6280978d98d4d91e8046503f5dd94c4bfe06bd8149e6cf766f529f792ddcb1f
+  metadata.gz: 3ee88f43b7986394ed519e0e94364d9a603dac40bd61f25ec83f661beb52ace2036586e19df6ccf0e99e894b4dbe1c0f0123b83fd1bb52af7c8ff03a336f6875
+  data.tar.gz: 9c17ea44d83d5f885fbc1a6ad08bba5d9d8d551d2b163010d35c9e59127ce11db8472e7751cef67d7ab70cbb1ac0be7c6e79a99f62f8dd50d92c24b9386fae98

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.5.1
+
+* Remove Rewriter::Instance class methods current and current_source
+
 ## 0.5.0 (2014-08-21)
 
 * Add group to rewriter

data/lib/synvert/core/node_ext.rb

@@ -209,9 +209,8 @@ class Parser::AST::Node
   #
   # @return [String] source code.
   def to_source
-    instance = Synvert::Rewriter::Instance.current
     if self.loc.expression
-      instance.current_source[self.loc.expression.begin_pos...self.loc.expression.end_pos]
+      self.loc.expression.source
     end
   end
 
@@ -271,8 +270,7 @@ class Parser::AST::Node
         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]
+          evaluated.loc.expression.source
         when Array
           if evaluated.size > 0
             source = evaluated.first.loc.expression.source_buffer.source

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

@@ -236,7 +236,7 @@ module Synvert::Core
     # @return [Integer] begin position.
     def begin_pos
       node_begin_pos = @node.loc.expression.begin_pos
-      while @instance.current_source[node_begin_pos -= 1] == ' '
+      while @node.loc.expression.source_buffer.source[node_begin_pos -= 1] == ' '
       end
       node_begin_pos - Engine::ERUBY_STMT_SPLITTER.length + 1
     end
@@ -246,9 +246,8 @@ module Synvert::Core
     # @return [Integer] end position.
     def end_pos
       node_begin_pos = @node.loc.expression.begin_pos
-      node_end_pos = @node.loc.expression.end_pos
-      node_begin_pos += @instance.current_source[node_begin_pos..node_end_pos].index "do"
-      while @instance.current_source[node_begin_pos += 1] != '@'
+      node_begin_pos += @node.loc.expression.source.index "do"
+      while @node.loc.expression.source_buffer.source[node_begin_pos += 1] != '@'
       end
       node_begin_pos
     end
@@ -257,7 +256,7 @@ module Synvert::Core
     #
     # @return [String] rewritten code.
     def rewritten_code
-      @instance.current_source[begin_pos...end_pos].sub(Engine::ERUBY_STMT_SPLITTER, "@output_buffer.append= ")
+      @node.loc.expression.source_buffer.source[begin_pos...end_pos].sub(Engine::ERUBY_STMT_SPLITTER, "@output_buffer.append= ")
         .sub(Engine::ERUBY_STMT_SPLITTER, Engine::ERUBY_EXPR_SPLITTER)
     end
   end

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

@@ -9,10 +9,6 @@ module Synvert::Core
     include Rewriter::Helper
 
     class <<self
-      # @!attribute [rw] current
-      #   @return current instance
-      attr_accessor :current
-
       # Cached file source.
       #
       # @param file_path [String] file path
@@ -64,11 +60,9 @@ module Synvert::Core
 
     # @!attribute [rw] current_node
     #   @return current parsing node
-    # @!attribute [rw] current_source
-    #   @return current source code of file
     # @!attribute [rw] current_file
     #   @return current filename
-    attr_accessor :current_node, :current_source, :current_file
+    attr_accessor :current_node, :current_file
 
     # Initialize an instance.
     #
@@ -88,8 +82,6 @@ module Synvert::Core
     # It finds all files, for each file, it executes the block code, gets all rewrite actions,
     # and rewrite source code back to original file.
     def process
-      self.class.current = self
-
       file_pattern = File.join(Configuration.instance.get(:path), @file_pattern)
       Dir.glob(file_pattern).each do |file_path|
         unless Configuration.instance.get(:skip_files).include? file_path
@@ -99,7 +91,6 @@ module Synvert::Core
             ast = self.class.file_ast(file_path)
 
             @current_file = file_path
-            @current_source = source
 
             self.process_with_node ast do
               instance_eval &@block

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -56,8 +56,6 @@ describe Parser::AST::Node do
     it 'gets for block node' do
       source = 'RSpec.configure do |config|; end'
       node = parse(source)
-      instance = double(current_source: source)
-      Synvert::Rewriter::Instance.current = instance
       expect(node.arguments.map { |argument| argument.to_source }).to eq ['config']
     end
 
@@ -192,8 +190,6 @@ describe Parser::AST::Node do
   describe '#to_source' do
     it 'gets for node' do
       source = 'params[:user][:email]'
-      instance = double(current_source: source)
-      Synvert::Rewriter::Instance.current = instance
       node = parse(source)
       expect(node.to_source).to eq 'params[:user][:email]'
     end
@@ -223,53 +219,45 @@ describe Parser::AST::Node do
       rewriter = Synvert::Rewriter.new('foo', 'bar')
       Synvert::Rewriter::Instance.new(rewriter, 'file pattern')
     }
-    before { Synvert::Rewriter::Instance.current = instance }
 
     it 'matches class name' do
       source = 'class Synvert; end'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'class', name: 'Synvert')
     end
 
     it 'matches message with regexp' do
       source = 'User.find_by_login(login)'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'send', message: /^find_by_/)
     end
 
     it 'matches arguments with symbol' do
       source = 'params[:user]'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: [:user])
     end
 
     it 'matches assign number' do
       source = 'at_least(0)'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'send', arguments: [0])
     end
 
     it 'matches arguments with string' do
       source = 'params["user"]'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'send', receiver: 'params', message: '[]', arguments: ['user'])
     end
 
     it 'matches arguments any' do
       source = 'config.middleware.insert_after ActiveRecord::QueryCache, Lifo::Cache, page_cache: false'
-      instance.current_source = source
       node = parse(source)
       expect(node).to be_match(type: 'send', arguments: {any: 'Lifo::Cache'})
     end
 
     it 'matches not' do
       source = 'class Synvert; end'
-      instance.current_source = source
       node = parse(source)
       expect(node).not_to be_match(type: 'class', name: {not: 'Synvert'})
     end
@@ -280,18 +268,15 @@ describe Parser::AST::Node do
       rewriter = Synvert::Rewriter.new('foo', 'bar')
       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

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

@@ -11,8 +11,7 @@ module Synvert::Core
       """
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
-    let(:instance) { double(:current_node => node, :current_source => source) }
-    before { Rewriter::Instance.current = instance }
+    let(:instance) { double(:current_node => node) }
 
     describe Rewriter::IfExistCondition do
       describe '#process' do
@@ -67,8 +66,7 @@ module Synvert::Core
             end
           """
           node = Parser::CurrentRuby.parse(source)
-          instance = double(:current_node => node, :current_source => source)
-          Rewriter::Instance.current = instance
+          instance = double(:current_node => node)
           run = false
           condition = Rewriter::IfOnlyExistCondition.new instance, type: 'send', message: 'include', arguments: ['EmailSpec::Helpers'] do
             run = true

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

@@ -17,11 +17,8 @@ end
 """
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
-    let(:instance) { double(:current_node => node, :current_node= => node, :current_source => source) }
-    before do
-      allow(instance).to receive(:process_with_node).and_yield
-      Rewriter::Instance.current = instance
-    end
+    let(:instance) { double(:current_node => node, :current_node= => node) }
+    before { allow(instance).to receive(:process_with_node).and_yield }
 
     describe '#process' do
       it 'not call block if no matching node' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser