breakout_parser 0.0.11-x86-mswin32 → 0.0.12-x86-mswin32

data/ChangeLog

@@ -0,0 +1,12 @@
+[ 0.0.12 ]
+
+    * new internal calling convention
+    * parse() and parse_links_only() methods now accept site url as third (optional)
+      argument: parse( "some markup", "space_name", "http://breakout.localhost:3000" )
+    * Handle [[r:num:rev]] in addition to [[r:num]]; also handle [[revision:num:rev]]
+      see http://www.assembla.com/spaces/breakout/tickets/5637
+    * parse() and parse_links_only() methods now accept git url as fourth (optional)
+      argument, f.ex. if "http://github.com/" provided as git url, it will be
+      concatenated with git commit id and converted to a html anchor
+
+# vim:ts=2:sw=2:expandtab:syntax=ruby:textwidth=0

data/spec/parser_spec.rb

@@ -1,4 +1,5 @@
 require 'breakout_parser'
+require File.dirname(__FILE__) + '/obj_proxy'
 
 describe 'BreakoutParser' do
   def self.hex_string s
@@ -10,6 +11,19 @@ describe 'BreakoutParser' do
   end
   def hex_string s; self.class.hex_string(s); end
 
+  it 'accepts from 2 to 4 arguments' do
+    [0,1,5,6,7,8,9,10].each do |argc|
+      lambda{
+        BreakoutParser.parse(*(['a']*argc))
+      }.should raise_error(ArgumentError, "wrong number of arguments (#{argc} for 2..4)")
+    end
+    (2..4).each do |argc|
+      lambda{
+        BreakoutParser.parse(*(['a']*argc))
+      }.should_not raise_error
+    end
+  end
+
   it 'converts \n to <br />' do
     parse("aaa\nbbb").should match(%r"aaa ?<br /> ?bbb")
   end
@@ -31,22 +45,22 @@ describe 'BreakoutParser' do
 
   it "handles nil & false text well" do
     parse(false).should == ""
-    parse(false,false).should == ""
-    parse("",false).should == ""
+    parse(false, :space_name => false).should == ""
+    parse("",    :space_name => false).should == ""
     parse(nil).should == ""
-    parse(nil,nil).should == ""
-    parse("",nil).should == ""
+    parse(nil,   :space_name => nil).should == ""
+    parse("",    :space_name => nil).should == ""
   end
 
   it "handles nil space_name well" do
     lambda{
-      parse("#123",nil)
+      parse("#123", :space_name => nil)
     }.should raise_error(TypeError)
   end
 
   it "handles false space_name well" do
     lambda{
-      parse("#123",false)
+      parse("#123", :space_name => false)
     }.should raise_error(TypeError)
   end
 
@@ -740,8 +754,14 @@ describe 'BreakoutParser' do
       '<a href="/code/test_space/git/changesets/1f4bdab77be696efd">revision:1f4bdab77be696efd</a>'
     a["revision:12345"] =
       '<a href="/code/test_space/subversion/changesets/12345">revision:12345</a>'
+    a["revision:567:1f4bdab77be696efd"] =
+      '<a href="/code/test_space/git-567/changesets/1f4bdab77be696efd">revision:1f4bdab77be696efd</a>'
+    a["revision:3:12345"] =
+      '<a href="/code/test_space/subversion-3/changesets/12345">revision:12345</a>'
     a["r:2345"] = '<a href="/code/test_space/subversion/changesets/2345">revision:2345</a>'
     a["r:2345ef"] = '<a href="/code/test_space/git/changesets/2345ef">revision:2345ef</a>'
+    a["r:10:2345"] = '<a href="/code/test_space/subversion-10/changesets/2345">revision:2345</a>'
+    a["r:1:2345ef"] = '<a href="/code/test_space/git-1/changesets/2345ef">revision:2345ef</a>'
 
     a["url:http://www.ru"]   = '<a rel="nofollow" href="http://www.ru">http://www.ru</a>'
     a["url:https://www.ru"]  = '<a rel="nofollow" href="https://www.ru">https://www.ru</a>'
@@ -765,6 +785,69 @@ describe 'BreakoutParser' do
       it "parses [[#{k}|test & here]]" do
         parse("[[#{k}|test & here]]").should == v.sub(/>.*</,">test &amp; here<")
       end
+      if v['href="/'] && !k['url:']
+        it "parses [[#{k}]] with a site url" do
+          site_url = "http://www.ru"
+          parse("[[#{k}]]", :site_url => site_url).should ==
+            v.gsub('href="/',"href=\"#{site_url}/")
+
+          # with extraordinary slash
+          parse("[[#{k}]]", :site_url => "#{site_url}/").should ==
+            v.gsub('href="/',"href=\"#{site_url}/")
+
+          site_url = "http://127.0.0.1:3000"
+          parse("[[#{k}]]", :site_url => site_url).should ==
+            v.gsub('href="/',"href=\"#{site_url}/")
+
+          # with extraordinary slash
+          parse("[[#{k}]]", :site_url => "#{site_url}/").should ==
+            v.gsub('href="/',"href=\"#{site_url}/")
+        end
+      end
+      if v['/git/']
+        it "parses [[#{k}]] with custom git_url (String)" do
+          git_url = "http://www.ru/"
+          rev = k.split(':').last.tr(']','')
+          parse("[[#{k}]]", :git_url => git_url).should ==
+            v.sub('/code/test_space/git/changesets/',git_url)
+        end
+
+        it "parses [[#{k}]] with custom git_url (ObjProxy)" do
+          rev = k.split(':').last.tr(']','')
+          @asdfg = 'http://mmm.us'
+          git_url = Breakout::ObjProxy.new do
+            @asdfg + '/'
+          end
+          parse("[[#{k}]]", :git_url => git_url).should ==
+            v.sub('/code/test_space/git/changesets/',git_url)
+        end
+
+        it "parses [[#{k}]] with NULL git_url (ObjProxy)" do
+          rev = k.split(':').last.tr(']','')
+          git_url = Breakout::ObjProxy.new do
+            nil
+          end
+          parse("[[#{k}]]", :git_url => git_url).should == v
+        end
+
+        it "parses [[#{k}]] with FALSE git_url (ObjProxy)" do
+          rev = k.split(':').last.tr(']','')
+          git_url = Breakout::ObjProxy.new do
+            false
+          end
+          parse("[[#{k}]]", :git_url => git_url).should == v
+        end
+      end
+    end
+
+    it "should not instantiate ObjProxy's internal object if there's no git links in text" do
+      git_url = Breakout::ObjProxy.new do
+        raise 'should not be raised'
+      end
+      lambda {
+        parse("[[r:2345]]", :git_url => git_url).should ==
+          '<a href="/code/test_space/subversion/changesets/2345">revision:2345</a>'
+      }.should_not raise_error
     end
 
     a = {}
@@ -823,7 +906,8 @@ describe 'BreakoutParser' do
     s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
   end
 
-  def parse s, space_name = "test_space"
-    BreakoutParser.parse(s, space_name).strip
+  def parse s, h = {}
+    h[:space_name] = "test_space" unless h.key?(:space_name)
+    BreakoutParser.parse(s, h[:space_name], h[:site_url], h[:git_url]).strip
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: breakout_parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: x86-mswin32
 authors: 
 - Andrey "Zed" Zaikin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +06:00
+date: 2010-04-01 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- ChangeLog
 - LICENSE
 files: 
+- ChangeLog
 - LICENSE
 - lib/breakout_parser.rb
 - lib/breakout_parser/win32-ruby1.8/breakout_parser.so