rosemary 0.3.3 → 0.3.4

data/lib/rosemary/parser.rb

@@ -1,5 +1,6 @@
 require 'httparty'
 require 'xml/libxml'
+
 class Rosemary::Parser < HTTParty::Parser
   include LibXML::XML::SaxParser::Callbacks
 
@@ -15,7 +16,13 @@ class Rosemary::Parser < HTTParty::Parser
   end
 
   def xml
-    @parser = LibXML::XML::SaxParser.string(body)
+    # instead of using
+    # LibXML::XML::default_substitute_entities = true
+    # we change the options of the xml context:
+    ctx = XML::Parser::Context.string(body)
+    ctx.options = XML::Parser::Options::NOENT
+    @parser = LibXML::XML::SaxParser.new(ctx)
+
     @parser.callbacks = self
     @parser.parse
     @collection.empty? ? @context : @collection

data/lib/rosemary/version.rb

@@ -1,3 +1,3 @@
 module Rosemary
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/models/parser_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+include Rosemary
+describe Parser do
+  context "xml" do
+    it "parses ampersands correctly" do
+
+      node_xml =<<-EOF
+      <osm>
+       <node id="123" lat="51.2" lon="13.4" version="42" changeset="12" user="fred" uid="123" visible="true" timestamp="2005-07-30T14:27:12+01:00">
+         <tag k="note" v="Just a node"/>
+         <tag k="amenity" v="bar" />
+         <tag k="name" v="The rose &#38; the pony" />
+       </node>
+      </osm>
+      EOF
+
+      n = Parser.call(node_xml, :xml)
+      n.name.should == "The rose & the pony"
+
+
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rosemary
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70175609238780 !ruby/object:Gem::Requirement
+  requirement: &70334409635220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175609238780
+  version_requirements: *70334409635220
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
-  requirement: &70175609237160 !ruby/object:Gem::Requirement
+  requirement: &70334409634680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175609237160
+  version_requirements: *70334409634680
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70175609236060 !ruby/object:Gem::Requirement
+  requirement: &70334409634120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175609236060
+  version_requirements: *70334409634120
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70175609233860 !ruby/object:Gem::Requirement
+  requirement: &70334409633580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175609233860
+  version_requirements: *70334409633580
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70175609231920 !ruby/object:Gem::Requirement
+  requirement: &70334409633020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70175609231920
+  version_requirements: *70334409633020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70175609230140 !ruby/object:Gem::Requirement
+  requirement: &70334409632200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175609230140
+  version_requirements: *70334409632200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70175609228640 !ruby/object:Gem::Requirement
+  requirement: &70334409631420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175609228640
+  version_requirements: *70334409631420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70175609226760 !ruby/object:Gem::Requirement
+  requirement: &70334409630720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175609226760
+  version_requirements: *70334409630720
 description: OpenStreetMap API client for ruby
 email:
 - info@christophbuente.de
@@ -143,6 +143,7 @@ files:
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb
 - spec/models/node_spec.rb
+- spec/models/parser_spec.rb
 - spec/models/relation_spec.rb
 - spec/models/way_spec.rb
 - spec/spec_helper.rb
@@ -164,6 +165,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4299720809747143469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +187,7 @@ test_files:
 - spec/integration/way_spec.rb
 - spec/models/changeset_spec.rb
 - spec/models/node_spec.rb
+- spec/models/parser_spec.rb
 - spec/models/relation_spec.rb
 - spec/models/way_spec.rb
 - spec/spec_helper.rb
-has_rdoc: