synvert-core 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32daaff5e515783785e74b94839328eb08fc1a0c48e6bae047079f0575bba411
-  data.tar.gz: fde8c7b9081f4a32e6f63e9ee9e6ced1878debf41541f822da788e26b756233f
+  metadata.gz: 8a431b26d98c476c389746269aade183f241a3c1cb2fabab27b87b2b0689510f
+  data.tar.gz: 61b1907dbadbef95ca5d8869b6c27f65e43f72dccd0f64ead4ad3cf15a5f9c01
 SHA512:
-  metadata.gz: 8608a8c3576c5ce5f778c8547a74dfefa99ff166b0137a758972fa910cf7ffa9a7ed4642b8724c6789cf8b203cccd06315ee956451053c577c54899a299405dd
-  data.tar.gz: d400c921693d29c5ffded99b0874514724f29604e974aee1c69fb551c0f2cf25b09b3230bcb816fed6b1e9903965d01feb2d9912fe4fcd0d4bc86cf3df03f9f8
+  metadata.gz: e3ee5356583c8450635e8296657860e7016a8dfe0214fb2518da72aa2631e7511672802e326553bd44b3de1dea7e683a0784ff58770c641dae76ab9bca86e317
+  data.tar.gz: d7426a0450fbfaf871c8083aa4d06b1a1bf439436ed964cfb8e2325e832a05b479b1f81ae71c2b3b103c614a02b7eb23ddfc4ac6311f14b7e161a54893bb040b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.19.0 (2023-02-06)
+
+* Remove `Instance#query_adapter`
+
+## 1.18.1 (2023-02-05)
+
+* Fix glob with only paths
+
 ## 1.18.0 (2023-02-01)
 
 * Remove `todo` dsl

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.18.0)
+    synvert-core (1.19.0)
       activesupport (< 7.0.0)
       erubis
       node_mutation (>= 1.8.2)
@@ -59,7 +59,7 @@ GEM
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
-    parser_node_ext (0.9.0)
+    parser_node_ext (0.10.0)
       parser
     pry (0.14.1)
       coderay (~> 1.1)

data/README.md

@@ -105,5 +105,4 @@ Attributes:
 
 * [file_path](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#file_path-instance_method) - current file path
 * [node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#node-instance_method) - current ast node
-* [query_adapter](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#query_adapter-instance_method) - [query adapter](https://xinminlabs.github.io/node-query-ruby/NodeQuery/Adapter.html) to get some helper methods
 * [mutation_adapter](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#mutation_adapter-instance_method) - [mutation adapter](https://xinminlabs.github.io/node-mutation-ruby/NodeMutation/Adapter.html) to get some helper methods

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

@@ -30,11 +30,9 @@ module Synvert::Core
     #   @return file path
     # @!attribute [rw] current_node
     #   @return current ast node
-    # @!attribute [r] query_adapter
-    #   @return NodeQuery Adapter
     # @!attribute [r] mutation_adapter
     #   @return NodeMutation Adapter
-    attr_reader :file_path, :current_node, :query_adapter, :mutation_adapter
+    attr_reader :file_path, :current_node, :mutation_adapter
     attr_accessor :current_node
 
     # Process the instance.
@@ -48,7 +46,6 @@ module Synvert::Core
         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)
 
@@ -85,7 +82,6 @@ module Synvert::Core
       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)
 

data/lib/synvert/core/rewriter.rb

@@ -347,46 +347,16 @@ module Synvert::Core
     # @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|
+        Parallel.map(Utils.glob(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|
+        Utils.glob(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/utils.rb

@@ -27,6 +27,18 @@ module Synvert::Core
         end
       end
 
+      # Glob file paths.
+      # @param file_patterns [Array<String>] file patterns
+      # @return [Array<String>] file paths
+      def glob(file_patterns)
+        Dir.chdir(Configuration.root_path) do
+          all_files = file_patterns.flat_map do |file_pattern|
+            Dir.glob(file_pattern)
+          end
+          filter_only_paths(all_files) - get_skip_files
+        end
+      end
+
       private
 
       def is_valid_url?(url)
@@ -65,6 +77,32 @@ module Synvert::Core
 
         url.sub('//github.com/', '//raw.githubusercontent.com/').sub('/blob/', '/')
       end
+
+      # Filter only paths with `Configuration.only_paths`.
+      # @return [Array<String>] filtered file paths
+      def filter_only_paths(all_files)
+        return all_files if Configuration.only_paths.size == 0
+
+        Configuration.only_paths.flat_map do |only_path|
+          all_files.filter { |file_path| file_path.starts_with?(only_path) }
+        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
     end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.18.0'
+    VERSION = '1.19.0'
   end
 end

data/spec/synvert/core/rewriter_spec.rb

@@ -86,7 +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(Utils).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)
@@ -112,7 +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(Utils).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 =
@@ -125,7 +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(Utils).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

data/spec/synvert/core/utils_spec.rb

@@ -53,5 +53,30 @@ module Synvert::Core
         end
       end
     end
+
+    describe '.glob' do
+      before do
+        Configuration.only_paths = []
+        Configuration.skip_paths = []
+      end
+
+      it 'gets all files' do
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+      end
+
+      it 'filters only paths' do
+        Configuration.only_paths = ['app/models']
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb'])
+      end
+
+      it 'skip files' do
+        Configuration.skip_paths = ['app/controllers/**/*']
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(Dir).to receive(:glob).with('app/controllers/**/*').and_return(['app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb'])
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport