Download as
Browse Code »

Commit 72253b6a2f4e42e74912ed8465d8dbbe1de9397a

Authored by Daniela Feitosa
2 parents c8e36b08 d3082f5d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/22' of http://git.gitorious.org/noosfero/noosf… 

…ero into merge-requests/22
Showing 4 changed files with 22 additions and 3 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @72253b6
... ... @@ -236,17 +236,17 @@ class Environment < ActiveRecord::Base
236 236  
237 237 # Enables a feature identified by its name
238 238 def enable(feature)
239   - self.settings["#{feature}_enabled"] = true
  239 + self.settings["#{feature}_enabled".to_sym] = true
240 240 end
241 241  
242 242 # Disables a feature identified by its name
243 243 def disable(feature)
244   - self.settings["#{feature}_enabled"] = false
  244 + self.settings["#{feature}_enabled".to_sym] = false
245 245 end
246 246  
247 247 # Tells if a feature, identified by its name, is enabled
248 248 def enabled?(feature)
249   - self.settings["#{feature}_enabled"] == true
  249 + self.settings["#{feature}_enabled".to_sym] == true
250 250 end
251 251  
252 252 # enables the features identified by <tt>features</tt>, which is expected to
... ...
lib/acts_as_having_settings.rb
  Diff comments   View file @72253b6
... ... @@ -14,6 +14,11 @@ module ActsAsHavingSettings
14 14 def #{settings_field}
15 15 self[:#{settings_field}] ||= Hash.new
16 16 end
  17 + before_save :symbolize_settings_keys
  18 + private
  19 + def symbolize_settings_keys
  20 + self[:#{settings_field}] && self[:#{settings_field}].symbolize_keys!
  21 + end
17 22 CODE
18 23 settings_items(*args)
19 24 end
... ...
test/unit/acts_as_having_settings_test.rb
  Diff comments   View file @72253b6
... ... @@ -74,4 +74,10 @@ class ActsAsHavingSettingsTest &lt; Test::Unit::TestCase
74 74 assert_equal true, obj.flag
75 75 end
76 76  
  77 + should 'symbolize keys when save' do
  78 + obj = TestClass.new
  79 + obj.settings.expects(:symbolize_keys!).once
  80 + assert obj.save
  81 + end
  82 +
77 83 end
... ...
test/unit/environment_test.rb
  Diff comments   View file @72253b6
... ... @@ -1167,4 +1167,12 @@ class EnvironmentTest &lt; Test::Unit::TestCase
1167 1167 p2.save!
1168 1168 end
1169 1169  
  1170 + should 'always store setting keys as symbol' do
  1171 + env = Environment.default
  1172 + env.settings['string_key'] = 'new value'
  1173 + env.save!; env.reload
  1174 + assert_nil env.settings['string_key']
  1175 + assert_equal env.settings[:string_key], 'new value'
  1176 + end
  1177 +
1170 1178 end
... ...