[Logilogi-svn] SF.net SVN: logilogi:[1652] trunk

Revision: 1652
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1652&view=rev
Author:   wybow
Date:     2009-12-09 17:15:34 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
Rails 2.3.5 ready

Modified Paths:
--------------
    trunk/app/models/link.rb
    trunk/config/environment.rb
    trunk/test/unit/context_test.rb

Modified: trunk/app/models/link.rb
===================================================================
--- trunk/app/models/link.rb	2009-12-09 15:52:52 UTC (rev 1651)
+++ trunk/app/models/link.rb	2009-12-09 17:15:34 UTC (rev 1652)
@@ -140,7 +140,9 @@
   # Parses a link_hash from a link_string
   #
   # The syntax is as follows:
-  # <tag>(/<tag>)*(<logi>)?(<logi_version>)?(<spec suffix>)?
+  # <tag>(/<tag>)*(<logi>(<logi_version>)?)?(<spec suffix>)?
+  # 
+  # Plus optionally a preceding url which will be stripped.
   #
   # with:
   # <tag> = ([\w._-])+
@@ -149,13 +151,14 @@
   # <spec suffix> = \$stance=<stance>
   #
   # Examples:
-  # Foucault==v0
+  # https://en.so.logilogi.org/Foucault
+  # Foucault=John_Johnson_2=v1
   # Economics/Foucault/Non_Existing_Word/Botanics
   #
   def self.hash_from_s(link_string)
     if GlobalConfig.done_with_basics?
-     if link_string =~ /\:\d+/
-        link_string.gsub!(/^.*?\:\d+\//,"")
+     if link_string =~ /\/\//
+        link_string.gsub!(/^.*?\/\/[^\/]+\//,"")
       end
     end
     link_string =~ Const::Link::DISSECT_LINK_RE

Modified: trunk/config/environment.rb
===================================================================
--- trunk/config/environment.rb	2009-12-09 15:52:52 UTC (rev 1651)
+++ trunk/config/environment.rb	2009-12-09 17:15:34 UTC (rev 1652)
@@ -4,7 +4,7 @@
 # you don't control web/app server and can't set it the proper way
 # ENV['RAILS_ENV'] ||= 'production'
 
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

Modified: trunk/test/unit/context_test.rb
===================================================================
--- trunk/test/unit/context_test.rb	2009-12-09 15:52:52 UTC (rev 1651)
+++ trunk/test/unit/context_test.rb	2009-12-09 17:15:34 UTC (rev 1652)
@@ -123,7 +123,7 @@
   def test_reduced_matching_logis
     c = Context.new(Link.new_from_s('Logi_Logi/Hubba'))
     assert_equal 2, c.reduced_matching_logis.size
-    assert_equal logis(:logi_logi), c.reduced_matching_logis.first
+    assert c.reduced_matching_logis.include?(logis(:logi_logi))
 
     # reduced, unordered
     c = Context.new(Link.new_from_s('Manta/Logi_Logi/Hubba'))


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