Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/366 Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh

Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/366 Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh
Rodrigo Souto
2 parents 5e853854 bfa26491
Showing 6 changed files with 63 additions and 15 deletions Show diff stats
INSTALL.md
app/helpers/application_helper.rb
config/initializers/dependencies.rb
debian/control
script/install-dependencies/debian-squeeze.sh
test/functional/cms_controller_test.rb
@@ -23,7 +23,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or De
     # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby1.8 \
       libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libhpricot-ruby \
       libwill-paginate-ruby iso-codes libfeedparser-ruby libdaemons-ruby thin \
-      tango-icon-theme
+      tango-icon-theme libnokogiri-ruby
 On other systems, they may or may not be available through your regular package management system. Below are the links to their homepages.
@@ -41,6 +41,7 @@ On other systems, they may or may not be available through your regular package 
 * Thin: http://code.macournoyer.com/thin
 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
 * Hpricot: http://hpricot.com
+* Nokogiri: http://nokogiri.org/
 If you manage to install Noosfero successfully on other systems than Debian,
 please feel free to contact the Noosfero development mailing with the
@@ -1382,16 +1382,16 @@ module ApplicationHelper
   end
   def convert_macro(html, source)
-    doc = Hpricot(html)
+    doc = Nokogiri::HTML(html)
     #TODO This way is more efficient but do not support macro inside of
     #     macro. You must parse them from the inside-out in order to enable
     #     that.
-    doc.search('.macro').each do |macro|
+    doc.css('.macro').each do |macro|
       macro_name = macro['data-macro']
       result = @plugins.parse_macro(macro_name, macro, source)
-      macro.inner_html = result.kind_of?(Proc) ? self.instance_eval(&result) : result
+      macro.content = result.kind_of?(Proc) ? self.instance_eval(&result) : result
     end
-    doc.html
+    doc.xpath('//body/*').to_s
   end
   def default_folder_for_image_upload(profile)
@@ -8,3 +8,4 @@ require &#39;route_if&#39;
 # third-party libraries
 require 'will_paginate'
+require 'nokogiri'
@@ -41,6 +41,7 @@ Depends:
  thin,
  tango-icon-theme,
  libhpricot-ruby,
+ libnokogiri-ruby,
  memcached,
  debconf,
  dbconfig-common,
@@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
 # needed for development
-run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre
+run sudo apt-get -y install libtidy-ruby libhpricot-ruby libnokogiri-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre
 gem which bundler >/dev/null 2>&1 || gem_install bundler
 setup_rubygems_path
 run bundle install
@@ -644,8 +644,13 @@ class CmsControllerTest &lt; ActionController::TestCase
     article = profile.articles.create!(:name => 'test', :published => false)
     get :edit, :profile => profile.identifier, :id => article.id
-    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_true' }
-    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'article[published]', :id => 'article_published_false', :checked => 'checked' }
+    assert_select 'input#article_published_true[name=?][type="radio"]', 'article[published]'
+    assert_select 'input#article_published_false[name=?][type="radio"]', 'article[published]' do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element["checked"]
+      end
+    end
   end
   should 'be able to add image with alignment' do
@@ -844,13 +849,23 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'display posts per page input with default value on edit blog' do
     n = Blog.new.posts_per_page.to_s
     get :new, :profile => profile.identifier, :type => 'Blog'
-    assert_tag :tag => 'select', :attributes => { :name => 'article[posts_per_page]' }, :child => { :tag => 'option', :attributes => {:value => n, :selected => 'selected'} }
+    assert_select 'select[name=?] option[value=?]', 'article[posts_per_page]', n do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element["selected"]
+      end
+    end
   end
   should 'display options for blog visualization with default value on edit blog' do
     format = Blog.new.visualization_format
     get :new, :profile => profile.identifier, :type => 'Blog'
-    assert_tag :tag => 'select', :attributes => { :name => 'article[visualization_format]' }, :child => { :tag => 'option', :attributes => {:value => 'full', :selected => 'selected'} }
+    assert_select 'select[name=?] option[value=full]', 'article[visualization_format]' do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element["selected"]
+      end
+    end
   end
   should 'not offer to create special article types' do
@@ -985,6 +1000,11 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :content => 'Cancel', :attributes => { :href => /\/myprofile\/#{profile.identifier}/ }
   end
+  should 'have only one mandatory field in the blog creation form' do
+    get :new, :profile => profile.identifier, :type => Blog.name
+    assert_select '.required-field .formfieldline', 1
+  end
+
   should 'create icon upload file in folder' do
     f = Gallery.create!(:name => 'test_folder', :profile => profile)
     post :new, :profile => profile.identifier,
@@ -1076,7 +1096,12 @@ class CmsControllerTest &lt; ActionController::TestCase
     profile.articles << Blog.new(:name => 'test blog', :profile => profile)
     profile.blog.create_external_feed(:address => 'address', :enabled => true)
     get :edit, :profile => profile.identifier, :id => profile.blog.id
-    assert_tag :tag => 'input', :attributes => { :name => 'article[external_feed_builder][enabled]', :checked => 'checked' }
+    assert_select 'input[type=checkbox][name=?]',  'article[external_feed_builder][enabled]' do |elements|
+      elements.length > 0
+      elements.each do |element|
+        assert element["checked"]
+      end
+    end
   end
   should "display 'Fetch posts from an external feed' unchecked if blog has disabled external feed" do
@@ -1094,7 +1119,12 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'only_once option marked by default' do
     get :new, :profile => profile.identifier, :type => 'Blog'
-    assert_tag :tag => 'input', :attributes => { :name => 'article[external_feed_builder][only_once]', :checked => 'checked', :value => 'true' }
+    assert_select 'input[name=?][value="true"]', 'article[external_feed_builder][only_once]' do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element['checked']
+      end
+    end
   end
   should 'display media listing when it is TinyMceArticle and enabled on environment' do
@@ -1250,7 +1280,12 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'display posts per page input with default value on edit forum' do
     n = Forum.new.posts_per_page.to_s
     get :new, :profile => profile.identifier, :type => 'Forum'
-    assert_tag :tag => 'select', :attributes => { :name => 'article[posts_per_page]' }, :child => { :tag => 'option', :attributes => {:value => n, :selected => 'selected'} }
+    assert_select 'select[name=?] option[value=?]', 'article[posts_per_page]', n do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element['selected']
+      end
+    end
   end
   should 'offer to edit a forum' do
@@ -1419,7 +1454,12 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'display display posts in current language input checked when editing blog' do
     profile.articles << Blog.new(:name => 'Blog for test', :profile => profile, :display_posts_in_current_language => true)
     get :edit, :profile => profile.identifier, :id => profile.blog.id
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[display_posts_in_current_language]', :checked => 'checked' }
+    assert_select 'input[type=checkbox][name=?]', 'article[display_posts_in_current_language]' do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element["checked"]
+      end
+    end
   end
   should 'display display posts in current language input not checked on new blog' do
@@ -1444,7 +1484,12 @@ class CmsControllerTest &lt; ActionController::TestCase
   should 'be checked display posts in current language checkbox' do
     profile.articles << Blog.new(:name => 'Blog for test', :profile => profile, :display_posts_in_current_language => true)
     get :edit, :profile => profile.identifier, :id => profile.blog.id
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[display_posts_in_current_language]', :checked => 'checked' }
+    assert_select 'input[type=checkbox][name=?]', 'article[display_posts_in_current_language]' do |elements|
+      assert elements.length > 0
+      elements.each do |element|
+        assert element["checked"]
+      end
+    end
   end
   should 'be unchecked display posts in current language checkbox' do
	@@ -1382,16 +1382,16 @@ module ApplicationHelper		@@ -1382,16 +1382,16 @@ module ApplicationHelper
1382	end	1382	end
1383		1383
1384	def convert_macro(html, source)	1384	def convert_macro(html, source)
1385	- doc = Hpricot(html)	1385	+ doc = Nokogiri::HTML(html)
1386	#TODO This way is more efficient but do not support macro inside of	1386	#TODO This way is more efficient but do not support macro inside of
1387	# macro. You must parse them from the inside-out in order to enable	1387	# macro. You must parse them from the inside-out in order to enable
1388	# that.	1388	# that.
1389	- doc.search('.macro').each do \|macro\|	1389	+ doc.css('.macro').each do \|macro\|
1390	macro_name = macro['data-macro']	1390	macro_name = macro['data-macro']
1391	result = @plugins.parse_macro(macro_name, macro, source)	1391	result = @plugins.parse_macro(macro_name, macro, source)
1392	- macro.inner_html = result.kind_of?(Proc) ? self.instance_eval(&result) : result	1392	+ macro.content = result.kind_of?(Proc) ? self.instance_eval(&result) : result
1393	end	1393	end
1394	- doc.html	1394	+ doc.xpath('//body/*').to_s
1395	end	1395	end
1396		1396
1397	def default_folder_for_image_upload(profile)	1397	def default_folder_for_image_upload(profile)
	@@ -8,3 +8,4 @@ require 'route_if'		@@ -8,3 +8,4 @@ require 'route_if'
8		8
9	# third-party libraries	9	# third-party libraries
10	require 'will_paginate'	10	require 'will_paginate'
		11	+require 'nokogiri'
	@@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies		@@ -5,7 +5,7 @@ run sudo apt-get -y install $runtime_dependencies
5	sudo apt-get -y install iceweasel \|\| sudo apt-get -y install firefox	5	sudo apt-get -y install iceweasel \|\| sudo apt-get -y install firefox
6		6
7	# needed for development	7	# needed for development
8	-run sudo apt-get -y install libtidy-ruby libhpricot-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre	8	+run sudo apt-get -y install libtidy-ruby libhpricot-ruby libnokogiri-ruby libmocha-ruby imagemagick po4a xvfb libxml2-dev libxslt-dev postgresql openjdk-6-jre
9	gem which bundler >/dev/null 2>&1 \|\| gem_install bundler	9	gem which bundler >/dev/null 2>&1 \|\| gem_install bundler
10	setup_rubygems_path	10	setup_rubygems_path
11	run bundle install	11	run bundle install