settingson 1.7.6 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f694dc0ae8fbd86f5c64e4c66844876c90ae607b
-  data.tar.gz: 8732e4b92ec3ebab8c5c5fbf24a09921f9c2088f
+SHA256:
+  metadata.gz: '029f4b7934884ec49504aa25070f056bd41c303cc4aa60e268f9874ef2135dbd'
+  data.tar.gz: 73c561c6fbd85eb06e4d65548228e0c287bfa801a58b7f3d28c9e25246639e7c
 SHA512:
-  metadata.gz: a26fc3405ec03c65bd3c663b9de579975bb0a811d919ea4cec5e0dcb4cce990b339f96846d8165c5a30d3fcef019d44974b3554a0f69e866debbec8ec9eb6056
-  data.tar.gz: 073b4eb59078be399ad906166008ed1f82d8264113f2e0acb02e15e5b15f69b377d8aabdb5cf55e82f12a2d0acd90636d1b689cda48c910ac574541dd95107ec
+  metadata.gz: f48a3d9ddee9b3c729b6c4ebf4301dbcef3913cf75d349510cd2555bf9d0699e2e18e5826c52cefc3242daac87c6d248c7debbdcad06e558e1b980eab6f279c8
+  data.tar.gz: 12df9a647182c640647ac6242021e18e6bd0a67fa7e393b737eb96a9d35a4fa1b93dcb8137912d1ded6af3a41298359ab9189e092c4668050e4a09c5828cc40e

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -27,3 +26,4 @@ spec/dummy/tmp/*
 !spec/dummy/tmp/cache
 spec/dummy/tmp/cache/*
 !spec/dummy/tmp/cache/.keep
+Gemfile.lock

data/.travis.yml

@@ -1,16 +1,22 @@
 language: ruby
+cache: bundler
 
 sudo: false
-cache: bundler
+#cache: bundler
 
-script: bundle exec rspec
+script: "bundle exec rspec && bundle exec codeclimate-test-reporter"
 
 rvm:
-  - 2.2.2
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.6
 
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
 
 env:
   - CODECLIMATE_REPO_TOKEN=620b22e287791de2c9f8a522182ddf57098302ff8958768f8192eaaa7d8a685d

data/Appraisals

@@ -1,7 +1,15 @@
 appraise "4.2" do
-  gem "rails", "~> 4.2.0"
+  gem "rails", "~> 4.2"
 end
 
 appraise "5.0" do
-  gem "rails", "~> 5.0.0"
+  gem "rails", "~> 5.0"
+end
+
+appraise "5.1" do
+  gem "rails", "~> 5.1"
+end
+
+appraise "5.2" do
+  gem "rails", "~> 5.1"
 end

data/README.md

@@ -5,7 +5,7 @@
 
 # Settingson
 
-Simple settings management for applications (Ruby on Rails 4 with ActiveRecord)
+Simple settings management for applications (Ruby on Rails with ActiveRecord)
 
 ## Installation
 
@@ -36,7 +36,10 @@ Replace MODEL by the class name used for the applications settings, it's frequen
 
 Next, you'll usually run
 ```console
+bin/rails db:migrate
+# or 
 rake db:migrate
+# for rails 4 or less
 ```
 as the generator will have created a migration file (if your ORM supports them).
 
@@ -44,8 +47,8 @@ as the generator will have created a migration file (if your ORM supports them).
 
 shell commands:
 ```console
-rails g settingson Settings
-rake db:migrate
+bin/rails g settingson Settings
+bin/rails db:migrate
 ```
 
 code:
@@ -117,15 +120,31 @@ end
 ## The initial values
 in config/initializers/settingson.rb
 ```ruby
-Settings.defaults do |conf|
-  conf.server.smtp.host = 'host'
-  conf.server.smtp.port = 25
+Settings.defaults do |default|
+  default.server.smtp.host = 'host'
+  default.server.smtp.port = 25
 end
 
 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.
+
+## TODO:
+* Skip key search when assignment requested
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/daanforever/settingson/fork )

data/Rakefile

@@ -1,3 +1,6 @@
-require "bundler/gem_tasks"
-require "appraisal"
+#require "bundler/gem_tasks"
+#require "appraisal"
 #require "rails/dummy/tasks"
+
+require "rubygems"
+require "bundler/setup"

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::Store.new( klass: self, path: '__defaults' )
+      @__defaults = Settingson::Store::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')
@@ -53,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

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "rails", "~> 4.2.0"
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rails", "~> 4.2"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/4.2.gemfile.lock

@@ -1,149 +1,144 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    settingson (1.6.0)
+    settingson (1.7.10)
       rails (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    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.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    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.7.1)
-      activesupport (= 4.2.7.1)
+    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.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activesupport (4.2.10)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.3)
-    builder (3.2.2)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.0.2)
-    database_cleaner (1.5.3)
-    diff-lcs (1.2.5)
+    arel (6.0.4)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    concurrent-ruby (1.0.5)
+    crass (1.0.3)
+    database_cleaner (1.6.2)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
-    faker (1.6.6)
+    faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+    globalid (0.4.1)
+      activesupport (>= 4.2.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.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.9.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.6.4)
+    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.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    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.7.1)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-dummy (0.0.4)
       rails
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
-      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)
-    simplecov (0.12.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 (1.7.2)
-    spring-commands-rspec (1.0.4)
-      spring (>= 0.9.1)
-    sprockets (3.7.0)
+    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.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -155,13 +150,12 @@ DEPENDENCIES
   codeclimate-test-reporter
   database_cleaner
   faker
-  rails (~> 4.2.0)
+  rails (~> 4.2)
   rails-dummy
   rspec (~> 3.5)
   rspec-rails (~> 3.5)
   settingson!
-  spring-commands-rspec
   sqlite3
 
 BUNDLED WITH
-   1.12.5
+   1.16.6

data/gemfiles/5.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "codeclimate-test-reporter", :group => :test, :require => nil
-gem "rails", "~> 5.0.0"
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rails", "~> 5.0"
 
-gemspec :path => "../"
+gemspec path: "../"