wikilink-converter 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.1
1
+ 0.2.2
@@ -1,4 +1,5 @@
1
1
  require 'cgi'
2
+ require 'uri'
2
3
 
3
4
  module Wikilink
4
5
  class Converter
@@ -29,8 +30,13 @@ module Wikilink
29
30
  attributes = attributes.inject('') do |memo, (key, value)|
30
31
  memo + key.to_s + '="' + CGI.escape_html(value) + '" '
31
32
  end
33
+ url, fragment = url.split('#', 2)
34
+ url = URI.encode(url)
35
+ if fragment
36
+ url << '#' + URI.encode(fragment, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
37
+ end
32
38
 
33
- "<a #{attributes}href=\"#{CGI.escape_html url}\">#{CGI.escape_html name}</a>"
39
+ %Q{<a #{attributes}href="#{url}">#{CGI.escape_html name}</a>}
34
40
  end
35
41
  end
36
42
 
data/spec/spec_helper.rb CHANGED
@@ -4,6 +4,7 @@ if ENV['COVERAGE']
4
4
  require 'simplecov'
5
5
  SimpleCov.start do
6
6
  add_filter "/spec/"
7
+ add_filter "/vendor/"
7
8
  end
8
9
  end
9
10
 
@@ -61,6 +61,9 @@ describe Wikilink::Converter::Namespace::Default do
61
61
  it { should convert(run_options).
62
62
  to('<a href="Home">Name</a>')
63
63
  }
64
+ it { should convert(path: 'foo/bar', name: 'Header 1').
65
+ to('<a href="foo/bar">Header 1</a>')
66
+ }
64
67
  it_behaves_like 'converter that keeps query fragment only path untouched'
65
68
  end
66
69
 
@@ -20,6 +20,6 @@ describe Wikilink::Converter::Sites::Wikipedia do
20
20
  on.site('wiki', wikipedia)
21
21
  end
22
22
  }
23
- it { should convert('[[wiki:红宝石]]').to('<a class="external" href="http://zh.wikipedia.org/wiki/红宝石">wiki:红宝石</a>')}
23
+ it { should convert('[[wiki:红宝石]]').to('<a class="external" href="http://zh.wikipedia.org/wiki/%E7%BA%A2%E5%AE%9D%E7%9F%B3">wiki:红宝石</a>')}
24
24
  end
25
25
  end
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "wikilink-converter"
8
- s.version = "0.2.1"
8
+ s.version = "0.2.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ian Yang"]
12
- s.date = "2011-12-06"
12
+ s.date = "2011-12-07"
13
13
  s.description = "convert [[WikiLink]] to <a>"
14
14
  s.email = "me@iany.me"
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wikilink-converter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-12-06 00:00:00.000000000Z
12
+ date: 2011-12-07 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
16
- requirement: &2153445440 !ruby/object:Gem::Requirement
16
+ requirement: &2153564460 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *2153445440
24
+ version_requirements: *2153564460
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: yard
27
- requirement: &2153444940 !ruby/object:Gem::Requirement
27
+ requirement: &2153562460 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2153444940
35
+ version_requirements: *2153562460
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &2153444460 !ruby/object:Gem::Requirement
38
+ requirement: &2153560560 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2153444460
46
+ version_requirements: *2153560560
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: jeweler
49
- requirement: &2153443960 !ruby/object:Gem::Requirement
49
+ requirement: &2153549500 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2153443960
57
+ version_requirements: *2153549500
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: simplecov
60
- requirement: &2153443480 !ruby/object:Gem::Requirement
60
+ requirement: &2153547900 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2153443480
68
+ version_requirements: *2153547900
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: guard
71
- requirement: &2153443000 !ruby/object:Gem::Requirement
71
+ requirement: &2153546000 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2153443000
79
+ version_requirements: *2153546000
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: guard-rspec
82
- requirement: &2153442520 !ruby/object:Gem::Requirement
82
+ requirement: &2153543540 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2153442520
90
+ version_requirements: *2153543540
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: guard-bundler
93
- requirement: &2153442020 !ruby/object:Gem::Requirement
93
+ requirement: &2153541760 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2153442020
101
+ version_requirements: *2153541760
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: guard-yard
104
- requirement: &2153441500 !ruby/object:Gem::Requirement
104
+ requirement: &2153540600 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2153441500
112
+ version_requirements: *2153540600
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: redcarpet
115
- requirement: &2153440980 !ruby/object:Gem::Requirement
115
+ requirement: &2153539700 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2153440980
123
+ version_requirements: *2153539700
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: growl_notify
126
- requirement: &2153440420 !ruby/object:Gem::Requirement
126
+ requirement: &2153538560 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2153440420
134
+ version_requirements: *2153538560
135
135
  description: convert [[WikiLink]] to <a>
136
136
  email: me@iany.me
137
137
  executables: []
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
181
181
  version: '0'
182
182
  segments:
183
183
  - 0
184
- hash: -3433314059402378483
184
+ hash: 382493492981620894
185
185
  required_rubygems_version: !ruby/object:Gem::Requirement
186
186
  none: false
187
187
  requirements: