settingson 1.7.3 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34ce3aa791e2071425e8e55d2d9e4e693de1cd51
-  data.tar.gz: 49cbb9368ac5709dbddb7b0113c55fae2d65225b
+  metadata.gz: 8d70db0e0baed5e010cb81899fe4dec58953c0c9
+  data.tar.gz: 6cf9942db0b8e386869b86d57151b381b4adc28b
 SHA512:
-  metadata.gz: e01a623f73b52b470ecd41e3a7f4332112c99d2cf9df2937601f462367387dc978a670c513d12f7b20f1b9985032d7934bbbaa54ee5c6cf01d63d468d1e08205
-  data.tar.gz: 904a023b25fc9e1ffbf85dd657eb865ca4bdf8660b94c656420ebadbb091b5491a1c575efd0b536a2ee94f70d3fa4086fc432739dc73b3340c1ae6fc23e4a67a
+  metadata.gz: edfa8ac6772add3bfd15628eebb62f3ba5474b8b4a5aa510188579b4fdc99074ec38b2df0324caafb70906f52d3312aa2eaa5b6ff1a5d3932b152d20efbabc01
+  data.tar.gz: 50eaf5dc9deecb6ab9b572e7e71fcbf473dc15c23eab0431f94646c3470b7138e7f2e57f9010cdb55a87b93fba57496ab0cf889adc950aa4f4354b40b4576c87

data/lib/settingson/config.rb

@@ -1,9 +1,11 @@
 class Settingson::Config
   attr_accessor :cache
   attr_accessor :debug
+  attr_accessor :trace
 
   def initialize
     @debug = false
+    @trace = 0
     @cache = OpenStruct.new(expires_in: 60.seconds,
                             race_condition_ttl: 10.seconds,
                             enabled: true,

data/lib/settingson/store.rb

@@ -1,5 +1,8 @@
 class Settingson::Store
 
+  # extend ActiveModel::Naming
+  # include ActiveModel::Conversion
+  #
   def initialize(klass:, path: nil)
     @__klass  = klass
     @__path   = path
@@ -29,36 +32,52 @@ class Settingson::Store
   alias to_ary to_a
 
   def method_missing(symbol, *args)
-    __debug("caller: #{caller(1).first}")
-    __debug("caller: #{caller(2).first}")
-    __debug("caller: #{caller(3).first}")
-    __rescue_action(symbol.to_s, args)
+    __debug
+    __debug("from\n\t#{caller[1..@__klass.configure.trace].join("\n\t")}") if
+      @__klass.configure.trace > 0
+
+    __references_action(symbol, *args) or __rescue_action(symbol.to_s, *args)
+    # __rescue_action(symbol.to_s, *args)
   end # method_missing
 
   protected
   # TODO: move all methods to support class
-  def __debug(message)
-    message = sprintf("%s#%-24s: %s",
+  def __debug(message="")
+    message = sprintf("%s#%20s: %s",
                       self.class.name,
                       caller_locations.first.label,
                       message)
     Rails.logger.debug(message) if @__klass.configure.debug
   end
 
-  def __rescue_action(key, value)
-    __debug("key: #{key}:#{key.class} value: #{value}:#{value.class} " +
+  def __references_action(symbol, *args)
+    # Proxy pass only one method
+    # return nil
+    # return nil unless ['model_name', 'to_model'].include?(symbol.to_s)
+    if @__klass and @__klass.respond_to?(symbol)
+      __debug("#{@__klass.to_s} know what to do with #{symbol}")
+      @__klass.send(symbol, *args)
+    end
+  end
+
+  def __rescue_action(key, *args)
+    __debug("key: #{key}:#{key.class} args: #{args}:#{args.class} " +
             "path: '#{@__path}'")
     case key
-    when '[]'     # object reference
-      __debug("reference '#{value.first}'")
-      __get( __reference(value.first) )
+    when '[]'     # object reference[, with :field]
+      __debug("reference '#{args}'")
+      __get( __with_reference(args[0], args[1]) )
     when '[]='    # object reference setter
-      __debug("reference setter '#{value.first}' '#{value.last}'")
-      __set( __reference(value.first), value.last )
+      __debug("reference setter '#{args}'")
+      if args.size == 3 # [@setting, :key]= form
+        __set( __with_reference(args[0], args[1]), args[2] )
+      else # [@settings]= form
+        __set( __with_reference(args.first), args.last )
+      end
     when /(.+)=/  # setter
-      __debug("set '#{$1}' value '#{value.first}'")
-      __set($1, value.first)
-    else          # returns values or self
+      __debug("set '#{$1}' args '#{args.first}'")
+      __set($1, args.first)
+    else          # returns result or self
       __debug("get '#{key}'")
       __get(key)
     end
@@ -90,16 +109,21 @@ class Settingson::Store
 
   # @profile = Profile.first # any ActiveRecord::Base object
   # Settings[@profile].some.host = 'value'
-  def __reference(key)
+  def __with_reference(key, field=nil)
     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'}"
+      @__reference = key
+      if field.nil?
+        class_name = __underscore(key.class)
+        ref_id = __reference_id(key)
+        "#{class_name}_#{ref_id || 'new'}"
+      else
+        key.send(field.to_sym)
+      end
     else
       raise ArgumentError.new(
         'String/Symbol/ActiveRecord::Base variable required'

data/lib/settingson/version.rb

@@ -1,3 +1,3 @@
 module Settingson
-  VERSION = "1.7.3"
+  VERSION = "1.7.5"
 end

data/spec/models/settings_spec.rb

@@ -152,6 +152,11 @@ describe Settings do
       Settings[:say] = 'hello'
       expect( Settings.say ).to eq('hello')
     end
+    it 'Settings[@setting, :key] form' do
+      setting = Settings.create!(key: 'test_key', value: 'test_value')
+      Settings[setting, :value] = 'hello'
+      expect( Settings.test_value ).to eq('hello')
+    end
     it 'Settings[:say].hello == Settings.say[:hello]' do
       Settings[:say].hello = 'hello'
       expect( Settings.say[:hello] ).to eq('hello')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.5
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails