made SiteSetting predicates generated

Author: Oaphi

app/models/site_setting.rb

@@ -44,46 +44,23 @@ def self.exist?(name)
       SiteSetting.where(name: name).any?
   end
 
-  # Checks whether the setting is a global site setting
-  # @return [Boolean]
+  # Is the setting global?
+  # @return [Boolean] check result
   def global?
     community_id.nil?
   end
 
-  # Is the setting array-valued?
-  # @return [Boolean] check result
-  def array?
-    value_type.downcase == 'array'
-  end
-
-  # Is the setting boolean-valued?
-  # @return [Boolean] check result
-  def boolean?
-    value_type.downcase == 'boolean'
-  end
-
-  # Is the setting floating point number-valued?
-  # @return [Boolean] check result
-  def float?
-    value_type.downcase == 'float'
-  end
-
-  # Is the setting integer-valued?
-  # @return [Boolean] check result
-  def integer?
-    value_type.downcase == 'integer'
-  end
-
-  # Is the setting string-valued (plain text)?
-  # @return [Boolean] check result
-  def string?
-    value_type.downcase == 'string'
+  # Defines predicates for each value type
+  [:array, :boolean, :float, :integer, :string, :text].each do |method|
+    define_method "#{method}?" do
+      value_type.downcase.to_sym == method
+    end
   end
 
-  # Is the setting text-valued (HTML-aware text)?
+  # Is the setting numeric-valued?
   # @return [Boolean] check result
-  def text?
-    value_type.downcase == 'text'
+  def numeric?
+    float? || integer?
   end
 
   def typed

test/fixtures/site_settings.yml

@@ -13,6 +13,16 @@ int:
   value: 42
   value_type: integer
 
+float:
+  name: SettingWithFloatValue
+  value: 3.14
+  value_type: float
+
+string:
+  name: SettingWithStringValue
+  value: plain text value
+  value_type: string
+
 text:
   name: SettingWithTextValue
   value: "<p>a paragraph of text</p>"

test/models/site_setting_test.rb

@@ -54,11 +54,18 @@ class SiteSettingTest < ActiveSupport::TestCase
     assert_equal SiteSetting.where(name: 'test').first, setting1
   end
 
-  test 'text? should correctly check if the setting accepts long text values' do
-    text_setting = site_settings(:text)
-    int_setting = site_settings(:int)
+  test 'type predicates should correctly check the setting\'s value type' do
+    [:array, :boolean, :float, :integer, :string, :text].each do |method|
+      site_settings.each do |setting|
+        assert_equal setting.value_type == method.to_s, setting.send("#{method}?")
+      end
+    end
+  end
 
-    assert_equal text_setting.text?, true
-    assert_equal int_setting.text?, false
+  test 'numeric? should correctly check if the setting\'s value is numeric' do
+    assert site_settings(:int).numeric?
+    assert site_settings(:float).numeric?
+    assert_not site_settings(:string).numeric?
+    assert_not site_settings(:text).numeric?
   end
 end