arsi 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a823949fda3f493e0f892d441820f2e3fbb02a6e
-  data.tar.gz: b95f8517a5ba5c3942b9d4fb6f50f67f7664c858
+SHA256:
+  metadata.gz: ea7a4a5e12e9e4a35319a230ebf3b4310db0e0d02582da4840d93c85d714cca6
+  data.tar.gz: 22f1bda30e928de04e48ceea8de894e67cbd1e1c14d44d7b72c98cfc5c25a87c
 SHA512:
-  metadata.gz: ecac706249fab2d17ab49748783b8a929f9dcab52b3cc5daa582be70514428cdc317795786aa928e5141d658f9e630cbcb0955173bed30a75efc7b4302ae242e
-  data.tar.gz: 2974f6f056397e5f5fb56fc8124e5182f82b9738973f9e0b23a5c8cfc790c1d2420a43d528ff01e104c42c007543bd5d828602658235e6f2639d8b7c265a2a6b
+  metadata.gz: de787c78a923844c619250378ede3267f4b72e89b207dce90a1b085938c3f2d9ebb441d6780dc00321a71130064f28546f89278c8e00fb3e54122783d9749ae2
+  data.tar.gz: ee136b4e0cc3cde3289679b3a487bd21982085e96c42e1964dc8bce66ff9367f3e2f4b4edebbf1b5534013c4e7e019af2934fc64157367d0c004aad68f5b6d01

data/README.md

@@ -1,6 +1,4 @@
-# ARSI - ActiveRecord SQL Inspector
-
-[![Build Status](https://travis-ci.org/zendesk/arsi.svg?branch=master)](https://travis-ci.org/zendesk/arsi)
+# ARSI - ActiveRecord SQL Inspector [![CI](https://github.com/zendesk/arsi/actions/workflows/actions.yml/badge.svg)](https://github.com/zendesk/arsi/actions/workflows/actions.yml)
 
 Block sql statements that are not scoped by id in `.update_all` and `.delete_all`.
 

data/lib/arsi/arel_tree_manager.rb

@@ -2,20 +2,29 @@ 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 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.
-    if ::Arel::VERSION.start_with?('6')
-      def where_sql
-        return if @ctx.wheres.empty?
-        viz = ::Arel::Visitors::WhereSql.new @engine.connection
-        ::Arel::Nodes::SqlLiteral.new viz.accept(@ctx, ::Arel::Collectors::SQLString.new).value
+    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
-    else
-      def where_sql
-        return if @ctx.wheres.empty?
-        viz = ::Arel::Visitors::WhereSql.new @engine.connection
-        ::Arel::Nodes::SqlLiteral.new viz.accept @ctx
+
+      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
     end
   end
 end

data/lib/arsi/relation.rb

@@ -1,6 +1,6 @@
 module Arsi
   module Relation
-    attr_accessor :without_arsi
+    attr_writer  :without_arsi
 
     def without_arsi
       if block_given?
@@ -14,7 +14,8 @@ module Arsi
     end
 
     def without_arsi?
-      @without_arsi || !arsi_scopeable?
+      return @without_arsi if defined?(@without_arsi) && @without_arsi
+      !arsi_scopeable?
     end
 
     def delete_all(*)

data/lib/arsi/version.rb

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

data/lib/arsi.rb

@@ -21,6 +21,7 @@ module Arsi
   end
 
   class << self
+    attr_reader :enabled
     attr_accessor :violation_callback
 
     def sql_check!(sql, relation)
@@ -30,6 +31,7 @@ module Arsi
     end
 
     def arel_check!(arel, relation)
+      return unless @enabled
       sql = arel.respond_to?(:ast) ? arel.where_sql : arel.to_s
       sql_check!(sql, relation)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arsi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Christopher Kintner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -42,22 +42,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +72,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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,21 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
-  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: byebug
+  name: single_cov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -187,7 +159,7 @@ homepage: https://github.com/zendesk/arsi
 licenses:
 - Apache License Version 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -202,9 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Inspector
 test_files: []