settingson 1.7.8 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98735a13bd6244ec4b786e599451dac575e78c1
-  data.tar.gz: b6adcb94c38670e3c4a92aa79d4890af389f6bd8
+  metadata.gz: f386d06c5ca9c9f4bc53680acde702b3c220b9dc
+  data.tar.gz: 0dd5979d1f284281186bf6bfb5c53fe4df11cd4a
 SHA512:
-  metadata.gz: f00b4aa3f2f5cbafb4aed5544a1c35e53cf13652c3e91bf97bcfe90a762e3ce9c499aaf55c21c7be38394562c1d7777dfd23b586a9009fb75487b3e8e36d8ba9
-  data.tar.gz: 880af88d221a90cfe86e8cb3a1118065d981e3ee84f16a0da9097425eaa85389b957ec5da34dd869f0dfb619daf890cebcbbb5f2d56ba5b63c3b0c8ea6810d58
+  metadata.gz: 28731bc9f03371ff13bfaa45dcf3ab0bea0b896d532607c55ec3df27aeae7cbcdf254714f13bb71e4eb58aac45cf357d1f55f8db3adf7a6076606e63b1924e3d
+  data.tar.gz: 7b901c14b6d6d31409fe334db1fd7266ebad1b5206527f45f681cd4ae0a845261ad2a7d215af470fe40a16e4456ed87e7925c82c8e6bfbd450bde1b5fb7295b8

data/README.md

@@ -48,6 +48,7 @@ as the generator will have created a migration file (if your ORM supports them).
 shell commands:
 ```console
 bin/rails g settingson Settings
+bin/rails db:migrate
 ```
 
 code:
@@ -128,6 +129,19 @@ Settings.server.smtp.host # => 'host'
 Settings.server.smtp.port # => 25
 ```
 
+## Debug and testings
+in config/initializers/settingson.rb
+```ruby
+
+if Rails.env.development?
+  Settings.configure.debug         = true
+  Settings.configure.trace         = 3
+  Settings.configure.cache.enabled = false (default: true)
+end
+
+Caching is disabled by default only in test environment.
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/daanforever/settingson/fork )

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

@@ -24,7 +24,7 @@ module Settingson::Base
     #   default.server.port = 80
     # end
     def defaults
-      @__defaults = Settingson::Default.new( klass: self )
+      @__defaults = Settingson::Store::Default.new( klass: self )
 
       if block_given?
         Rails.application.config.after_initialize do
@@ -58,7 +58,7 @@ module Settingson::Base
     def method_missing(symbol, *args)
       super
     rescue NameError, NoMethodError
-      Settingson::Store.new(klass: self).send(symbol, *args)
+      Settingson::Store::General.new(klass: self).send(symbol, *args)
     end
 
   end # module ClassMethods

data/gemfiles/4.2.gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.8)
+    settingson (1.7.9)
       rails (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -50,40 +50,41 @@ GEM
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     concurrent-ruby (1.0.5)
-    database_cleaner (1.5.3)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    faker (1.7.3)
+    faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    rack (1.6.5)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -95,53 +96,49 @@ GEM
       rails
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    spring (2.0.1)
-      activesupport (>= 4.2)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
+    simplecov-html (0.10.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -158,7 +155,6 @@ DEPENDENCIES
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
   settingson!
-  spring-commands-rspec
   sqlite3
 
 BUNDLED WITH

data/gemfiles/5.0.gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.8)
+    settingson (1.7.9)
       rails (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
+    actioncable (5.0.6)
+      actionpack (= 5.0.6)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.6)
+      actionview (= 5.0.6)
+      activesupport (= 5.0.6)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.6)
+      activesupport (= 5.0.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.0.6)
+      activesupport (= 5.0.6)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.6)
+      activesupport (= 5.0.6)
+    activerecord (5.0.6)
+      activemodel (= 5.0.6)
+      activesupport (= 5.0.6)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -53,103 +53,100 @@ GEM
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     concurrent-ruby (1.0.5)
-    database_cleaner (1.5.3)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    faker (1.7.3)
+    faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    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.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+    rails (5.0.6)
+      actioncable (= 5.0.6)
+      actionmailer (= 5.0.6)
+      actionpack (= 5.0.6)
+      actionview (= 5.0.6)
+      activejob (= 5.0.6)
+      activemodel (= 5.0.6)
+      activerecord (= 5.0.6)
+      activesupport (= 5.0.6)
+      bundler (>= 1.3.0)
+      railties (= 5.0.6)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    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.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.6)
+      actionpack (= 5.0.6)
+      activesupport (= 5.0.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    spring (2.0.1)
-      activesupport (>= 4.2)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
+    simplecov-html (0.10.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -165,7 +162,6 @@ DEPENDENCIES
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
   settingson!
-  spring-commands-rspec
   sqlite3
 
 BUNDLED WITH

data/gemfiles/5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    settingson (1.7.8)
+    settingson (1.7.9)
       rails (>= 4.0)
 
 GEM
@@ -53,34 +53,32 @@ GEM
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     concurrent-ruby (1.0.5)
-    crass (1.0.2)
-    database_cleaner (1.6.1)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
     diff-lcs (1.3)
     docile (1.1.5)
     erubi (1.7.0)
     faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.9.0)
+    i18n (0.9.1)
       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)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
     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-test (0.8.2)
       rack (>= 1.0, < 3)
     rails (5.1.4)
       actioncable (= 5.1.4)
@@ -107,37 +105,33 @@ GEM
       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)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       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)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.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)
@@ -148,11 +142,11 @@ GEM
     sqlite3 (1.3.13)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -168,7 +162,6 @@ DEPENDENCIES
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
   settingson!
-  spring-commands-rspec
   sqlite3
 
 BUNDLED WITH

data/lib/settingson.rb

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

data/lib/settingson/config.rb

@@ -11,5 +11,6 @@ class Settingson::Config
                             enabled: true,
                             namespace: "settingson/#{Rails.env}"
                             )
+    @cache.enabled = false if Rails.env.test?
   end
 end

data/lib/settingson/store.rb

@@ -1,12 +1,12 @@
 class Settingson::Store
 
-  # extend ActiveModel::Naming
-  # include ActiveModel::Conversion
-  #
-  def initialize(klass:, path: nil, defaults: false)
+  require 'settingson/store/default'
+  require 'settingson/store/general'
+
+  def initialize(klass:, path: nil)
     @__klass    = klass
     @__path     = path
-    @__defaults = defaults
+    @__config   = klass.configure
   end
 
   def to_s
@@ -35,8 +35,8 @@ class Settingson::Store
 
   def method_missing(symbol, *args)
     __debug
-    __debug("from\n\t#{caller[1..@__klass.configure.trace].join("\n\t")}") if
-      @__klass.configure.trace > 0
+    __debug("from\n\t#{caller[1..@__config.trace].join("\n\t")}") if
+      @__config.trace > 0
 
     __references_action(symbol, *args) or __rescue_action(symbol.to_s, *args)
     # __rescue_action(symbol.to_s, *args)
@@ -45,7 +45,7 @@ class Settingson::Store
   protected
   # TODO: move all methods to support class
   def __debug(message="")
-    return unless @__klass.configure.debug
+    return unless @__config.debug
     message = sprintf("%s#%20s: %s",
                       self.class.name,
                       caller_locations.first.label,
@@ -58,7 +58,7 @@ class Settingson::Store
     # 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}")
+      __debug("#{@__klass} know what to do with #{symbol}")
       @__klass.send(symbol, *args)
     end
   end
@@ -93,16 +93,17 @@ class Settingson::Store
     else
       @__klass.create!(key: @__path, value: value)
     end
-    Rails.cache.write(__cache_key(@__path), value)
+
+    Rails.cache.write(__cache_key(@__path), value) if @__config.cache.enabled
     value
   end
 
   def __get(key)
     __update_search_path(key)
-    result = __cached_or_default_value(@__path)
+    result = __look_up_value(@__path)
 
     if result.is_a?(ActiveRecord::RecordNotFound) or
-       result.is_a?(Settingson::Default::Store)
+       result.is_a?(Settingson::Store::Default)
       __debug("return self with path: #{@__path}")
       self
     else
@@ -149,12 +150,16 @@ class Settingson::Store
     key.try(:to_key).try(:join, '_') || key.id
   end
 
+  def _search_path(key)
+    [@__path, key].compact.join('.')
+  end
+
   def __update_search_path(key)
-    @__path = [@__path, key].compact.join('.')
+    @__path = _search_path(key)
   end
 
-  def __cached_or_default_value(key)
-    result = __cached_value(key)
+  def __look_up_value(key)
+    result = @__config.cache.enabled ? __from_cache(key) : __from_db(key)
 
     if result.is_a?(ActiveRecord::RecordNotFound)
       __debug("looking in #{@__klass.name}.defaults[#{key}]")
@@ -165,22 +170,22 @@ class Settingson::Store
   end
 
   def __cache_key(key)
-    [ @__klass.configure.cache.namespace, key ].join('/')
+    [ @__config.cache.namespace, key ].join('/')
   end
 
-  def __cached_value(key)
+  def __from_cache(key)
     __debug("looking in cache '#{__cache_key(key)}'")
     Rails.cache.fetch(
       __cache_key(key),
-      expires_in:         @__klass.configure.cache.expires,
-      race_condition_ttl: @__klass.configure.cache.race_condition_ttl
+      expires_in:         @__config.cache.expires,
+      race_condition_ttl: @__config.cache.race_condition_ttl
     ) do
       __debug("ask DB '#{key}'")
-      __get_from_db(key)
+      __from_db(key)
     end
   end
 
-  def __get_from_db(key)
+  def __from_db(key)
     @__klass.find_by!(key: key).value
   rescue ActiveRecord::RecordNotFound
     __debug("not found")

data/lib/settingson/store/default.rb

@@ -0,0 +1,25 @@
+class Settingson::Store::Default < Settingson::Store
+
+  @@__defaults = {}
+
+  def to_h
+    @@__defaults
+  end
+
+  def to_ary
+    @@__defaults.to_a
+  end
+
+  protected
+  def __set(key, value)
+    @@__defaults[_search_path(key)] = value
+    @__path = nil
+    value
+  end
+
+  def __get(key)
+    __update_search_path(key)
+    @@__defaults[@__path] || self
+  end
+
+end

data/lib/settingson/store/general.rb

@@ -0,0 +1,3 @@
+class Settingson::Store::General < Settingson::Store
+
+end

data/lib/settingson/version.rb

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

data/settingson.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rspec-rails", "~> 3.5"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "spring-commands-rspec"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "faker"
   # spec.add_development_dependency "rake"

data/spec/dummy/config/initializers/settingson.rb

@@ -1 +1,2 @@
 Settings.configure.debug = true
+Settings.configure.cache.enabled = true

data/spec/models/settingson/defaults_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Settingson::Default do
+describe Settingson::Store::Default do
 
   it 'not raises errors with empty block' do
     expect{ Settings.defaults {} }.to_not raise_error
@@ -21,4 +21,16 @@ describe Settingson::Default do
     expect( h['cached.key2'] ).to eq(word)
   end
 
+  describe '#to_h' do
+    it 'returns Hash' do
+      expect( Settings.defaults.to_h ).to be_a(Hash)
+    end
+  end
+
+  describe '#to_ary' do
+    it 'returns Array' do
+      expect( Settings.defaults.to_ary ).to be_a(Array)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.10
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spring-commands-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -180,9 +166,10 @@ files:
 - lib/settingson.rb
 - lib/settingson/config.rb
 - lib/settingson/default.rb
-- lib/settingson/default/store.rb
 - lib/settingson/engine.rb
 - lib/settingson/store.rb
+- lib/settingson/store/default.rb
+- lib/settingson/store/general.rb
 - lib/settingson/utils.rb
 - lib/settingson/version.rb
 - settingson.gemspec

data/lib/settingson/default/store.rb

@@ -1,127 +0,0 @@
-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