rails_admin_settings 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79581ee6690bb33c78f3a779cf07970c19e4ca63
-  data.tar.gz: 3d3e9f23b0d566dc74d350354c36d2baae35f0e6
+  metadata.gz: 2706c7ab6b92fd874b54a1ca1c905d7c045170d6
+  data.tar.gz: 16f77c93bb7ee6ff47b510f9e0eccb4d72d8502b
 SHA512:
-  metadata.gz: 4fc1572a97b6a298af4a5a87c6eb43190b2e4b19f1d81b3d725543472773a1803ec4f25e182fa1258e34f3326567540c89434042cf4e67aa2cbf1376c4aba8db
-  data.tar.gz: 5fd5e9e887be12cf47c124161994891f8cb2e0d23dfcb26014d708192677c0c71b843d8b9d1586ad5af982b2d7a91cd1b0e38257cf5f3d5e21cdbb9f103e6990
+  metadata.gz: dbc51040c4ab7243f58cf79078c3fd098e1cf5931f7c1b829dc4c64fce0a6553245e12987e11d8b94ed308a2d281ac2591b2a4d12d33025494fa71ad1d52a907
+  data.tar.gz: 18abefda74697ac17b27995f065f7f8266af434316c69e49fc85632a99b1eddf2d91c24362e563a72203a1ddbcc5ae36fca10e59b06d56f72a1d00e1e609e256

data/lib/rails_admin_settings/fallback.rb

@@ -12,8 +12,10 @@ module RailsAdminSettings
     end
 
     def method_missing(*args)
-      @ns.fallback = @fb
-      @ns.__send__(*args)
+      @ns.ns_mutex.synchronize do
+        @ns.fallback = @fb
+        @ns.__send__(*args)
+      end
     end
   end
 end

data/lib/rails_admin_settings/namespaced.rb

@@ -3,11 +3,12 @@ module RailsAdminSettings
   # Kernel or Object
   class Namespaced < BasicObject
     attr_accessor :settings, :fallback
-    attr_reader :loaded, :mutex
+    attr_reader :loaded, :mutex, :ns_mutex, :name
 
     def initialize(name)
       self.settings = {}
       @mutex = ::Mutex.new
+      @ns_mutex = ::Mutex.new
       @loaded = false
       @locked = false
       @name = name
@@ -49,7 +50,7 @@ module RailsAdminSettings
         @locked = true
         v = @settings[key]
         if v.nil?
-          unless @fallback.nil?
+          unless @fallback.nil? || @fallback == @name
             v = ::Settings.ns(@fallback).getnc(key)
           end
           if v.nil?

data/lib/rails_admin_settings/settings.rb

@@ -13,29 +13,24 @@ class Settings < BasicObject
   @@ns_default = 'main'
   @@ns_fallback = nil
 
-
+  cattr_reader :mutex
 
   class << self
     def ns(name, options = {})
       options.symbolize_keys!
-      if name.nil? || name == 'main'
+      if name.nil? || name == Settings.ns_default
         name = @@ns_default.to_s
-        options[:fallback] = @@ns_fallback.to_s
       else
         name = name.to_s
       end
       @@mutex.synchronize do
         @@namespaces[name] ||= ::RailsAdminSettings::Namespaced.new(name.to_s)
       end
-      if options[:fallback].nil?
-        @@namespaces[name]
-      else
-        ::RailsAdminSettings::Fallback.new(@@namespaces[name], options[:fallback])
-      end
+      ::RailsAdminSettings::Fallback.new(@@namespaces[name], options[:fallback])
     end
 
     def get_default_ns
-      ns(@@ns_default, fallback: @@ns_fallback)
+      ns(nil, fallback: @@ns_fallback)
     end
 
     def unload!
@@ -85,22 +80,12 @@ class Settings < BasicObject
 
     def get(key, options = {})
       options.symbolize_keys!
-
-      if options[:ns].nil? || options[:ns].to_s == 'main'
-        get_default_ns.get(key, options)
-      else
-        ns(options[:ns]).get(key, options)
-      end
+      ns(options[:ns], options).get(key, options)
     end
 
     def set(key, value = nil, options = {})
       options.symbolize_keys!
-
-      if options[:ns].nil? || options[:ns].to_s == 'main'
-        get_default_ns.set(key, value, options)
-      else
-        ns(options[:ns]).set(key, value, options)
-      end
+      ns(options[:ns], options).set(key, value, options)
     end
 
     def save_default(key, value, options = {})

data/lib/rails_admin_settings/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSettings
-  VERSION = "0.6.8"
+  VERSION = "0.7.0"
 end

data/spec/namespaced_spec.rb

@@ -38,4 +38,13 @@ describe 'Namespaced settings' do
     ns.get(:phone).val.city.should eq '906'
     ns.get(:phone).val.formatted_subscriber.should eq '111-11-11'
   end
+
+  it 'works with custom defaults' do
+    Settings.ns_default = 'hitfood'
+    Settings.ns_fallback = 'main'
+    Settings.test.should eq ''
+    Settings.test = 'zzz'
+    Settings.get(:test, ns: 'hitfood').raw.should eq 'zzz'
+    Settings.get(:test, ns: 'main').raw.should eq ''
+  end
 end

metadata

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