settingson 1.7.6 → 1.7.11

data/gemfiles/5.2.gemfile.lock

@@ -0,0 +1,168 @@
+PATH
+  remote: ..
+  specs:
+    settingson (1.7.10)
+      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.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.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.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    rack (2.0.3)
+    rack-test (0.8.2)
+      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.3.2)
+    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.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.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)
+    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.4)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (>= 1.6)
+  codeclimate-test-reporter
+  database_cleaner
+  faker
+  rails (~> 5.1)
+  rails-dummy
+  rspec (~> 3.5)
+  rspec-rails (~> 3.5)
+  settingson!
+  sqlite3
+
+BUNDLED WITH
+   1.17.2

data/lib/generators/settingson/settingson_generator.rb

@@ -28,8 +28,9 @@ class SettingsonGenerator < Rails::Generators::NamedBase
 
   private
   def settingson_inject_lines(name)
-    if File.readlines("app/models/#{name.downcase}.rb").grep(/\A\s*include Settingson::Base\z/).blank?
-      inject_into_class "app/models/#{name.downcase}.rb", name.camelize, "\tinclude Settingson::Base\n"
+    file = Rails.root.join("app/models/#{name.downcase}.rb")
+    if File.readlines(file).grep(/\A\s*include Settingson::Base\z/).blank?
+      inject_into_class file, name.camelize, "\tinclude Settingson::Base\n"
     end
   end
-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/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/store.rb

@@ -1,11 +1,12 @@
 class Settingson::Store
 
-  # extend ActiveModel::Naming
-  # include ActiveModel::Conversion
-  #
+  require 'settingson/store/default'
+  require 'settingson/store/general'
+
   def initialize(klass:, path: nil)
-    @__klass  = klass
-    @__path   = path
+    @__klass    = klass
+    @__path     = path
+    @__config   = klass.configure
   end
 
   def to_s
@@ -34,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)
@@ -44,11 +45,12 @@ class Settingson::Store
   protected
   # TODO: move all methods to support class
   def __debug(message="")
+    return unless @__config.debug
     message = sprintf("%s#%20s: %s",
                       self.class.name,
                       caller_locations.first.label,
                       message)
-    Rails.logger.debug(message) if @__klass.configure.debug
+    Rails.logger.debug(message)
   end
 
   def __references_action(symbol, *args)
@@ -56,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
@@ -91,15 +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)
+    if result.is_a?(ActiveRecord::RecordNotFound) or
+       result.is_a?(Settingson::Store::Default)
       __debug("return self with path: #{@__path}")
       self
     else
@@ -146,37 +150,42 @@ 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) # Try defaults
-      __cached_value('__defaults.' + key)
+    if result.is_a?(ActiveRecord::RecordNotFound)
+      __debug("looking in #{@__klass.name}.defaults[#{key}]")
+      @__klass.defaults[key]
     else
       result
     end
   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.6"
+  VERSION = "1.7.11"
 end

data/settingson.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Settingson::VERSION
   spec.authors       = ["dan"]
   spec.email         = ["daan.forever@gmail.com"]
-  spec.summary       = %q{Settings management for Ruby on Rails 4 applications (ActiveRecord) }
-  spec.description   = %q{Settings management for Ruby on Rails 4 applications (ActiveRecord) }
+  spec.summary       = %q{Settings management for Ruby on Rails applications (with ActiveRecord) }
+  spec.description   = %q{Settings management for Ruby on Rails applications (with ActiveRecord) }
   spec.homepage      = "https://github.com/daanforever/settingson"
   spec.license       = "MIT"
 
@@ -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/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/dummy/config/environments/test.rb

@@ -13,8 +13,13 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  if Rails::VERSION::MAJOR < 5
+    config.serve_static_files   = true
+    config.static_cache_control = 'public, max-age=3600'
+  else
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

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

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

data/spec/models/settings_spec.rb

@@ -18,6 +18,18 @@ describe Settings do
       Settings.defaults{|s| s.some.key = word}
       expect( Settings.some.key ).to eq(word)
     end
+
+    it 'save and returns correct value for multiple default values' do
+      word1 = Faker::Lorem.word
+      word2 = Faker::Lorem.word
+      Settings.defaults do |s|
+        s.some.key1 = word1
+        s.some.key2 = word2
+      end
+      expect( Settings.some.key1 ).to eq(word1)
+      expect( Settings.some.key2 ).to eq(word2)
+    end
+
   end
 
   describe '::from_hash' do

data/spec/models/settingson/defaults_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Settingson::Store::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
+
+  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