rails-settings-cached 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ee4761ccc2fa3dcd3b594e8de0878dfff7737c
-  data.tar.gz: 453fbd403e16fd91823f64853c209e9742c20ef2
+  metadata.gz: 814ca9dffbaac78275816924d159c1eda85a5031
+  data.tar.gz: 8dc29d44e8b5aa3c5f10a3fc4fe46943f25d04d5
 SHA512:
-  metadata.gz: 498d13784837ecb3ad5b9ee48ff73a9ca19acb0086a950179c34e8c130056aa02af31ef3acab41a0e67eb715d41462b64cdec206bdeb35222b7562f3354c4de2
-  data.tar.gz: 4a054dedbd4d73dcdb571e658e9ecc82dcb0a0e1d56f0e948040d8b57c0416879183cac1937fa2b99e5c00a2a284099fba1dfb93276007094b552fe08e9c17ac
+  metadata.gz: 4ec4e326eecb245cb60b88402e0c6e6f9bf33c5499e5cfe1ca5bbab0a5a8136c572e38e4e870f9fdc02ff6f01cfa1a66a7ba71b2c7a4bf7b4bd1854a195584c6
+  data.tar.gz: 28209a07180e319b2f64d555e676c52be74b12c25f01d71be8a6a4b4803ce02d468fee4f3ab9e19097ebe04a2b78a88bae675935529c0223643890e82002a0f6

data/lib/rails-settings-cached.rb

@@ -4,13 +4,8 @@ require_relative 'rails-settings/cached_settings'
 require_relative 'rails-settings/scoped_settings'
 require_relative 'rails-settings/default'
 require_relative 'rails-settings/extend'
+require_relative 'rails-settings/railtie'
 require_relative 'rails-settings/version'
 
 module RailsSettings
-  class Railtie < Rails::Railtie
-    initializer "rails_settings.active_record.initialization" do
-      RailsSettings::Base.after_commit :rewrite_cache, on: %i(create update)
-      RailsSettings::Base.after_commit :expire_cache, on: %i(destroy)
-    end
-  end
 end

data/lib/rails-settings/base.rb

@@ -30,6 +30,7 @@ module RailsSettings
       end
 
       def [](key)
+        return super(key) unless rails_initialized?
         val = Rails.cache.fetch(cache_key(key, @object)) do
           super(key)
         end

data/lib/rails-settings/railtie.rb

@@ -0,0 +1,8 @@
+module RailsSettings
+  class Railtie < Rails::Railtie
+    initializer "rails_settings.active_record.initialization" do
+      RailsSettings::Base.after_commit :rewrite_cache, on: %i(create update)
+      RailsSettings::Base.after_commit :expire_cache, on: %i(destroy)
+    end
+  end
+end

data/lib/rails-settings/settings.rb

@@ -104,7 +104,9 @@ module RailsSettings
       end
 
       def object(var_name)
-        table_exists? && thing_scoped.where(var: var_name.to_s).first
+        return nil unless rails_initialized?
+        return nil unless table_exists?
+        thing_scoped.where(var: var_name.to_s).first
       end
 
       def thing_scoped
@@ -114,6 +116,10 @@ module RailsSettings
       def source(filename)
         Default.source(filename)
       end
+
+      def rails_initialized?
+        Rails.application && Rails.application.initialized?
+      end
     end
   end
 end

data/lib/rails-settings/version.rb

@@ -1,7 +1,7 @@
 module RailsSettings
   class << self
     def version
-      "0.6.1"
+      "0.6.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-settings-cached
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jason Lee
@@ -48,6 +48,7 @@ files:
 - lib/rails-settings/cached_settings.rb
 - lib/rails-settings/default.rb
 - lib/rails-settings/extend.rb
+- lib/rails-settings/railtie.rb
 - lib/rails-settings/scoped_settings.rb
 - lib/rails-settings/settings.rb
 - lib/rails-settings/version.rb