upmark 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upmark (0.1.3)
+    upmark (0.1.4)
       parslet
 
 GEM
@@ -10,7 +10,7 @@ GEM
     blankslate (2.1.2.4)
     diff-lcs (1.1.3)
     multi_json (1.0.3)
-    parslet (1.2.3)
+    parslet (1.4.0)
       blankslate (~> 2.0)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)

data/lib/upmark/parser/xml.rb

@@ -60,13 +60,17 @@ module Upmark
       rule(:attribute) {
         name.as(:name) >>
         str('=') >> (
-          (str('"') >> attribute_value.as(:value) >> str('"')) | # double quotes
-          (str("'") >> attribute_value.as(:value) >> str("'"))   # single quotes
+          (str('"') >> double_quoted_attribute_value.as(:value) >> str('"')) | # double quotes
+          (str("'") >> single_quoted_attribute_value.as(:value) >> str("'"))   # single quotes
         )
       }
 
-      rule(:attribute_value) {
-        (match(/['"]/).absent? >> (match(/[^<&]/) | entity_ref)).repeat
+      rule(:double_quoted_attribute_value) {
+        (str('"').absent? >> (match(/[^<&]/) | entity_ref)).repeat
+      }
+
+      rule(:single_quoted_attribute_value) {
+        (str("'").absent? >> (match(/[^<&]/) | entity_ref)).repeat
       }
 
       rule(:entity_ref) { match("&") >> name >> match(";") }

data/lib/upmark/version.rb

@@ -1,3 +1,3 @@
 module Upmark
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/unit/lib/upmark/parser/xml_spec.rb

@@ -81,6 +81,8 @@ describe Upmark::Parser::XML do
 
     it { should     parse %q{art="party organic"} }
     it { should     parse %q{art='party organic'} }
+    it { should     parse %q{art="party'organic"} }
+    it { should     parse %q{art='party"organic'} }
     it { should_not parse "art" }
     it { should_not parse "art=" }
     it { should_not parse "art=party" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upmark
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70329857124760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329857124760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70329857124340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70329857124340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70329857123920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70329857123920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Upmark has the skills to convert your HTML to Markdown.
 email: dev@theconversation.edu.au
 executables:
@@ -95,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: upmark
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A HTML to Markdown converter.