arsi 0.4.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7a4a5e12e9e4a35319a230ebf3b4310db0e0d02582da4840d93c85d714cca6
-  data.tar.gz: 22f1bda30e928de04e48ceea8de894e67cbd1e1c14d44d7b72c98cfc5c25a87c
+  metadata.gz: 4568758138c9d89d766860d327ee3233771f8a0e25924288b57513088a4894f8
+  data.tar.gz: 06c17d87d50c76db362a083a358c731828359ca0195db29062b1a1e8346feabf
 SHA512:
-  metadata.gz: de787c78a923844c619250378ede3267f4b72e89b207dce90a1b085938c3f2d9ebb441d6780dc00321a71130064f28546f89278c8e00fb3e54122783d9749ae2
-  data.tar.gz: ee136b4e0cc3cde3289679b3a487bd21982085e96c42e1964dc8bce66ff9367f3e2f4b4edebbf1b5534013c4e7e019af2934fc64157367d0c004aad68f5b6d01
+  metadata.gz: 38b1cdb07c23ac73a838702f89ecb5239e341cc9df2220def0a414dea33c946fe258606c0b0ef88dce980675ee87ba75407c115456a91b370f50312fc0638247
+  data.tar.gz: 4c603a0b1fdb9fca7ee7c9dd02869f9d29df4e127b7ba65a939ec4f0c42087275aad6be0b16189de22034e56fa679947d4427ead5ff80ff94ca39f528e556c0a

data/lib/arsi/arel_tree_manager.rb

@@ -2,29 +2,12 @@ require 'arel'
 
 module Arsi
   module ArelTreeManager
-    AREL_WHERE_SQL_ARITY_1 = ::Arel::VERSION[0].to_i < 7
-    AREL_WHERE_SQL_ENGINE_ACCESSOR = ::Arel::VERSION[0].to_i < 9
+    # This is inspired from Arel::SelectManager, a subclass of Arel::TreeManager
+    # just like Arel::UpdateManager and Arel::DeleteManager.
+    def where_sql(engine = ::Arel::Table.engine)
+      return if @ast.wheres.empty?
 
-    # This is from Arel::SelectManager which inherits from Arel::TreeManager.
-    # We need where_sql on both Arel::UpdateManager and Arel::DeleteManager so we add it to the parent class.
-    def where_sql(provided_engine = :none)
-      return if @ctx.wheres.empty?
-
-      selected_engine = provided_engine
-      if selected_engine == :none
-        selected_engine = if AREL_WHERE_SQL_ENGINE_ACCESSOR
-          self.engine || ::Arel::Table.engine
-        else
-          Arel::Table.engine
-        end
-      end
-
-      viz = if AREL_WHERE_SQL_ARITY_1
-        ::Arel::Visitors::WhereSql.new selected_engine.connection
-      else
-        ::Arel::Visitors::WhereSql.new(selected_engine.connection.visitor, selected_engine.connection)
-      end
-      ::Arel::Nodes::SqlLiteral.new viz.accept(@ctx, ::Arel::Collectors::SQLString.new).value
+      ::Arel::Nodes::SqlLiteral.new("WHERE #{::Arel::Nodes::And.new(@ast.wheres).to_sql(engine)}")
     end
   end
 end

data/lib/arsi/relation.rb

@@ -18,23 +18,22 @@ module Arsi
       !arsi_scopeable?
     end
 
+    def _update_record(*)
+      with_relation_in_connection { super }
+    end
+
     def delete_all(*)
       with_relation_in_connection { super }
     end
 
-    def self.prepended(base)
-      base.class_eval do
-        alias_method :update_all_without_arsi, :update_all
-        def update_all(*args)
-          with_relation_in_connection { update_all_without_arsi(*args) }
-        end
-      end
+    def update_all(*)
+      with_relation_in_connection { super }
     end
 
     private
 
     def arsi_scopeable?
-      @klass.columns.any? { |c| c.name =~ Arsi::SCOPEABLE_REGEX }
+      @klass.columns.any? { |c| Arsi::SCOPEABLE_REGEX.match?(c.name) }
     end
 
     def with_relation_in_connection

data/lib/arsi/version.rb

@@ -1,3 +1,3 @@
 module Arsi
-  VERSION = '0.4.3'
+  VERSION = '1.1.0'
 end

data/lib/arsi.rb

@@ -6,9 +6,10 @@ require 'active_record/connection_adapters/mysql2_adapter'
 
 module Arsi
   class UnscopedSQL < StandardError; end
-  Arel::TreeManager.send(:include, ArelTreeManager)
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:prepend, Mysql2Adapter)
-  ActiveRecord::Relation.send(:prepend, Relation)
+  Arel::UpdateManager.include(ArelTreeManager)
+  Arel::DeleteManager.include(ArelTreeManager)
+  ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(Mysql2Adapter)
+  ActiveRecord::Relation.prepend(Relation)
   ActiveRecord::Querying.delegate(:without_arsi, :to => :relation)
 
   @enabled = true
@@ -24,15 +25,12 @@ module Arsi
     attr_reader :enabled
     attr_accessor :violation_callback
 
-    def sql_check!(sql, relation)
-      return if !@enabled || relation.try(:without_arsi?)
-      return if sql =~ SQL_MATCHER
-      report_violation(sql, relation)
-    end
-
     def arel_check!(arel, relation)
       return unless @enabled
-      sql = arel.respond_to?(:ast) ? arel.where_sql : arel.to_s
+      return if relation && relation.without_arsi?
+
+      # ::Arel::TreeManager, String, nil or ... ?
+      sql = arel.respond_to?(:where_sql) ? arel_where_sql(arel, relation) : arel.to_s
       sql_check!(sql, relation)
     end
 
@@ -54,6 +52,18 @@ module Arsi
 
     private
 
+    def arel_where_sql(arel, relation)
+      return arel.where_sql if relation.nil?
+      return arel.where_sql unless relation.model.respond_to?(:arel_engine)
+
+      arel.where_sql(relation.model.arel_engine)
+    end
+
+    def sql_check!(sql, relation)
+      return if SQL_MATCHER.match?(sql)
+      report_violation(sql, relation)
+    end
+
     def run_with_arsi(with_arsi)
       previous, @enabled = @enabled, with_arsi
       yield

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: arsi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Kintner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +33,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +43,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -87,21 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  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: minitest-rg
+  name: maxitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -167,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Inspector