synvert-core 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4282ee9f0e489971000bf8cedfc613d9fc44c11
-  data.tar.gz: 0f27f2a20c1f7a111692436d86c4b10f2d9790f9
+  metadata.gz: 0f24ec1fdcc29492b0b5e7747f7541c3eaac7e40
+  data.tar.gz: 3ff09347d10f30e79cd03a53c00d57dd0cb6a299
 SHA512:
-  metadata.gz: 564a1c66e905b84e830a8f8a782336ba0b4640962ebbd7dea6d3fd04c0817d87d90061a5e596d953ff3c5bc3973563ab06e65666fca95146450b4871e81de3f4
-  data.tar.gz: b701564b0eff45f5d9bc439f524946929e31d5b9da10547c24593861f46c0c88cf3ea98ac61af66071a0f6be9daf4537ac5178fcbddb2930d6f60fe3f879652a
+  metadata.gz: 8fc6bf37a059cb3d04bdcdc1bb8d464250eab3fb81c8ac724f2e6ce2eb88908c166ca258b831b1c6569fcb8006aba3be4da57ee0602955aaa657395edc2691a4
+  data.tar.gz: 879e33c2e928a1607bbabf7d4746242510e655e7fd7aea4d0f72b66efd84183d818347c609fa85afa2bf3c2339c688c266a24ee692cf93df2242702ffcc4c416

data/CHANGELOG.md

@@ -1,10 +1,15 @@
 # CHANGELOG
 
+## 0.11.0 (2016-07-31)
+
+* Add options to Rewriter::Instance
+* Add sort_by option to Rewriter::Instance
+
 ## 0.10.0 (2016-07-31)
 
 * Use parser 2.3.1.2
 * Add options to Rewriter::Action
-* Add autoindent option
+* Add autoindent option to Rewriter::Action
 
 ## 0.9.0 (2015-12-23)
 

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

@@ -3,6 +3,8 @@
 module Synvert::Core
   # Action defines rewriter action, add, replace or remove code.
   class Rewriter::Action
+    DEFAULT_OPTIONS = { autoindent: true }
+
     # Initialize an action.
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
@@ -11,7 +13,7 @@ module Synvert::Core
     def initialize(instance, code, options={})
       @instance = instance
       @code = code
-      @options = default_options.merge(options)
+      @options = DEFAULT_OPTIONS.merge(options)
       @node = @instance.current_node
     end
 
@@ -41,20 +43,6 @@ module Synvert::Core
     def rewritten_source
       @rewritten_source ||= @node.rewritten_source(@code)
     end
-
-    # Compare actions by begin position.
-    #
-    # @param action [Synvert::Core::Rewriter::Action]
-    # @return [Integer] -1, 0 or 1
-    def <=>(action)
-      self.begin_pos <=> action.begin_pos
-    end
-
-    private
-
-    def default_options
-      { autoindent: true }
-    end
   end
 end
 

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

@@ -64,16 +64,20 @@ module Synvert::Core
     #   @return current filename
     attr_accessor :current_node, :current_file
 
+    DEFAULT_OPTIONS = { sort_by: 'begin_pos' }
+
     # Initialize an instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
     # @param file_pattern [String] pattern to find files, e.g. spec/**/*_spec.rb
+    # @param options [Hash] instance options, it includes :sort_by.
     # @param block [Block] block code to find nodes, match conditions and rewrite code.
     # @return [Synvert::Core::Rewriter::Instance]
-    def initialize(rewriter, file_pattern, &block)
+    def initialize(rewriter, file_pattern, options={}, &block)
       @rewriter = rewriter
       @actions = []
       @file_pattern = file_pattern
+      @options = DEFAULT_OPTIONS.merge(options)
       @block = block
       rewriter.helpers.each { |helper| self.singleton_class.send(:define_method, helper[:name], &helper[:block]) }
     end
@@ -102,7 +106,7 @@ module Synvert::Core
             end
 
             if @actions.length > 0
-              @actions.sort!
+              @actions.sort_by! { |action| action.send(@options[:sort_by]) }
               conflict_actions = get_conflict_actions
               @actions.reverse.each do |action|
                 source[action.begin_pos...action.end_pos] = action.rewritten_code

data/lib/synvert/core/rewriter.rb

@@ -206,13 +206,14 @@ module Synvert::Core
     # It creates a [Synvert::Core::Rewriter::Instance] to rewrite code.
     #
     # @param file_pattern [String] pattern to find files, e.g. spec/**/*_spec.rb
+    # @param options [Hash] instance options.
     # @param block [Block] the block to rewrite code in the matching files.
-    def within_files(file_pattern, &block)
+    def within_files(file_pattern, options={}, &block)
       return if @sandbox
 
       if (!@ruby_version || @ruby_version.match?) &&
         (!@gem_spec || @gem_spec.match?)
-        Rewriter::Instance.new(self, file_pattern, &block).process
+        Rewriter::Instance.new(self, file_pattern, options, &block).process
       end
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Richard Huang