rails_admin_settings 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea98edd6e8bad6c86e500d5dffd7fb55588fcd4
-  data.tar.gz: a5b9d884b4d4b5f7deeac4f3e46dc135e521721e
+  metadata.gz: 71d5b091e4c98ce03f6c83d05f0d9d0bddb5943e
+  data.tar.gz: 8d68636b7c7b276e6a1590ad29fa0c01edde4bb0
 SHA512:
-  metadata.gz: 6e4348c966b49d6252543f12d00090bafcf302a98b8a456aa4776c6dc401aed384dcc93b9f5be4a47c67a01d18b0eeb22597142b6b7d54731ab2dffa44c3548c
-  data.tar.gz: 378f2c80f910a6a73f25a4e70aebee49a4a812a5f315dfd20cb68003c8cd03ed1960c4aff8c82006b8b4bc22ae2849d1cad83ad2e8ae404b394468a5a8f1a148
+  metadata.gz: 440fc5862b70524e11c265c44b5676b11728128165f3b1f8dba738d8bc1220843dc3af58c7fdcff0c5ff57f5da2736f6efdd1065cf6a7edef4d52815925ebe8f
+  data.tar.gz: 92e113cef2735cbaabd77b289ed8e7e6e2b757fee3405e34cba81cb969239f90b0eb55fc0999d596daa69b4596caf4a73a0ed69961ba992acd57c28c0dc47b1a

data/lib/rails_admin_settings/settings.rb

@@ -9,11 +9,18 @@ class Settings < BasicObject
   @@namespaces = {}
   @@mutex = ::Mutex.new
 
+  cattr_accessor :ns_default, :ns_fallback
+  @@ns_default = 'main'
+  @@ns_fallback = nil
+
+
+
   class << self
     def ns(name, options = {})
       options.symbolize_keys!
-      if name.nil?
-        name = 'main'
+      if name.nil? || name == 'main'
+        name = @@ns_default.to_s
+        options[:fallback] = @@ns_fallback.to_s
       else
         name = name.to_s
       end
@@ -27,10 +34,16 @@ class Settings < BasicObject
       end
     end
 
+    def get_default_ns
+      ns(@@ns_default, fallback: @@ns_fallback)
+    end
+
     def unload!
       @@mutex.synchronize do
         @@namespaces.values.map(&:unload!)
         @@namespaces = {}
+        @@ns_default = 'main'
+        @@ns_fallback = nil
       end
     end
 
@@ -74,7 +87,7 @@ class Settings < BasicObject
       options.symbolize_keys!
 
       if options[:ns].nil? || options[:ns].to_s == 'main'
-        ns('main').get(key, options)
+        get_default_ns.get(key, options)
       else
         ns(options[:ns]).get(key, options)
       end
@@ -84,7 +97,7 @@ class Settings < BasicObject
       options.symbolize_keys!
 
       if options[:ns].nil? || options[:ns].to_s == 'main'
-        ns('main').set(key, value, options)
+        get_default_ns.set(key, value, options)
       else
         ns(options[:ns]).set(key, value, options)
       end
@@ -99,7 +112,7 @@ class Settings < BasicObject
     end
 
     def method_missing(*args)
-      ns('main').__send__(*args)
+      get_default_ns.__send__(*args)
     end
   end
 end

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/defaults_spec.rb

@@ -43,6 +43,32 @@ describe 'Settings loading defaults' do
     Settings.ns(:etc, fallback: :other).footer.should eq 'zzz'
   end
 
+  it 'works with custom default namespace' do
+    Settings.ns_default = 'other'
+    Settings.ns_fallback = 'other'
+    Settings.ns(:main).phone.should eq '906 1111111'
+    Settings.ns(:other).footer.should eq 'zzz'
+    Settings.ns(:main).footer.should eq 'test <b></b>'
+    Settings.footer.should eq 'zzz'
+
+    Settings.ns(:etc, fallback: :main).phone.should eq '906 1111111'
+    Settings.ns(:etc, fallback: :main).footer.should eq 'test <b></b>'
+    Settings.ns(:other, fallback: :main).footer.should eq 'zzz'
+    Settings.ns(:etc, fallback: :other).footer.should eq 'zzz'
+
+    Settings.ns_default = :etc
+    Settings.ns_fallback = :main
+    Settings.phone.should eq '906 1111111'
+    Settings.footer.should eq 'test <b></b>'
+
+    Settings.ns_fallback = :other
+    Settings.footer.should eq 'zzz'
+
+    Settings.ns_default = :other
+    Settings.ns_fallback = :main
+    Settings.footer.should eq 'zzz'
+  end
+
   it "doesn't overwrite" do
     Settings.ns(:main).phone = '906 2222222'
     Settings.ns(:other).footer = 'xxx'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_settings
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Gleb Tv