setting_accessors 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff68f0a6d47ec46945e83aa4c4f625bec4e7c115
-  data.tar.gz: b3d12cf74aac005bf9d0e0f46e4b9b4402127701
+  metadata.gz: 8b57b02b1ed6e6025882eb8f66f00811e31187d0
+  data.tar.gz: 9e9f7ce1783329c95f1cc1d3a22a40c39e605d97
 SHA512:
-  metadata.gz: 399a03eabae5d7b475b0ac0119cec650ad37f6c266d53d86c9d90cbb63431e8b32987f9c5fe8a1ec4b255f5b83df876603beeb6fb178c52bb5b1ae2d9130aea0
-  data.tar.gz: aca92f047b34247a2f9b6bcbc1478f36529e6b31e6837758749a99aa81088216a90883ff977c167681618eaf5079acdaf1fb2fcce96dcbcb23092c1600dbc940
+  metadata.gz: e0c62a32615cf53c34729be73ca94be87826bdfef304e231333cf1cbfad1d0543bf23cc9a10a4ba8633626e92269e750ced273080d26430b195b064cbd4d7bc6
+  data.tar.gz: 29fd6bb464c1a5ea65f9cc0a018a2659a7f96d4521d41e59febb4819f90139c48f7ace193da1833dcdc2e1decffd58d1d95c2682c73748def7f7420125b4554f

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.1
   - 2.2
 
+before_install: 'gem install bundler'
 script: 'bundle exec rake'
 
 notifications:

data/lib/setting_accessors/accessor.rb

@@ -28,6 +28,22 @@ class SettingAccessors::Accessor
     result
   end
 
+  #
+  # Like #fetch, but it will store the default value as a temporary setting
+  # if no actual setting value could be found. This is useful to further work
+  # with default setting values.
+  # The default value is cloned (using #dup to avoid copying object states) before
+  # it is assigned. This will not work for singleton instances like true, false, etc.
+  #
+  def fetch_and_store(key, default = nil)
+    result = self[key]
+    if result.nil? && !has_key?(key)
+      self[key] = default.duplicable? ? default.dup : default
+    else
+      result
+    end
+  end
+
   def has_key?(key)
     @temp_settings.has_key?(key.to_sym)
   end
@@ -46,7 +62,7 @@ class SettingAccessors::Accessor
   # specified in the setting config file.
   #
   def get_or_default(key)
-    fetch key, SettingAccessors.setting_class.get_or_default(key, @record)
+    fetch_and_store(key, SettingAccessors.setting_class.get_or_default(key, @record))
   end
 
   #
@@ -54,7 +70,7 @@ class SettingAccessors::Accessor
   # If none is found, tries to find a global setting with the same name
   #
   def get_or_global(key)
-    fetch key, SettingAccessors.setting_class.get(key)
+    fetch_and_store(key, SettingAccessors.setting_class.get(key))
   end
 
   #
@@ -62,7 +78,7 @@ class SettingAccessors::Accessor
   # if none is found, it will return the given value instead.
   #
   def get_or_value(key, value)
-    fetch key, value
+    fetch_and_store(key, value)
   end
 
   def get_with_fallback(key, fallback = nil)

data/lib/setting_accessors/converter.rb

@@ -25,7 +25,7 @@ class SettingAccessors::Converter
   #
   def convert(new_value)
     #If the value is set to be polymorphic, we don't have to convert anything.
-    return new_value if @value_type == 'polymorphic'
+    return new_value if @value_type.to_s == 'polymorphic'
 
     #ActiveRecord only converts non-nil values to their database type
     #during assignment
@@ -68,4 +68,4 @@ class SettingAccessors::Converter
     value.to_s
   end
 
-end
+end

data/lib/setting_accessors/integration.rb

@@ -95,4 +95,4 @@ module SettingAccessors::Integration
   def settings
     @settings_accessor ||= SettingAccessors::Accessor.new(self)
   end
-end
+end

data/lib/setting_accessors/setting_scaffold.rb

@@ -194,7 +194,7 @@ module SettingAccessors::SettingScaffold
   # @return [Object] the default value for the current setting
   #
   def default_value
-    data['default']
+    data['default'].freeze
   end
 
   #
@@ -249,4 +249,4 @@ module SettingAccessors::SettingScaffold
     SettingAccessors::Internal.setting_data(name, assignable)
   end
 
-end
+end

data/lib/setting_accessors/version.rb

@@ -1,3 +1,3 @@
 module SettingAccessors
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/setting_accessors.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.5'
   spec.add_development_dependency 'byebug', '~> 3.5'
 
-  spec.add_dependency 'rails', '~> 4'
+  spec.add_dependency 'rails', '~> 4.1'
 end

data/test/dummy/app/models/user.rb

@@ -1,5 +1,7 @@
 class User < ActiveRecord::Base
 
+  setting_accessor :polymorphic_setting, :type => :polymorphic, :default => {}, :fallback => :default
+
   setting_accessor :locale, :type => :string, :validations => {:presence => true}
 
   setting_accessor :a_string, :fallback => :default

data/test/dummy/test/models/user_test.rb

@@ -37,4 +37,31 @@ class UserTest < ActiveSupport::TestCase
       assert !@user.respond_to?(:a_string?)
     end
   end
+
+  context 'Polymorphic class-wise settings' do
+    setup do
+      @user = User.create
+    end
+
+    should 'be updated in database if their whole value changes' do
+      @user.polymorphic_setting = {:a => :b}
+      assert @user.save
+      assert_equal User.last, @user
+      assert_equal User.last.polymorphic_setting, {:a => :b}
+    end
+
+    should 'be updated in database if a property of their value changes' do
+      @user.polymorphic_setting[:new_key] = 'new_value'
+      assert @user.save
+      assert_equal User.last, @user
+      assert_equal User.last.polymorphic_setting, {:new_key => 'new_value'}
+    end
+
+    should 'not update other assignable settings' do
+      @user2 = User.create
+      @user2.polymorphic_setting = {:foo => :bar}
+      assert @user2.save
+      assert_equal User.first.polymorphic_setting, {}
+    end
+  end
 end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'active_support'
 require 'minitest'
 require 'shoulda'
 require "rails/test_help"
+require 'byebug'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setting_accessors
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Stefan Exner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.1'
 description: |-
   Adds a global key-value-store to Rails applications and allows adding typed columns
                             to model classes without having to change the database layout.
@@ -119,8 +119,6 @@ extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -217,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A global key-value-store and virtual model columns

data/.ruby-gemset

@@ -1 +0,0 @@
-setting_accessors

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1.1