xml_mapper 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/xml_mapper.rb

@@ -127,7 +127,7 @@ class XmlMapper
     if xml_or_doc.is_a?(Array)
       xml_or_doc.map { |doc| attributes_from_xml(doc, xml_path) } 
     else
-      doc = xml_or_doc.is_a?(Nokogiri::XML::Node) ? xml_or_doc : Nokogiri::XML(xml_or_doc)
+      doc = xml_or_doc.is_a?(Nokogiri::XML::Node) ? xml_or_doc : Nokogiri::XML(xml_or_doc.gsub(/xmlns=.*?.xsd[\"\']/, "")) # get rid of xml namespaces, quick and dirty
       doc = doc.root if doc.respond_to?(:root)
       atts = self.mappings.inject(XmlMapperHash.from_path_and_node(xml_path, doc)) do |hash, mapping|
         if (value = value_from_doc_and_mapping(doc, mapping, xml_path)) != :not_found

data/spec/xml_mapper_spec.rb

@@ -848,4 +848,21 @@ describe "XmlMapper" do
       }
     end
   end
+
+  it "does not care about xmlns" do
+    xml = %(
+      <submission xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://schemas.ingrooves.com/INgrooves/INgrooves_2_0.xsd http://schemas.ingrooves.com/INgrooves/INgrooves_2_0.xsd" schema_version="1" schema_revision="0" xmlns="http://schemas.ingrooves.com/INgrooves/INgrooves_2_0.xsd">
+        <album>
+          <title>Black on Both Sides</title>
+        </album>
+      </submission>
+    )
+    class Mapper < XmlMapper
+      within "album" do
+        text "title" => :title
+      end
+    end
+    
+    Mapper.attributes_from_xml(xml).should == { :title => "Black on Both Sides" }
+  end
 end

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-04-11}
   s.description = %q{Declarative XML to Ruby mapping}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dynport/xml_mapper}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Declarative XML to Ruby mapping}
   s.test_files = [
     "spec/example_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xml_mapper
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +02:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id001
+  requirement: *id001
   prerelease: false
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest
-  version_requirements: *id002
+  requirement: *id002
   prerelease: false
+  name: autotest
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: autotest-growl
-  version_requirements: *id003
+  requirement: *id003
   prerelease: false
+  name: autotest-growl
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +73,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  name: rspec
-  version_requirements: *id004
+  requirement: *id004
   prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id005
+  requirement: *id005
   prerelease: false
+  name: ruby-debug
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: cucumber
-  version_requirements: *id006
+  requirement: *id006
   prerelease: false
+  name: cucumber
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,12 +117,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id007
+  requirement: *id007
   prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,12 +133,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  name: jeweler
-  version_requirements: *id008
+  requirement: *id008
   prerelease: false
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,9 +147,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id009
+  requirement: *id009
   prerelease: false
+  name: rcov
 description: Declarative XML to Ruby mapping
 email: tobias.schwab@dynport.de
 executables: []
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Declarative XML to Ruby mapping