RubyGems - synvert-core - Versions diffs - 1.2.1 → 1.4.0 - Mend

synvert-core 1.2.1 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +16 -0
data/Gemfile +9 -0
data/lib/synvert/core/node_query/compiler/attribute.rb +6 -18
data/lib/synvert/core/node_query/compiler/basic_selector.rb +28 -0
data/lib/synvert/core/node_query/compiler/comparable.rb +26 -19
data/lib/synvert/core/node_query/compiler/expression.rb +8 -93
data/lib/synvert/core/node_query/compiler/identifier.rb +1 -1
data/lib/synvert/core/node_query/compiler/regexp.rb +2 -2
data/lib/synvert/core/node_query/compiler/selector.rb +91 -34
data/lib/synvert/core/node_query/compiler/string.rb +1 -1
data/lib/synvert/core/node_query/compiler.rb +1 -0
data/lib/synvert/core/node_query/lexer.rex +20 -26
data/lib/synvert/core/node_query/lexer.rex.rb +35 -51
data/lib/synvert/core/node_query/parser.racc.rb +115 -293
data/lib/synvert/core/node_query/parser.y +16 -35
data/lib/synvert/core/node_query.rb +3 -4
data/lib/synvert/core/rewriter/action/delete_action.rb +4 -2
data/lib/synvert/core/rewriter/action/remove_action.rb +5 -2
data/lib/synvert/core/rewriter/instance.rb +8 -4
data/lib/synvert/core/version.rb +1 -1
data/spec/synvert/core/node_query/lexer_spec.rb +46 -106
data/spec/synvert/core/node_query/parser_spec.rb +116 -129
data/spec/synvert/core/rewriter/instance_spec.rb +12 -7
data/spec/synvert/core/rewriter/scope/query_scope_spec.rb +9 -2
data/synvert-core-ruby.gemspec +0 -10
metadata +3 -128

data/spec/synvert/core/node_query/parser_spec.rb CHANGED Viewed

@@ -1,141 +1,138 @@
 require 'spec_helper'
+def assert_parser(source)
+  expect(parser.parse(source).to_s).to eq source
+end
 module Synvert::Core::NodeQuery
   RSpec.describe Parser do
     let(:parser) { described_class.new }
-    def assert_parser(source)
-      expect(parser.parse(source).to_s).to eq source
-    end
-    it 'parses one selector' do
-      source = '.send[message=:create]'
-      assert_parser(source)
-    end
-    it 'parses two selectors' do
-      source = '.class[name=Synvert] .def[name="foobar"]'
-      assert_parser(source)
-    end
+    describe '#toString' do
+      it 'parses one selector' do
+        source = '.send[message=:create]'
+        assert_parser(source)
+      end
-    it 'parses three selectors' do
-      source = '.class[name=Synvert] .def[name="foobar"] .send[message=create]'
-      assert_parser(source)
-    end
+      it 'parses two selectors' do
+        source = '.class[name=Synvert] .def[name="foobar"]'
+        assert_parser(source)
+      end
-    it 'parses child selector' do
-      source = '.class[name=Synvert] > .def[name="foobar"]'
-      assert_parser(source)
-    end
+      it 'parses three selectors' do
+        source = '.class[name=Synvert] .def[name="foobar"] .send[message=create]'
+        assert_parser(source)
+      end
-    it 'parses scope' do
-      source = '.block <body> > .send'
-      assert_parser(source)
-    end
+      it 'parses child selector' do
+        source = '.class[name=Synvert] > .def[name="foobar"]'
+        assert_parser(source)
+      end
-    it 'parses :first-child' do
-      source = '.class .def:first-child'
-      assert_parser(source)
-    end
+      it 'parses scope' do
+        source = '.block body > .send'
+        assert_parser(source)
+      end
-    it 'parses :last-child' do
-      source = '.class .def:last-child'
-      assert_parser(source)
-    end
+      it 'parses :has selector' do
+        source = '.class :has(> .def)'
+        assert_parser(source)
+      end
-    it 'parses :nth-child(n)' do
-      source = '.class .def:nth-child(2)'
-      assert_parser(source)
-    end
+      it 'parses :not_has selector' do
+        source = '.class :not_has(> .def)'
+        assert_parser(source)
+      end
-    it 'parses :nth-last-child(n)' do
-      source = '.class .def:nth-last-child(2)'
-      assert_parser(source)
-    end
+      it 'parses root :has selector' do
+        source = ':has(.def)'
+        assert_parser(source)
+      end
-    it 'parses :has selector' do
-      source = '.class :has(> .def)'
-      assert_parser(source)
-    end
+      it 'parses multiple attributes' do
+        source = '.send[receiver=nil][message=:create]'
+        assert_parser(source)
+      end
-    it 'parses :not_has selector' do
-      source = '.class :not_has(> .def)'
-      assert_parser(source)
-    end
+      it 'parses nested attributes' do
+        source = '.send[receiver.message=:create]'
+        assert_parser(source)
+      end
-    it 'parses root :has selector' do
-      source = ':has(.def)'
-      assert_parser(source)
-    end
+      it 'parses selector value' do
+        source = '.send[receiver=.send[message=:create]]'
+        assert_parser(source)
+      end
-    it 'parses multiple attributes' do
-      source = '.send[receiver=nil][message=:create]'
-      assert_parser(source)
-    end
+      it 'parses start with operator' do
+        source = '.def[name^=synvert]'
+        assert_parser(source)
+      end
-    it 'parses nested attributes' do
-      source = '.send[receiver.message=:create]'
-      assert_parser(source)
-    end
+      it 'parses end with operator' do
+        source = '.def[name$=synvert]'
+        assert_parser(source)
+      end
-    it 'parses selector value' do
-      source = '.send[receiver=.send[message=:create]]'
-      assert_parser(source)
-    end
+      it 'parses contain operator' do
+        source = '.def[name*=synvert]'
+        assert_parser(source)
+      end
-    it 'parses not equal operator' do
-      source = '.send[receiver=.send[message!=:create]]'
-      assert_parser(source)
-    end
+      it 'parses not equal operator' do
+        source = '.send[receiver=.send[message!=:create]]'
+        assert_parser(source)
+      end
-    it 'parses greater than operator' do
-      source = '.send[receiver=.send[arguments.size>1]]'
-      assert_parser(source)
-    end
+      it 'parses greater than operator' do
+        source = '.send[receiver=.send[arguments.size>1]]'
+        assert_parser(source)
+      end
-    it 'parses greater than or equal operator' do
-      source = '.send[receiver=.send[arguments.size>=1]]'
-      assert_parser(source)
-    end
+      it 'parses greater than or equal operator' do
+        source = '.send[receiver=.send[arguments.size>=1]]'
+        assert_parser(source)
+      end
-    it 'parses less than operator' do
-      source = '.send[receiver=.send[arguments.size<1]]'
-      assert_parser(source)
-    end
+      it 'parses less than operator' do
+        source = '.send[receiver=.send[arguments.size<1]]'
+        assert_parser(source)
+      end
-    it 'parses less than or equal operator' do
-      source = '.send[receiver=.send[arguments.size<=1]]'
-      assert_parser(source)
-    end
+      it 'parses less than or equal operator' do
+        source = '.send[receiver=.send[arguments.size<=1]]'
+        assert_parser(source)
+      end
-    it 'parses in operator' do
-      source = '.def[name in (foo bar)]'
-      assert_parser(source)
-    end
+      it 'parses in operator' do
+        source = '.def[name in (foo bar)]'
+        assert_parser(source)
+      end
-    it 'parses not_in operator' do
-      source = '.def[name not in (foo bar)]'
-      assert_parser(source)
-    end
+      it 'parses not_in operator' do
+        source = '.def[name not in (foo bar)]'
+        assert_parser(source)
+      end
-    it 'parses includes operator' do
-      source = '.def[arguments includes &block]'
-      assert_parser(source)
-    end
+      it 'parses includes operator' do
+        source = '.def[arguments includes &block]'
+        assert_parser(source)
+      end
-    it 'parses empty string' do
-      source = '.send[arguments.first=""]'
-      assert_parser(source)
-    end
+      it 'parses empty string' do
+        source = '.send[arguments.first=""]'
+        assert_parser(source)
+      end
-    it 'parses []=' do
-      source = '.send[message=[]=]'
-      assert_parser(source)
-    end
+      it 'parses []=' do
+        source = '.send[message=[]=]'
+        assert_parser(source)
+      end
-    it 'parses :[]' do
-      source = '.send[message=:[]]'
-      assert_parser(source)
+      it 'parses :[]' do
+        source = '.send[message=:[]]'
+        assert_parser(source)
+      end
     end
     describe '#query_nodes' do
@@ -178,31 +175,21 @@ module Synvert::Core::NodeQuery
         expect(expression.query_nodes(node)).to eq node.body
       end
-      it 'matches first def node' do
-        expression = parser.parse('.def:first-child')
-        expect(expression.query_nodes(node)).to eq [node.body.first]
+      it 'matches start with' do
+        expression = parser.parse('.def[name^=foo]')
+        expect(expression.query_nodes(node)).to eq [node.body.first, node.body.last]
       end
-      it 'matches nested first node' do
-        expression = parser.parse('.def[arguments.size=0] .send:first-child')
-        expect(expression.query_nodes(node)).to eq [node.body.first.body.first, node.body.second.body.first]
+      it 'matches end with' do
+        expression = parser.parse('.def[name$=bar]')
+        expect(expression.query_nodes(node)).to eq [node.body.second, node.body.last]
       end
-      it 'matches last def node' do
-        expression = parser.parse('.def:last-child')
+      it 'matches contain' do
+        expression = parser.parse('.def[name*=oob]')
         expect(expression.query_nodes(node)).to eq [node.body.last]
       end
-      it 'matches nth-child node' do
-        expression = parser.parse('.def:nth-child(2)')
-        expect(expression.query_nodes(node)).to eq [node.body.second]
-      end
-      it 'matches nth-last-child node' do
-        expression = parser.parse('.def:nth-last-child(2)')
-        expect(expression.query_nodes(node)).to eq [node.body[-2]]
-      end
       it 'matches not equal' do
         expression = parser.parse('.def[name!=foobar]')
         expect(expression.query_nodes(node)).to eq [node.body.first, node.body.second]
@@ -265,15 +252,15 @@ module Synvert::Core::NodeQuery
       end
       it 'matches goto scope' do
-        expression = parser.parse('.def <body> > .send[message=:create]')
+        expression = parser.parse('.def body > .send[message=:create]')
         expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
-        expression = parser.parse('.def <body> .send[message=:create]')
+        expression = parser.parse('.def body .send[message=:create]')
         expect(expression.query_nodes(node)).to eq [node.body.first.body.last, node.body.second.body.last]
       end
       it 'matches multiple goto scope' do
-        expression = parser.parse('.block <caller.arguments> .const[name=Synvert]')
+        expression = parser.parse('.block caller.arguments .const[name=Synvert]')
         expect(expression.query_nodes(test_node)).to eq [test_node.caller.arguments.first]
       end

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

@@ -71,7 +71,7 @@ module Synvert::Core
       condition = double
       block = proc {}
       expect(Rewriter::IfExistCondition).to receive(:new)
-        .with(instance, type: 'send', message: 'create', &block)
+        .with(instance, { type: 'send', message: 'create' }, &block)
         .and_return(condition)
       expect(condition).to receive(:process)
       instance.if_exist_node(type: 'send', message: 'create', &block)
@@ -81,7 +81,7 @@ module Synvert::Core
       condition = double
       block = proc {}
       expect(Rewriter::UnlessExistCondition).to receive(:new)
-        .with(instance, type: 'send', message: 'create', &block)
+        .with(instance, { type: 'send', message: 'create' }, &block)
         .and_return(condition)
       expect(condition).to receive(:process)
       instance.unless_exist_node(type: 'send', message: 'create', &block)
@@ -91,7 +91,7 @@ module Synvert::Core
       condition = double
       block = proc {}
       expect(Rewriter::IfOnlyExistCondition).to receive(:new)
-        .with(instance, type: 'send', message: 'create', &block)
+        .with(instance, { type: 'send', message: 'create' }, &block)
         .and_return(condition)
       expect(condition).to receive(:process)
       instance.if_only_exist_node(type: 'send', message: 'create', &block)
@@ -167,16 +167,21 @@ module Synvert::Core
     it 'parses remove' do
       action = double
-      expect(Rewriter::RemoveAction).to receive(:new).with(instance).and_return(action)
+      expect(Rewriter::RemoveAction).to receive(:new).with(instance, { and_comma: true }).and_return(action)
       expect(action).to receive(:process)
-      instance.remove
+      instance.remove and_comma: true
     end
     it 'parses remove' do
       action = double
-      expect(Rewriter::DeleteAction).to receive(:new).with(instance, :dot, :message).and_return(action)
+      expect(Rewriter::DeleteAction).to receive(:new).with(
+        instance,
+        :dot,
+        :message,
+        { and_comma: true }
+      ).and_return(action)
       expect(action).to receive(:process)
-      instance.delete :dot, :message
+      instance.delete :dot, :message, and_comma: true
     end
     it 'parses wrap with' do

data/spec/synvert/core/rewriter/scope/query_scope_spec.rb CHANGED Viewed

@@ -59,16 +59,23 @@ module Synvert::Core
       end
       it 'raises ParseError' do
-        scope = described_class.new(instance, 'hello world') {}
+        scope = described_class.new(instance, 'synvert') {}
         expect {
           scope.process
         }.to raise_error(NodeQuery::Compiler::ParseError)
-        scope = described_class.new(instance, '.type[key IN value]') {}
+        scope = described_class.new(instance, '.block <caller.arguments> .hash') {}
         expect {
           scope.process
         }.to raise_error(NodeQuery::Compiler::ParseError)
       end
+      it 'raises InvalidOperatorError' do
+        scope = described_class.new(instance, '.send[receiver IN FactoryGirl]') {}
+        expect {
+          scope.process
+        }.to raise_error(NodeQuery::Compiler::InvalidOperatorError)
+      end
     end
   end
 end

data/synvert-core-ruby.gemspec CHANGED Viewed

@@ -23,14 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
   spec.add_runtime_dependency "parser"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "guard-rake"
-  spec.add_development_dependency "oedipus_lex"
-  spec.add_development_dependency "racc"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "3.10.0"
-  spec.add_development_dependency "rspec-mocks", "3.10.2" # rspec-mocks 3.10.3 breaks tests
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,132 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oedipus_lex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.10.0
-- !ruby/object:Gem::Dependency
-  name: rspec-mocks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.10.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.10.2
 description: convert ruby code to better syntax automatically.
 email:
 - flyerhzm@gmail.com
@@ -206,6 +80,7 @@ files:
 - lib/synvert/core/node_query/compiler/array.rb
 - lib/synvert/core/node_query/compiler/attribute.rb
 - lib/synvert/core/node_query/compiler/attribute_list.rb
+- lib/synvert/core/node_query/compiler/basic_selector.rb
 - lib/synvert/core/node_query/compiler/boolean.rb
 - lib/synvert/core/node_query/compiler/comparable.rb
 - lib/synvert/core/node_query/compiler/dynamic_attribute.rb