xml_mapper 0.5.0 → 0.5.1

data/README.rdoc

@@ -79,8 +79,10 @@ Declarative mapping of XML files to ruby attributes
       text :producer => { :contributions => :producer }     # assigns to content at xpath :performer to attributes[:contributions][:producer]
     end
 
-    after_map do                                            # is called after attributes are extracted, self references the extracted attributes
+    after_map do                                                    # is called after attributes are extracted, self references the extracted attributes
       self[:tracks_count] = self[:tracks].length
+      self[:xml_path] = self.xml_path                               # lets you access the xml_path when called with attributes_from_xml_path
+      self[:other_tracks_count] = self.node.search("track").count   # lets you access the current xml node (in this case the whole doc)
     end
 
     # to be used for after_map callbacks
@@ -92,7 +94,7 @@ Declarative mapping of XML files to ruby attributes
 == How to call
 
 * MyMapper.attributes_from_xml(xml)
-* MyMapper.attributes_from_xml_path(xml) (also sets :xml_path)
+* MyMapper.attributes_from_xml_path(xml)
 
 == Output
   {
@@ -105,7 +107,7 @@ Declarative mapping of XML files to ruby attributes
         :explicit_lyrics=>false, :contributions=>{:performer=>"Mos Def", :producer=>"DJ Premier"}, :isrc=>"2345"
       }
     ], 
-    :tracks_count=>2, :released_in=>1999, :xml_path=>"/Users/tobias/Projects/xml_mapper/spec/fixtures/base.xml", 
+    :tracks_count=>2, :released_in=>1999, 
     :released_on=>#<Date: 4902927/2,0,2299161>, :artist_name=>"Mos Def", 
     :contributions=>[ {:name=>"Mos Def", :role=>"artist"}, {:name=>"DJ Premier", :role=>"producer"} ]
     :artist_id=>1212, :country=>"DE"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/xml_mapper.rb

@@ -68,6 +68,10 @@ class XmlMapper
     def mapper
       @mapper ||= self.new
     end
+    
+    def include_mapper(clazz)
+      self.mapper.mappings += clazz.mapper.mappings
+    end
   end
   
   def initialize

data/spec/xml_mapper_spec.rb

@@ -761,4 +761,59 @@ describe "XmlMapper" do
       end
     end
   end
+  
+  describe "#include_mapper" do
+    before(:each) do
+      @clazz = create_class
+    end
+    
+    class Submapper < XmlMapper
+      text :title, :released_on
+    end
+    
+    it "is callable" do
+      @clazz.include_mapper(Submapper)
+    end
+    
+    it "works" do
+      xml = %(
+        <album>
+          <artist_name>Mos Def</artist_name>
+          <title>Black on Both Sides</title>
+          <released_on>2011-03-01</released_on>
+        </album>
+      )
+      @clazz.text "artist_name" => :artist_name
+      @clazz.include_mapper(Submapper)
+      @clazz.attributes_from_xml(xml).should == { :artist_name => "Mos Def", :title => "Black on Both Sides", :released_on => "2011-03-01" }
+    end
+    
+    it "works for many keyword" do
+      xml = %(
+        <album>
+          <title>Album Title</title>
+          <released_on>1999-01-01</released_on>
+          <tracks>
+            <track>
+              <title>Track 1</title>
+              <released_on>1999-02-01</released_on>
+            </track>
+            <track>
+              <title>Track 2</title>
+              <released_on>1999-03-01</released_on>
+            </track>
+          </tracks>
+        </album>
+      )
+      @clazz.many "tracks/track" => :tracks do
+        include_mapper Submapper
+      end
+      @clazz.attributes_from_xml(xml).should ==  {
+        :tracks=>[
+          {
+            :released_on=>"1999-02-01", :title=>"Track 1"}, {:released_on=>"1999-03-01", :title=>"Track 2"}
+        ]
+      }
+    end
+  end
 end

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-04-07}
   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.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Declarative XML to Ruby mapping}
   s.test_files = [
     "spec/example_spec.rb",
@@ -54,7 +54,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xml_mapper
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: nokogiri
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  version_requirements: *id001
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: autotest
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: autotest
+  version_requirements: *id002
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: autotest-growl
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: autotest-growl
+  version_requirements: *id003
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +73,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: *id004
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: ruby-debug
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  version_requirements: *id005
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: cucumber
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: cucumber
+  version_requirements: *id006
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -119,12 +117,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: *id007
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -135,12 +133,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: *id008
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,7 +147,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  name: rcov
+  version_requirements: *id009
+  prerelease: false
 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.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Declarative XML to Ruby mapping