synvert-core 0.62.0 → 0.63.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e6217815771ca45d3fc81030b42ae126252ab800e127518e72c2f2b4dd2eb5c
-  data.tar.gz: 266cc5cda364f6df8100a290d393f879075b433acfd7ee70c780b37d23a83292
+  metadata.gz: 5739f84132a6ece2551028571b7e6cb458812524f51ea11de6175eb621592d21
+  data.tar.gz: a55b00a9431cacbe740405294b351cd8c5a1face1f2c20ba3a61897316dc7bd4
 SHA512:
-  metadata.gz: 89c3f93da22298305839c57fadb4963ea0973e16de10b2d2260c76e63927d25c302bbcd2c74515e79adeb24d2440ecba53025aaeeab0b173c6176adccb5d0875
-  data.tar.gz: df7a75da7a8bbecee35d4cc1afb862f6aa0184e96d484a6f207a88510dfac70098ea17cca794aefaac0938e37e96d8a91f7ba21738f2f116554238f02344e4c1
+  metadata.gz: ba153f740ea4d281dde99359dcf864beb49bdac33db3833878eebb9ba020966bb8957426936e65f7fc00ce84b76f7bb79fe2c01a5984ea155c5a4f6845c6e5b7
+  data.tar.gz: 6ff6c82355e35e6f86a42f01bcbd57b4e25d6c0ccef0079b89d4980bca26a983bf187526f9f5af150ee7a970d906b3cb22dd69b1af9f84263d3d8231d4673df7

data/.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', '3.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -29,4 +29,4 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - name: Run tests
-      run: bundle exec rake
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.63.1 (2022-02-26)
+
+* Read absolute path of Gemfile.lock
+
+## 0.63.0 (2022-02-26)
+
+* Add `to` option to `InsertAction`
+* Add `gt`, `gte`, `lt` and `lte` rules
+
 ## 0.62.0 (2021-12-24)
 
 * Support `csend` node

data/Gemfile

@@ -4,5 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in synvert.gemspec
 gemspec
-
-gem 'coveralls', require: false

data/lib/synvert/core/node_ext.rb

@@ -487,27 +487,29 @@ module Parser::AST
     # @param rules [Hash] rules to match.
     # @return true if matches.
     def match?(rules)
+      keywords = %i[any contain not in not_in gt gte lt lte]
       flat_hash(rules).keys.all? do |multi_keys|
-        case multi_keys.last
+        last_key = multi_keys.last
+        actual = keywords.include?(last_key) ? actual_value(multi_keys[0...-1]) : actual_value(multi_keys)
+        expected = expected_value(rules, multi_keys)
+        case last_key
         when :any, :contain
-          actual_values = actual_value(self, multi_keys[0...-1])
-          expected = expected_value(rules, multi_keys)
-          actual_values.any? { |actual| match_value?(actual, expected) }
+          actual.any? { |actual_value| match_value?(actual_value, expected) }
         when :not
-          actual = actual_value(self, multi_keys[0...-1])
-          expected = expected_value(rules, multi_keys)
           !match_value?(actual, expected)
         when :in
-          actual = actual_value(self, multi_keys[0...-1])
-          expected_values = expected_value(rules, multi_keys)
-          expected_values.any? { |expected| match_value?(actual, expected) }
+          expected.any? { |expected_value| match_value?(actual, expected_value) }
         when :not_in
-          actual = actual_value(self, multi_keys[0...-1])
-          expected_values = expected_value(rules, multi_keys)
-          expected_values.all? { |expected| !match_value?(actual, expected) }
+          expected.all? { |expected_value| !match_value?(actual, expected_value) }
+        when :gt
+          actual > expected
+        when :gte
+          actual >= expected
+        when :lt
+          actual < expected
+        when :lte
+          actual <= expected
         else
-          actual = actual_value(self, multi_keys)
-          expected = expected_value(rules, multi_keys)
           match_value?(actual, expected)
         end
       end
@@ -696,8 +698,8 @@ module Parser::AST
     # @param node [Parser::AST::Node]
     # @param multi_keys [Array<Symbol>]
     # @return [Object] actual value.
-    def actual_value(node, multi_keys)
-      multi_keys.inject(node) { |n, key| n.send(key) if n }
+    def actual_value(multi_keys)
+      multi_keys.inject(self) { |n, key| n.send(key) if n }
     end
 
     # Get expected value from rules.

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

@@ -3,13 +3,15 @@
 module Synvert::Core
   # InsertAction to add code to the node.
   class Rewriter::InsertAction < Rewriter::Action
-    def initialize(instance, code, at:)
+    def initialize(instance, code, at:, to: nil)
       super(instance, code)
       @at = at
+      @to = to
     end
 
     def calculate_position
-      @begin_pos = @at == 'end' ? @node.loc.expression.end_pos : @node.loc.expression.begin_pos
+      node_range = @to ? @node.child_node_range(@to) : @node.loc.expression
+      @begin_pos = @at == 'end' ? node_range.end_pos : node_range.begin_pos
       @end_pos = @begin_pos
     end
 

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

@@ -19,7 +19,7 @@ module Synvert::Core
     # @return [Boolean] true if matches, otherwise false.
     # @raise [Synvert::Core::GemfileLockNotFound] raise if Gemfile.lock does not exist.
     def match?
-      gemfile_lock_path = File.join(Configuration.path, 'Gemfile.lock')
+      gemfile_lock_path = File.expand_path(File.join(Configuration.path, 'Gemfile.lock'))
 
       # if Gemfile.lock does not exist, just ignore this check
       return true unless File.exist?(gemfile_lock_path)

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

@@ -240,8 +240,9 @@ module Synvert::Core
     #
     # @param code [String] code need to be inserted.
     # @param at [String] insert position, beginning or end, end is the default.
-    def insert(code, at: 'end')
-      @actions << Rewriter::InsertAction.new(self, code, at: at).process
+    # @param to [String] where to insert, if it is nil, will insert to current node.
+    def insert(code, at: 'end', to: nil)
+      @actions << Rewriter::InsertAction.new(self, code, at: at, to: to).process
     end
 
     # Parse insert_after dsl, it creates a [Synvert::Core::Rewriter::InsertAfterAction] to

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.62.0'
+    VERSION = '0.63.1'
   end
 end

data/lib/synvert/core.rb

@@ -5,6 +5,7 @@ require 'bundler'
 require 'parser'
 require 'parser/current'
 require 'ast'
+require 'active_support'
 require 'active_support/core_ext/object'
 require 'active_support/core_ext/array'
 require 'erubis'

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'synvert/core'
 
-require 'coveralls'
-Coveralls.wear!
-
 Dir[File.join(File.dirname(__FILE__), 'support', '*')].each do |path|
   require path
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -567,6 +567,34 @@ describe Parser::AST::Node do
       node = parse(source)
       expect(node).not_to be_match(type: 'send', message: { not_in: %i[create build] })
     end
+
+    it 'matches gt' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { gt: 1 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { gt: 2 } })
+    end
+
+    it 'matches gte' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { gte: 2 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { gte: 3 } })
+    end
+
+    it 'matches lt' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { lt: 3 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { lt: 2 } })
+    end
+
+    it 'matches lte' do
+      source = 'foobar(foo, bar)'
+      node = parse(source)
+      expect(node).to be_match(type: 'send', arguments: { size: { lte: 2 } })
+      expect(node).not_to be_match(type: 'send', arguments: { size: { lte: 1 } })
+    end
   end
 
   describe '#child_node_by_name' do

data/spec/synvert/core/rewriter/action/insert_action_spec.rb

@@ -45,5 +45,26 @@ module Synvert::Core
         expect(subject.rewritten_code).to eq 'URI.'
       end
     end
+
+    context 'to receiver' do
+      subject {
+        source = "User.where(username: 'Richard')"
+        node = Parser::CurrentRuby.parse(source)
+        instance = double(current_node: node)
+        Rewriter::InsertAction.new(instance, '.active', to: 'receiver', at: 'end').process
+      }
+
+      it 'gets begin_pos' do
+        expect(subject.begin_pos).to eq "User".length
+      end
+
+      it 'gets end_pos' do
+        expect(subject.end_pos).to eq "User".length
+      end
+
+      it 'gets rewritten_code' do
+        expect(subject.rewritten_code).to eq '.active'
+      end
+    end
   end
 end

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

@@ -15,38 +15,39 @@ module Synvert::Core
           rake (10.1.1)
           slop (3.4.7)
     EOS
+    let(:lock_path) { File.absolute_path('./Gemfile.lock') }
     before { allow(File).to receive(:exist?).with(File.join(ENV['HOME'], '.gem/specs')).and_return(false) }
 
     it 'returns true if version in Gemfile.lock is greater than definition' do
-      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
-      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      expect(File).to receive(:exist?).with(lock_path).and_return(true)
+      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', '~> 1.1')
       expect(gem_spec).to be_match
     end
 
     it 'returns true if version in Gemfile.lock is equal to definition' do
-      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
-      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      expect(File).to receive(:exist?).with(lock_path).and_return(true)
+      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
       expect(gem_spec).to be_match
     end
 
     it 'returns false if version in Gemfile.lock is less than definition' do
-      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
-      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      expect(File).to receive(:exist?).with(lock_path).and_return(true)
+      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', '> 1.2.0')
       expect(gem_spec).not_to be_match
     end
 
     it 'returns false if gem does not exist in Gemfile.lock' do
-      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
-      expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
+      expect(File).to receive(:exist?).with(lock_path).and_return(true)
+      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('synvert', '1.0.0')
       expect(gem_spec).not_to be_match
     end
 
     it 'raise Synvert::Core::GemfileLockNotFound if Gemfile.lock does not exist' do
-      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(false)
+      expect(File).to receive(:exist?).with(lock_path).and_return(false)
       gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
       expect(gem_spec).to be_match
     end

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

@@ -118,14 +118,14 @@ module Synvert::Core
 
     it 'parses insert at end' do
       action = double
-      expect(Rewriter::InsertAction).to receive(:new).with(instance, '.first', at: 'end').and_return(action)
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, '.first', at: 'end', to: 'receiver').and_return(action)
       expect(action).to receive(:process)
-      instance.insert '.first'
+      instance.insert '.first', to: 'receiver'
     end
 
     it 'parses insert at beginning' do
       action = double
-      expect(Rewriter::InsertAction).to receive(:new).with(instance, 'URI.', at: 'beginning').and_return(action)
+      expect(Rewriter::InsertAction).to receive(:new).with(instance, 'URI.', at: 'beginning', to: nil).and_return(action)
       expect(action).to receive(:process)
       instance.insert 'URI.', at: 'beginning'
     end

data/synvert-core-ruby.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", "~> 6"
+  spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
   spec.add_runtime_dependency "parser"
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.62.0
+  version: 0.63.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.