xml_mapper 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/lib/xml_mapper.rb

@@ -4,7 +4,7 @@ require "date"
 require "time"
 
 class XmlMapper
-  attr_accessor :mappings, :after_map_block, :within_xpath
+  attr_accessor :mappings, :after_map_block, :within_xpath, :selector_mode
   
   class << self
     attr_accessor :mapper
@@ -75,6 +75,10 @@ class XmlMapper
       @mapper ||= self.new
     end
     
+    def selector_mode(style)
+      self.mapper.selector_mode = style
+    end
+
     def include_mapper(clazz)
       self.mapper.mappings += clazz.mapper.mappings
     end
@@ -82,6 +86,7 @@ class XmlMapper
   
   def initialize
     self.mappings = []
+    self.selector_mode = :search
   end
   
   def extract_options_from_args(args)
@@ -155,7 +160,7 @@ class XmlMapper
   
   def value_from_doc_and_mapping(doc, mapping, xml_path = nil)
     if mapping[:type] == :many
-      mapping[:options][:mapper].attributes_from_xml(doc.search(mapping[:xpath]).to_a, xml_path)
+      mapping[:options][:mapper].attributes_from_xml(doc.send(self.selector_mode, mapping[:xpath]).to_a, xml_path)
     else
       node = mapping[:xpath].length == 0 ? doc : doc.xpath(mapping[:xpath]).first
       if mapping[:type] == :exists

data/spec/xml_mapper_spec.rb

@@ -873,4 +873,19 @@ describe "XmlMapper" do
     
     Mapper.attributes_from_xml(xml).should == { :title => "Black on Both Sides" }
   end
+  
+  it "allows forcing xpath style selectors" do
+    mapper = create_class.new
+    mapper.add_mapping(:many, { "tracks/track" => :tracks }, :mapper => XmlMapper.new)
+    mapper.selector_mode = :xpath
+    node = mock("nokogiri node")
+    node.should_receive(:send).with(:xpath, "tracks/track")
+    Nokogiri.stub(:XML).and_return {node}
+    xml = %(
+          <album>
+            <title>Black on Both Sides</title>
+          </album>
+    )
+    mapper.attributes_from_xml(xml)
+  end
 end

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-08-02}
   s.description = %q{Declarative XML to Ruby mapping}
   s.email = %q{tobias.schwab@dynport.de}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xml_mapper
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement