wikilink-converter 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/wikilink/converter/namespace.rb

@@ -1,4 +1,5 @@
 require 'wikilink/converter/utils'
+require 'uri'
 
 module Wikilink
   class Converter
@@ -46,7 +47,12 @@ module Wikilink
           if path.nil? || path.empty?
             [query, fragment].join
           else
-            [options[:prefix], path, options[:suffix], query, fragment].join
+            if options[:prefix]
+              prefix = URI.parse(URI.escape(options[:prefix]))
+              prefix.path = File.expand_path(URI.escape(path), prefix.path)
+              path = prefix.to_s
+            end
+            [path, options[:suffix], query, fragment].join
           end
         end
       end

data/lib/wikilink/converter/utils.rb

@@ -31,7 +31,6 @@ module Wikilink
           memo + key.to_s + '="' + CGI.escape_html(value) + '" '
         end
         url, fragment = url.split('#', 2)
-        url = URI.encode(url)
         if fragment
           url << '#' + URI.encode(fragment, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
         end

data/spec/wikilink/converter/namespace_spec.rb

@@ -64,6 +64,9 @@ describe Wikilink::Converter::Namespace::Default do
     it { should convert(path: 'foo/bar', name: 'Header 1').
       to('<a href="foo/bar">Header 1</a>')
     }
+    it { should convert(path: '../bar', name: 'Header 1').
+      to('<a href="../bar">Header 1</a>')
+    }
     it_behaves_like 'converter that keeps query fragment only path untouched'
   end
 
@@ -72,6 +75,9 @@ describe Wikilink::Converter::Namespace::Default do
     describe '#run' do
       subject { converter.method(:run) }
       it_behaves_like 'converter that keeps query fragment only path untouched'
+      it { should convert(path: '../blog', name: 'Header 1').
+        to('<a href="/blog">Header 1</a>')
+      }
     end
   end
 

data/wikilink-converter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wikilink-converter"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian Yang"]
-  s.date = "2011-12-07"
+  s.date = "2011-12-31"
   s.description = "convert [[WikiLink]] to <a>"
   s.email = "me@iany.me"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikilink-converter
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153868500 !ruby/object:Gem::Requirement
+  requirement: &2154161980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153868500
+  version_requirements: *2154161980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153868020 !ruby/object:Gem::Requirement
+  requirement: &2154161400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153868020
+  version_requirements: *2154161400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153867440 !ruby/object:Gem::Requirement
+  requirement: &2154160880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153867440
+  version_requirements: *2154160880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153866920 !ruby/object:Gem::Requirement
+  requirement: &2154160380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153866920
+  version_requirements: *2154160380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153866440 !ruby/object:Gem::Requirement
+  requirement: &2154159880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153866440
+  version_requirements: *2154159880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153865860 !ruby/object:Gem::Requirement
+  requirement: &2154159360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153865860
+  version_requirements: *2154159360
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153865340 !ruby/object:Gem::Requirement
+  requirement: &2154158880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153865340
+  version_requirements: *2154158880
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153864860 !ruby/object:Gem::Requirement
+  requirement: &2154158340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153864860
+  version_requirements: *2154158340
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &2153864280 !ruby/object:Gem::Requirement
+  requirement: &2154157860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153864280
+  version_requirements: *2154157860
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2153863760 !ruby/object:Gem::Requirement
+  requirement: &2154157380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153863760
+  version_requirements: *2154157380
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2153842780 !ruby/object:Gem::Requirement
+  requirement: &2154156900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153842780
+  version_requirements: *2154156900
 description: convert [[WikiLink]] to <a>
 email: me@iany.me
 executables: []
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1200163682605513531
+      hash: -2707503494731941883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: