ActionItem789: making themes available only in its environment

* Listing environment themes and approved themes for selection * Adding settings 'themes' for the environment * Adding method approved_themes to theme.rb

ActionItem789: making themes available only in its environment
* Listing environment themes and approved themes for selection * Adding settings 'themes' for the environment * Adding method approved_themes to theme.rb
Daniela Feitosa
1 parent cc4ec8ba
Showing 6 changed files with 89 additions and 28 deletions Show diff stats
app/controllers/my_profile/themes_controller.rb
app/models/environment.rb
app/models/theme.rb
test/functional/themes_controller_test.rb
test/unit/environment_test.rb
test/unit/theme_test.rb
@@ -9,7 +9,7 @@ class ThemesController &lt; MyProfileController
   end
   def index
-    @themes = Theme.system_themes + Theme.public_themes
+    @themes = profile.environment.themes + Theme.approved_themes(profile)
     @current_theme = profile.theme
     @layout_templates = LayoutTemplate.all
@@ -315,6 +315,18 @@ class Environment &lt; ActiveRecord::Base
     self[:theme] || 'default'
   end
+  def themes
+    if settings[:themes]
+      Theme.system_themes.select { |theme| settings[:themes].include?(theme.id) }
+    else
+      []
+    end
+  end
+
+  def themes=(values)
+    settings[:themes] = values.map(&:id)
+  end
+
   def layout_template
     settings[:layout_template] || 'default'
   end
@@ -2,7 +2,7 @@ class Theme
   class << self
     def system_themes
-      Dir.glob(RAILS_ROOT + '/public/designs/themes/*').map do |item|
+      Dir.glob(File.join(system_themes_dir, '*')).map do |item|
         File.basename(item)
       end.map do |item|
         new(item)
@@ -13,6 +13,10 @@ class Theme
       File.join(RAILS_ROOT, 'public', 'user_themes')
     end
+    def system_themes_dir
+      File.join(RAILS_ROOT, 'public', 'designs', 'themes')
+    end
+
     def create(id, attributes = {})
       if find(id) || system_themes.map(&:id).include?(id)
         raise DuplicatedIdentifier
@@ -37,12 +41,12 @@ class Theme
       end
     end
-    def public_themes
-      Dir.glob(File.join(user_themes_dir, '*', 'theme.yml')).select do |desc|
-        config = YAML.load_file(desc)
-        config['public']
+    def approved_themes(owner)
+      Dir.glob(File.join(system_themes_dir, '*')).select do |item|
+        config = YAML.load_file(File.join(item, 'theme.yml'))
+        (config['owner_type'] == owner.class.base_class.name) && (config['owner_id'] == owner.id) || config['public']
       end.map do |desc|
-        Theme.find(File.basename(File.dirname(desc)))
+        new(File.basename(desc))
       end
     end
@@ -59,6 +63,7 @@ class Theme
     attributes.each do |k,v|
       self.send("#{k}=", v)
     end
+    config['id'] = id
   end
   def name
@@ -24,40 +24,46 @@ class ThemesControllerTest &lt; Test::Unit::TestCase
   TMP_THEMES_DIR = RAILS_ROOT + '/test/tmp/themes_controller'
-  should 'display list of themes for selection' do
-    Theme.expects(:system_themes).returns([Theme.new('first'), Theme.new('second')])
+  should 'display themes that can be applied' do
+    env = Environment.default
+    Theme.stubs(:approved_themes).with(@profile).returns([Theme.new('t1', :name => 't1')])
+    t2 = Theme.create('t2')
+    t3 = Theme.create('t3')
+    env.themes = [t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([t2, t3])
     get :index, :profile => 'testinguser'
-    %w[ first second ].each do |item|
+    %w[ t1 t2 ].each do |item|
       assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/#{item}" }
     end
-  end
-
-  should 'not display themes for selection if it is not public' do
-    Theme.create('first', :owner => profile, :public => true)
-    Theme.create('second', :owner => profile, :public => false)
-    get :index, :profile => 'testinguser'
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/first" }
-    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/second" }
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/t3" }
   end
   should 'highlight current theme' do
-    profile.update_attributes(:theme => 'first')
-    Theme.expects(:system_themes).returns([Theme.new('first'), Theme.new('second')])
+    env = Environment.default
+    t1 = Theme.create('one', :name => 'one')
+    t2 = Theme.create('two', :name => 'two')
+    env.themes = [t1, t2]
+    env.save
+
+    Theme.stubs(:system_themes).returns([t1, t2])
+    profile.update_attributes(:theme => 'one')
     get :index, :profile => 'testinguser'
     assert_tag :attributes => { :class => 'selected theme' }, :descendant =>  { :content => /(current)/ }
-    assert_no_tag :attributes => { :class => 'selected theme' }, :descendant =>  { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/first" } }
+    assert_no_tag :attributes => { :class => 'selected theme' }, :descendant =>  { :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/set/one" } }
   end
   should 'display list of my themes for edition' do
-    Theme.create('first', :owner => profile)
-    Theme.create('second', :owner => profile)
+    Theme.create('three', :owner => profile)
+    Theme.create('four', :owner => profile)
     get :index, :profile => 'testinguser'
-    %w[ first second ].each do |item|
+    %w[ three four ].each do |item|
       assert_tag :tag => 'a', :attributes => { :href => "/myprofile/testinguser/themes/edit/#{item}" }
     end
   end
@@ -397,6 +397,31 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal 'default', Environment.new.theme
   end
+  should 'have a list of themes' do
+    env = Environment.default
+    t1 = mock
+    t2 = mock
+
+    t1.stubs(:id).returns('theme_1')
+    t2.stubs(:id).returns('theme_2')
+
+    Theme.expects(:system_themes).returns([t1, t2])
+    env.themes = [t1, t2]
+    env.save!
+    assert_equal  [t1, t2], Environment.default.themes
+  end
+
+  should 'set themes to environment' do
+    env = Environment.default
+    t1 = mock
+
+    t1.stubs(:id).returns('theme_1')
+
+    env.themes = [t1]
+    env.save
+    assert_equal  [t1.id], Environment.default.settings[:themes]
+  end
+
   should 'create templates' do
     e = Environment.create!(:name => 'test_env')
     e.reload
@@ -27,6 +27,12 @@ class ThemeTest &lt; ActiveSupport::TestCase
     assert_equal 'the-id', Theme.new('the-id').name
   end
+  should 'save id on theme.yml' do
+    Theme.create('other_theme')
+    t = Theme.find('other_theme')
+    assert t.config['id']
+  end
+
   should 'create theme' do
     t = Theme.create('mytheme')
     assert_equal t, Theme.find('mytheme')
@@ -149,12 +155,19 @@ class ThemeTest &lt; ActiveSupport::TestCase
     assert_equivalent [ 'one.png', 'two.png' ], theme.image_files
   end
-  should 'be able to find public themes' do
+  should 'be able to find approved themes' do
+    Theme.stubs(:system_themes_dir).returns(TMP_THEMES_DIR)
+
     profile = create_user('testinguser').person
-    t1 = Theme.create('mytheme', :owner => profile, :public => false)
-    t2 = Theme.create('mytheme2', :owner => profile, :public => true)
+    profile2 = create_user('testinguser2').person
+    t1 = Theme.new('mytheme1', :name => 'mytheme1', :owner => profile, :public => false); t1.save
+    t2 = Theme.new('mytheme2', :name => 'mytheme2', :owner => profile2, :public => true); t2.save
+    t3 = Theme.new('mytheme3', :name => 'mytheme3', :public => false); t3.save
-    assert_equal [t2], Theme.public_themes
+    [Theme.find(t2.id), Theme.find(t1.id)].each do |theme|
+      assert Theme.approved_themes(profile).include?(theme)
+    end
+    assert ! Theme.approved_themes(profile).include?(Theme.find(t3.id))
   end
   should 'set theme to public' do
	@@ -9,7 +9,7 @@ class ThemesController < MyProfileController		@@ -9,7 +9,7 @@ class ThemesController < MyProfileController
9	end	9	end
10		10
11	def index	11	def index
12	- @themes = Theme.system_themes + Theme.public_themes	12	+ @themes = profile.environment.themes + Theme.approved_themes(profile)
13	@current_theme = profile.theme	13	@current_theme = profile.theme
14		14
15	@layout_templates = LayoutTemplate.all	15	@layout_templates = LayoutTemplate.all
	@@ -315,6 +315,18 @@ class Environment < ActiveRecord::Base		@@ -315,6 +315,18 @@ class Environment < ActiveRecord::Base
315	self[:theme] \|\| 'default'	315	self[:theme] \|\| 'default'
316	end	316	end
317		317
		318	+ def themes
		319	+ if settings[:themes]
		320	+ Theme.system_themes.select { \|theme\| settings[:themes].include?(theme.id) }
		321	+ else
		322	+ []
		323	+ end
		324	+ end
		325	+
		326	+ def themes=(values)
		327	+ settings[:themes] = values.map(&:id)
		328	+ end
		329	+
318	def layout_template	330	def layout_template
319	settings[:layout_template] \|\| 'default'	331	settings[:layout_template] \|\| 'default'
320	end	332	end
	@@ -397,6 +397,31 @@ class EnvironmentTest < Test::Unit::TestCase		@@ -397,6 +397,31 @@ class EnvironmentTest < Test::Unit::TestCase
397	assert_equal 'default', Environment.new.theme	397	assert_equal 'default', Environment.new.theme
398	end	398	end
399		399
		400	+ should 'have a list of themes' do
		401	+ env = Environment.default
		402	+ t1 = mock
		403	+ t2 = mock
		404	+
		405	+ t1.stubs(:id).returns('theme_1')
		406	+ t2.stubs(:id).returns('theme_2')
		407	+
		408	+ Theme.expects(:system_themes).returns([t1, t2])
		409	+ env.themes = [t1, t2]
		410	+ env.save!
		411	+ assert_equal [t1, t2], Environment.default.themes
		412	+ end
		413	+
		414	+ should 'set themes to environment' do
		415	+ env = Environment.default
		416	+ t1 = mock
		417	+
		418	+ t1.stubs(:id).returns('theme_1')
		419	+
		420	+ env.themes = [t1]
		421	+ env.save
		422	+ assert_equal [t1.id], Environment.default.settings[:themes]
		423	+ end
		424	+
400	should 'create templates' do	425	should 'create templates' do
401	e = Environment.create!(:name => 'test_env')	426	e = Environment.create!(:name => 'test_env')
402	e.reload	427	e.reload