has_setting 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b7dd1f57f85031a2c3078a402651786ecc07900
-  data.tar.gz: d712740b678c37bc6f724cd5fc2374f5e19c0110
+SHA256:
+  metadata.gz: d0f0a651598e3e614da58374c217080580ef91c8a9cd7b29f0a738a917af66cc
+  data.tar.gz: aa4433f3838bc991d7926be8ed61179d09d79e7552a21d5a909ec2e8495de761
 SHA512:
-  metadata.gz: 7cfe4aeb31062a4ab5ced166ebaaf6a1e53d0a26c7e98ed263ee023dc8cb52b2a0c7f4ff99d9e52692144bc465a37c3237b5fffa8668db44640a9620adb31e8a
-  data.tar.gz: 5ebe5930b8eb9db4fc2ac4c0661446a75e9fcda63c8f7a6fb12b76390299d7fc0135ef06d65b9988f149aeaf902c08834f061012c8543b947359a243690947ef
+  metadata.gz: a7867c928a56b1fbe8f6806bb48029ec382c8055768b1554caac1c351c02ada220549db7c8d310103d0222e7d9454e32fe4504e21577cc26ed1d197e4e36755d
+  data.tar.gz: 89e78c2c5217f37cb381a22c9f11cf0de7f4497d44183b1d01c798bb105b19a27356dc599fb4e5e4c2fe34b8cc503eef6ab2d4f7d4a21b903834478480250b45

data/README.md

@@ -41,9 +41,7 @@ This will create the following methods for you on the owner class:
   * *:strings* Uses the StringsFormatter to convert from/to string[]
   * *:booleans* Uses the BooleansFormatter to convert from/to boolean[]
   * *:strict_booleans* Uses the BooleansFormatter to convert from/to boolean[]
-  * *:default* allows you to specify a default value that will be returned if the setting does not exist (i.e. has never been written). Note that the default value is _ignored_ if the setting exists, no matter what the value of the setting is. The default value is returned as is, no type conversion takes place.
-
-
+  * *:default* allows you to specify a default value that will be returned if the setting does not exist (i.e. has never been written). Note that the default value is _ignored_ if the setting exists, no matter what the value of the setting is. The default value is returned as is, no type conversion takes place. You can provide `Proc` as a default value. In this case it will be executed withing the object's context and the result will be returned as a default value.
 
 # How it works
 
@@ -105,7 +103,9 @@ has_setting should stay as simple as possible... still some ideas are around:
  * Add validation options
 
 # History
-
+ 
+ * 1.0.4
+   * Added possibility to provide `Proc` as default value
  * 0.5:
    * Added basic locale awareness. If you update from a previous version, you need to add a locale column to the settings table.
  * 0.4.3:

data/has_setting.gemspec

@@ -26,4 +26,4 @@ Gem::Specification.new do |gem|
     "test/unit/has_setting_test.rb"
   ]
 
-end
+end

data/lib/has_setting/ar_extensions.rb

@@ -47,7 +47,15 @@ module HasSetting
       define_method(name) do |*args|
         setting = read_setting(name)
         options = args.first || has_setting_option(name)
-        return options[:default] if setting.nil?
+        if setting.nil?
+          result =
+            if options[:default].is_a?(Proc)
+              instance_exec(&options[:default])
+            else
+              options[:default]
+            end
+          return result
+        end
         formatter = Formatters.for_type(options[:type] || type)
         formatter.to_type(setting.value)
       end
@@ -88,12 +96,13 @@ module HasSetting
     klass = self.class
     option = klass.has_setting_options ? klass.has_setting_options[name] : nil
     while option.nil? and
-          klass.base_class != ActiveRecord::Base and
-          klass.base_class.respond_to?(:has_setting_options)
-      klass = klass.base_class
-      option = klass.has_setting_options[name]
+          klass.superclass != ActiveRecord::Base
+      klass = klass.superclass
+      if klass.respond_to?(:has_setting_options) and klass.has_setting_options
+        option = klass.has_setting_options[name]
+      end
     end
     option
   end
 
-end
+end

data/lib/has_setting/version.rb

@@ -1,3 +1,3 @@
 module HasSetting
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
 end

data/test/foo.rb

@@ -5,4 +5,5 @@ class Foo < ActiveRecord::Base
   
   has_setting(:setting_3, :type => :boolean)
   has_setting(:setting_4, :type => :boolean, :default => false)
-end
+  has_setting(:setting_5, :type => :boolean, :default => -> { is_a?(Foo) })
+end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 
 require File.dirname(__FILE__) + '/../lib/has_setting'
 
+I18n.available_locales = %w(en de de-CH)
 
 ActiveRecord::Base.establish_connection(
   :adapter  => 'sqlite3',

data/test/unit/formatters_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
+
 include HasSetting
 class FormattersTest < Test::Unit::TestCase
   def test_for_type

data/test/unit/has_setting_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative '../test_helper'
 
 class HasSettingTest < Test::Unit::TestCase
   def setup
@@ -87,7 +87,7 @@ class HasSettingTest < Test::Unit::TestCase
     assert_equal(12, @bar.setting_2)
   end
 
-  def test_default_values()
+  def test_default_values
     assert_equal('def', @foo.with_default)
     assert_equal('override def', @foo.with_default(:default => 'override def'))
     @foo.with_default = 'not def'
@@ -120,6 +120,7 @@ class HasSettingTest < Test::Unit::TestCase
     @foo = Foo.find @foo.id
     assert_equal true, @foo.setting_3
   end
+
   def test_boolean_setting_with_default
     assert_equal false, @foo.setting_4
     @foo.setting_4 = true
@@ -138,6 +139,10 @@ class HasSettingTest < Test::Unit::TestCase
     assert_equal false, @foo.setting_4
   end
 
+  def test_proc_value_as_default_value
+    assert_equal @foo.setting_5, true
+  end
+
   def test_locale_awareness
     I18n.locale = :de
     @bar.setting_1 = 'setting de'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: has_setting
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Simplificator GmbH
 - Nico Ritsche
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies: []
 description: Stores settings as key/value pairs in a settings table and provides accessors
   for them on the owning object
@@ -41,7 +41,7 @@ files:
 homepage: http://github.com/ncri/has_setting
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -57,9 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Simple setting extension to AR
 test_files: