arel_toolkit 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e58b08598fbaed4b77466a70f23818f8f41c6a82657c3a7bed28541b06f3c01
-  data.tar.gz: a16bfdb439a31fece794eaa6d54092ad0edb52e3e463957abf96db8259e6e0c9
+  metadata.gz: ff1c5420d091c5e2df0fb1bbc6350fb9a7454893855c6091eb25b3d7ae5ba46c
+  data.tar.gz: 1b98b3c7b2bc7488af08cc9b58d6f1b2d92dfe0a3cda7f7bdb01a61e2fa1a193
 SHA512:
-  metadata.gz: ee280959b83a74d0f633442d488218aa36ea88bba7f1d2783ae9848bcb1904055e28db1d71a66bd187360e0bf4cebce1da0c248284a6bf28c3476c6a206d4d98
-  data.tar.gz: 7b571f3ed5301b57053039fd1088a698d4e3f7bb355bda276477254a33a5b49dcee64abf0381268df1408ebf7d35a593ec14757b5ea4998c898c71e978f41b5b
+  metadata.gz: 772871812878e1ac7c4989a4d14c2414675b327ed5b1b5a140841bb699a0f590fc7f04f3ea1de6dfefb0166541b5260c7a01360d41869948e8a1a7b7d77cd6b6
+  data.tar.gz: b996389ef2016ba70449d44491496882ff246e01e43801e086b1db4831901acfe7e4a10c5df5a323e5167b74f9333dc5ff8d62e6d66b61bf3da84a650c978a06

data/.github/workflows/develop.yml

@@ -47,6 +47,8 @@ jobs:
     - name: Rebase
       if: matrix.rebase
       run: |
+        git config --global user.email "ci@github.com"
+        git config --global user.name "GitHub CI"
         git fetch origin $GITHUB_REF
         git rebase $GITHUB_SHA
 

data/.gitignore

@@ -20,4 +20,5 @@
 *.temp
 # emacs
 TAGS
-.#*
+.#*
+stackprof.json

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.4.2](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.2) (2020-01-08)
+
+[Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.1...v0.4.2)
+
+**Breaking changes:**
+
+- Remove path, inline visit and improve recursion for improved performance [\#152](https://github.com/mvgijssel/arel_toolkit/pull/152) ([Willianvdv](https://github.com/Willianvdv))
+
+**Implemented enhancements:**
+
+- Validate whether setting a session variable transformation does the right thing [\#155](https://github.com/mvgijssel/arel_toolkit/issues/155)
+- Add ability to mutate nodes with precomputed Arel::Nodes::Enhance [\#158](https://github.com/mvgijssel/arel_toolkit/pull/158) ([mvgijssel](https://github.com/mvgijssel))
+
 ## [v0.4.1](https://github.com/mvgijssel/arel_toolkit/tree/v0.4.1) (2019-11-13)
 
 [Full Changelog](https://github.com/mvgijssel/arel_toolkit/compare/v0.4.0...v0.4.1)
@@ -18,6 +31,7 @@
 
 **Fixed bugs:**
 
+- Bundle install fails with missing arel\_toolkit/pg\_result\_init [\#148](https://github.com/mvgijssel/arel_toolkit/issues/148)
 - Handle column reference with 3 \(or more\) fields [\#145](https://github.com/mvgijssel/arel_toolkit/issues/145)
 - Error when aliasing a range select  [\#144](https://github.com/mvgijssel/arel_toolkit/issues/144)
 - Make sure the method signatures of PostgreSQLAdapter match [\#122](https://github.com/mvgijssel/arel_toolkit/issues/122)
@@ -30,15 +44,15 @@
 
 **Implemented enhancements:**
 
+- Replace Arel::Nodes::UnboundColumnReference with Arel::Nodes::UnqualifiedColumn [\#91](https://github.com/mvgijssel/arel_toolkit/issues/91)
+- Add brakeman to check for security vulnerabilities [\#10](https://github.com/mvgijssel/arel_toolkit/issues/10)
 - Rename Arel.transformer to Arel.enhance [\#111](https://github.com/mvgijssel/arel_toolkit/issues/111)
 - Ability to query an Arel transformer tree [\#103](https://github.com/mvgijssel/arel_toolkit/issues/103)
 - Implement PREPARE and DEALLOCATE statement [\#101](https://github.com/mvgijssel/arel_toolkit/issues/101)
-- Replace Arel::Nodes::UnboundColumnReference with Arel::Nodes::UnqualifiedColumn [\#91](https://github.com/mvgijssel/arel_toolkit/issues/91)
 - Create Arel transformer class to safely and easily mutate an Arel AST [\#89](https://github.com/mvgijssel/arel_toolkit/issues/89)
 - Test and verify compatibility with Arel extension gems [\#81](https://github.com/mvgijssel/arel_toolkit/issues/81)
 - Automatically load Railtie when gem is included in Rails [\#66](https://github.com/mvgijssel/arel_toolkit/issues/66)
 - Create remove ActiveRecord specifics transformer [\#63](https://github.com/mvgijssel/arel_toolkit/issues/63)
-- Add brakeman to check for security vulnerabilities [\#10](https://github.com/mvgijssel/arel_toolkit/issues/10)
 
 **Fixed bugs:**
 
@@ -79,6 +93,7 @@
 **Implemented enhancements:**
 
 - Handle op in pg\_query\_visitor\#visit\_SelectStmt [\#38](https://github.com/mvgijssel/arel_toolkit/issues/38)
+- Introduce Guard [\#5](https://github.com/mvgijssel/arel_toolkit/issues/5)
 - Add WITH, OVERRIDING and RETURNING to INSERT [\#28](https://github.com/mvgijssel/arel_toolkit/issues/28)
 - Return \(Select|Update|Insert|Delete\)Manager instead of \(Select|Update|Insert|Delete\)Statement [\#25](https://github.com/mvgijssel/arel_toolkit/issues/25)
 - Implement UNION in sql\_to\_arel [\#24](https://github.com/mvgijssel/arel_toolkit/issues/24)
@@ -87,10 +102,8 @@
 - Implement pg\_query\_visitor method for INSERT [\#21](https://github.com/mvgijssel/arel_toolkit/issues/21)
 - Implement pg\_query\_visitor method for UPDATE [\#20](https://github.com/mvgijssel/arel_toolkit/issues/20)
 - Implement all the visitor methods in PgQueryVisitor for SELECT statements [\#11](https://github.com/mvgijssel/arel_toolkit/issues/11)
-- Introduce Guard [\#5](https://github.com/mvgijssel/arel_toolkit/issues/5)
 - 22/implement delete [\#30](https://github.com/mvgijssel/arel_toolkit/pull/30) ([mvgijssel](https://github.com/mvgijssel))
 - Added WITH, OVERRIDING and RETURINING to INSERT [\#29](https://github.com/mvgijssel/arel_toolkit/pull/29) ([mvgijssel](https://github.com/mvgijssel))
-- Initial UPDATE\_STMT [\#27](https://github.com/mvgijssel/arel_toolkit/pull/27) ([mvgijssel](https://github.com/mvgijssel))
 - Added badges to README \(and fix setup\) [\#3](https://github.com/mvgijssel/arel_toolkit/pull/3) ([mvgijssel](https://github.com/mvgijssel))
 - Configure codeclimate [\#2](https://github.com/mvgijssel/arel_toolkit/pull/2) ([mvgijssel](https://github.com/mvgijssel))
 - Updated travis file [\#1](https://github.com/mvgijssel/arel_toolkit/pull/1) ([mvgijssel](https://github.com/mvgijssel))
@@ -101,9 +114,9 @@
 
 **Closed issues:**
 
-- Create issues for unknown branches in pg\_query\_visitor [\#19](https://github.com/mvgijssel/arel_toolkit/issues/19)
 - Remove unnecessary to\_arel remains [\#15](https://github.com/mvgijssel/arel_toolkit/issues/15)
 - Merge to\_arel gem [\#4](https://github.com/mvgijssel/arel_toolkit/issues/4)
+- Create issues for unknown branches in pg\_query\_visitor [\#19](https://github.com/mvgijssel/arel_toolkit/issues/19)
 
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arel_toolkit (0.4.1)
+    arel_toolkit (0.4.2)
       activerecord (~> 5.2.0)
       arel (~> 9.0.0)
       pg (~> 1.1.4)
@@ -87,6 +87,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
@@ -166,6 +167,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
+    stackprof (0.2.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -188,6 +190,7 @@ DEPENDENCIES
   guard-rake (~> 1.0.0)
   guard-rspec (~> 4.7)
   guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
   pry
   pry-alias
   pry-doc
@@ -200,6 +203,7 @@ DEPENDENCIES
   rubocop (= 0.71.0)
   simplecov (~> 0.16.1)
   simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -65,7 +65,7 @@ enhanced_arel.child_at_path(['ast', 'cores', 0, 'projections', 1]).object
 ```
 
 ##### Replace or remove nodes without modifying the original arel
-`remove` and `replace` allow for modifications to the Arel AST. The changes are aplied to a new copy of the AST, making sure the original AST is not touched.
+`remove` and `replace` allow for modifications to the Arel AST. The changes are aplied to a new copy of the AST, making sure the original AST is not touched. The `replace` method accepts any Arel node or a precomputed enhanced node for improved performance.
 
 ```ruby
 enhanced_arel.child_at_path(['ast', 'cores', 0, 'projections', 1]).replace(Post.arel_table[:content])

data/arel_toolkit.gemspec

@@ -49,6 +49,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-rubocop', '~> 1.3.0'
   spec.add_development_dependency 'guard-rake', '~> 1.0.0'
 
+  spec.add_development_dependency 'stackprof', '~> 0.2'
+  spec.add_development_dependency 'memory_profiler', '~> 0.9'
+
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'pry-doc'

data/benchmark.rb

@@ -0,0 +1,54 @@
+GC.disable
+
+require 'arel'
+require 'active_record'
+require 'memory_profiler'
+require 'json'
+require 'stackprof'
+
+require './lib/arel/enhance'
+require './lib/arel/extensions'
+require './lib/arel/sql_to_arel'
+
+ActiveRecord::Base.establish_connection(
+  adapter: 'postgresql',
+  host: 'localhost',
+  databse: 'arel_toolkit_test',
+  username: 'postgres',
+)
+
+# rubocop:disable Metrics/LineLength
+SQL = %{
+SELECT COUNT("hacktivity_items"."id") FROM (SELECT "hacktivity_items".* FROM (SELECT "hacktivity_items".* FROM (SELECT "hacktivity_items".*, (NULLIF(current_setting('secure.requester_id'), ''))::integer AS "_requester_id" FROM (SELECT "outer_hacktivity_items".*, EXISTS (SELECT 1 FROM "public"."reports" INNER JOIN "public"."teams" ON "teams"."id" = "reports"."team_id" WHERE "teams"."state" = 5 AND "reports"."disclosed_at" IS NOT NULL AND "reports"."public_view" = 'full' AND "reports"."id" = "outer_hacktivity_items"."report_id") AS "is_someone_visiting_a_public_report", EXISTS (SELECT 1 FROM "public"."reports" INNER JOIN "public"."teams" ON "teams"."id" = "reports"."team_id" INNER JOIN "public"."whitelisted_reporters" ON "whitelisted_reporters"."team_id" = "teams"."id" WHERE "teams" ."state" = 4 AND "teams"."allows_private_disclosure" = 't'::bool AND (("whitelisted_reporters"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "whitelisted_reporters"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "reports"."disclosed_at" IS NOT NULL AND "reports"."public_view" = 'full' AND "reports"."id" = "outer_hacktivity_items"."report_id") AS "is_someone_visiting_a_report_privately_disclosed_to_them", EXISTS (SELECT 1 FROM "public"."reports" WHERE "reports"."hacker_published" = 't'::bool AND "reports"."disclosed_at" IS NOT NULL AND "reports"."id" = "outer_hacktivity_items"."report_id") AS "is_hacker_published", EXISTS (SELECT 1 FROM "public"."teams" INNER JOIN "public"."team_members" ON "team_members"."team_id" = "teams"."id" WHERE (("team_members"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "team_members"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "team_members"."user_id" IS NOT NULL AND "teams"."id" = "outer_hacktivity_items"."team_id") AS "is_team_team_member", EXISTS (SELECT 1 FROM "public"."teams" WHERE "teams"."state" = 5 AND "teams"."id" = "outer_hacktivity_items"."team_id") AS "is_team_public", EXISTS (SELECT 1 FROM "public"."teams" INNER JOIN "public"."whitelisted_reporters" ON "whitelisted_reporters"."team_id" = "teams"."id" INNER JOIN "public"."users" ON "users"."id" = "whitelisted_reporters"."user_id" WHERE (("users"."id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "users"."id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "users"."id" IS NOT NULL AND "teams"."id" = "outer_hacktivity_items"."team_id") AS "is_team_whitelisted_reporter", EXISTS (SELECT 1 FROM "public"."teams" WHERE "teams"."state" = 4 AND "teams"."id" = "outer_hacktivity_items"."team_id") AS "is_team_private", EXISTS (SELECT 1 FROM "public"."teams" WHERE "teams"."offers_bounties" = 't'::bool AND "teams"."hide_bounty_amounts" = 'f'::bool AND "teams"."id" = "outer_hacktivity_items"."team_id") AS "is_team_shows_bounty_amounts" FROM "public"."hacktivity_items" "outer_hacktivity_items") AS "hacktivity_items" WHERE "hacktivity_items"."is_team_public" = 't'::bool OR ("hacktivity_items"."is_team_private" = 't'::bool AND ("hacktivity_items"."is_team_team_member" = 't'::bool OR "hacktivity_items"."is_team_whitelisted_reporter" = 't'::bool)) OR "hacktivity_items"."is_hacker_published" = 't'::bool) hacktivity_items) AS "hacktivity_items" LEFT OUTER JOIN (SELECT "reports".*, "new_j0"."disclosed_at" AS "__new_filterable_disclosed_at" FROM (SELECT "reports".*, (NULLIF(current_setting('secure.requester_id'), ''))::integer AS "_requester_id" FROM (SELECT "outer_reports".*, EXISTS (SELECT 1 FROM "public"."teams" INNER JOIN "public"."team_members" ON "team_members"."team_id" = "teams"."id" INNER JOIN "public"."users" ON "users"."id" = "team_members"."user_id" WHERE (("users"."id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "users"."id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "users"."id" IS NOT NULL AND "teams"."id" = "outer_reports"."team_id") AS "is_team_member", (("outer_reports"."reporter_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "outer_reports"."reporter_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "outer_reports"."reporter_id" IS NOT NULL AS "is_reporter", EXISTS (SELECT 1 FROM "public"."reports_users" INNER JOIN "public"."users" ON "users"."id" = "reports_users"."user_id" WHERE (("reports_users"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "reports_users"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "reports_users"."user_id" IS NOT NULL AND "reports_users"."report_id" = "outer_reports"."id") AS "is_external_user", EXISTS (SELECT 1 FROM "public"."report_retests" INNER JOIN "public"."report_retest_users" ON "report_retest_users"."report_retest_id" = "report_retests"."id" WHERE (EXISTS (SELECT "invitations".* FROM "public"."invitations" WHERE ("accepted_at" IS NOT NULL OR "expires_at" >= now() OR "expires_at" IS NULL) AND "invitations"."cancelled_at" IS NULL AND "invitations"."rejected_at" IS NULL AND "invitations"."id" = "report_retest_users"."invitation_id") OR (NOT (EXISTS (SELECT "invitations".* FROM "public"."invitations" WHERE "invitations"."id" = "report_retest_users"."invitation_id")))) AND (("report_retest_users"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "report_retest_users"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "report_retest_users"."user_id" IS NOT NULL AND "report_retests"."report_id" = "outer_reports"."id") AS "is_retester", EXISTS (SELECT 1 FROM "public"."teams" LEFT OUTER JOIN "public"."users" ON "users"."anc_triager" WHERE "outer_reports"."pre_submission_review_state" IS NOT NULL AND "teams"."state" IN (4, 5) AND "teams"."anc_enabled" = 't'::bool AND (("users"."id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "users"."id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "users"."id" IS NOT NULL AND "teams"."id" = "outer_reports"."team_id") AS "is_anc_triager", EXISTS (SELECT 1 FROM "public"."teams" INNER JOIN "public"."team_members" ON "team_members"."team_id" = "teams"."id" INNER JOIN "public"."users" ON "users"."id" = "team_members"."user_id" WHERE (("users"."id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "users"."id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "users"."hackerone_triager" = 't'::bool AND "users"."id" IS NOT NULL AND "teams"."id" = "outer_reports"."team_id") AS "is_hackerone_triager", EXISTS (SELECT 1 FROM "public"."report_collaborators" WHERE (("report_collaborators"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "report_collaborators"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "report_collaborators"."user_id" IS NOT NULL AND "report_collaborators"."report_id" = "outer_reports"."id") AS "is_report_collaborator", EXISTS (SELECT 1 FROM "public"."teams" WHERE "teams"."state" = 5 AND "outer_reports"."disclosed_at" IS NOT NULL AND "outer_reports"."public_view" = 'full' AND "teams"."id" = "outer_reports"."team_id") AS "is_someone_visiting_a_public_report", EXISTS (SELECT 1 FROM "public"."teams" WHERE "teams"."state" = 5 AND "outer_reports"."disclosed_at" IS NOT NULL AND "outer_reports"."public_view" = 'no-content' AND "teams"."id" = "outer_reports"."team_id") AS "is_someone_visiting_a_public_limited_report", EXISTS (SELECT 1 FROM "public"."teams" INNER JOIN "public"."whitelisted_reporters" ON "whitelisted_reporters"."team_id" = "teams"."id" WHERE "teams"."state" = 4 AND "teams"."allows_private_disclosure" = 't'::bool AND (("whitelisted_reporters"."user_id" IS NULL AND NULLIF(current_setting('secure.requester_id'), '') IS NULL) OR "whitelisted_reporters"."user_id" = (NULLIF(current_setting('secure.requester_id'), ''))::integer) AND "outer_reports"."disclosed_at" IS NOT NULL AND "outer_reports"."public_view" = 'full' AND "teams"."id" = "outer_reports"."team_id") AS "is_someone_visiting_a_report_privately_disclosed_to_them", "outer_reports"."hacker_published" = 't'::bool AND "outer_reports"."disclosed_at" IS NOT NULL AS "is_hacker_published" FROM "public"."reports" "outer_reports") AS "reports" WHERE "reports"."is_reporter" = 't'::bool OR "reports"."is_team_member" = 't'::bool OR "reports"."is_external_user" = 't'::bool OR "reports"."is_anc_triager" = 't'::bool OR "reports"."is_report_collaborator" = 't'::bool OR "reports"."is_someone_visiting_a_public_report" = 't'::bool OR "reports"."is_someone_visiting_a_public_limited_report" = 't'::bool OR "reports"."is_someone_visiting_a_report_privately_disclosed_to_them" = 't'::bool OR "reports"."is_hacker_published" = 't'::bool OR "reports"."is_retester" = 't'::bool) reports LEFT OUTER JOIN "public"."reports" "new_j0" ON "reports"."id" = "new_j0"."id" AND ("reports"."is_reporter" = 't'::bool OR "reports"."is_team_member" = 't'::bool OR "reports"."is_external_user" = 't'::bool OR "reports"."is_anc_triager" = 't'::bool OR "reports"."is_report_collaborator" = 't'::bool OR "reports"."is_someone_visiting_a_public_report" = 't'::bool OR "reports"."is_someone_visiting_a_public_limited_report" = 't'::bool OR "reports"."is_someone_visiting_a_report_privately_disclosed_to_them" = 't'::bool OR "reports"."is_hacker_published" = 't'::bool)) AS "reports" ON "reports"."id" = "hacktivity_items"."report_id" WHERE "reports"."__new_filterable_disclosed_at" IS NOT NULL) AS "hacktivity_items" LEFT OUTER JOIN "hacktivity_scores" ON "hacktivity_scores"."hacktivity_item_id" = "hacktivity_items"."id"
+}.freeze
+# rubocop:enable Metrics/LineLength
+
+def do_it
+  arel = Arel.sql_to_arel SQL
+  enhanced_arel = Arel.enhance(arel)
+
+  enhanced_arel.query(class: Arel::Attributes::Attribute).each do |node|
+    node.replace node
+  end
+
+  enhanced_arel
+end
+
+# Warm up
+do_it
+
+profile = StackProf.run(mode: :wall, raw: true) { do_it }
+File.write('stackprof.json', JSON.generate(profile))
+
+report = MemoryProfiler.report { do_it }
+puts report.pretty_print
+
+n = 100
+
+Benchmark.bm do |benchmark|
+  benchmark.report do
+    n.times do
+      do_it
+    end
+  end
+end

data/gemfiles/arel_gems.gemfile.lock

@@ -31,7 +31,7 @@ GIT
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.0)
+    arel_toolkit (0.4.2)
       activerecord (~> 5.2.0)
       arel (~> 9.0.0)
       pg (~> 1.1.4)
@@ -64,8 +64,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     appraisal (2.2.0)
       bundler
@@ -88,20 +88,20 @@ GEM
     docile (1.3.2)
     dpl (1.10.12)
     erubi (1.8.0)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.11.1)
     formatador (0.2.5)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.15.0)
       activesupport
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
+      retriable (~> 3.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -136,10 +136,11 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
     nokogiri (1.10.3)
@@ -154,7 +155,7 @@ GEM
       ast (~> 2.4.0)
     pg (1.1.4)
     pg_array_parser (0.0.9)
-    pg_query (1.1.0)
+    pg_query (1.1.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -172,7 +173,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -194,7 +195,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    retriable (2.1.0)
+    retriable (3.1.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -238,6 +239,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
+    stackprof (0.2.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -256,11 +258,12 @@ DEPENDENCIES
   bundler (~> 2.0)
   database_cleaner (~> 1.7.0)
   dpl (~> 1.10.11)
-  github_changelog_generator (~> 1.14.3)
+  github_changelog_generator (~> 1.15)
   guard (~> 2.15)
   guard-rake (~> 1.0.0)
   guard-rspec (~> 4.7)
   guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
   pg_search!
   postgres_ext!
   pry
@@ -276,6 +279,7 @@ DEPENDENCIES
   rubocop (= 0.71.0)
   simplecov (~> 0.16.1)
   simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/gemfiles/default.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    arel_toolkit (0.4.0)
+    arel_toolkit (0.4.2)
       activerecord (~> 5.2.0)
       arel (~> 9.0.0)
       pg (~> 1.1.4)
@@ -21,8 +21,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     appraisal (2.2.0)
       bundler
@@ -42,20 +42,20 @@ GEM
     diff-lcs (1.3)
     docile (1.3.2)
     dpl (1.10.12)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
     ffi (1.11.1)
     formatador (0.2.5)
-    github_changelog_generator (1.14.3)
+    github_changelog_generator (1.15.0)
       activesupport
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
-      rainbow (>= 2.1)
+      rainbow (>= 2.2.1)
       rake (>= 10.0)
-      retriable (~> 2.1)
+      retriable (~> 3.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -77,7 +77,7 @@ GEM
       guard (~> 2.0)
       rubocop (~> 0.20)
     hirb (0.7.3)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     interception (0.5)
     jaro_winkler (1.5.3)
@@ -87,10 +87,11 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.13.0)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     nenv (0.3.0)
     nokogiri (1.10.3)
@@ -104,7 +105,7 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    pg_query (1.1.0)
+    pg_query (1.1.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -122,7 +123,7 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
     rake (10.5.0)
     rake-compiler (1.0.7)
@@ -130,7 +131,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    retriable (2.1.0)
+    retriable (3.1.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -166,6 +167,7 @@ GEM
       hirb
       simplecov
     simplecov-html (0.10.2)
+    stackprof (0.2.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -183,11 +185,12 @@ DEPENDENCIES
   bundler (~> 2.0)
   database_cleaner (~> 1.7.0)
   dpl (~> 1.10.11)
-  github_changelog_generator (~> 1.14.3)
+  github_changelog_generator (~> 1.15)
   guard (~> 2.15)
   guard-rake (~> 1.0.0)
   guard-rspec (~> 4.7)
   guard-rubocop (~> 1.3.0)
+  memory_profiler (~> 0.9)
   pry
   pry-alias
   pry-doc
@@ -200,6 +203,7 @@ DEPENDENCIES
   rubocop (= 0.71.0)
   simplecov (~> 0.16.1)
   simplecov-console (~> 0.4.2)
+  stackprof (~> 0.2)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/arel/enhance/node.rb

@@ -3,7 +3,7 @@ module Arel
     class Node
       attr_reader :object
       attr_reader :parent
-      attr_reader :path
+      attr_reader :local_path
       attr_reader :fields
       attr_reader :children
       attr_reader :root_node
@@ -11,7 +11,6 @@ module Arel
 
       def initialize(object)
         @object = object
-        @path = Path.new
         @root_node = self
         @fields = []
         @children = {}
@@ -51,12 +50,12 @@ module Arel
         mutate(nil, remove: true)
       end
 
-      def replace(new_node)
-        mutate(new_node)
+      def replace(new_arel_node)
+        mutate(new_arel_node)
       end
 
       def add(path_node, node)
-        node.path = path.append(path_node)
+        node.local_path = path_node
         node.parent = self
         node.root_node = root_node
         @children[path_node.value.to_s] = node
@@ -107,9 +106,21 @@ module Arel
         Arel::Enhance::Query.call(self, kwargs)
       end
 
+      def full_path
+        the_path = [local_path]
+        current_parent = parent
+
+        while current_parent
+          the_path.unshift current_parent.local_path
+          current_parent = current_parent.parent
+        end
+
+        the_path.compact
+      end
+
       protected
 
-      attr_writer :path
+      attr_writer :local_path
       attr_writer :parent
       attr_writer :root_node
 
@@ -117,7 +128,7 @@ module Arel
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def recursive_inspect(string, indent = 1)
-        string << "<#{inspect_name} #{path.inspect}\n"
+        string << "<#{inspect_name} #{full_path.inspect}\n"
         string << "#{spacing(indent)}sql = #{to_sql}\n" unless to_sql.nil?
         string << "#{spacing(indent)}parent = #{parent.nil? ? nil.inspect : parent.inspect_name}"
         string << "\n" unless children.length.zero?
@@ -135,6 +146,7 @@ module Arel
                     "#{spacing(indent - 1)}>\n"
                   end
       end
+
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
@@ -154,10 +166,16 @@ module Arel
       def deep_copy_object
         # https://github.com/mvgijssel/arel_toolkit/issues/97
         new_object = Marshal.load(Marshal.dump(object))
+        self.object = new_object
 
-        each do |node|
-          selected_object = node.path.dig_send(new_object)
-          node.object = selected_object
+        recursive_update_object(new_object)
+      end
+
+      def recursive_update_object(arel_tree)
+        children.each_value do |child|
+          tree_child = arel_tree.send(*child.local_path.method)
+          child.object = tree_child
+          child.recursive_update_object(tree_child)
         end
       end
 
@@ -177,28 +195,34 @@ module Arel
         root_node.mark_as_dirty
 
         parent_object = parent.object
-        new_node = [] if remove && object.is_a?(Array)
+        new_arel_node = new_node.is_a?(Arel::Enhance::Node) ? new_node.object : new_node
+        new_arel_node = [] if remove && object.is_a?(Array)
 
-        if parent_object.respond_to?("#{path.current.value}=")
-          parent_object.send("#{path.current.value}=", new_node)
+        if parent_object.respond_to?("#{local_path.value}=")
+          parent_object.send("#{local_path.value}=", new_arel_node)
 
-        elsif parent_object.instance_values.key?(path.current.value)
-          parent_object.instance_variable_set("@#{path.current.value}", new_node)
+        elsif parent_object.instance_values.key?(local_path.value)
+          parent_object.instance_variable_set("@#{local_path.value}", new_arel_node)
 
-        elsif path.current.arguments? && parent_object.respond_to?(path.current.method[0])
+        elsif local_path.arguments? && parent_object.respond_to?(local_path.method[0])
           if remove
-            parent_object.delete_at(path.current.value)
+            parent_object.delete_at(local_path.value)
 
           else
-            parent_object[path.current.value] = new_node
+            parent_object[local_path.value] = new_arel_node
           end
         else
-          raise "Don't know how to replace `#{path.current.value}` in #{parent_object.inspect}"
+          raise "Don't know how to replace `#{local_path.value}` in #{parent_object.inspect}"
         end
 
-        new_parent_tree = Visitor.new.accept_with_root(parent_object, parent)
-        parent.parent.add(parent.path.current, new_parent_tree)
-        new_parent_tree[path.current.value]
+        if new_node.is_a?(Arel::Enhance::Node)
+          parent.add(local_path, new_node)
+          parent[local_path.value]
+        else
+          new_parent_tree = Visitor.new.accept_with_root(parent_object, parent)
+          parent.parent.add(parent.local_path, new_parent_tree)
+          new_parent_tree[local_path.value]
+        end
       end
       # rubocop:enable Metrics/PerceivedComplexity
       # rubocop:enable Metrics/CyclomaticComplexity

data/lib/arel/enhance/visitor.rb

@@ -63,9 +63,23 @@ module Arel
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
+      # arel/lib/arel/visitors/visitor.rb:29
       def visit(object)
-        Arel::Visitors::Visitor.instance_method(:visit).bind(self).call(object)
+        dispatch_method = dispatch[object.class]
+        send dispatch_method, object
+      rescue NoMethodError => e
+        raise e if respond_to?(dispatch_method, true)
+
+        superklass = object.class.ancestors.find do |klass|
+          respond_to?(dispatch[klass], true)
+        end
+        raise(TypeError, "Cannot visit #{object.class}") unless superklass
+
+        dispatch[object.class] = dispatch[superklass]
+        retry
       end
+      # rubocop:enable Metrics/AbcSize
 
       def current_node
         @node_stack.last

data/lib/arel_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ArelToolkit
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - maarten
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -290,6 +290,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: stackprof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +430,7 @@ files:
 - README.md
 - Rakefile
 - arel_toolkit.gemspec
+- benchmark.rb
 - bin/console
 - bin/setup
 - ext/pg_result_init/extconf.rb
@@ -573,8 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Collection of tools for Arel