xml_mapper 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/xml_mapper.rb

@@ -46,8 +46,12 @@ class XmlMapper
       end
     end
     
-    def attributes_from_xml_path(path)
-      attributes_from_superclass(path, :attributes_from_xml_path).merge(mapper.attributes_from_xml_path(path))
+    def attributes_from_xml_path(path, xml = nil)
+      if xml
+        attributes_from_superclass(xml, :attributes_from_xml).merge(mapper.attributes_from_xml(xml, path))
+      else
+        attributes_from_superclass(path, :attributes_from_xml_path).merge(mapper.attributes_from_xml_path(path))
+      end
     end
     
     def capture_submapping(&block)

data/spec/xml_mapper_spec.rb

@@ -467,6 +467,17 @@ describe "XmlMapper" do
       }
     end
     
+    it "allows providing of custom xml on second parameter of attributes_from_xml_path" do
+      data = %(<album><title>Static Test</title></album>)
+      @clazz.text(:title)
+      @clazz.after_map do
+        self[:some_path] = xml_path
+      end
+      @clazz.attributes_from_xml_path("/some/path.xml", data).should == {
+        :title => "Static Test", :some_path => "/some/path.xml"
+      }
+    end
+    
     it "allows defining a after_map block" do
       @clazz.after_map do
         self[:upc] = "1234"

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-12}
+  s.date = %q{2011-04-18}
   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.4.2}
+  s.rubygems_version = %q{1.7.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: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-12 00:00:00 +02:00
-default_executable: 
+date: 2011-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
   name: nokogiri
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +41,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: autotest
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +55,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: autotest-growl
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +71,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: rspec
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,12 +85,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: ruby-debug
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +99,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  prerelease: false
+  version_requirements: *id006
   name: cucumber
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,12 +115,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id007
-  prerelease: false
+  version_requirements: *id007
   name: bundler
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,12 +131,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id008
-  prerelease: false
+  version_requirements: *id008
   name: jeweler
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,9 +145,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-  prerelease: false
+  version_requirements: *id009
   name: rcov
+  prerelease: false
+  type: :development
 description: Declarative XML to Ruby mapping
 email: tobias.schwab@dynport.de
 executables: []
@@ -182,7 +181,6 @@ files:
 - spec/xml_mapper_hash_spec.rb
 - spec/xml_mapper_spec.rb
 - xml_mapper.gemspec
-has_rdoc: true
 homepage: http://github.com/dynport/xml_mapper
 licenses: 
 - MIT
@@ -212,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Declarative XML to Ruby mapping