synvert-core 1.14.2 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf73847a243ca7bed5a7838e67f7ca4841818d6fa71645e5d6e5ab752be5c2e0
-  data.tar.gz: 6b1acefc43253e642ea3ce012665a8288b9064927590e7b7a5a7410c43db14d6
+  metadata.gz: 0fddb0e5f9a0308d8dbf4af383000ff6e7249697cc22986dad4e2ead63d833f5
+  data.tar.gz: 9e15b511b6bc4dc20f8b8cfe32beb0b57d1bc5ec505800c88d121c3849b866f4
 SHA512:
-  metadata.gz: 808cebc5d15d61324aa00407e8932857ea93928cc2bf6948a253870f6cb5bc9e7a59e09e8172d01fdce61f01ee28667d4eae92ac09993a33bb769e34e2d31b8a
-  data.tar.gz: 30c5e89a55fd489948e8aa7e3867fb9188b9b12abb8eb81ed5c106c6ae277f954fab9b7bca2a332a5a323c4e8508510c1b178a307e3fa3056581c1845fd00a71
+  metadata.gz: 75a0e4992bc623f897294bf603ebaf5b1a713cac9b349e7d4b2a53bb7be3ccc024313957b232049dcb377d412944e8858b66e59ef6a3d00d58a766473f7bc836
+  data.tar.gz: daa75723d1e22c1a3d0bd91016dae1cd5f1bd863c750a22d7c897b087f726fd9dd1c35b3ae8695b614fe26cfa502f05263773f1cecc1843c76a10e9c580273c8

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.16.0 (2022-12-29)
+
+* Add `Instance#query_adapter` and `Instance#mutation_adapter`
+* One instance handle only one file
+* Use `instance.file_path` instead of `instance.current_file`
+
+## 1.15.0 (2022-11-30)
+
+* Load snippet from github
+
 ## 1.14.2 (2022-11-19)
 
 * Specify `node_query`, `node_mutation` and `parser_node_ext` versions

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.14.2)
+    synvert-core (1.16.0)
       activesupport (< 7.0.0)
       erubis
-      node_mutation (>= 1.7.1)
-      node_query (>= 1.10.0)
+      node_mutation (>= 1.8.1)
+      node_query (>= 1.11.0)
       parallel
       parser
       parser_node_ext (>= 0.4.1)
@@ -50,18 +50,18 @@ GEM
     method_source (1.0.0)
     minitest (5.16.3)
     nenv (0.3.0)
-    node_mutation (1.7.1)
+    node_mutation (1.8.1)
       activesupport (< 7.0.0)
       erubis
-    node_query (1.10.0)
+    node_query (1.11.0)
       activesupport (< 7.0.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
-    parser_node_ext (0.4.1)
+    parser_node_ext (0.5.1)
       parser
     pry (0.14.1)
       coderay (~> 1.1)

data/lib/synvert/core/node_ext.rb

@@ -27,7 +27,7 @@ module Parser::AST
   # +type: 'send', receiver: { type: 'send', receiver: { type: 'send', message: 'config' }, message: 'active_record' }, message: 'identity_map='+
   #
   # Source Code to Ast Node
-  # {https://synvert-playground.xinminlabs.com/ruby}
+  # {https://playground.synvert.net/ruby}
   class Node
     # Get the file name of node.
     #

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'parallel'
 
 module Synvert::Core
   # Instance is an execution unit, it finds specified ast nodes,
@@ -12,12 +11,12 @@ module Synvert::Core
     # Initialize an Instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
-    # @param file_patterns [Array<String>] pattern list to find files, e.g. ['spec/**/*_spec.rb']
+    # @param file_path [Array<String>]
     # @yield block code to find nodes, match conditions and rewrite code.
-    def initialize(rewriter, file_patterns, &block)
+    def initialize(rewriter, file_path, &block)
       @rewriter = rewriter
       @actions = []
-      @file_patterns = file_patterns
+      @file_path = file_path
       @block = block
       strategy = NodeMutation::Strategy::KEEP_RUNNING
       if rewriter.options[:strategy] == Strategy::ALLOW_INSERT_AT_SAME_POSITION
@@ -27,20 +26,56 @@ module Synvert::Core
       rewriter.helpers.each { |helper| singleton_class.send(:define_method, helper[:name], &helper[:block]) }
     end
 
+    # @!attribute [r] file_path
+    #   @return file path
     # @!attribute [rw] current_node
-    #   @return current parsing node
-    # @!attribute [rw] current_file
-    #   @return current filename
-    # @!attribute [rw] current_mutation
+    #   @return current ast node
+    # @!attribute [r] current_mutation
     #   @return current mutation
-    attr_accessor :current_node, :current_file, :current_mutation
+    # @!attribute [r] query_adapter
+    #   @return NodeQuery Adapter
+    # @!attribute [r] mutation_adapter
+    #   @return NodeMutation Adapter
+    attr_reader :file_path, :current_node, :current_mutation, :query_adapter, :mutation_adapter
+    attr_accessor :current_node
 
     # Process the instance.
     # It finds specified files, for each file, it executes the block code, rewrites the original code,
     # then writes the code back to the original file.
     def process
-      get_file_paths.each do |file_path|
-        process_file(file_path)
+      puts @file_path if Configuration.show_run_process
+
+      absolute_file_path = File.join(Configuration.root_path, @file_path)
+      while true
+        source = read_source(absolute_file_path)
+        @current_mutation = NodeMutation.new(source)
+        @mutation_adapter = NodeMutation.adapter
+        @query_adapter = NodeQuery.adapter
+        begin
+          node = parse_code(@file_path, source)
+
+          process_with_node(node) do
+            instance_eval(&@block)
+          rescue NoMethodError => e
+            puts [
+              "error: #{e.message}",
+              "file: #{file_path}",
+              "source: #{source}",
+              "line: #{current_node.line}"
+            ].join("\n")
+            raise
+          end
+
+          result = @current_mutation.process
+          if result.affected?
+            @rewriter.add_affected_file(file_path)
+            write_source(absolute_file_path, result.new_source)
+          end
+          break unless result.conflicted?
+        rescue Parser::SyntaxError
+          puts "[Warn] file #{file_path} was not parsed correctly."
+          # do nothing, iterate next file
+        end
       end
     end
 
@@ -48,17 +83,36 @@ module Synvert::Core
     # It finds specified files, for each file, it executes the block code, tests the original code,
     # then returns the actions.
     def test
-      if Configuration.number_of_workers > 1
-        Parallel.map(get_file_paths, in_processes: Configuration.number_of_workers) do |file_path|
-          test_file(file_path)
-        end
-      else
-        get_file_paths.map do |file_path|
-          test_file(file_path)
+      absolute_file_path = File.join(Configuration.root_path, file_path)
+      source = read_source(absolute_file_path)
+      @current_mutation = NodeMutation.new(source)
+      @mutation_adapter = NodeMutation.adapter
+      @query_adapter = NodeQuery.adapter
+      begin
+        node = parse_code(file_path, source)
+
+        process_with_node(node) do
+          instance_eval(&@block)
+        rescue NoMethodError => e
+          puts [
+            "error: #{e.message}",
+            "file: #{file_path}",
+            "source: #{source}",
+            "line: #{current_node.line}"
+          ].join("\n")
+          raise
         end
+
+        result = @current_mutation.test
+        result.file_path = file_path
+        result
+      rescue Parser::SyntaxError
+        puts "[Warn] file #{file_path} was not parsed correctly."
+        # do nothing, iterate next file
       end
     end
 
+
     # Gets current node, it allows to get current node in block code.
     #
     # @return [Parser::AST::Node]
@@ -363,105 +417,6 @@ module Synvert::Core
 
     private
 
-    # Process one file.
-    #
-    # @param file_path [String]
-    def process_file(file_path)
-      puts file_path if Configuration.show_run_process
-
-      @current_file = File.join(Configuration.root_path, file_path)
-      while true
-        source = read_source(@current_file)
-        @current_mutation = NodeMutation.new(source)
-        begin
-          node = parse_code(file_path, source)
-
-          process_with_node(node) do
-            instance_eval(&@block)
-          rescue NoMethodError => e
-            puts [
-              "error: #{e.message}",
-              "file: #{file_path}",
-              "source: #{source}",
-              "line: #{current_node.line}"
-            ].join("\n")
-            raise
-          end
-
-          result = @current_mutation.process
-          if result.affected?
-            @rewriter.add_affected_file(file_path)
-            write_source(@current_file, result.new_source)
-          end
-          break unless result.conflicted?
-        rescue Parser::SyntaxError
-          puts "[Warn] file #{file_path} was not parsed correctly."
-          # do nothing, iterate next file
-        end
-      end
-    end
-
-    # Test one file.
-    #
-    # @param file_path [String]
-    def test_file(file_path)
-      @current_file = File.join(Configuration.root_path, file_path)
-      source = read_source(@current_file)
-      @current_mutation = NodeMutation.new(source)
-      begin
-        node = parse_code(@current_file, source)
-
-        process_with_node(node) do
-          instance_eval(&@block)
-        rescue NoMethodError => e
-          puts [
-            "error: #{e.message}",
-            "file: #{file_path}",
-            "source: #{source}",
-            "line: #{current_node.line}"
-          ].join("\n")
-          raise
-        end
-
-        result = @current_mutation.test
-        result.file_path = file_path
-        result
-      rescue Parser::SyntaxError
-        puts "[Warn] file #{file_path} was not parsed correctly."
-        # do nothing, iterate next file
-      end
-    end
-
-    # Get file paths.
-    # @return [Array<String>] file paths
-    def get_file_paths
-      Dir.chdir(Configuration.root_path) do
-        only_paths = Configuration.only_paths.size > 0 ? Configuration.only_paths : ["."]
-        only_paths.flat_map do |only_path|
-          @file_patterns.flat_map do |file_pattern|
-            pattern = only_path == "." ? file_pattern : File.join(only_path, file_pattern)
-            Dir.glob(pattern)
-          end
-        end - get_skip_files
-      end
-    end
-
-    # Get skip files.
-    # @return [Array<String>] skip files
-    def get_skip_files
-      Configuration.skip_paths.flat_map do |skip_path|
-        if File.directory?(skip_path)
-          Dir.glob(File.join(skip_path, "**/*"))
-        elsif File.file?(skip_path)
-          [skip_path]
-        elsif skip_path.end_with?("**") || skip_path.end_with?("**/")
-          Dir.glob(File.join(skip_path, "*"))
-        else
-          Dir.glob(skip_path)
-        end
-      end
-    end
-
     # Read file source.
     # @param file_path [String] file path
     # @return [String] file source

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

@@ -8,7 +8,7 @@ module Synvert::Core
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param message [String] warning message.
     def initialize(instance, message)
-      @file_path = instance.current_file
+      @file_path = instance.file_path
       @line = instance.current_node.loc.expression.line
       @message = message
     end

data/lib/synvert/core/rewriter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'parallel'
 require 'fileutils'
 
 module Synvert::Core
@@ -223,11 +224,16 @@ module Synvert::Core
       return if @ruby_version && !@ruby_version.match?
       return if @gem_spec && !@gem_spec.match?
 
-      instance = Rewriter::Instance.new(self, Array(file_patterns), &block)
       if @options[:write_to_file]
-        instance.process
+        handle_one_file(Array(file_patterns)) do |file_path|
+          instance = Rewriter::Instance.new(self, file_path, &block)
+          instance.process
+        end
       else
-        results = instance.test
+        results = handle_one_file(Array(file_patterns)) do |file_path|
+          instance = Rewriter::Instance.new(self, file_path, &block)
+          instance.test
+        end
         merge_test_results(results)
       end
     end
@@ -357,6 +363,52 @@ module Synvert::Core
 
     private
 
+    # Handle one file.
+    # @param file_patterns [String] file patterns to find files.
+    # @yield [file_path] block to handle file.
+    # @yieldparam file_path [String] file path.
+    def handle_one_file(file_patterns)
+      if Configuration.number_of_workers > 1
+        Parallel.map(get_file_paths(file_patterns), in_processes: Configuration.number_of_workers) do |file_path|
+          yield(file_path)
+        end
+      else
+        get_file_paths(file_patterns).map do |file_path|
+          yield(file_path)
+        end
+      end
+    end
+
+    # Get file paths.
+    # @return [Array<String>] file paths
+    def get_file_paths(file_patterns)
+      Dir.chdir(Configuration.root_path) do
+        only_paths = Configuration.only_paths.size > 0 ? Configuration.only_paths : ["."]
+        only_paths.flat_map do |only_path|
+          file_patterns.flat_map do |file_pattern|
+            pattern = only_path == "." ? file_pattern : File.join(only_path, file_pattern)
+            Dir.glob(pattern)
+          end
+        end - get_skip_files
+      end
+    end
+
+    # Get skip files.
+    # @return [Array<String>] skip files
+    def get_skip_files
+      Configuration.skip_paths.flat_map do |skip_path|
+        if File.directory?(skip_path)
+          Dir.glob(File.join(skip_path, "**/*"))
+        elsif File.file?(skip_path)
+          [skip_path]
+        elsif skip_path.end_with?("**") || skip_path.end_with?("**/")
+          Dir.glob(File.join(skip_path, "*"))
+        else
+          Dir.glob(skip_path)
+        end
+      end
+    end
+
     def merge_test_results(results)
       @test_results += results.select { |result| result.affected? }
     end

data/lib/synvert/core/snippet_not_found_error.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class SnippetNotFoundError < StandardError
+end

data/lib/synvert/core/utils.rb

@@ -1,18 +1,29 @@
 # frozen_string_literal: true
 
+require 'net/http'
 require 'uri'
+require 'open-uri'
 
 module Synvert::Core
   class Utils
     class << self
       def eval_snippet(snippet_name)
+        eval(load_snippet(snippet_name))
+      end
+
+      def load_snippet(snippet_name)
         if is_valid_url?(snippet_name)
           uri = URI.parse(format_url(snippet_name))
-          eval(uri.open.read)
+          return uri.open.read if remote_snippet_exists?(uri)
+          raise SnippetNotFoundError.new("#{snippet_name} nout found")
         elsif is_valid_file?(snippet_name)
-          eval(File.read(snippet_name))
+          return File.read(snippet_name)
         else
-          eval(File.read(File.join(default_snippets_home, 'lib', "#{snippet_name}.rb")))
+          snippet_path = snippet_expand_path(snippet_name)
+          return File.read(snippet_path) if File.exist?(snippet_path)
+          snippet_uri = URI.parse(format_url(remote_snippet_url(snippet_name)))
+          return snippet_uri.open.read if remote_snippet_exists?(snippet_uri)
+          raise SnippetNotFoundError.new("#{snippet_name} nout found")
         end
       end
 
@@ -26,10 +37,25 @@ module Synvert::Core
         File.exist?(path)
       end
 
+      def remote_snippet_exists?(uri)
+        req = Net::HTTP.new(uri.host, uri.port)
+        req.use_ssl = uri.scheme == 'https'
+        res = req.request_head(uri.path)
+        res.code == "200"
+      end
+
+      def snippet_expand_path(snippet_name)
+        File.join(default_snippets_home(), 'lib', "#{snippet_name}.rb")
+      end
+
       def default_snippets_home
         ENV['SYNVERT_SNIPPETS_HOME'] || File.join(ENV['HOME'], '.synvert-ruby')
       end
 
+      def remote_snippet_url(snippet_name)
+        "https://github.com/xinminlabs/synvert-snippets-ruby/blob/main/lib/#{snippet_name}.rb"
+      end
+
       def format_url(url)
         convert_to_github_raw_url(url)
       end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.14.2'
+    VERSION = '1.16.0'
   end
 end

data/lib/synvert/core.rb

@@ -19,6 +19,7 @@ module Synvert
     autoload :Engine, 'synvert/core/engine'
     autoload :Utils, 'synvert/core/utils'
     autoload :Strategy, 'synvert/core/strategy'
+    autoload :SnippetNotFoundError, 'synvert/core/snippet_not_found_error'
   end
 end
 

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

@@ -6,7 +6,7 @@ module Synvert::Core
   describe Rewriter::Instance do
     let(:instance) {
       rewriter = Rewriter.new('foo', 'bar')
-      Rewriter::Instance.new(rewriter, ['file pattern'])
+      Rewriter::Instance.new(rewriter, 'code.rb')
     }
 
     it 'parses find_node' do
@@ -97,35 +97,35 @@ module Synvert::Core
     end
 
     it 'parses append' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:append).with(instance.current_node, 'Foobar')
       instance.append 'Foobar'
     end
 
     it 'parses prepend' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:prepend).with(instance.current_node, 'Foobar')
       instance.prepend 'Foobar'
     end
 
     it 'parses insert at end' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'end', to: 'receiver')
       instance.insert 'Foobar', to: 'receiver'
     end
 
     it 'parses insert at beginning' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'beginning', to: nil)
       instance.insert 'Foobar', at: 'beginning'
     end
 
     it 'parses insert_after' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
       expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "\n  Foobar", at: 'end', to: nil)
@@ -133,7 +133,7 @@ module Synvert::Core
     end
 
     it 'parses insert_before' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
       expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "Foobar\n  ", at: 'beginning', to: nil)
@@ -141,7 +141,7 @@ module Synvert::Core
     end
 
     it 'parses replace_erb_stmt_with_expr' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       action = double
       expect(instance.current_mutation).to receive(:actions).and_return([])
@@ -151,42 +151,42 @@ module Synvert::Core
     end
 
     it 'parses replace_with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:replace_with).with(instance.current_node, 'Foobar')
       instance.replace_with 'Foobar'
     end
 
     it 'parses replace with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:replace).with(instance.current_node, :message, with: 'Foobar')
       instance.replace :message, with: 'Foobar'
     end
 
     it 'parses remove' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:remove).with(instance.current_node, and_comma: true)
       instance.remove and_comma: true
     end
 
     it 'parses delete' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:delete).with(instance.current_node, :dot, :message, and_comma: true)
       instance.delete :dot, :message, and_comma: true
     end
 
     it 'parses wrap with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:wrap).with(instance.current_node, with: 'module Foobar')
       instance.wrap with: 'module Foobar'
     end
 
     it 'parses noop' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(instance.current_mutation).to receive(:noop).with(instance.current_node)
       instance.noop
@@ -206,7 +206,7 @@ module Synvert::Core
 
       it 'writes new code to file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -225,7 +225,6 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        expect(Dir).to receive(:glob).with('spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb'])
         expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('./spec/models/post_spec.rb', output)
         instance.process
@@ -233,7 +232,7 @@ module Synvert::Core
 
       it 'does not write if file content is not changed' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/spec_helper.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
             with_node type: 'block', caller: { receiver: 'RSpec', message: 'configure' } do
               unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
                 insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
@@ -250,7 +249,6 @@ module Synvert::Core
             config.include FactoryGirl::Syntax::Methods
           end
         EOS
-        expect(Dir).to receive(:glob).with('spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
         expect(File).to receive(:read).with('./spec/spec_helper.rb', encoding: 'UTF-8').and_return(input)
         expect(File).not_to receive(:write).with('./spec/spec_helper.rb', output)
         instance.process
@@ -258,7 +256,7 @@ module Synvert::Core
 
       it 'updates file_source and file_ast when writing a file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -277,7 +275,6 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        expect(Dir).to receive(:glob).with('spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb']).twice
         expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('./spec/models/post_spec.rb', output)
         expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(output)
@@ -292,7 +289,7 @@ module Synvert::Core
 
       it 'writes new code to file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -304,11 +301,10 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        expect(Dir).to receive(:glob).with('spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb'])
         expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(input)
         results = instance.test
-        expect(results[0].file_path).to eq 'spec/models/post_spec.rb'
-        expect(results[0].actions).to eq [
+        expect(results.file_path).to eq 'spec/models/post_spec.rb'
+        expect(results.actions).to eq [
           OpenStruct.new(start: 35, end: 59, new_code: 'create :user'),
           OpenStruct.new(start: 69, end: 105, new_code: 'create :post, user: user')
         ]
@@ -316,7 +312,7 @@ module Synvert::Core
 
       it 'does not write if file content is not changed' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/spec_helper.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
             with_node type: 'block', caller: { receiver: 'RSpec', message: 'configure' } do
               unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
                 insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
@@ -328,11 +324,10 @@ module Synvert::Core
             config.include FactoryGirl::Syntax::Methods
           end
         EOS
-        expect(Dir).to receive(:glob).with('spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
         expect(File).to receive(:read).with('./spec/spec_helper.rb', encoding: 'UTF-8').and_return(input)
         result = instance.test
-        expect(result[0].file_path).to eq 'spec/spec_helper.rb'
-        expect(result[0].actions).to eq []
+        expect(result.file_path).to eq 'spec/spec_helper.rb'
+        expect(result.actions).to eq []
       end
     end
 

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

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = "def test\n  debugger\nend"
       send_node = Parser::CurrentRuby.parse(source).body.first
-      instance = double(current_node: send_node, current_file: 'app/test.rb')
+      instance = double(current_node: send_node, file_path: 'app/test.rb')
       Rewriter::Warning.new(instance, 'remove debugger')
     }
 

data/spec/synvert/core/rewriter_spec.rb

@@ -86,6 +86,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_ruby matches' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect(File).to receive(:exist?).with('./.ruby-version').and_return(true)
         expect(File).to receive(:read).with('./.ruby-version').and_return('2.0.0')
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
@@ -111,6 +112,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_gem matches' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(true)
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter =
@@ -123,6 +125,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_ruby and if_gem do not exist' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter =
           Rewriter.new 'group', 'name' do
@@ -221,7 +224,8 @@ module Synvert::Core
       end
 
       it 'adds snippet by http url' do
-        expect_any_instance_of(URI).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'sub_rewriter' do\nend"))
+        expect(Utils).to receive(:remote_snippet_exists?).with(URI.parse('http://synvert.net/foo/bar.rb')).and_return(true)
+        expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'sub_rewriter' do\nend"))
         rewriter = Rewriter.new 'group', 'rewriter' do
           add_snippet 'http://synvert.net/foo/bar.rb'
         end

data/spec/synvert/core/utils_spec.rb

@@ -3,27 +3,54 @@ require 'spec_helper'
 module Synvert::Core
   RSpec.describe Utils do
     describe '.eval_snippet' do
-      it 'evals snippet by http url' do
-        expect_any_instance_of(URI).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
-        rewriter = described_class.eval_snippet('http://example.com/rewriter.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context "by http url" do
+        it 'evals snippet' do
+          expect(described_class).to receive(:remote_snippet_exists?).with(URI.parse('http://example.com/rewriter.rb')).and_return(true)
+          expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
+          rewriter = described_class.eval_snippet('http://example.com/rewriter.rb')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
+
+        it 'raises error' do
+          expect(described_class).to receive(:remote_snippet_exists?).and_return(false)
+          expect do
+            described_class.eval_snippet('http://example.com/rewriter.rb')
+          end.to raise_error(SnippetNotFoundError)
+        end
       end
 
-      it 'adds snippet by file path' do
-        expect(File).to receive(:exist?).and_return(true)
-        expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
-        rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context 'by file path' do
+        it 'evals snippet' do
+          expect(File).to receive(:exist?).and_return(true)
+          expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
+          rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
       end
 
-      it 'adds snippet by snippet name' do
-        expect(File).to receive(:exist?).and_return(false)
-        expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
-        rewriter = described_class.eval_snippet('/home/richard/foo/bar.rb')
-        expect(rewriter.group).to eq 'group'
-        expect(rewriter.name).to eq 'name'
+      context 'by snippet name' do
+        it 'evals snippet as file' do
+          expect(File).to receive(:exist?).with("group/name").and_return(false)
+          expect(described_class).to receive(:default_snippets_home).and_return('/home/richard/.synvert-ruby')
+          expect(File).to receive(:exist?).with("/home/richard/.synvert-ruby/lib/group/name.rb").and_return(true)
+          expect(File).to receive(:read).and_return("Rewriter.new 'group', 'name' do\nend")
+          rewriter = described_class.eval_snippet('group/name')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
+
+        it 'evals snippet as github url' do
+          expect(File).to receive(:exist?).with("group/name").and_return(false)
+          expect(described_class).to receive(:default_snippets_home).and_return('/home/richard/.synvert-ruby')
+          expect(File).to receive(:exist?).with("/home/richard/.synvert-ruby/lib/group/name.rb").and_return(false)
+          expect(described_class).to receive(:remote_snippet_exists?).with(URI.parse("https://raw.githubusercontent.com/xinminlabs/synvert-snippets-ruby/main/lib/group/name.rb")).and_return(true)
+          expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'name' do\nend"))
+          rewriter = described_class.eval_snippet('group/name')
+          expect(rewriter.group).to eq 'group'
+          expect(rewriter.name).to eq 'name'
+        end
       end
     end
   end

data/synvert-core-ruby.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
   spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "node_query", ">= 1.10.0"
-  spec.add_runtime_dependency "node_mutation", ">= 1.7.1"
+  spec.add_runtime_dependency "node_query", ">= 1.11.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.8.1"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 0.4.1"
   spec.add_runtime_dependency "parallel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.16.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/synvert/core/rewriter/scope/goto_scope.rb
 - lib/synvert/core/rewriter/scope/within_scope.rb
 - lib/synvert/core/rewriter/warning.rb
+- lib/synvert/core/snippet_not_found_error.rb
 - lib/synvert/core/strategy.rb
 - lib/synvert/core/utils.rb
 - lib/synvert/core/version.rb
@@ -187,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.