simplificator-has_setting 0.3.8 → 0.3.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 8
+:patch: 9
 :major: 0

data/lib/has_setting.rb

@@ -9,5 +9,8 @@ end
 
 
 HasSetting::Formatters.register_formatter(:string, HasSetting::Formatters::StringFormatter.new)
+HasSetting::Formatters.register_formatter(:strings, HasSetting::Formatters::StringsFormatter.new)
 HasSetting::Formatters.register_formatter(:float, HasSetting::Formatters::FloatFormatter.new)
-HasSetting::Formatters.register_formatter(:int, HasSetting::Formatters::IntFormatter.new)
+HasSetting::Formatters.register_formatter(:floats, HasSetting::Formatters::FloatFormatter.new)
+HasSetting::Formatters.register_formatter(:int, HasSetting::Formatters::IntFormatter.new)
+HasSetting::Formatters.register_formatter(:ints, HasSetting::Formatters::IntsFormatter.new)

data/lib/has_setting/ar_extensions.rb

@@ -36,9 +36,7 @@ module HasSetting
           # Callback to save settings
           def save_has_setting_association
             self.settings.each do |setting|
-              if setting.changed?
-                setting.save
-              end
+              setting.save if setting.changed?
             end
           end
         end
@@ -63,14 +61,8 @@ module HasSetting
         setting = read_setting(name)
         options = args.first || self.class.has_setting_options[name]
         return options[:default] if setting.nil? 
-        formatter = HasSetting::Formatters.for_type(options[:type])
+        formatter = Formatters.for_type(options[:type])
         formatter.to_type(setting.value)
-        #case options[:type]
-        #  when :string : setting.value
-        #  when :int : setting.value.nil? ? nil : setting.value.to_i
-        #  when :float : setting.value.nil? ? nil : setting.value.to_f
-        #  else raise ArgumentError.new("Unsupported type: #{options[:type]}")
-        #end
       end
     end
   end

data/lib/has_setting/formatters.rb

@@ -43,6 +43,38 @@ module HasSetting
         value.to_s
       end
     end
+    
+    class IntsFormatter < NilSafeFormatter
+      def safe_to_type(value)
+        value.split(',').map() {|item| Formatters.for_type(:int).to_type(item)}
+      end
+      def safe_to_s(value)
+        Array(value).map() {|item| Formatters.for_type(:int).to_s(item)}.join(',')
+      end
+    end
+    
+    class FloatsFormatter < NilSafeFormatter
+      def safe_to_type(value)
+        value.split(',').map() {|item| Formatters.for_type(:float).to_type(item)}
+      end
+      def safe_to_s(value)
+        Array(value).map() {|item| Formatters.for_type(:float).to_s(item)}.join(',')
+      end
+    end
+    
+    class StringsFormatter < NilSafeFormatter
+      def safe_to_type(value)
+        # Ruby does not know "negative look before". Or i dont know how to do it in ruby. Thus
+        # i ended up using some reverse calls... ugly. Anyone out there eager to help me out?
+        value.reverse.split(/,(?!\\)/).map() {|item| item.reverse.gsub('\,', ',')}.reverse
+      end
+      def safe_to_s(value)
+        # Escape the separator character ',' with a backslash
+        Array(value).map() {|item| item.gsub(',', '\,')}.join(',')
+      end
+    end
+    
+    
     # Formatter for ints
     # Throws ArgumentError if value can not be converted
     class IntFormatter < NilSafeFormatter

data/test/unit/formatters_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 include HasSetting
 class FormattersTest < Test::Unit::TestCase
   def test_for_type
-    [:string, :float, :int].each do |symbol|
+    [:string, :float, :floats, :int, :ints, :strings].each do |symbol|
       assert(Formatters.for_type(symbol), "No formatter for #{symbol}")
     end
     assert_raises(ArgumentError) do
@@ -10,6 +10,23 @@ class FormattersTest < Test::Unit::TestCase
     end
   end
   
+  def test_strings_formatter
+    f = Formatters::StringsFormatter.new
+    assert_equal(nil, f.to_s(nil))
+    assert_equal('bla', f.to_s('bla'))
+    assert_equal('bla', f.to_s(['bla']))
+    assert_equal('bla,bli', f.to_s(['bla', 'bli']))
+    assert_equal('\,schni\,schna\,,bli,\,bla', f.to_s([',schni,schna,', 'bli', ',bla']))
+    assert_equal('\,\,\,\,,\,\,\,,\,\,,\,', f.to_s([',,,,', ',,,', ',,', ',']))
+    
+    assert_equal(nil, f.to_type(nil))
+    assert_equal([], f.to_type(''))
+    assert_equal(['bli'], f.to_type('bli'))
+    assert_equal(['bli','', 'bla'], f.to_type('bli,,bla'))
+    assert_equal([',schni,schna,', 'bli', ',bla'], f.to_type('\,schni\,schna\,,bli,\,bla'))
+    assert_equal([',,,,', ',,,', ',,', ','], f.to_type('\,\,\,\,,\,\,\,,\,\,,\,'))
+  end
+
   def test_string_formatter()
     f = Formatters::StringFormatter.new
     assert_equal('', f.to_s(''))
@@ -39,6 +56,7 @@ class FormattersTest < Test::Unit::TestCase
     assert_nil(f.to_type(nil))
     assert_equal(2, f.to_type('2'))
     assert_equal(2, f.to_type('2.6'))
+    assert_equal(2, f.to_type(' 2.6 '))
   end  
   
   def test_float_formatter()
@@ -63,4 +81,31 @@ class FormattersTest < Test::Unit::TestCase
     assert_equal(2.0, f.to_type('2'))
     assert_equal(2.6, f.to_type('2.6'))
   end  
+  
+  def test_ints_formatter
+    f = Formatters::IntsFormatter.new
+    assert_equal(nil, f.to_s(nil))
+    assert_equal('1', f.to_s(1))
+    assert_equal('1', f.to_s([1]))
+    assert_equal('1,2', f.to_s([1,2]))
+    
+    assert_equal(nil, f.to_type(nil))
+    assert_equal([], f.to_type(''))
+    assert_equal([1], f.to_type('1'))
+    assert_equal([1,2], f.to_type('1,2'))
+  end
+  def test_floats_formatter
+    f = Formatters::FloatsFormatter.new
+    assert_equal(nil, f.to_s(nil))
+    assert_equal('1.2', f.to_s(1.2))
+    assert_equal('1.2', f.to_s([1.2]))
+    assert_equal('1.2,1.3', f.to_s([1.2,1.3]))
+    
+    assert_equal(nil, f.to_type(nil))
+    assert_equal([], f.to_type(''))
+    assert_equal([1.2], f.to_type('1.2'))
+    assert_equal([1.2,1.3], f.to_type('1.2,1.3'))
+    assert_equal([1.2,1.3], f.to_type('1.2, 1.3'))
+  end
+  
 end

data/test/unit/has_setting_test.rb

@@ -7,6 +7,7 @@ class HasSettingTest < Test::Unit::TestCase
     @baz = Baz.create!
   end
   
+  
   def test_setting_has_accessors
     assert @foo.respond_to?(:setting_1)
     assert @foo.respond_to?(:setting_1=)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplificator-has_setting
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Simplificator GmbH
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-06 00:00:00 -08:00
+date: 2009-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: []