synvert-core 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741ca9c2f6f29e5bbafbc5b63d94b3cd9a56aa20e8a00f3f70830b73b1fb697e
-  data.tar.gz: a8bbf6e0c48a4af42578abb20807f3d86359fc069dc85ff90e12cf011f076998
+  metadata.gz: 5d838da042cfdbc68e4a235117a465ca340fa732203f7470684a9279e6797fff
+  data.tar.gz: ad784c3e09faa73a55e0bf0ad51a982230d9a1b2a328c43414e4aa297e38a00e
 SHA512:
-  metadata.gz: 7fcadf632c863b1f3ba410b65f63c741b594255567f337ebc86c51ae45e681484653b45eec01fc5c3e3a4ea170a6bd38e899bdf22f65b2e980d58cac8c11cfcd
-  data.tar.gz: 80ebe8f07ef9679c6921233d52b46979a6bfb895e4b63b974672dec193ef52ce08c40454d2a92fd509f12b8f3567065bb7d2dbee33af7bca37a96246e6373381
+  metadata.gz: 4b31e94f8071af04f1ae7b1292bb5af91e52ba047949535667cb6765a5ef32c9bbcf855dd92a212aa640b0185f42fbd1bbcf4614f424c596f9c52f62a313a643
+  data.tar.gz: 197318ccffd17c9eb60251731bf49f45198e2b5fb5812c22d4fe6d0d07bac94bff638bc5a125d05be2ccec930b16300ccdb83ffdd53bf8cf0c4cd8ad22a34c94

data/.github/workflows/main.yml

@@ -15,7 +15,6 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,7 +14,3 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
-lib/synvert/core/node_query/lexer.rex.rb
-lib/synvert/core/node_query/parser.racc.rb
-lib/synvert/core/node_query/parser.output

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.6.0 (2022-09-15)
+
+* Make use of `NodeQuery` to query nodes
+* Remove `Node#to_hash`
+* Downgrade `activesupport` to < 7.0.0
+
+## 1.5.0 (2022-07-02)
+
+* Abstract `node_query`
+* Abstract `node_mutation`
+* Abstract `parser_node_ext`
+
 ## 1.4.0 (2022-05-21)
 
 * Drop support `:first-child` and `:last-child`

data/Gemfile

@@ -7,9 +7,6 @@ gemspec
 
 gem "guard"
 gem "guard-rspec"
-gem "guard-rake"
-gem "oedipus_lex"
-gem "racc"
 gem "rake"
 gem "rspec"
 gem "rspec-mocks"

data/Gemfile.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: .
+  specs:
+    synvert-core (1.6.0)
+      activesupport (< 7.0.0)
+      erubis
+      node_mutation
+      node_query
+      parser
+      parser_node_ext
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    erubis (2.7.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.16.3)
+    nenv (0.3.0)
+    node_mutation (1.2.1)
+      activesupport
+      erubis
+    node_query (1.5.0)
+      activesupport (< 7.0.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    parser (3.1.2.1)
+      ast (~> 2.4.1)
+    parser_node_ext (0.4.0)
+      parser
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.2)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    shellany (0.0.1)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard
+  guard-rspec
+  rake
+  rspec
+  rspec-mocks
+  synvert-core!
+
+BUNDLED WITH
+   2.3.7

data/Guardfile

@@ -3,14 +3,5 @@
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
-  watch('lib/synvert/core/node_query/lexer.rex.rb') { 'spec/synvert/core/node_query/lexer_spec.rb'  }
-  watch('lib/synvert/core/node_query/compiler.rb') { 'spec/synvert/core/node_query/parser_spec.rb'  }
-  watch(%r{^lib/synvert/core/node_query/compiler/.*\.rb$}) { 'spec/synvert/core/node_query/parser_spec.rb' }
-  watch('lib/synvert/core/node_query/parser.racc.rb') { 'spec/synvert/core/node_query/parser_spec.rb' }
   watch('spec/spec_helper.rb') { "spec" }
 end
-
-guard :rake, task: 'generate' do
-  watch('lib/synvert/core/node_query/lexer.rex')
-  watch('lib/synvert/core/node_query/parser.y')
-end

data/README.md

@@ -1,6 +1,6 @@
 # synvert-core-ruby
 
-<img src="https://synvert.xinminlabs.com/img/logo_96.png" alt="logo" width="32" height="32" />
+<img src="https://synvert.net/img/logo_96.png" alt="logo" width="32" height="32" />
 
 [![AwesomeCode Status for xinminlabs/synvert-core-ruby](https://awesomecode.io/projects/033f7f02-7b22-41c3-a902-fca37f1ec72a/status)](https://awesomecode.io/repos/xinminlabs/synvert-core-ruby)
 ![Main workflow](https://github.com/xinminlabs/synvert-core-ruby/actions/workflows/main.yml/badge.svg)
@@ -8,29 +8,46 @@
 Synvert core provides a set of DSLs to rewrite ruby code. e.g.
 
 ```ruby
-Synvert::Rewriter.new 'ruby', 'map_and_flatten_to_flat_map' do
+Synvert::Rewriter.new 'factory_bot', 'convert_factory_girl_to_factory_bot' do
   description <<~EOS
-    It converts `map` and `flatten` to `flat_map`
+    It converts FactoryGirl to FactoryBot
 
     ```ruby
-    enum.map do
-      # do something
-    end.flatten
+    require 'factory_girl'
+    require 'factory_girl_rails'
     ```
 
     =>
 
     ```ruby
-    enum.flat_map do
-      # do something
-    end
+    require 'factory_bot'
+    require 'factory_bot_rails'
+    ```
+
+    ```ruby
+    FactoryGirl.create(:user)
+    FactoryGirl.build(:user)
+    ```
+
+    =>
+
+    ```ruby
+    FactoryBot.create(:user)
+    FactoryBot.build(:user)
     ```
   EOS
 
-  within_files Synvert::ALL_RUBY_FILES do
-    with_node type: 'send', receiver: { type: 'block', caller: { type: 'send', message: 'map' } }, message: 'flatten', arguments: { size: 0 } do
-      delete :message, :dot
-      replace 'receiver.caller.message', with: 'flat_map'
+  within_files Synvert::RAILS_TEST_FILES do
+    find_node '.const[name=FactoryGirl]' do
+      replace_with 'FactoryBot'
+    end
+
+    find_node ".send[receiver=nil][message=require][arguments.size=1][arguments.first='factory_girl']" do
+      replace :arguments, with: "'factory_bot'"
+    end
+
+    with_node type: 'send', receiver: nil, message: 'require', arguments: { size: 1, first: "'factory_girl_rails'" } do
+      replace :arguments, with: "'factory_bot_rails'"
     end
   end
 end
@@ -56,6 +73,7 @@ DSLs are as follows
 
 Scopes:
 
+* [find_node](./Synvert/Core/Rewriter/Instance.html#find_node-instance_method) - recursively find matching ast nodes by node query language
 * [within_node](./Synvert/Core/Rewriter/Instance.html#within_node-instance_method) - recursively find matching ast nodes
 * [with_node](./Synvert/Core/Rewriter/Instance.html#with_node-instance_method) - alias to within_node
 * [goto_node](./Synvert/Core/Rewriter/Instance.html#goto_node-instance_method) - go to a child node

data/Rakefile

@@ -2,21 +2,7 @@
 
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-require 'oedipus_lex'
-Rake.application.rake_require "oedipus_lex"
-
-file "lib/synvert/core/node_query/lexer.rex.rb" => "lib/synvert/core/node_query/lexer.rex"
-file "lib/synvert/core/node_query/parser.racc.rb" => "lib/synvert/core/node_query/parser.y"
 
-task :lexer  => "lib/synvert/core/node_query/lexer.rex.rb"
-task :parser => "lib/synvert/core/node_query/parser.racc.rb"
-task :generate  => [:lexer, :parser]
-
-rule '.racc.rb' => '.y' do |t|
-  cmd = "bundle exec racc -l -v -o #{t.name} #{t.source}"
-  sh cmd
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-task :spec => :generate

data/lib/synvert/core/engine/erb.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     ERUBY_EXPR_SPLITTER = ';  ;'
     ERUBY_STMT_SPLITTER = ';   ;'
 
-    class ERB
+    class Erb
       class << self
         # convert erb to ruby code.
         #

data/lib/synvert/core/engine.rb

@@ -3,6 +3,6 @@
 module Synvert::Core
   # Engine defines how to encode / decode other files (like erb).
   module Engine
-    autoload :ERB, 'synvert/core/engine/erb'
+    autoload :Erb, 'synvert/core/engine/erb'
   end
 end