Merge branch 'field-of-interest' into 'master'

Ticket #85: The person_tags plugin now exposes a PersonTagsBlock The `person_tags` plugin exposes a block now, so people can show their interests in their profiles. ![tags-block](/uploads/8c8ca6d46d09a3cfb4545b9a15561b21/tags-block.png) I also renamed `interest` to `tag` because it was in conflict with other Noosfero stuff. See merge request !963

Merge branch 'field-of-interest' into 'master'
Ticket #85: The person_tags plugin now exposes a PersonTagsBlock The `person_tags` plugin exposes a block now, so people can show their interests in their profiles. ![tags-block](/uploads/8c8ca6d46d09a3cfb4545b9a15561b21/tags-block.png) I also renamed `interest` to `tag` because it was in conflict with other Noosfero stuff. See merge request !963
Daniela Feitosa
2 parents 9db0c7d6 44d21c5e
Showing 12 changed files with 85 additions and 13 deletions Show diff stats
plugins/person_tags/features/person_tags.feature
plugins/person_tags/lib/ext/person.rb
plugins/person_tags/lib/person_tags_plugin.rb
plugins/person_tags/lib/person_tags_plugin/api.rb
plugins/person_tags/lib/person_tags_plugin/interests_block.rb
plugins/person_tags/public/style.css
plugins/person_tags/test/unit/api_test.rb
plugins/person_tags/test/unit/person_tags_test.rb
plugins/person_tags/views/blocks/interests.html.erb
plugins/person_tags/views/environment_design
plugins/person_tags/views/profile-editor-extras.html.erb
plugins/person_tags/views/profile_design
@@ -10,9 +10,9 @@ Background:
 Scenario: add tags to person
   Given I am on joao's control panel
   And I follow "Edit Profile"
-  When I fill in "profile_data_interest_list" with "linux,debian"
+  When I fill in "profile_data_tag_list" with "linux,debian"
   And I press "Save"
   And I go to joao's control panel
   And I follow "Edit Profile"
-  Then the "profile_data_interest_list" field should contain "linux"
-  And the "profile_data_interest_list" field should contain "debian"
+  Then the "profile_data_tag_list" field should contain "linux"
+  And the "profile_data_tag_list" field should contain "debian"
 require_dependency 'person'
  
 class Person
-  attr_accessible :interest_list
+  attr_accessible :tag_list
  
-  acts_as_taggable_on :interests
+  acts_as_taggable_on :tags
   N_('Fields of interest')
 end
@@ -19,4 +19,18 @@ class PersonTagsPlugin &lt; Noosfero::Plugin
   def self.api_mount_points
     [PersonTagsPlugin::API]
   end
+
+  def self.extra_blocks
+    {
+      PersonTagsPlugin::InterestsBlock => { type: Person }
+    }
+  end
+
+  def self.has_admin_url?
+    false
+  end
+
+  def stylesheet?
+    true
+  end
 end
@@ -3,7 +3,7 @@ class PersonTagsPlugin::API &lt; Grape::API
     get ':id/tags' do
       person = environment.people.visible.find_by(id: params[:id])
       return not_found! if person.blank?
-      present person.interest_list
+      present person.tag_list
     end
   end
 end
@@ -0,0 +1,29 @@
+class PersonTagsPlugin::InterestsBlock < Block
+  def view_title
+    self.default_title 
+  end
+
+  def tags
+    owner.tag_list
+  end
+
+  def extra_option
+    {}
+  end
+
+  def self.description
+    _('Fields of Interest')
+  end
+
+  def help
+    _('Things that this person is interested in')
+  end
+
+  def default_title
+    _('Fields of Interest')
+  end
+
+  def self.expire_on
+    { profile: [:profile] }
+  end
+end
@@ -0,0 +1,13 @@
+.person-tags-block ul {
+  padding: 0;
+  margin: 0;
+}
+
+.person-tags-block li {
+  float: left;
+  list-style: none;
+  padding: 5px;
+  color: #fff;
+  background: #000;
+  margin: 5px;
+}
@@ -10,7 +10,7 @@ class APITest &lt;  ActiveSupport::TestCase
  
   should 'return tags for a person' do
     person = create_user('person').person
-    person.interest_list.add('linux')
+    person.tag_list.add('linux')
     person.save!
     person.reload
     get "/api/v1/people/#{person.id}/tags?#{params.to_query}"
@@ -7,10 +7,10 @@ class PersonTagsPluginTest &lt; ActiveSupport::TestCase
     @environment.enable_plugin(PersonTagsPlugin)
   end
  
-  should 'have interests' do
+  should 'have tags' do
     person = create_user('person').person
-    assert_equal [], person.interests
-    person.interest_list.add('linux')
-    assert_equal ['linux'], person.interest_list
+    assert_equal [], person.tags
+    person.tag_list.add('linux')
+    assert_equal ['linux'], person.tag_list
   end
 end
@@ -0,0 +1,14 @@
+<%= block_title(block.view_title, block.subtitle) %>
+
+<div class="person-tags-block">
+  <% unless block.tags.size == 0 %>
+    <ul>
+      <% block.tags.each do |tag| %>
+        <li><%= tag %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <div class="person-tags-block-none"><%= c_('None') %></div>
+  <% end %>
+  <br style="clear:both" />
+</div>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
 <h2><%= _('Select your fields of interest') %></h2>
-<%= text_field_tag('profile_data[interest_list]', context.profile.interest_list.join(','), size: 64) %>
+<%= text_field_tag('profile_data[tag_list]', context.profile.tag_list.join(','), size: 64) %>
 <br />
 <%= content_tag( 'small', _('Separate tags with commas') ) %>
  
 <script>
-  jQuery('#profile_data_interest_list').inputosaurus();
+  jQuery('#profile_data_tag_list').inputosaurus();
 </script>
@@ -0,0 +1 @@
+box_organizer
 \ No newline at end of file
...	...	@@ -10,9 +10,9 @@ Background:
10	10	Scenario: add tags to person
11	11	Given I am on joao's control panel
12	12	And I follow "Edit Profile"
13		- When I fill in "profile_data_interest_list" with "linux,debian"
	13	+ When I fill in "profile_data_tag_list" with "linux,debian"
14	14	And I press "Save"
15	15	And I go to joao's control panel
16	16	And I follow "Edit Profile"
17		- Then the "profile_data_interest_list" field should contain "linux"
18		- And the "profile_data_interest_list" field should contain "debian"
	17	+ Then the "profile_data_tag_list" field should contain "linux"
	18	+ And the "profile_data_tag_list" field should contain "debian"
...	...
1	1	require_dependency 'person'
2	2
3	3	class Person
4		- attr_accessible :interest_list
	4	+ attr_accessible :tag_list
5	5
6		- acts_as_taggable_on :interests
	6	+ acts_as_taggable_on :tags
7	7	N_('Fields of interest')
8	8	end
...	...
...	...	@@ -19,4 +19,18 @@ class PersonTagsPlugin < Noosfero::Plugin
19	19	def self.api_mount_points
20	20	[PersonTagsPlugin::API]
21	21	end
	22	+
	23	+ def self.extra_blocks
	24	+ {
	25	+ PersonTagsPlugin::InterestsBlock => { type: Person }
	26	+ }
	27	+ end
	28	+
	29	+ def self.has_admin_url?
	30	+ false
	31	+ end
	32	+
	33	+ def stylesheet?
	34	+ true
	35	+ end
22	36	end
...	...
...	...	@@ -3,7 +3,7 @@ class PersonTagsPlugin::API < Grape::API
3	3	get ':id/tags' do
4	4	person = environment.people.visible.find_by(id: params[:id])
5	5	return not_found! if person.blank?
6		- present person.interest_list
	6	+ present person.tag_list
7	7	end
8	8	end
9	9	end
...	...
...	...	@@ -0,0 +1,29 @@
	1	+class PersonTagsPlugin::InterestsBlock < Block
	2	+ def view_title
	3	+ self.default_title
	4	+ end
	5	+
	6	+ def tags
	7	+ owner.tag_list
	8	+ end
	9	+
	10	+ def extra_option
	11	+ {}
	12	+ end
	13	+
	14	+ def self.description
	15	+ _('Fields of Interest')
	16	+ end
	17	+
	18	+ def help
	19	+ _('Things that this person is interested in')
	20	+ end
	21	+
	22	+ def default_title
	23	+ _('Fields of Interest')
	24	+ end
	25	+
	26	+ def self.expire_on
	27	+ { profile: [:profile] }
	28	+ end
	29	+end
...	...
...	...	@@ -0,0 +1,13 @@
	1	+.person-tags-block ul {
	2	+ padding: 0;
	3	+ margin: 0;
	4	+}
	5	+
	6	+.person-tags-block li {
	7	+ float: left;
	8	+ list-style: none;
	9	+ padding: 5px;
	10	+ color: #fff;
	11	+ background: #000;
	12	+ margin: 5px;
	13	+}
...	...
...	...	@@ -10,7 +10,7 @@ class APITest < ActiveSupport::TestCase
10	10
11	11	should 'return tags for a person' do
12	12	person = create_user('person').person
13		- person.interest_list.add('linux')
	13	+ person.tag_list.add('linux')
14	14	person.save!
15	15	person.reload
16	16	get "/api/v1/people/#{person.id}/tags?#{params.to_query}"
...	...
...	...	@@ -7,10 +7,10 @@ class PersonTagsPluginTest < ActiveSupport::TestCase
7	7	@environment.enable_plugin(PersonTagsPlugin)
8	8	end
9	9
10		- should 'have interests' do
	10	+ should 'have tags' do
11	11	person = create_user('person').person
12		- assert_equal [], person.interests
13		- person.interest_list.add('linux')
14		- assert_equal ['linux'], person.interest_list
	12	+ assert_equal [], person.tags
	13	+ person.tag_list.add('linux')
	14	+ assert_equal ['linux'], person.tag_list
15	15	end
16	16	end
...	...
...	...	@@ -0,0 +1,14 @@
	1	+<%= block_title(block.view_title, block.subtitle) %>
	2	+
	3	+<div class="person-tags-block">
	4	+ <% unless block.tags.size == 0 %>
	5	+ <ul>
	6	+ <% block.tags.each do \|tag\| %>
	7	+ <li><%= tag %></li>
	8	+ <% end %>
	9	+ </ul>
	10	+ <% else %>
	11	+ <div class="person-tags-block-none"><%= c_('None') %></div>
	12	+ <% end %>
	13	+ <br style="clear:both" />
	14	+</div>
...	...
...	...	@@ -0,0 +1 @@
	1	+box_organizer
0	2	\ No newline at end of file
...	...