Added a block that works like a container of blocks

Victor Costa
1 parent ce0d03ab
Showing 20 changed files with 402 additions and 0 deletions Show diff stats
plugins/container_block/lib/container_block.rb
plugins/container_block/lib/container_block_array.rb
plugins/container_block/lib/container_block_plugin.rb
plugins/container_block/lib/ext/block.rb
plugins/container_block/lib/ext/environment.rb
plugins/container_block/lib/ext/profile.rb
plugins/container_block/public/style.css
plugins/container_block/test/functional/container_block_environment_design_controller_test.rb
plugins/container_block/test/functional/container_block_home_controller_test.rb
plugins/container_block/test/test_helper.rb
plugins/container_block/test/unit/block_test.rb
plugins/container_block/test/unit/container_block_array_test.rb
plugins/container_block/test/unit/container_block_plugin_test.rb
plugins/container_block/test/unit/container_block_test.rb
plugins/container_block/test/unit/environment_test.rb
plugins/container_block/test/unit/profile_test.rb
plugins/container_block/views/blocks/container.rhtml
plugins/container_block/views/box_organizer/_container_block.rhtml
plugins/container_block/views/environment_design
plugins/container_block/views/profile_design
@@ -0,0 +1,48 @@
+class ContainerBlock < Block
+
+  include Noosfero::Plugin::HotSpot
+
+  after_create :create_box
+
+  settings_items :container_box_id, :type => Integer, :default => nil
+  
+  def self.description
+    _('Container')
+  end
+
+  def help
+    _('This block acts as a container for another blocks')
+  end
+
+  def create_box
+    box = Box.create!(:owner => self)
+    settings[:container_box_id] = box.id
+    save!
+  end
+
+  def container_box
+    Box.find(container_box_id)
+  end
+
+  def block_classes=(classes)
+    classes.each { |c| block = c.constantize.create!(:box => container_box) } if classes
+  end
+
+  def blocks
+    container_box.blocks
+  end
+
+  #FIXME needed?
+  def layout_template
+    'default2'
+  end
+
+  #FIXME controller test
+  def content(args={})
+    block = self
+    lambda do
+      render :file => 'blocks/container.rhtml', :locals => {:block => block}
+    end
+  end
+  
+end
@@ -0,0 +1,14 @@
+module ContainerBlockArray
+
+  def blocks_with_container_block_plugin
+    blocks = blocks_without_container_block_plugin
+    blocks.each { |block| blocks.concat(block.blocks) if block.kind_of?(ContainerBlock) }
+  end
+
+  def self.included(base)
+    base.class_eval do
+      alias_method_chain :blocks, :container_block_plugin
+    end
+  end
+
+end
@@ -0,0 +1,19 @@
+class ContainerBlockPlugin < Noosfero::Plugin
+
+  def self.plugin_name
+    "Container Block Plugin"
+  end
+
+  def self.plugin_description
+    _("A plugin that add a container block.")
+  end
+  
+  def self.extra_blocks
+    { ContainerBlock => {} }
+  end
+
+  def stylesheet?
+    true
+  end
+
+end
@@ -0,0 +1,15 @@
+require_dependency 'block'
+
+class Block
+  
+  def box_with_container_block_plugin
+    box = box_without_container_block_plugin
+    if box && box.owner.kind_of?(ContainerBlock) 
+      box = box.owner.box
+    end
+    box
+  end
+
+  alias_method_chain :box, :container_block_plugin
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'environment'
+
+class Environment
+  
+  include ContainerBlockArray
+
+end
@@ -0,0 +1,7 @@
+require_dependency 'profile'
+
+class Profile
+
+  include ContainerBlockArray
+
+end
@@ -0,0 +1,11 @@
+#content .boxes .container-block .block, #content .boxes .container-block .block-target {
+  float: left;
+}
+
+#content .boxes .container-block .block-target {
+  width: 20px;
+}
+
+#content .boxes .container-block .block .icon-down, #content .boxes .container-block .block .icon-down-disabled, #content .boxes .container-block .block .icon-up, #content .boxes .container-block .block .icon-up-disabled {
+  display: none;
+}
@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    box = Box.create!(:owner => @environment)
+    @block = ContainerBlock.create!(:box => box)
+  end
+
+  should 'be able to edit ContainerBlock' do
+    get :edit, :id => @block.id
+    assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
+  end
+
+  should 'be able to save ContainerBlock' do
+    get :edit, :id => @block.id
+    post :save, :id => @block.id, :block => {:title => 'Container' }
+    @block.reload
+    assert_equal 'Container', @block.title
+  end
+
+end
@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class HomeController
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+  def rescue_action(e) 
+    raise e 
+  end 
+end
+
+class HomeControllerTest < ActionController::TestCase
+
+  def setup
+    Environment.delete_all
+    @environment = Environment.new(:name => 'testenv', :is_default => true)
+    @environment.enabled_plugins = ['ContainerBlock']
+    @environment.save!
+
+    user = create_user('testinguser')
+    @environment.add_admin(user.person)
+    login_as(user.login)
+
+    box = Box.create!(:owner => @environment)
+    @block = ContainerBlock.create!(:box => box)
+    
+    @environment.boxes = [box]
+  end
+
+  should 'display ContainerBlock' do
+    get :index
+    assert_tag :div, :attributes => { :class => 'block container-block' }
+  end
+
+end
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class BlockTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.new
+
+    @box = Box.new(:owner => @environment)
+    @block = Block.new(:box => @box)
+
+    @container_box = Box.new(:owner => @environment)
+    @container = ContainerBlock.new(:box => @container_box)
+  end
+
+  should 'return block box if block owner is not a ContainerBlock' do
+    assert_equal @box, @block.box
+  end
+
+  should 'return container box if block onwer is a ContainerBlock' do
+    @box.owner = @container
+    assert_equal @container_box, @block.box
+  end
+
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContainerBlockArrayTest < ActiveSupport::TestCase
+  
+  attr_reader :blocks
+
+  include ContainerBlockArray
+
+  def setup
+    @blocks = []
+
+    @environment = fast_create(Environment)
+    @container_box = Box.new(:owner => @environment)
+    @container = ContainerBlock.new(:box => @container_box)
+  end
+
+  should 'return blocks as usual' do
+    @blocks << Block.new
+    assert_equal @blocks, blocks_without_container_block_plugin
+  end
+
+  should 'return blocks and container block children' do
+    @container.save!
+    @container_box.blocks << Block.new
+    @blocks.concat([Block.new, @container])
+    assert_equal @blocks + @container.blocks, blocks_without_container_block_plugin
+  end
+
+end
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContainerBlockPluginTest < ActiveSupport::TestCase
+
+  def setup
+    @plugin = ContainerBlockPlugin.new
+  end
+
+  should 'has a name' do
+    assert !ContainerBlockPlugin.plugin_name.blank?
+  end
+
+  should 'has a description' do
+    assert !ContainerBlockPlugin.plugin_description.blank?
+  end
+  
+  should 'add a block' do
+    assert_equal [ContainerBlock], ContainerBlockPlugin.extra_blocks.keys
+  end
+
+  should 'has stylesheet' do
+    assert @plugin.stylesheet?
+  end
+
+end
@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContainerBlockTest < ActiveSupport::TestCase
+  
+  def setup
+    @block = ContainerBlock.new
+  end
+
+  should 'describe yourself' do
+    assert !ContainerBlock.description.blank?
+  end
+
+  should 'has a help' do
+    assert !@block.help.blank?
+  end
+
+  should 'create a box on save' do
+    @block.save!
+    assert @block.container_box_id
+  end
+
+  should 'return created box' do
+    @block.save!
+    assert @block.container_box
+  end
+
+  should 'create new blocks when receive block classes' do
+    Block.destroy_all
+    @block.save!
+    @block.block_classes = ['Block']
+    assert_equal 2, Block.count
+    assert_equal Block, Block.last.class
+  end
+
+  should 'do not create blocks when nothing is passed as block classes' do
+    Block.destroy_all
+    @block.save!
+    @block.block_classes = []
+    assert_equal 1, Block.count
+  end
+
+  should 'do not create blocks when nil is passed as block classes' do
+    Block.destroy_all
+    @block.save!
+    @block.block_classes = nil
+    assert_equal 1, Block.count
+  end
+
+  should 'return a list of blocks associated with the container block' do
+    Block.destroy_all
+    @block.save!
+    @block.block_classes = ['Block', 'Block']
+    assert_equal [Block, Block], @block.blocks.map(&:class)
+  end
+
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class EnvironmentTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = fast_create(Environment)
+
+    @box = Box.create!(:owner => @environment)
+    @block = Block.create!(:box => @box)
+
+    @container_box = Box.create!(:owner => @environment)
+    @container = ContainerBlock.create!(:box => @container_box)
+  end
+
+  should 'return blocks as usual' do
+    assert_equal [@block, @container], @environment.blocks
+  end
+
+  should 'return block with id at find method' do
+    assert_equal @block, @environment.blocks.find(@block.id)
+  end
+
+  should 'return child block with id at find method' do
+    block = Block.create!(:box => @container_box)
+    @container.save!
+    assert_equal @block, @environment.blocks.find(@block.id)
+  end
+
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ProfileTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = fast_create(Profile)
+
+    @box = Box.create!(:owner => @profile)
+    @block = Block.create!(:box => @box)
+
+    @container_box = Box.create!(:owner => @profile)
+    @container = ContainerBlock.create!(:box => @container_box)
+  end
+
+  should 'return blocks as usual' do
+    assert_equal [@block, @container], @profile.blocks
+  end
+
+  should 'return block with id at find method' do
+    assert_equal @block, @profile.blocks.find(@block.id)
+  end
+
+  should 'return child block with id at find method' do
+    block = Block.create!(:box => @container_box)
+    @container.save!
+    assert_equal @block, @profile.blocks.find(@block.id)
+  end
+
+end
@@ -0,0 +1,4 @@
+<% block.blocks.each do |block| %>
+  <%= display_block(block, '') %>
+<% end %>
+<div class="clear"></div>
@@ -0,0 +1,14 @@
+<br/>
+<ul id="links">
+  <% @block.blocks.each do |block| %>
+    <li>
+    <%= block.class.name %>
+    </li>
+  <% end %>
+</ul>
+
+<%= link_to_function(_('New block'), nil, :class => 'button icon-add with-text') { |page|
+    page.insert_html :bottom, 'links', content_tag('li',select_tag('block[block_classes][]', 
+    options_for_select( @controller.available_blocks.each_with_index.map {|b,i| [b.name, b.name] } ))) } %>
+
+<br/><br/>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+class ContainerBlock < Block
	2	+
	3	+ include Noosfero::Plugin::HotSpot
	4	+
	5	+ after_create :create_box
	6	+
	7	+ settings_items :container_box_id, :type => Integer, :default => nil
	8	+
	9	+ def self.description
	10	+ _('Container')
	11	+ end
	12	+
	13	+ def help
	14	+ _('This block acts as a container for another blocks')
	15	+ end
	16	+
	17	+ def create_box
	18	+ box = Box.create!(:owner => self)
	19	+ settings[:container_box_id] = box.id
	20	+ save!
	21	+ end
	22	+
	23	+ def container_box
	24	+ Box.find(container_box_id)
	25	+ end
	26	+
	27	+ def block_classes=(classes)
	28	+ classes.each { \|c\| block = c.constantize.create!(:box => container_box) } if classes
	29	+ end
	30	+
	31	+ def blocks
	32	+ container_box.blocks
	33	+ end
	34	+
	35	+ #FIXME needed?
	36	+ def layout_template
	37	+ 'default2'
	38	+ end
	39	+
	40	+ #FIXME controller test
	41	+ def content(args={})
	42	+ block = self
	43	+ lambda do
	44	+ render :file => 'blocks/container.rhtml', :locals => {:block => block}
	45	+ end
	46	+ end
	47	+
	48	+end
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+module ContainerBlockArray
	2	+
	3	+ def blocks_with_container_block_plugin
	4	+ blocks = blocks_without_container_block_plugin
	5	+ blocks.each { \|block\| blocks.concat(block.blocks) if block.kind_of?(ContainerBlock) }
	6	+ end
	7	+
	8	+ def self.included(base)
	9	+ base.class_eval do
	10	+ alias_method_chain :blocks, :container_block_plugin
	11	+ end
	12	+ end
	13	+
	14	+end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class ContainerBlockPlugin < Noosfero::Plugin
	2	+
	3	+ def self.plugin_name
	4	+ "Container Block Plugin"
	5	+ end
	6	+
	7	+ def self.plugin_description
	8	+ _("A plugin that add a container block.")
	9	+ end
	10	+
	11	+ def self.extra_blocks
	12	+ { ContainerBlock => {} }
	13	+ end
	14	+
	15	+ def stylesheet?
	16	+ true
	17	+ end
	18	+
	19	+end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+require_dependency 'block'
	2	+
	3	+class Block
	4	+
	5	+ def box_with_container_block_plugin
	6	+ box = box_without_container_block_plugin
	7	+ if box && box.owner.kind_of?(ContainerBlock)
	8	+ box = box.owner.box
	9	+ end
	10	+ box
	11	+ end
	12	+
	13	+ alias_method_chain :box, :container_block_plugin
	14	+
	15	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+require_dependency 'environment'
	2	+
	3	+class Environment
	4	+
	5	+ include ContainerBlockArray
	6	+
	7	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+require_dependency 'profile'
	2	+
	3	+class Profile
	4	+
	5	+ include ContainerBlockArray
	6	+
	7	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+#content .boxes .container-block .block, #content .boxes .container-block .block-target {
	2	+ float: left;
	3	+}
	4	+
	5	+#content .boxes .container-block .block-target {
	6	+ width: 20px;
	7	+}
	8	+
	9	+#content .boxes .container-block .block .icon-down, #content .boxes .container-block .block .icon-down-disabled, #content .boxes .container-block .block .icon-up, #content .boxes .container-block .block .icon-up-disabled {
	10	+ display: none;
	11	+}
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+# Re-raise errors caught by the controller.
	4	+class EnvironmentDesignController; def rescue_action(e) raise e end; end
	5	+
	6	+class EnvironmentDesignControllerTest < ActionController::TestCase
	7	+
	8	+ def setup
	9	+ Environment.delete_all
	10	+ @environment = Environment.new(:name => 'testenv', :is_default => true)
	11	+ @environment.enabled_plugins = ['ContainerBlock']
	12	+ @environment.save!
	13	+
	14	+ user = create_user('testinguser')
	15	+ @environment.add_admin(user.person)
	16	+ login_as(user.login)
	17	+
	18	+ box = Box.create!(:owner => @environment)
	19	+ @block = ContainerBlock.create!(:box => box)
	20	+ end
	21	+
	22	+ should 'be able to edit ContainerBlock' do
	23	+ get :edit, :id => @block.id
	24	+ assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
	25	+ end
	26	+
	27	+ should 'be able to save ContainerBlock' do
	28	+ get :edit, :id => @block.id
	29	+ post :save, :id => @block.id, :block => {:title => 'Container' }
	30	+ @block.reload
	31	+ assert_equal 'Container', @block.title
	32	+ end
	33	+
	34	+end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class BlockTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @environment = Environment.new
	7	+
	8	+ @box = Box.new(:owner => @environment)
	9	+ @block = Block.new(:box => @box)
	10	+
	11	+ @container_box = Box.new(:owner => @environment)
	12	+ @container = ContainerBlock.new(:box => @container_box)
	13	+ end
	14	+
	15	+ should 'return block box if block owner is not a ContainerBlock' do
	16	+ assert_equal @box, @block.box
	17	+ end
	18	+
	19	+ should 'return container box if block onwer is a ContainerBlock' do
	20	+ @box.owner = @container
	21	+ assert_equal @container_box, @block.box
	22	+ end
	23	+
	24	+end