ActionItem122: implementing storage of theme info

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2390 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem122: implementing storage of theme info
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2390 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 6f1ddaea
Showing 8 changed files with 72 additions and 8 deletions Show diff stats
app/helpers/application_helper.rb
app/models/environment.rb
app/models/profile.rb
db/migrate/049_add_theme_attribute.rb
db/schema.rb
test/unit/application_helper_test.rb
test/unit/environment_test.rb
test/unit/profile_test.rb
@@ -153,7 +153,7 @@ module ApplicationHelper
   # should be a current profile (i.e. while viewing some profile's pages, or the
   # profile info, etc), because if there is no profile an exception is thrown.
   def profile
-    @controller.send(:profile) || raise("There is no current profile")
+    @controller.send(:profile)
   end
   def category_color
@@ -328,9 +328,13 @@ module ApplicationHelper
     result << '/stylesheets/' << name << '.css'
   end
-  # FIXME do not hardcode 'default' like this
   def current_theme
-    'default'
+    p = profile
+    if p
+      p.theme
+    else
+      @environment.theme
+    end
   end
   # generates a image tag for the profile. 
@@ -241,4 +241,8 @@ class Environment &lt; ActiveRecord::Base
   has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 
+  def theme
+    self[:theme] || 'default'
+  end
+
 end
@@ -399,4 +399,8 @@ class Profile &lt; ActiveRecord::Base
     self[:custom_footer] || environment.custom_footer
   end
+  def theme
+    self[:theme] || environment.theme
+  end
+
 end
@@ -0,0 +1,15 @@
+class AddThemeAttribute < ActiveRecord::Migration
+  TABLE = [ :profiles, :environments ]
+
+  def self.up
+    TABLE.each do |table|
+      add_column table, :theme, :string
+    end
+  end
+
+  def self.down
+    TABLE.each do |table|
+      remove_column table, :theme
+    end
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 48) do
+ActiveRecord::Schema.define(:version => 49) do
   create_table "article_versions", :force => true do |t|
     t.integer  "article_id"
@@ -145,6 +145,7 @@ ActiveRecord::Schema.define(:version =&gt; 48) do
     t.text    "design_data"
     t.text    "custom_header"
     t.text    "custom_footer"
+    t.string  "theme"
   end
   create_table "favorite_enteprises_people", :id => false, :force => true do |t|
@@ -217,6 +218,7 @@ ActiveRecord::Schema.define(:version =&gt; 48) do
     t.string   "nickname",          :limit => 16
     t.text     "custom_header"
     t.text     "custom_footer"
+    t.string   "theme"
   end
   add_index "profiles", ["environment_id"], :name => "index_profiles_on_environment_id"
@@ -64,11 +64,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_same result, link_to_category(cat)
   end
-  should 'get current theme' do
-    assert_equal 'default', current_theme()
-  end
-
   should 'nil theme option when no exists theme' do
+    stubs(:current_theme).returns('something-very-unlikely')
     File.expects(:exists?).returns(false)
     assert_nil theme_option()
   end
@@ -84,6 +81,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
   end
   should 'nil javascript theme when no exists theme' do
+    stubs(:current_theme).returns('something-very-unlikely')
     File.expects(:exists?).returns(false)
     assert_nil theme_javascript
   end
@@ -138,6 +136,21 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     #assert_no_match /parent category/, result
   end
+  should 'get theme from environment by default' do
+    @environment = mock
+    @environment.stubs(:theme).returns('my-environment-theme')
+    stubs(:profile).returns(nil)
+    assert_equal 'my-environment-theme', current_theme
+  end
+
+  should 'get theme from profile when profile is present' do
+    profile = mock
+    profile.stubs(:theme).returns('my-profile-theme')
+    stubs(:profile).returns(profile)
+    assert_equal 'my-profile-theme', current_theme
+  end
+
+
   protected
   def content_tag(tag, content, options = {})
@@ -355,4 +355,12 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal 'my footer', Environment.new(:custom_footer => "my footer").custom_footer
   end
+  should 'provide theme' do
+    assert_equal 'my-custom-theme', Environment.new(:theme => 'my-custom-theme').theme
+  end
+
+  should 'give default theme' do
+    assert_equal 'default', Environment.new.theme
+  end
+
 end
@@ -771,6 +771,20 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal 'environment footer', profile.custom_footer
   end
+  should 'store theme' do
+    p = Profile.new(:theme => 'my-shiny-theme')
+    assert_equal 'my-shiny-theme', p.theme
+  end
+
+  should 'delegate theme selection to environment by default' do
+    p = Profile.new
+    env = mock
+    p.stubs(:environment).returns(env)
+    env.expects(:theme).returns('environment-stored-theme')
+
+    assert_equal 'environment-stored-theme', p.theme
+  end
+
   private
   def assert_invalid_identifier(id)
	@@ -241,4 +241,8 @@ class Environment < ActiveRecord::Base		@@ -241,4 +241,8 @@ class Environment < ActiveRecord::Base
241		241
242	has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'	242	has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
243		243
		244	+ def theme
		245	+ self[:theme] \|\| 'default'
		246	+ end
		247	+
244	end	248	end
	@@ -399,4 +399,8 @@ class Profile < ActiveRecord::Base		@@ -399,4 +399,8 @@ class Profile < ActiveRecord::Base
399	self[:custom_footer] \|\| environment.custom_footer	399	self[:custom_footer] \|\| environment.custom_footer
400	end	400	end
401		401
		402	+ def theme
		403	+ self[:theme] \|\| environment.theme
		404	+ end
		405	+
402	end	406	end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class AddThemeAttribute < ActiveRecord::Migration
	2	+ TABLE = [ :profiles, :environments ]
	3	+
	4	+ def self.up
	5	+ TABLE.each do \|table\|
	6	+ add_column table, :theme, :string
	7	+ end
	8	+ end
	9	+
	10	+ def self.down
	11	+ TABLE.each do \|table\|
	12	+ remove_column table, :theme
	13	+ end
	14	+ end
	15	+end
	@@ -355,4 +355,12 @@ class EnvironmentTest < Test::Unit::TestCase		@@ -355,4 +355,12 @@ class EnvironmentTest < Test::Unit::TestCase
355	assert_equal 'my footer', Environment.new(:custom_footer => "my footer").custom_footer	355	assert_equal 'my footer', Environment.new(:custom_footer => "my footer").custom_footer
356	end	356	end
357		357
		358	+ should 'provide theme' do
		359	+ assert_equal 'my-custom-theme', Environment.new(:theme => 'my-custom-theme').theme
		360	+ end
		361	+
		362	+ should 'give default theme' do
		363	+ assert_equal 'default', Environment.new.theme
		364	+ end
		365	+
358	end	366	end
	@@ -771,6 +771,20 @@ class ProfileTest < Test::Unit::TestCase		@@ -771,6 +771,20 @@ class ProfileTest < Test::Unit::TestCase
771	assert_equal 'environment footer', profile.custom_footer	771	assert_equal 'environment footer', profile.custom_footer
772	end	772	end
773		773
		774	+ should 'store theme' do
		775	+ p = Profile.new(:theme => 'my-shiny-theme')
		776	+ assert_equal 'my-shiny-theme', p.theme
		777	+ end
		778	+
		779	+ should 'delegate theme selection to environment by default' do
		780	+ p = Profile.new
		781	+ env = mock
		782	+ p.stubs(:environment).returns(env)
		783	+ env.expects(:theme).returns('environment-stored-theme')
		784	+
		785	+ assert_equal 'environment-stored-theme', p.theme
		786	+ end
		787	+
774	private	788	private
775		789
776	def assert_invalid_identifier(id)	790	def assert_invalid_identifier(id)