activerecord-autoscope 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ebf49c0e9411d8e3276fc893fe9ed8719f6ab1acda91d63657008799be67dd7
-  data.tar.gz: 937fe74e98aa59b7e048dde8df4dedcf66c8f713f460ef9750c092b1bb997397
+  metadata.gz: 1a1b8d23ca764a24f3d6a8c9b050d494ec96c6adf7ffd21ce4f85e982a0ac4fc
+  data.tar.gz: a7ab35b21e0c3ac910dd9171afd9eb616bf9fcbc4807d62dfb2584c3df37f3f3
 SHA512:
-  metadata.gz: 805a2109457614814a9e7740a521b67fd8c6dd0515329fdfc850849611575763655e892013538496805eaa7e6efe851ca052949123edc987132649c52cb0fe02
-  data.tar.gz: 9bee74f15a103f81c766e7a87e8d90982ca317e7eb890c4ab502a909268aefbc2aa0f318192971bc1efab07ff1a31088a2af111a48d36e0809b33025fb78aebc
+  metadata.gz: b5521ec5915dad75454d9a429a6e2c6f89b03d595f6dd449533cdc4c7d81db44dbbc8558ec8c73b7c34cbd496da9377e00df85f6cdd37545180dd4c14db2fd50
+  data.tar.gz: 5b0e30d55dfff96c32399018e0c8de151d439e47d641cfb1dd9ec6ed74a0e60d9c179eb7f2b531b997c5025982177b3387771850db9b6ce552bd0fcc00352d5d

data/Gemfile.lock

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

data/README.md

@@ -58,7 +58,7 @@ Please check its [implementation](https://github.com/yhirano55/activerecord-auto
 
 ### Manually settings
 
-If you want to define these scope methods manually, you have to add this initializer file:
+This gem provides automatically each scopes with `method_missing` If you don't any configuration, you can use it. But if you want to define these scope methods manually, you have to add this initializer file:
 
 ```ruby
 # config/initializers/activerecord_autoscope.rb
@@ -75,4 +75,4 @@ end
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+[MIT License](https://opensource.org/licenses/MIT)

data/lib/activerecord/auto_scope.rb

@@ -3,6 +3,7 @@
 require 'active_record'
 
 require_relative 'auto_scope/config'
+require_relative 'auto_scope/hook_methods'
 require_relative 'auto_scope/scope_methods'
 require_relative 'auto_scope/version'
 
@@ -15,14 +16,6 @@ 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/hook_methods.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module AutoScope
+    module HookMethods # :nodoc:
+      def self.prepended(child)
+        child.extend ClassMethods
+      end
+
+      module ClassMethods # :nodoc:
+        private
+
+        def method_missing(method_name, *args, &block)
+          if enable_auto_define_scopes? && enable_auto_scopes!
+            public_send(method_name, *args, &block)
+          else
+            super
+          end
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          super
+        end
+
+        def enable_auto_define_scopes?
+          ::ActiveRecord::AutoScope.config.auto_define_scopes && !abstract_class?
+        end
+      end
+    end
+  end
+end

data/lib/activerecord/auto_scope/railtie.rb

@@ -3,20 +3,12 @@
 module ActiveRecord
   module AutoScope
     class Railtie < ::Rails::Railtie # :nodoc:
-      config.before_initialize do
+      config.after_initialize do
         ActiveSupport.on_load :active_record do
           ActiveRecord::Base.extend ::ActiveRecord::AutoScope::ScopeMethods
+          ActiveRecord::Base.prepend ::ActiveRecord::AutoScope::HookMethods
         end
       end
-
-      config.to_prepare do
-        ::ActiveRecord::AutoScope.tracer.enable if ::ActiveRecord::AutoScope.config.auto_define_scopes
-      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
 end

data/lib/activerecord/auto_scope/scope_methods.rb

@@ -6,10 +6,18 @@ module ActiveRecord
       def enable_auto_scopes!
         return if abstract_class?
 
+        already_defined_scope = false
+
         columns.each do |column|
           attr_name = column.name
           table_name = column.table_name
 
+          # NOTE: if it has already defined methods, return false
+          if respond_to?("#{attr_name}_eq") && respond_to?("#{attr_name}_not_eq")
+            already_defined_scope = true
+            break
+          end
+
           scope("#{attr_name}_eq", ->(value) { where(attr_name => value) })
           scope("#{attr_name}_not_eq", ->(value) { where.not(attr_name => value) })
           scope("#{attr_name}_is", ->(value) { where(attr_name => value) })
@@ -45,6 +53,8 @@ module ActiveRecord
             scope("not_#{attr_name}", -> { where(attr_name => false) })
           end
         end
+
+        !already_defined_scope
       end
     end
   end

data/lib/activerecord/auto_scope/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-autoscope
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yoshiyuki Hirano
@@ -88,6 +88,7 @@ files:
 - lib/activerecord-autoscope.rb
 - lib/activerecord/auto_scope.rb
 - lib/activerecord/auto_scope/config.rb
+- lib/activerecord/auto_scope/hook_methods.rb
 - lib/activerecord/auto_scope/railtie.rb
 - lib/activerecord/auto_scope/scope_methods.rb
 - lib/activerecord/auto_scope/version.rb