eitil 1.1.37 → 1.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1ab2c62c13503c0afc55aea6663a381a4d7ad81a363e9131a2d185ead576997
-  data.tar.gz: 44faf8bb9335b81c978ba1a8c6a6cd105d4980a2c982874ce69fa203acce4ac5
+  metadata.gz: 6a10cacbe01eb49c8964a1dc6e2061e4b0aa80b0345d6560bf4353384146c61a
+  data.tar.gz: 1ca77ced97a199df79116b3023e3501b7072b5a680aca33fb142e303bba4136e
 SHA512:
-  metadata.gz: fc48bffc1b39584a556e0a742095b56fbd29e22559280c873b7654572ae48c59eb5382bb3d2eddcee184b5f65c9033271c98383cfe04625a633550e8db964a27
-  data.tar.gz: a2f8cd2ca05de73290728093d068e91dda6113e77de2f358e916b1c3425fdf2d1184ccccf55ab2aa6737f8c2751fb644cf850b8919c57d7ce3c07fde35940e87
+  metadata.gz: 4c579863550638fe0f4792406fb99b1ca21d577ae0c8e2e3794b9a9999862e547190ce10730f06415339b9f18b5965660afcf906833619a29b2c2c903183e0c5
+  data.tar.gz: c21f9c314e5861d0b9d64147280ac184c353f7c9516a460f73b27d609d6839b681e8f5a7e5dd9b327c1b0acf636bdc154066e086d395726efbe975c8e17914ae

data/eitil_wrapper/lib/eitil_wrapper/callbacks/helper_methods.rb

@@ -14,6 +14,8 @@ module EitilWrapper
 
       def inherited(subclass)
         super
+
+        return if Eitil.skip_callback_helper_methods_for_models.include?(subclass.to_s.to_sym)
         subclass.use_eitil_callback_helper_methods
 
         rescue => e

data/eitil_wrapper/lib/eitil_wrapper/scopes/default_scopes.rb

@@ -36,6 +36,8 @@ module EitilWrapper
 
       def inherited(subclass)
         super
+
+        return if Eitil.skip_default_scopes_for_models.include?(subclass.to_s.to_sym)
         subclass.use_eitil_scopes
 
         rescue => e

data/lib/eitil/railtie.rb

@@ -1,4 +1,6 @@
 
+
+
 # Constants
 
 module Eitil
@@ -9,8 +11,53 @@ module Eitil
 
 end
 
+
+
 # Configuration
 
+module Eitil 
+  class Railtie < ::Rails::Railtie   
+    
+    # The following configuration has its own special place in the boot sequence:
+    # on the one hand, it should run before the initialization of Eitil (gem), but
+    # read config assigned by the main app – which is only loaded AFTER all gems have
+    # been initialized.
+
+    # Therefore, we only require the specified file from the main app, after defining
+    # the possible configurations for the Eitil railtie. This way we escape the boot
+    # sequence's dedault order.
+
+    config.before_initialize do |eitil|
+
+      Eitil.mattr_accessor :controller_ivars, 
+                           :skip_default_scopes_for_models,
+                           :skip_callback_helper_methods_for_models
+
+      Eitil.controller_ivars ||= []
+      Eitil.skip_default_scopes_for_models ||= []
+      Eitil.skip_callback_helper_methods_for_models ||= []
+
+      def Eitil.set_config(&block)
+        yield Eitil
+      end
+
+      config_path = Rails.root + 'config/initializers/eitil.rb'
+    
+      if File.exists? config_path
+        puts "Loading Eitil config from #{config_path}..."
+        load config_path
+      else
+        puts "Eitil config not found at #{config_path}, resorting to defaults..."
+      end
+
+    end
+  end
+end
+
+
+
+# Loading
+
 module Eitil
   
   class Railtie < ::Rails::Railtie   
@@ -27,12 +74,4 @@ module Eitil
 
   end
 
-  mattr_accessor :controller_ivars
-
-  self.controller_ivars ||= []
-
-  def self.set_config(&block)
-    yield self
-  end
-
 end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.37'
+  VERSION = '1.1.38'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.37
+  version: 1.1.38
 platform: ruby
 authors:
 - Jurriaan Schrofer