Merge branch 'blocks'

Conflicts: lib/ext/search_controller.rb

Merge branch 'blocks'
Conflicts: lib/ext/search_controller.rb
Arthur Esposte
2 parents 5a1ee775 960bf10e
Showing 13 changed files with 224 additions and 29 deletions Show diff stats
lib/categories_and_tags_block.rb
lib/download_block.rb
lib/mpog_software_plugin.rb
lib/repository_block.rb
public/mpog-user-validations.js
test/unit/categories_and_tags_block_test.rb
test/unit/download_block_test.rb
test/unit/repository_block_test.rb
views/blocks/categories_and_tags.html.erb
views/blocks/download.html.erb
views/blocks/repository.html.erb
views/blocks/software_information.html.erb
views/box_organizer/_download_block.html.erb
@@ -0,0 +1,29 @@
+class CategoriesAndTagsBlock < Block
+
+  attr_accessible :show_name
+
+  settings_items :show_name, :type => :boolean, :default => false
+
+  def self.description
+    _('Categories and Tags')
+  end
+
+  def help
+    _('This block displays the categories and tags of a software.')
+  end
+
+  def content(args={})
+    block = self
+    s = show_name
+    lambda do |object|
+      render(
+        :file => 'blocks/categories_and_tags',
+        :locals => { :block => block, :show_name => s }
+      )
+    end
+  end
+
+  def cacheable?
+    false
+  end
+end
@@ -0,0 +1,33 @@
+class DownloadBlock < Block
+
+  attr_accessible :name, :link, :software_description, :show_name, :version_news
+
+  settings_items :name, :type => :string, :default => ''
+  settings_items :link, :type => :string, :default => ''
+  settings_items :software_description, :type => :string, :default => ''
+  settings_items :show_name, :type => :boolean, :default => false
+  settings_items :version_news, :type => :string, :default => ''
+
+  def self.description
+    _('Download Stable Version')
+  end
+
+  def help
+    _('This block displays the stable version of a software.')
+  end
+
+  def content(args={})
+    block = self
+    s = show_name
+    lambda do |object|
+      render(
+        :file => 'blocks/download',
+        :locals => { :block => block, :show_name => s }
+      )
+    end
+  end
+
+  def cacheable?
+    false
+  end
+end
@@ -128,7 +128,10 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     {
       SoftwaresBlock => {:type => [Environment, Person] },
       SoftwareInformationBlock => {:type => [Community] },
-      InstitutionsBlock => {:type => [Environment, Person]}
+      InstitutionsBlock => {:type => [Environment, Person]},
+      DownloadBlock => {:type => [Community]},
+      RepositoryBlock => {:type => [Community]},
+      CategoriesAndTagsBlock => {:type => [Community]}
     }
   end
@@ -220,7 +223,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     required_list[:person_fields].each do |field|
       if person.send(field).blank?
-        empty_fields << field.sub("_"," ") 
+        empty_fields << field.sub("_"," ")
       end
     end
     required_list[:user_fields].each do |field|
@@ -0,0 +1,29 @@
+class RepositoryBlock < Block
+
+  attr_accessible :show_name
+
+  settings_items :show_name, :type => :boolean, :default => false
+
+  def self.description
+    _('Repository Link')
+  end
+
+  def help
+    _('This block displays the repository link of a software.')
+  end
+
+  def content(args={})
+    block = self
+    s = show_name
+    lambda do |object|
+      render(
+        :file => 'blocks/repository',
+        :locals => { :block => block, :show_name => s }
+      )
+    end
+  end
+
+  def cacheable?
+    false
+  end
+end
@@ -220,7 +220,7 @@
       return false;
     }
-    var correct_format_regex = new RegExp(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i);
+    var correct_format_regex = new RegExp(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/); 
     return !correct_format_regex.test(value);
   }
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class CategoriesAndTagsBlockTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  should 'inherit from Block' do
+    assert_kind_of Block, CategoriesAndTagsBlock.new
+  end
+
+  should 'declare its default title' do
+    CategoriesAndTagsBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_equal Block.new.default_title, CategoriesAndTagsBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, CategoriesAndTagsBlock.description
+  end
+
+end
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class DownloadBlockTest < ActiveSupport::TestCase
+  include PluginTestHelper
+  should 'inherit from Block' do
+    assert_kind_of Block, DownloadBlock.new
+  end
+
+  should 'declare its default title' do
+    DownloadBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_equal Block.new.default_title, DownloadBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, DownloadBlock.description
+  end
+
+  should 'have software info to download it' do
+
+    link = "gitlab.com/teste"
+    name = "Test Software"
+
+    block = DownloadBlock.create(:name => name, :link => link)
+
+    assert_equal block.link, link, "Link should not be empty"
+    assert_equal block.name, name, "Name should not be empty"
+  end
+end
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
+
+class RepositoryBlockTest < ActiveSupport::TestCase
+  include PluginTestHelper
+
+  should 'inherit from Block' do
+    assert_kind_of Block, RepositoryBlock.new
+  end
+
+  should 'declare its default title' do
+    RepositoryBlock.any_instance.stubs(:profile_count).returns(0)
+    assert_equal Block.new.default_title, RepositoryBlock.new.default_title
+  end
+
+  should 'describe itself' do
+    assert_not_equal Block.description, RepositoryBlock.description
+  end
+end
@@ -0,0 +1,14 @@
+<h3 class="block-title"><span><%= _("Categories") %></span></h3>
+
+<div class="category_cloud">
+<% block.owner.categories.each do |category| %>
+	<%= link_to category.name , category.path, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %>
+<% end %>
+</div><!-- end class='category_cloud' -->
+
+<h3 class="block-title"><span><%= _("Tags") %></span></h3>
+<div class="tag_cloud">
+<% block.owner.tag_list.each do |tag| %>
+	<%= link_to tag , "#", :id => "select-category-1-link", :class => "select-subcategory-link"%>
+<% end %>
+</div>
 \ No newline at end of file
@@ -0,0 +1,32 @@
+<% if block.owner.software_info.nil? %>
+  <%= _("This community needs a software to use this block") %>
+<% else %>
+  <div id="download-block">
+    <div id="download_spb">
+      <h2> <%= _("Download") %> </h2>
+
+      <span class="download-name">
+        <%= link_to block.name, "#" %>
+      </span>
+
+      <span class="download-system">
+        <%= _(block.software_description) %>
+      </span>
+    </div>
+
+    <p id="download_info">
+      <span class="req_spb">
+        <%= link_to _("Minimal Requirements") , block.owner.public_profile_url, :class => "anchor-link", :target => "_self" %>
+      </span>
+
+      <span class="nov_spb">
+        <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") if !block.version_news.blank? %>
+      </span>
+
+       <span class="licensed">
+        <%= _("Licensed by") %>
+        <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %>
+      </span>
+    </p>
+  </div>
+<% end %>
 \ No newline at end of file
@@ -0,0 +1,5 @@
+<% if block.owner.software_info.nil? %>
+  <%= _("This community needs a software to use this block") %>
+<% else %>
+  <%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
+<% end %>
 \ No newline at end of file
@@ -2,7 +2,6 @@
 <% if block.owner.software_info.nil? %>
   <%= _("This community needs a software to use this block") %>
-
 <% else %>
   <table id="software-information-block-table">
     <tr>
@@ -13,7 +12,9 @@
               <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
             </span>
             <div class='admin-link'>
-              <%= link_to _('Control panel'), block.owner.admin_url %>
+              <% if block.owner.admins.include?(current_user.person) %>
+                <%= link_to _('Control panel'), block.owner.admin_url %>
+              <% end %>
             </div>
           </div>
         </div>
@@ -23,33 +24,9 @@
           <%= _("#{block.owner.software_info.acronym} - ") unless block.owner.software_info.acronym.blank? %>
           <%= _("#{block.owner.name}") %>
         </h1>
-
         <b>
           <%= block.owner.software_info.finality %>
         </b>
-      </td> 
-    </tr>
-    <tr>
-      <td colspan="2">
-        <% identifier_name = block.owner.software_info.acronym.blank? ? block.owner.name : block.owner.software_info.acronym %>
-        <%= _("For more detailed information see ") %>
-        <%= link_to(_("#{block.owner.name} profile"), {:controller => 'profile', :action => "index", :profile => block.owner.identifier}) %>
-      </td>
-    </tr>
-    <% unless block.owner.software_info.repository_link.blank? %>
-      <tr>
-        <td colspan="2">
-          <%= _("Main repository: ") %>
-          <%= link_to block.owner.software_info.repository_link, block.owner.software_info.repository_link %>
-        </td>
-      </tr>
-    <% end %>
-    <tr>
-      <td>
-        <i>
-          <%= _("Licensed by ") %>
-          <%= link_to block.owner.software_info.license_info.version, block.owner.software_info.license_info.link %>
-        </i>
       </td>
     </tr>
   </table>
@@ -0,0 +1,6 @@
+<div id='edit-download-block'>
+  <%= labelled_form_field _('Name:'), text_field_tag('block[name]', @block.name) %>
+  <%= labelled_form_field _('Link:'), text_field_tag('block[link]', @block.link) %>
+  <%= labelled_form_field _('Software Description:'), text_field_tag('block[software_description]', @block.software_description) %>
+  <%= labelled_form_field _('Link to Version News:'), text_field_tag('block[version_news]', @block.version_news) %>
+</div>
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+class CategoriesAndTagsBlock < Block
	2	+
	3	+ attr_accessible :show_name
	4	+
	5	+ settings_items :show_name, :type => :boolean, :default => false
	6	+
	7	+ def self.description
	8	+ _('Categories and Tags')
	9	+ end
	10	+
	11	+ def help
	12	+ _('This block displays the categories and tags of a software.')
	13	+ end
	14	+
	15	+ def content(args={})
	16	+ block = self
	17	+ s = show_name
	18	+ lambda do \|object\|
	19	+ render(
	20	+ :file => 'blocks/categories_and_tags',
	21	+ :locals => { :block => block, :show_name => s }
	22	+ )
	23	+ end
	24	+ end
	25	+
	26	+ def cacheable?
	27	+ false
	28	+ end
	29	+end
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+class DownloadBlock < Block
	2	+
	3	+ attr_accessible :name, :link, :software_description, :show_name, :version_news
	4	+
	5	+ settings_items :name, :type => :string, :default => ''
	6	+ settings_items :link, :type => :string, :default => ''
	7	+ settings_items :software_description, :type => :string, :default => ''
	8	+ settings_items :show_name, :type => :boolean, :default => false
	9	+ settings_items :version_news, :type => :string, :default => ''
	10	+
	11	+ def self.description
	12	+ _('Download Stable Version')
	13	+ end
	14	+
	15	+ def help
	16	+ _('This block displays the stable version of a software.')
	17	+ end
	18	+
	19	+ def content(args={})
	20	+ block = self
	21	+ s = show_name
	22	+ lambda do \|object\|
	23	+ render(
	24	+ :file => 'blocks/download',
	25	+ :locals => { :block => block, :show_name => s }
	26	+ )
	27	+ end
	28	+ end
	29	+
	30	+ def cacheable?
	31	+ false
	32	+ end
	33	+end
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+class RepositoryBlock < Block
	2	+
	3	+ attr_accessible :show_name
	4	+
	5	+ settings_items :show_name, :type => :boolean, :default => false
	6	+
	7	+ def self.description
	8	+ _('Repository Link')
	9	+ end
	10	+
	11	+ def help
	12	+ _('This block displays the repository link of a software.')
	13	+ end
	14	+
	15	+ def content(args={})
	16	+ block = self
	17	+ s = show_name
	18	+ lambda do \|object\|
	19	+ render(
	20	+ :file => 'blocks/repository',
	21	+ :locals => { :block => block, :show_name => s }
	22	+ )
	23	+ end
	24	+ end
	25	+
	26	+ def cacheable?
	27	+ false
	28	+ end
	29	+end
	@@ -220,7 +220,7 @@		@@ -220,7 +220,7 @@
220	return false;	220	return false;
221	}	221	}
222		222
223	- var correct_format_regex = new RegExp(/\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i);	223	+ var correct_format_regex = new RegExp(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/);
224		224
225	return !correct_format_regex.test(value);	225	return !correct_format_regex.test(value);
226	}	226	}
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/test_helper'
	2	+require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
	3	+
	4	+class CategoriesAndTagsBlockTest < ActiveSupport::TestCase
	5	+ include PluginTestHelper
	6	+ should 'inherit from Block' do
	7	+ assert_kind_of Block, CategoriesAndTagsBlock.new
	8	+ end
	9	+
	10	+ should 'declare its default title' do
	11	+ CategoriesAndTagsBlock.any_instance.stubs(:profile_count).returns(0)
	12	+ assert_equal Block.new.default_title, CategoriesAndTagsBlock.new.default_title
	13	+ end
	14	+
	15	+ should 'describe itself' do
	16	+ assert_not_equal Block.description, CategoriesAndTagsBlock.description
	17	+ end
	18	+
	19	+end
	@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
		1	+<h3 class="block-title"><span><%= _("Categories") %></span></h3>
		2	+
		3	+<div class="category_cloud">
		4	+<% block.owner.categories.each do \|category\| %>
		5	+ <%= link_to category.name , category.path, :id => "select-category-1-link", :class => "select-subcategory-link", :target => "_blank" %>
		6	+<% end %>
		7	+</div><!-- end class='category_cloud' -->
		8	+
		9	+<h3 class="block-title"><span><%= _("Tags") %></span></h3>
		10	+<div class="tag_cloud">
		11	+<% block.owner.tag_list.each do \|tag\| %>
		12	+ <%= link_to tag , "#", :id => "select-category-1-link", :class => "select-subcategory-link"%>
		13	+<% end %>
		14	+</div>
0	\ No newline at end of file	15	\ No newline at end of file
	@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
		1	+<% if block.owner.software_info.nil? %>
		2	+ <%= _("This community needs a software to use this block") %>
		3	+<% else %>
		4	+ <div id="download-block">
		5	+ <div id="download_spb">
		6	+ <h2> <%= _("Download") %> </h2>
		7	+
		8	+ <span class="download-name">
		9	+ <%= link_to block.name, "#" %>
		10	+ </span>
		11	+
		12	+ <span class="download-system">
		13	+ <%= _(block.software_description) %>
		14	+ </span>
		15	+ </div>
		16	+
		17	+ <p id="download_info">
		18	+ <span class="req_spb">
		19	+ <%= link_to _("Minimal Requirements") , block.owner.public_profile_url, :class => "anchor-link", :target => "_self" %>
		20	+ </span>
		21	+
		22	+ <span class="nov_spb">
		23	+ <%= link_to(_("Version News"), block.version_news, :class => "anchor-link", :target => "_self") if !block.version_news.blank? %>
		24	+ </span>
		25	+
		26	+ <span class="licensed">
		27	+ <%= _("Licensed by") %>
		28	+ <%= link_to block.owner.software_info.license_info.version , block.owner.software_info.license_info.link, :target => "_blank" %>
		29	+ </span>
		30	+ </p>
		31	+ </div>
		32	+<% end %>
0	\ No newline at end of file	33	\ No newline at end of file
	@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
		1	+<% if block.owner.software_info.nil? %>
		2	+ <%= _("This community needs a software to use this block") %>
		3	+<% else %>
		4	+ <%= link_to _("Repository") , block.owner.software_info.repository_link, :id => "bt_repositorio", :target => "_blank" %>
		5	+<% end %>
0	\ No newline at end of file	6	\ No newline at end of file
	@@ -2,7 +2,6 @@		@@ -2,7 +2,6 @@
2		2
3	<% if block.owner.software_info.nil? %>	3	<% if block.owner.software_info.nil? %>
4	<%= _("This community needs a software to use this block") %>	4	<%= _("This community needs a software to use this block") %>
5	-
6	<% else %>	5	<% else %>
7	<table id="software-information-block-table">	6	<table id="software-information-block-table">
8	<tr>	7	<tr>
	@@ -13,7 +12,9 @@		@@ -13,7 +12,9 @@
13	<%= link_to profile_image(block.owner, :big) +"\n", profile.url %>	12	<%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
14	</span>	13	</span>
15	<div class='admin-link'>	14	<div class='admin-link'>
16	- <%= link_to _('Control panel'), block.owner.admin_url %>	15	+ <% if block.owner.admins.include?(current_user.person) %>
		16	+ <%= link_to _('Control panel'), block.owner.admin_url %>
		17	+ <% end %>
17	</div>	18	</div>
18	</div>	19	</div>
19	</div>	20	</div>
	@@ -23,33 +24,9 @@		@@ -23,33 +24,9 @@
23	<%= _("#{block.owner.software_info.acronym} - ") unless block.owner.software_info.acronym.blank? %>	24	<%= _("#{block.owner.software_info.acronym} - ") unless block.owner.software_info.acronym.blank? %>
24	<%= _("#{block.owner.name}") %>	25	<%= _("#{block.owner.name}") %>
25	</h1>	26	</h1>
26	-
27	<b>	27	<b>
28	<%= block.owner.software_info.finality %>	28	<%= block.owner.software_info.finality %>
29	</b>	29	</b>
30	- </td>
31	- </tr>
32	- <tr>
33	- <td colspan="2">
34	- <% identifier_name = block.owner.software_info.acronym.blank? ? block.owner.name : block.owner.software_info.acronym %>
35	- <%= _("For more detailed information see ") %>
36	- <%= link_to(_("#{block.owner.name} profile"), {:controller => 'profile', :action => "index", :profile => block.owner.identifier}) %>
37	- </td>
38	- </tr>
39	- <% unless block.owner.software_info.repository_link.blank? %>
40	- <tr>
41	- <td colspan="2">
42	- <%= _("Main repository: ") %>
43	- <%= link_to block.owner.software_info.repository_link, block.owner.software_info.repository_link %>
44	- </td>
45	- </tr>
46	- <% end %>
47	- <tr>
48	- <td>
49	- <i>
50	- <%= _("Licensed by ") %>
51	- <%= link_to block.owner.software_info.license_info.version, block.owner.software_info.license_info.link %>
52	- </i>
53	</td>	30	</td>
54	</tr>	31	</tr>
55	</table>	32	</table>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+<div id='edit-download-block'>
	2	+ <%= labelled_form_field _('Name:'), text_field_tag('block[name]', @block.name) %>
	3	+ <%= labelled_form_field _('Link:'), text_field_tag('block[link]', @block.link) %>
	4	+ <%= labelled_form_field _('Software Description:'), text_field_tag('block[software_description]', @block.software_description) %>
	5	+ <%= labelled_form_field _('Link to Version News:'), text_field_tag('block[version_news]', @block.version_news) %>
	6	+</div>