[Logilogi-svn] SF.net SVN: logilogi: [302] projects/ogog/trunk

Revision: 302
          http://logilogi.svn.sourceforge.net/logilogi/?rev=302&view=rev
Author:   wybow
Date:     2007-05-21 11:04:32 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Added integration-test and set truncate for tags everywhere...

Modified Paths:
--------------
    projects/ogog/trunk/app/helpers/application_helper.rb
    projects/ogog/trunk/app/helpers/post_helper.rb
    projects/ogog/trunk/app/models/feed.rb
    projects/ogog/trunk/test/unit/feed_test.rb

Added Paths:
-----------
    projects/ogog/trunk/test/integration/visits_test.rb

Modified: projects/ogog/trunk/app/helpers/application_helper.rb
===================================================================
--- projects/ogog/trunk/app/helpers/application_helper.rb	2007-05-21 16:51:46 UTC (rev 301)
+++ projects/ogog/trunk/app/helpers/application_helper.rb	2007-05-21 18:04:32 UTC (rev 302)
@@ -3,7 +3,7 @@
   include Rubaidh::TabularForm
 
   def link_to_tag(tag, options = {})
-    link_to(tag.to_s, index_url({:link_string => tag.to_s}),options) 
+    link_to(truncate(tag.to_s, 15), index_url({:link_string => tag.to_s}),options) 
   end
 
   def link_to_post(string, post, tag, options = {})

Modified: projects/ogog/trunk/app/helpers/post_helper.rb
===================================================================
--- projects/ogog/trunk/app/helpers/post_helper.rb	2007-05-21 16:51:46 UTC (rev 301)
+++ projects/ogog/trunk/app/helpers/post_helper.rb	2007-05-21 18:04:32 UTC (rev 302)
@@ -3,7 +3,7 @@
     link = Context.current.link
     link_url = '<ul>'
     (0...(link.size(options[:direction]))).each { |i|
-      link_url += '<li>' + link_to(link.tags(options[:direction])[i],
+      link_url += '<li>' + link_to(truncate(link.tags(options[:direction])[i].to_s, 15),
           {:action => 'index', :link_string => link.to_s(
               :direction => options[:direction], :step => i)}) +
           '</li><li><span class="slash_separator">/</span></li>'
@@ -29,7 +29,7 @@
 
   def link_to_cloud_tag(tag, css_class)
     context = Context.current
-    link = '<span class="cloud ' + css_class + '">' + link_to(truncate(tag.to_s, 20), index_url({:link_string => tag.to_s})) + '&nbsp;'
+    link = '<span class="cloud ' + css_class + '">' + link_to(truncate(tag.to_s, 12), index_url({:link_string => tag.to_s})) + '&nbsp;'
     if tag != Tag.overall && !context.link.requested_tags.include?(tag)
       link << link_to('/+', index_url({:link_string => context.link.to_s + '/' + tag.to_s}))
     else

Modified: projects/ogog/trunk/app/models/feed.rb
===================================================================
--- projects/ogog/trunk/app/models/feed.rb	2007-05-21 16:51:46 UTC (rev 301)
+++ projects/ogog/trunk/app/models/feed.rb	2007-05-21 18:04:32 UTC (rev 302)
@@ -31,7 +31,7 @@
 
   ### Regular expressions
 
-  URL = /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
+  URL = /^(http|https):\/\/[a-z0-9]+([\-\.a-z0-9])*(\.[a-z]{2,5}|:)([\/\-\.a-z0-9].*)?$/ix
 
   ### Validations
 

Added: projects/ogog/trunk/test/integration/visits_test.rb
===================================================================
--- projects/ogog/trunk/test/integration/visits_test.rb	                        (rev 0)
+++ projects/ogog/trunk/test/integration/visits_test.rb	2007-05-21 18:04:32 UTC (rev 302)
@@ -0,0 +1,50 @@
+#--#
+# Copyright: (c) 2007 The LogiLogi Foundation <fou...@lo...>
+#
+# License:
+#   This file is part of the OgOg program. OgOg is free software. You can run/
+#   distribute/modify OgOg under the terms of the Affero General Public 
+#   License version 1 or any later version. The Affero GPL states that running 
+#   a modified version or a derivative work also requires you to make the 
+#   sourcecode of that work available to everyone that can interact with it.
+#   We chose the Affero GPL to ensure that OgOg remains open and libre 
+#   (doc/LICENSE.txt contains the full text of the legally binding license).
+#++#
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class VisitsTest < ActionController::IntegrationTest
+  fixtures AllFixtures
+  # AllFixtures set in test_helper
+
+  def test_visits
+    # Normal pages
+    assert_visit main_url
+    assert_visit 'Overall'
+    assert_visit 'Rocks/Ducks'
+    assert_visit 'Plane'
+
+    # Specific pages
+    assert_visit 'do/feed/new'
+    assert_visit 'do/doc/tour'
+    assert_visit 'do/doc/faq'
+    assert_visit 'do/doc/api'
+    assert_visit 'do/doc/development'
+
+    # Content pages
+    assert_visit 'do/post/4/viewpoint/Overall'
+    assert_visit 'do/feed/3'
+    assert_visit 'do/user/kevin'
+
+    # Badges
+    assert_visit 'do/user/kevin/badge/Rocks'
+    assert_visit 'do/user/kevin/badge/Rocks.xml'
+    assert_visit 'do/user/kevin/badge/Rocks.json'
+    assert_visit 'do/user/kevin/badge/Rocks.png'
+  end
+
+  def assert_visit(url)
+    get url
+    assert_response :success
+  end
+end

Modified: projects/ogog/trunk/test/unit/feed_test.rb
===================================================================
--- projects/ogog/trunk/test/unit/feed_test.rb	2007-05-21 16:51:46 UTC (rev 301)
+++ projects/ogog/trunk/test/unit/feed_test.rb	2007-05-21 18:04:32 UTC (rev 302)
@@ -34,7 +34,7 @@
     f = Feed.find(feeds(:lamas).id)
     f.claim
     f.reload
-    assert_equal f.user, User.current
+    assert_equal User.current, f.user
   end
 
   def test_claim_link
@@ -43,7 +43,7 @@
     f.site_url = 'http://localhost:3000/pub/test/lama/linkedindex.html'
     f.claim
     f.reload
-    assert_equal f.user, User.current
+    assert_equal User.current, f.user
   end
 
   def test_claim_errors


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.