arsi 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe5a87bd8303daf7685c2d9e753b30ecdd8efa25f721b68cc5fea2ce1f9e96b
-  data.tar.gz: e631bb40979d5791707bda82e29db2bf7b225c3f1424addd69131ae9b0d23753
+  metadata.gz: be2cdd6b03875128c09328616b9bb0d3962dfd6767de0e90a4f16402d1ed9aef
+  data.tar.gz: ed84dc1f0bcc95a6b9ea930f848f1a021394466cf8fd3097b67034d2d2f04036
 SHA512:
-  metadata.gz: 75ab18df3d1ee8bc3e04dd51a69fa29e42a7904b8d6bb892341046ca98bc9f86217438ed80fb6d2e7721993a0e132ee601fa3b684e8a35babcb8ebaa9b616c27
-  data.tar.gz: 79660da433f0d3110f05026156634132e6fa295a9f6e8155feec43e7ca8186811d3f2b023ce3ee7dccf024a7a20c083289f3e9b28b6d506453bb7ea1021c73fe
+  metadata.gz: 75b399c5485fe278d99e568791ef9ff2ca7df143545fe76ecb03faa3c69d333e00c3a9dabb4dfb613084ee471053627d1dba93f3221d686ab58cbd7ace723a6c
+  data.tar.gz: a0c098390ada8a553c994556aa867adfe895329b8361441b25f5f1d89562e83a161d1cb4744d1ad48e545b4374e84d0ffc92d9b8813e24533be581db74ee639c

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)

data/lib/arsi/arel_tree_manager.rb

@@ -2,25 +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[0].to_i >= 6
-      def where_sql(engine = Arel::Table.engine)
-        return if @ctx.wheres.empty?
+    def where_sql(provided_engine = :none)
+      return if @ctx.wheres.empty?
 
-        viz = if ::Arel::VERSION[0].to_i > 6
-          ::Arel::Visitors::WhereSql.new(engine.connection.visitor, engine.connection)
+      selected_engine = provided_engine
+      if selected_engine == :none
+        selected_engine = if AREL_WHERE_SQL_ENGINE_ACCESSOR
+          self.engine || ::Arel::Table.engine
         else
-          ::Arel::Visitors::WhereSql.new engine.connection
+          Arel::Table.engine
         end
-        ::Arel::Nodes::SqlLiteral.new viz.accept(@ctx, ::Arel::Collectors::SQLString.new).value
       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.4.0'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arsi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Christopher Kintner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  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'
 description: Puts your SQL under a microscope
 email:
 - ckintner@zendesk.com
@@ -202,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Inspector