has_setting 0.7.4 → 0.55

data/lib/has_setting/ar_extensions.rb

@@ -11,7 +11,7 @@ module HasSetting
       self.class_eval do
         unless @has_setting_options # define only once
           # AR association to settings
-          has_many( :settings, :as => :owner, :class_name => 'HasSetting::Setting',
+          has_many( :settings, :as => :owner, :class_name => 'HasSetting::Setting', 
                     :foreign_key => :owner_id, :dependent => :destroy)
           after_save(:save_has_setting_association)
           @has_setting_options = {}
@@ -34,7 +34,6 @@ module HasSetting
       # default options
       type = options[:type] || :string    # treat as string
       options[:localize] ||= false
-      options[:no_fallback] ||= false
       self.has_setting_options[name] = options
 
       # setter
@@ -46,7 +45,7 @@ module HasSetting
       # getter
       define_method(name) do |*args|
         setting = read_setting(name)
-        options = args.first || has_setting_option(name)
+        options = args.first || self.class.has_setting_options[name]
         return options[:default] if setting.nil?
         formatter = Formatters.for_type(options[:type] || type)
         formatter.to_type(setting.value)
@@ -60,40 +59,20 @@ module HasSetting
     setting = self.settings.detect() {|item| item.name == name and item.locale.to_s == locale.to_s }
     setting = self.settings.build(:name => name, locale: locale) if setting.blank?
     setting.value = value
-    # mark model as changed to make sure model is saved so that after_save is triggered even if only settings change
-    # maybe there is a better way of doing this.
-    self.updated_at = Time.now if self.respond_to?(:updated_at)
   end
 
   def read_setting(name)
-    # use detect instead of SQL find. like this the 'cached' has_many-collection is inited
+    # use detect instead of SQL find. like this the 'cached' has_many-collection is inited 
     # only once
-    locale = localize?(name) ? I18n.locale.to_s : ""
+    locale = localize?(name) ? I18n.locale.to_s : nil
     s = self.settings.detect() {|item| item.name == name and item.locale.to_s == locale} # first see if there is a setting with current locale
-    s ||= self.settings.detect() {|item| item.name == name} unless no_fallback?(name) # then if not found, take the first setting with matching name (TODO: add locale fallbacks)
+    s ||= self.settings.detect() {|item| item.name == name} # then if not found, take the first setting with matching name (TODO: add locale fallbacks)
     s
   end
 
   def localize? name
-    options = has_setting_option name
+    options = self.class.has_setting_options[name]
     options ? options[:localize] : false
   end
 
-  def no_fallback? name
-    options = has_setting_option name
-    options ? options[:no_fallback] : false
-  end
-
-  def has_setting_option name
-    klass = self.class
-    option = klass.has_setting_options ? klass.has_setting_options[name] : nil
-    while option.nil? and
-          klass.superclass != ActiveRecord::Base and
-          klass.superclass.respond_to?(:has_setting_options)
-      klass = klass.superclass
-      option = klass.has_setting_options[name]
-    end
-    option
-  end
-
 end

data/lib/has_setting/version.rb

@@ -1,3 +1,3 @@
 module HasSetting
-  VERSION = "0.7.4"
+  VERSION = "0.55"
 end

data/test/unit/has_setting_test.rb

@@ -6,13 +6,19 @@ class HasSettingTest < Test::Unit::TestCase
     @bar = Bar.create!
     @baz = Baz.create!
   end
-
-
+  
+  
   def test_setting_has_accessors
     assert @foo.respond_to?(:setting_1)
     assert @foo.respond_to?(:setting_1=)
   end
-
+  
+  
+  def test_has_many
+    assert @foo.respond_to?(:settings)
+    assert @foo.settings.is_a?(Array)
+  end
+  
   def test_settings_are_destroyed
     count_before = HasSetting::Setting.count
     @foo.setting_1 = 10
@@ -20,9 +26,9 @@ class HasSettingTest < Test::Unit::TestCase
     assert_equal(count_before + 1, HasSetting::Setting.count)
     @foo.destroy
     assert_equal(count_before, HasSetting::Setting.count)
-
+    
   end
-
+  
   def test_write_setting
     count_before = HasSetting::Setting.count
     @foo.write_setting('name', 'value1')
@@ -31,14 +37,14 @@ class HasSettingTest < Test::Unit::TestCase
     setting = @foo.read_setting('name')
     assert setting
     assert_equal('value1', setting.value)
-
+    
     @foo.write_setting('name', 'value2')
-    assert_equal(count_before + 1, HasSetting::Setting.count)
+    assert_equal(count_before + 1, HasSetting::Setting.count) 
     setting = @foo.read_setting('name')
     assert setting
     assert_equal('value2', setting.value)
   end
-
+  
   def test_setting_accessors
     count_before = HasSetting::Setting.count
     assert(!@foo.setting_1)
@@ -49,7 +55,7 @@ class HasSettingTest < Test::Unit::TestCase
     @foo.setting_1 = 'bla'
     assert_equal('bla', @foo.setting_1)
   end
-
+  
   def test_different_classes_do_not_share_setting
     count_before = HasSetting::Setting.count
     @foo.setting_1 = 'foo'
@@ -57,43 +63,43 @@ class HasSettingTest < Test::Unit::TestCase
     @bar.setting_1 = 'bar'
     @bar.save!
     assert_equal(count_before + 2, HasSetting::Setting.count)
-
+    
     assert_equal('foo', @foo.setting_1)
     assert_equal('bar', @bar.setting_1)
   end
 
-
+  
   def test_has_nil_setting
     @foo.setting_1 = nil
     assert(@foo.read_setting('setting_1'))
     assert(!@foo.setting_1)
   end
-
+  
   def test_options_on_getter
     @foo.setting_1 = '12.3'
     assert_equal('12.3', @foo.setting_1)
     assert_equal(12, @foo.setting_1(:type => :int))
     assert_equal(12.3, @foo.setting_1(:type => :float))
-
+    
     # Foo.setting_2 is a float setting. Override and get as string
     @foo.setting_2 = 12.3
     assert_equal('12.3', @foo.setting_2(:type => :string))
   end
-
+  
   def test_different_classes_do_not_share_options()
     @foo.setting_2 = 12.3
     assert_equal(12.3, @foo.setting_2)
     @bar.setting_2 = 12.3
     assert_equal(12, @bar.setting_2)
   end
-
+  
   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'
     assert_equal('not def', @foo.with_default)
   end
-
+  
   def test_write_settings_without_saved_parent
     my_foo = Foo.new
     count_before = HasSetting::Setting.count
@@ -104,19 +110,19 @@ class HasSettingTest < Test::Unit::TestCase
     assert_equal(count_before + 1, HasSetting::Setting.count)
     assert_equal('radabumm', my_foo.with_default)
   end
-
+  
   def test_not_everyone_has_settings_association
     assert_equal(true, @foo.respond_to?(:settings))
     assert_equal(true, @bar.respond_to?(:settings))
     assert_equal(false, @baz.respond_to?(:settings))
   end
-
-
+  
+  
   def test_boolean_setting_without_default
     assert_equal nil, @foo.setting_3
     @foo.setting_3 = true
     @foo.save!
-
+    
     @foo = Foo.find @foo.id
     assert_equal true, @foo.setting_3
   end
@@ -127,7 +133,7 @@ class HasSettingTest < Test::Unit::TestCase
     @foo = Foo.find @foo.id
     assert_equal true, @foo.setting_4
   end
-
+  
   def test_boolean_setting_with_default_and_no_saving
     assert_equal false, @foo.setting_4
     @foo.setting_4 = true
@@ -147,6 +153,6 @@ class HasSettingTest < Test::Unit::TestCase
     I18n.locale = :de
     assert_equal 'setting de', @bar.setting_1
   end
-
-
+  
+  
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: has_setting
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: '0.55'
+  prerelease: 
 platform: ruby
 authors:
 - Simplificator GmbH
@@ -9,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2013-06-05 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
@@ -20,13 +21,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - README.md
 - Rakefile
 - VERSION.yml
 - has_setting.gemspec
 - help/001_create_settings.rb
-- lib/.DS_Store
 - lib/has_setting.rb
 - lib/has_setting/ar_extensions.rb
 - lib/has_setting/formatters.rb
@@ -40,27 +40,28 @@ files:
 - test/unit/has_setting_test.rb
 homepage: http://github.com/ncri/has_setting
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple setting extension to AR
 test_files:
 - test/bar.rb
@@ -69,3 +70,4 @@ test_files:
 - test/test_helper.rb
 - test/unit/formatters_test.rb
 - test/unit/has_setting_test.rb
+has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 628241cce8245e1e0d2d76bb35fb4bc33e6e00bc
-  data.tar.gz: 38e4e899954422e7a23a6ec786f877c7a1702e6d
-SHA512:
-  metadata.gz: 85f62ddf97adb6282b0e3347965c5411d7489534ccd026d4317e6d3a54c210b4bb77a7d159c706b0da7f9ae663808c7bbd7512a179aa63bb79990d0d4a463125
-  data.tar.gz: 1e2a0f35a9e60f32c0db6052447a6f7f17ab467623855d6fba20359c055be4aeee3ef368b1aadd3ad4b5c6a177cb6d5d0bcfa71fb85a4074025975f6889ebffe