activerecord-autoscope 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b25256fc1f2418a53b6b4ff9339b75deb6aadac63f24c56da07b9085d8f6429
-  data.tar.gz: 3d1488d0136e6966f010623033dddfcf77c5cf75bedcd3a2f4aeb0af020b6600
+  metadata.gz: 6ebf49c0e9411d8e3276fc893fe9ed8719f6ab1acda91d63657008799be67dd7
+  data.tar.gz: 937fe74e98aa59b7e048dde8df4dedcf66c8f713f460ef9750c092b1bb997397
 SHA512:
-  metadata.gz: 31f82763f6b3617d9401151e1b459b065e7c0308a2103f7f5f287fb482f1a356185353483a5a8acdc77ebffa5f440a07a15978da80b79edb970fa403765e81ec
-  data.tar.gz: abd3799fcc61c8478bb882c9cb9a7952cf5b43de709a9ddb43375aea2955064397ac414e837313afdf235a150523b9a6e76da88064d37e1a136a3b04547031b3
+  metadata.gz: 805a2109457614814a9e7740a521b67fd8c6dd0515329fdfc850849611575763655e892013538496805eaa7e6efe851ca052949123edc987132649c52cb0fe02
+  data.tar.gz: 9bee74f15a103f81c766e7a87e8d90982ca317e7eb890c4ab502a909268aefbc2aa0f318192971bc1efab07ff1a31088a2af111a48d36e0809b33025fb78aebc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activerecord-autoscope (0.2.0)
+    activerecord-autoscope (0.2.1)
       activerecord (>= 5.2)
 
 GEM

data/lib/activerecord/auto_scope.rb

@@ -15,6 +15,14 @@ end
 
 module ActiveRecord
   module AutoScope # :nodoc:
+    def self.tracer
+      @tracer ||= TracePoint.trace(:end) do |event|
+        next unless event.self.respond_to?(:enable_auto_scopes!)
+
+        event.self.enable_auto_scopes!
+      end
+    end
+
     def self.configure
       yield config
     end

data/lib/activerecord/auto_scope/railtie.rb

@@ -3,18 +3,19 @@
 module ActiveRecord
   module AutoScope
     class Railtie < ::Rails::Railtie # :nodoc:
-      config.after_initialize do
+      config.before_initialize do
         ActiveSupport.on_load :active_record do
           ActiveRecord::Base.extend ::ActiveRecord::AutoScope::ScopeMethods
         end
+      end
 
-        if ::ActiveRecord::AutoScope.config.auto_define_scopes
-          TracePoint.trace(:end) do |event|
-            next if !event.self.ancestors.include?(ActiveRecord::Base) || event.self.abstract_class?
+      config.to_prepare do
+        ::ActiveRecord::AutoScope.tracer.enable if ::ActiveRecord::AutoScope.config.auto_define_scopes
+      end
 
-            event.self.enable_auto_scopes!
-          end
-        end
+      # TODO: Disable trace point on development and test
+      config.after_initialize do
+        ::ActiveRecord::AutoScope.tracer.disable if ::ActiveRecord::AutoScope.config.auto_define_scopes && ::Rails.application.config.eager_load
       end
     end
   end

data/lib/activerecord/auto_scope/scope_methods.rb

@@ -4,6 +4,8 @@ module ActiveRecord
   module AutoScope
     module ScopeMethods # :nodoc:
       def enable_auto_scopes!
+        return if abstract_class?
+
         columns.each do |column|
           attr_name = column.name
           table_name = column.table_name

data/lib/activerecord/auto_scope/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module AutoScope
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-autoscope
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord