settingson 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e0abff7e29154b68e0008ebc83fb512c6418042
-  data.tar.gz: 3e3318ab67f0b95e0fc8a8dfce9f27f41753e286
+  metadata.gz: b98735a13bd6244ec4b786e599451dac575e78c1
+  data.tar.gz: b6adcb94c38670e3c4a92aa79d4890af389f6bd8
 SHA512:
-  metadata.gz: bdc095b96d9ef702464c42ec7f65fba3a8f5a86f9d45870eb4bf1d621f7b8ff4824b4ff83828fd3c6613c4a4d15c83f4a31de23b7ee6935112b7d22a44a1c22b
-  data.tar.gz: 3ce8f5406467feee5fc043ce643d6f47050c848e9af166075eb6559527971183aa69924dcb1f79bbea307960a6cdba806f1d551cf25e0656734afa63a99c8dc2
+  metadata.gz: f00b4aa3f2f5cbafb4aed5544a1c35e53cf13652c3e91bf97bcfe90a762e3ce9c499aaf55c21c7be38394562c1d7777dfd23b586a9009fb75487b3e8e36d8ba9
+  data.tar.gz: 880af88d221a90cfe86e8cb3a1118065d981e3ee84f16a0da9097425eaa85389b957ec5da34dd869f0dfb619daf890cebcbbb5f2d56ba5b63c3b0c8ea6810d58

data/.travis.yml

@@ -7,10 +7,12 @@ script: "bundle exec rspec && bundle exec codeclimate-test-reporter"
 
 rvm:
   - 2.2.2
+  - 2.4.1
 
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
 
 env:
   - CODECLIMATE_REPO_TOKEN=620b22e287791de2c9f8a522182ddf57098302ff8958768f8192eaaa7d8a685d

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise "5.0" do
   gem "rails", "~> 5.0.0"
 end
+
+appraise "5.1" do
+  gem "rails", "~> 5.1.0"
+end

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

@@ -19,15 +19,20 @@ module Settingson::Base
       @_settings
     end
 
-    # Settings.defaults do |settings|
-    #   settings.server.host = 'host'
-    #   settings.server.port = 80
+    # Settings.defaults do |default|
+    #   default.server.host = 'host'
+    #   default.server.port = 80
     # end
     def defaults
-      return unless block_given?
-      Rails.application.config.after_initialize do
-        yield Settingson::Defaults.new( klass: self )
+      @__defaults = Settingson::Default.new( klass: self )
+
+      if block_given?
+        Rails.application.config.after_initialize do
+          yield @__defaults
+        end
       end
+
+      @__defaults
     end
 
     # Settings.from_hash('smtp.host' => 'host')

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    settingson (1.7.6)
+    settingson (1.7.8)
       rails (>= 4.0)
 
 GEM
@@ -162,4 +162,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    settingson (1.7.6)
+    settingson (1.7.8)
       rails (>= 4.0)
 
 GEM
@@ -169,4 +169,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.15.4

data/gemfiles/5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/gemfiles/5.1.gemfile.lock

@@ -0,0 +1,175 @@
+PATH
+  remote: ..
+  specs:
+    settingson (1.7.8)
+      rails (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.7.0)
+    faker (1.8.4)
+      i18n (~> 0.5)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-dummy (0.0.4)
+      rails
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    spring (2.0.2)
+      activesupport (>= 4.2)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (>= 1.6)
+  codeclimate-test-reporter
+  database_cleaner
+  faker
+  rails (~> 5.1.0)
+  rails-dummy
+  rspec (~> 3.5)
+  rspec-rails (~> 3.5)
+  settingson!
+  spring-commands-rspec
+  sqlite3
+
+BUNDLED WITH
+   1.15.4

data/lib/settingson.rb

@@ -5,6 +5,6 @@ module Settingson
   if defined?(Rails)
     require 'settingson/engine'
     require 'settingson/store'
-    require 'settingson/defaults'
+    require 'settingson/default'
   end
 end

data/lib/settingson/default.rb

@@ -0,0 +1,11 @@
+class Settingson::Default
+  require 'settingson/default/store'
+
+  def initialize(klass:)
+    @__klass  = klass
+  end # initialize
+
+  def method_missing(symbol, *args)
+    Settingson::Default::Store.new( klass: @__klass ).send(symbol, *args)
+  end # method_missing
+end

data/lib/settingson/default/store.rb

@@ -0,0 +1,127 @@
+class Settingson::Default::Store
+
+  @@__defaults = {}
+
+  def initialize(klass:, path: nil)
+    @__klass    = klass
+    @__path     = path
+  end
+
+  def to_h
+    @@_defaults
+  end
+
+  def to_ary
+    @@__defaults.to_a
+  end
+
+  def method_missing(symbol, *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
+
+  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[, with :field]
+      __debug("reference '#{args}'")
+      __get( __with_reference(args[0], args[1]) )
+    when '[]='    # object reference setter
+      __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}' args '#{args.first}'")
+      __set($1, args.first)
+    else          # returns result or self
+      __debug("get '#{key}'")
+      __get(key)
+    end
+  end
+
+  protected
+  # TODO: move all methods to support class
+  def __debug(message="")
+    return unless @__klass.configure.debug
+    message = sprintf("%s#%20s: %s",
+                      self.class.name,
+                      caller_locations.first.label,
+                      message)
+    Rails.logger.debug(message)
+  end
+
+  def __set(key, value)
+    @@__defaults[_search_path(key)] = value
+    @__path = ''
+    value
+  end
+
+  def __get(key)
+    __update_search_path(key)
+    @@__defaults[@__path] || self
+  end
+
+  # @profile = Profile.first # any ActiveRecord::Base object
+  # Settings[@profile].some.host = 'value'
+  def __with_reference(key, field=nil)
+    case key
+    when String
+      key
+    when Symbol
+      key.to_s
+    when ActiveRecord::Base
+      @__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'
+      )
+    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 _search_path(key)
+    [@__path, key].compact.join('.')
+  end
+
+  def __update_search_path(key)
+    @__path = _search_path(key)
+  end
+end

data/lib/settingson/store.rb

@@ -101,7 +101,8 @@ class Settingson::Store
     __update_search_path(key)
     result = __cached_or_default_value(@__path)
 
-    if result.is_a?(ActiveRecord::RecordNotFound)
+    if result.is_a?(ActiveRecord::RecordNotFound) or
+       result.is_a?(Settingson::Default::Store)
       __debug("return self with path: #{@__path}")
       self
     else
@@ -155,8 +156,9 @@ class Settingson::Store
   def __cached_or_default_value(key)
     result = __cached_value(key)
 
-    if ! @__defaults and result.is_a?(ActiveRecord::RecordNotFound)
-      __cached_value('__defaults.' + key)
+    if result.is_a?(ActiveRecord::RecordNotFound)
+      __debug("looking in #{@__klass.name}.defaults[#{key}]")
+      @__klass.defaults[key]
     else
       result
     end

data/lib/settingson/version.rb

@@ -1,3 +1,3 @@
 module Settingson
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

data/spec/dummy/config/environments/development.rb

@@ -34,4 +34,6 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.cache_store = :memory_store, { size: 8.megabytes }
 end

data/spec/models/settingson/defaults_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Settingson::Default do
+
+  it 'not raises errors with empty block' do
+    expect{ Settings.defaults {} }.to_not raise_error
+  end
+
+  it 'returns value for given key' do
+    word = Faker::Lorem.word
+    h = Settings.defaults{|s| s.cached_key = word}
+    expect( h['cached_key'] ).to eq(word)
+  end
+
+  it 'returns value for given key #2' do
+    word = Faker::Lorem.word
+    h = Settings.defaults do |s|
+      s.cached_key1 = word
+      s.cached.key2 = word
+    end
+    expect( h['cached.key2'] ).to eq(word)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,11 +173,14 @@ files:
 - gemfiles/4.2.gemfile.lock
 - gemfiles/5.0.gemfile
 - gemfiles/5.0.gemfile.lock
+- gemfiles/5.1.gemfile
+- gemfiles/5.1.gemfile.lock
 - lib/generators/settingson/settingson_generator.rb
 - lib/generators/settingson/templates/migrations/rename_name_to_key_on_settings.rb
 - lib/settingson.rb
 - lib/settingson/config.rb
-- lib/settingson/defaults.rb
+- lib/settingson/default.rb
+- lib/settingson/default/store.rb
 - lib/settingson/engine.rb
 - lib/settingson/store.rb
 - lib/settingson/utils.rb
@@ -231,6 +234,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/models/settings_spec.rb
+- spec/models/settingson/defaults_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/daanforever/settingson
 licenses:
@@ -306,4 +310,5 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/models/settings_spec.rb
+- spec/models/settingson/defaults_spec.rb
 - spec/spec_helper.rb

data/lib/settingson/defaults.rb

@@ -1,12 +0,0 @@
-class Settingson::Defaults
-  def initialize(klass:)
-    @__klass  = klass
-    @__path   = '__defaults'
-  end # initialize
-
-  def method_missing(symbol, *args)
-    Settingson::Store.new(
-      klass: @__klass, path: @__path, defaults: true
-    ).send(symbol, *args)
-  end # method_missing
-end