settingson 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99560087ec3a6364f4fc18fdd833c43f8038b548
-  data.tar.gz: db460d9c07b8bdcaa7d3c9e124b5c30dc0d29ff8
+  metadata.gz: 35ba5f07c92b264c30cc01ae57b5d27dccd3976e
+  data.tar.gz: 5a260c492f899e609313ffff799a3bf772747124
 SHA512:
-  metadata.gz: 377401a9ccb1dd80569739525309c6ae224977389bf99790b5803bd7632c2e0cc221162d42d6f5d04dcde9184dba7a3424c315b15c2fc566015fc4e70f86f5d6
-  data.tar.gz: 2d77b76c3f4080ce229e043d8f58e11fb961224d4abd8846b18cecbc5b79eff9fb822eb13c0343e2d28044b3b304b663e754fe3daf970688870805f22d676a0f
+  metadata.gz: 31ee2d331f97bf54a69da8892e32ca847e035443556754238f82df806593213c30e8dcd0f21a5028bbd9ea89401854c43882f759cd0eab9ae903208082b2b769
+  data.tar.gz: 292dc86a675178fd6aeba5365851e41bc3f8fc7b49fc09b4530e2578357ceb584ebd5012f7cce7e3b364e7e2e47f14585bb5524d7d639867da9216e85efcbb21

data/README.md

@@ -66,15 +66,21 @@ Settings.from_hash({hello: :world})
 Settings.hello                            # => :world
 Settings.hello?                           # => true
 
-Settings.not_found                        # => ""
-Settings.not_found?                       # => false
+Settings[:greeting].welcome.message = 'Hello'
+Settings[:greeting].welcome.message       # => 'Hello'
+Settings.greeting[:welcome].message       # => 'Hello'
+Settings.greeting.welcome[:message]       # => 'Hello'
+Settings.greeting.welcome['message']      # => 'Hello'
+
+Settings.not_found.to_s                   # => ""
+Settings.not_found.to_i                   # => 0
 Settings.not_found.nil?                   # => true
 Settings.not_found.empty?                 # => true
 Settings.not_found.blank?                 # => true
 Settings.not_found.present?               # => false
 
 # but
-Settings.not_found.class    # => Settings(id: integer, key: string, value: text, created_at: datetime, updated_at: datetime)
+Settings.not_found.class    # => Settingson::Store
 
 Settings.all                # =>
 # [#<Settings id: 1, key: "server.host", value: "127.0.0.1", created_at: "2015-12-08 15:17:56", updated_at: "2015-12-08 15:17:56">,
@@ -109,18 +115,15 @@ end
 ```
 
 ## The initial values
-New way:
 in config/initializers/settingson.rb
 ```ruby
 Settings.defaults do |conf|
   conf.server.smtp.host = 'host'
   conf.server.smtp.port = 25
 end
-```
 
-```ruby
-conf.server.smtp.host # => 'host'
-conf.server.smtp.port # => 25
+Settings.server.smtp.host # => 'host'
+Settings.server.smtp.port # => 25
 ```
 
 ## Contributing

data/app/models/concerns/settingson/base.rb

@@ -53,7 +53,7 @@ module Settingson::Base
     def method_missing(symbol, *args)
       super
     rescue NameError, NoMethodError
-      Settingson::Store.new(klass: self).send(symbol, args.first)
+      Settingson::Store.new(klass: self).send(symbol, *args)
     end
 
   end # module ClassMethods

data/lib/settingson/store.rb

@@ -6,25 +6,30 @@ class Settingson::Store
   end
 
   def to_s
-    self.new_record? ? '' : super
+    ''
   end
 
   def to_i
-    self.new_record? ? 0 : super
+    0
   end
 
   def nil?
-    self.new_record? ? true : super
+    true
+  end
+
+  def to_a
+    []
   end
 
   alias empty? nil?
+  alias to_ary to_a
 
   def method_missing(symbol, *args)
-    __rescue_action(symbol.to_s, args.first)
+    __rescue_action(symbol.to_s, args)
   end # method_missing
 
   protected
-
+  # TODO: move all methods to support class
   def __debug(message)
     message = sprintf("%s#%-32s: %s",
                       self.class.name,
@@ -34,12 +39,20 @@ class Settingson::Store
   end
 
   def __rescue_action(key, value)
+    __debug("key: #{key}:#{key.class} value: #{value}:#{value.class} " +
+            "path: '#{@__path}'")
     case key
+    when '[]'     # object reference
+      __debug("reference '#{value.first}'")
+      __get( __reference(value.first) )
+    when '[]='    # object reference setter
+      __debug("reference setter '#{value.first}' '#{value.last}'")
+      __set( __reference(value.first), value.last )
     when /(.+)=/  # setter
-      __debug("set '#{$1}' value '#{value}' path '#{@__path}'")
-      __set($1, value)
-    else # returns values or self
-      __debug("get '#{key}' value '#{value}' path '#{@__path}'")
+      __debug("set '#{$1}' value '#{value.first}'")
+      __set($1, value.first)
+    else          # returns values or self
+      __debug("get '#{key}'")
       __get(key)
     end
   end
@@ -68,6 +81,39 @@ class Settingson::Store
     end
   end
 
+  # @profile = Profile.first # any ActiveRecord::Base object
+  # Settings[@profile].some.host = 'value'
+  def __reference(key)
+    case key
+    when String
+      key
+    when Symbol
+      key.to_s
+    when ActiveRecord::Base
+      class_name = __underscore(key.class)
+      ref_id = __reference_id(key)
+      "#{class_name}_#{ref_id || 'new'}"
+    else
+      raise ArgumentError.new(
+        'String/Symbol/ActiveRecord::Base variable required'
+      )
+    end
+  end
+
+  def __underscore(camel_cased_word)
+    word = camel_cased_word.to_s.dup
+    word.gsub!(/::/, '_')
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!('-', '_')
+    word.downcase!
+    word
+  end
+
+  def __reference_id(key)
+    key.try(:to_key).try(:join, '_') || key.id
+  end
+
   def __update_search_path(key)
     @__path = [@__path, key].compact.join('.')
   end

data/lib/settingson/version.rb

@@ -1,3 +1,3 @@
 module Settingson
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 end

data/spec/models/settings_spec.rb

@@ -42,8 +42,14 @@ describe Settings do
       Settings.number = 100
       expect( Settings.number ).to eq(100)
     end
-    it 'returns 0 when key not found' do
+    it 'pass simple checks' do
+      expect( Settings.not_found.to_s ).to eq("")
       expect( Settings.not_found.to_i ).to eq(0)
+      expect( Settings.not_found.to_a ).to eq([])
+      expect( Settings.not_found.nil? ).to eq(true)
+      expect( Settings.not_found.empty? ).to eq(true)
+      expect( Settings.not_found.blank? ).to eq(true)
+      expect( Settings.not_found.present? ).to eq(false)
     end
     it 'returns same String' do
       word = Faker::Lorem.word
@@ -125,4 +131,41 @@ describe Settings do
     end
   end
 
+  describe '::[]' do
+    it 'raises error with unknown class' do
+      expect{ Settings[Time.new] }.to raise_error(ArgumentError)
+    end
+    it 'returns Settingson::Store instance' do
+      expect( Settings['hello'] ).to be_a(Settingson::Store)
+    end
+    it 'returns instance with search path "hello" for simple' do
+      settings = Settings['hello']
+      expect( settings.instance_variable_get(:@__path) ).to eq('hello')
+    end
+    it 'returns instance with search path "hello.message" for complex #1' do
+      settings = Settings[:hello].message
+      expect( settings.instance_variable_get(:@__path) ).to eq('hello.message')
+    end
+
+    it 'Settings[:say] form' do
+      Settings[:say] = 'hello'
+      expect( Settings.say ).to eq('hello')
+    end
+    it 'Settings[:say].hello == Settings.say[:hello]' do
+      Settings[:say].hello = 'hello'
+      expect( Settings.say[:hello] ).to eq('hello')
+    end
+    it 'works with complex check' do
+      Settings[:greeting].welcome.message = 'Hello'
+      expect( Settings[:greeting].welcome.message  ).to eq('Hello')
+      expect( Settings.greeting[:welcome].message  ).to eq('Hello')
+      expect( Settings.greeting.welcome[:message]  ).to eq('Hello')
+      expect( Settings.greeting.welcome['message'] ).to eq('Hello')
+    end
+    it 'returns instance with search path "settings_1"' do
+      s = Settings.create(key: 'hello', value: 'world')
+      expect( Settings[s].instance_variable_get(:@__path) ).to eq("settings_1")
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,6 +179,7 @@ files:
 - lib/settingson/config.rb
 - lib/settingson/engine.rb
 - lib/settingson/store.rb
+- lib/settingson/utils.rb
 - lib/settingson/version.rb
 - settingson.gemspec
 - spec/dummy/README.rdoc