upmark 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- upmark (0.1.3)
4
+ upmark (0.1.4)
5
5
  parslet
6
6
 
7
7
  GEM
@@ -10,7 +10,7 @@ GEM
10
10
  blankslate (2.1.2.4)
11
11
  diff-lcs (1.1.3)
12
12
  multi_json (1.0.3)
13
- parslet (1.2.3)
13
+ parslet (1.4.0)
14
14
  blankslate (~> 2.0)
15
15
  rspec (2.6.0)
16
16
  rspec-core (~> 2.6.0)
@@ -60,13 +60,17 @@ module Upmark
60
60
  rule(:attribute) {
61
61
  name.as(:name) >>
62
62
  str('=') >> (
63
- (str('"') >> attribute_value.as(:value) >> str('"')) | # double quotes
64
- (str("'") >> attribute_value.as(:value) >> str("'")) # single quotes
63
+ (str('"') >> double_quoted_attribute_value.as(:value) >> str('"')) | # double quotes
64
+ (str("'") >> single_quoted_attribute_value.as(:value) >> str("'")) # single quotes
65
65
  )
66
66
  }
67
67
 
68
- rule(:attribute_value) {
69
- (match(/['"]/).absent? >> (match(/[^<&]/) | entity_ref)).repeat
68
+ rule(:double_quoted_attribute_value) {
69
+ (str('"').absent? >> (match(/[^<&]/) | entity_ref)).repeat
70
+ }
71
+
72
+ rule(:single_quoted_attribute_value) {
73
+ (str("'").absent? >> (match(/[^<&]/) | entity_ref)).repeat
70
74
  }
71
75
 
72
76
  rule(:entity_ref) { match("&") >> name >> match(";") }
@@ -1,3 +1,3 @@
1
1
  module Upmark
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
@@ -81,6 +81,8 @@ describe Upmark::Parser::XML do
81
81
 
82
82
  it { should parse %q{art="party organic"} }
83
83
  it { should parse %q{art='party organic'} }
84
+ it { should parse %q{art="party'organic"} }
85
+ it { should parse %q{art='party"organic'} }
84
86
  it { should_not parse "art" }
85
87
  it { should_not parse "art=" }
86
88
  it { should_not parse "art=party" }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: upmark
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-03-28 00:00:00.000000000 Z
13
+ date: 2012-08-02 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rspec
17
- requirement: &70329857124760 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
22
22
  version: '0'
23
23
  type: :development
24
24
  prerelease: false
25
- version_requirements: *70329857124760
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ! '>='
29
+ - !ruby/object:Gem::Version
30
+ version: '0'
26
31
  - !ruby/object:Gem::Dependency
27
32
  name: simplecov
28
- requirement: &70329857124340 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
29
34
  none: false
30
35
  requirements:
31
36
  - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
33
38
  version: '0'
34
39
  type: :development
35
40
  prerelease: false
36
- version_requirements: *70329857124340
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
37
47
  - !ruby/object:Gem::Dependency
38
48
  name: parslet
39
- requirement: &70329857123920 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
40
50
  none: false
41
51
  requirements:
42
52
  - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
44
54
  version: '0'
45
55
  type: :runtime
46
56
  prerelease: false
47
- version_requirements: *70329857123920
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
48
63
  description: Upmark has the skills to convert your HTML to Markdown.
49
64
  email: dev@theconversation.edu.au
50
65
  executables:
@@ -95,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
95
110
  version: '0'
96
111
  requirements: []
97
112
  rubyforge_project: upmark
98
- rubygems_version: 1.8.11
113
+ rubygems_version: 1.8.23
99
114
  signing_key:
100
115
  specification_version: 3
101
116
  summary: A HTML to Markdown converter.