ActionItem1146: limit must be a number, or nil

Antonio Terceiro
1 parent e9e51add
Showing 4 changed files with 14 additions and 1 deletions Show diff stats
app/models/recent_documents_block.rb
lib/acts_as_having_settings.rb
test/unit/acts_as_having_settings_test.rb
test/unit/recent_documents_block_test.rb
@@ -12,7 +12,7 @@ class RecentDocumentsBlock &lt; Block
     _('This block lists your recent content.')
   end
-  settings_items :limit
+  settings_items :limit, :type => :integer, :default => 5
   include ActionController::UrlWriter
   def content
@@ -31,6 +31,7 @@ module ActsAsHavingSettings
             val.nil? ? (#{default}.is_a?(String) ? gettext(#{default}) : #{default}) : val
           end
           def #{setting}=(value)
+            value = nil if (value.is_a?(String) && value.blank?)
             send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
           end
         CODE
@@ -7,6 +7,7 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
     settings_items :flag, :type => :boolean
     settings_items :flag_disabled_by_default, :type => :boolean, :default => false
     settings_items :name, :type => :string, :default => N_('ENGLISH TEXT')
+    settings_items :number, :type => :integer
   end
   should 'store settings in a hash' do
@@ -74,4 +75,10 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
     assert_equal true, obj.flag
   end
+   should 'store nil when set to empty string' do
+     obj = TestClass.new
+     obj.number = ''
+     assert_nil obj.number
+   end
+
 end
@@ -44,6 +44,11 @@ class RecentDocumentsBlockTest &lt; Test::Unit::TestCase
     assert_no_match /href=.*\/testinguser\/first/, output
   end
+  should 'have a default limit of items' do
+    block.limit = nil
+    assert_equal 5, block.limit
+  end
+
   should 'display a link to sitemap with title "All content"' do
     expects(:link_to).with('All content', :controller => 'profile', :action => 'sitemap', :profile => profile.identifier)
     expects(:_).with('All content').returns('All content')
	@@ -12,7 +12,7 @@ class RecentDocumentsBlock < Block		@@ -12,7 +12,7 @@ class RecentDocumentsBlock < Block
12	_('This block lists your recent content.')	12	_('This block lists your recent content.')
13	end	13	end
14		14
15	- settings_items :limit	15	+ settings_items :limit, :type => :integer, :default => 5
16		16
17	include ActionController::UrlWriter	17	include ActionController::UrlWriter
18	def content	18	def content