xml_mapper 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/xml_mapper.rb

@@ -1,5 +1,7 @@
 require "nokogiri"
 require "xml_mapper_hash"
+require "parsedate"
+require "date"
 
 class XmlMapper
   attr_accessor :mappings, :after_map_block, :within_xpath
@@ -206,4 +208,16 @@ class XmlMapper
   def string_to_boolean(value)
     MAPPINGS[value.to_s.downcase]
   end
+  
+  def parse_duration(string)
+    return string.to_i if string.match(/^\d+$/)
+    string = "00:#{string}" if string.match(/^(\d+):(\d+)$/)
+    string = string.to_s.gsub(/PT(\d+M.*)/,"PT0H\\1") # insert 0H into PT3M12S, for example: PT0H3M12S
+    year, month, day, hour, minute, second = ParseDate.parsedate(string)
+    return (hour.to_i * 1 * 3600 + minute.to_i * 1 * 60 + second.to_i).to_i
+  end
+  
+  def parse_date(text)
+    text.to_s.strip.length > 0 ? Date.parse(text.to_s.strip) : nil
+  end
 end

data/lib/xml_mapper_hash.rb

@@ -20,5 +20,18 @@ class XmlMapper
     def hashes_from_into_keys(into_keys)
       [into_keys].flatten.map { |key| self[key] }.flatten.compact
     end
+    
+    def strip_attributes!(hash)
+      hash.each do |key, value|
+        if value.is_a?(Hash)
+          strip_attributes!(value)
+        elsif value.is_a?(Array)
+          value.map { |array_value| strip_attributes!(array_value) }
+        elsif value.respond_to?(:strip!)
+          value.strip!
+          hash[key] = nil if value.length == 0
+        end
+      end
+    end
   end
 end

data/spec/xml_mapper_hash_spec.rb

@@ -69,4 +69,36 @@ describe XmlMapper::XmlMapperHash do
       }
     end
   end
+  
+  describe "#strip_attributes!" do
+    it "strips strings in simple hashes" do
+      hash = XmlMapper::XmlMapperHash.new.merge(:artist_name => " Test ")
+      hash.strip_attributes!(hash)
+      hash.should == { :artist_name => "Test" }
+    end
+    
+    it "sets blank attributes to nil" do
+      hash = XmlMapper::XmlMapperHash.new.merge(:artist_name => "  ")
+      hash.strip_attributes!(hash)
+      hash.should == { :artist_name => nil }
+    end
+
+    it "does not change nil values" do
+      hash = XmlMapper::XmlMapperHash.new.merge(:artist_name => nil)
+      hash.strip_attributes!(hash)
+      hash.should == { :artist_name => nil }
+    end
+
+    it "does strip nested hashes" do
+      hash = XmlMapper::XmlMapperHash.new.merge(:meta => { :title => " title " })
+      hash.strip_attributes!(hash)
+      hash.should == { :meta => { :title => "title" } }
+    end
+
+    it "does strip values in nested arrays" do
+      hash = XmlMapper::XmlMapperHash.new.merge(:tracks => [ { :title => " title 1 " }, { :title => " title 2 " } ])
+      hash.strip_attributes!(hash)
+      hash.should == { :tracks => [ { :title => "title 1" }, { :title => "title 2" } ] }
+    end
+  end
 end

data/spec/xml_mapper_spec.rb

@@ -15,6 +15,38 @@ describe "XmlMapper" do
     @mapper = XmlMapper.new
   end
   
+  describe "#parse_duration" do
+    it "convert human readable strings to lenghs" do
+      XmlMapper.new.parse_duration("00:01").should == 1
+      XmlMapper.new.parse_duration("00:00:01").should == 1
+      XmlMapper.new.parse_duration("00:01:01").should == 61
+      XmlMapper.new.parse_duration("01:01:01").should == 3661
+    end
+
+    it "should convert iso string to lengths" do
+      XmlMapper.new.parse_duration("PT0H5M54S").should == 354
+      XmlMapper.new.parse_duration("PT3M12S").should == 192
+    end
+
+    it "should not convert integer values" do
+      XmlMapper.new.parse_duration("60").should == 60
+    end
+  end
+  
+  describe "#parse_date" do
+    it "returns nil when text is blank" do
+      XmlMapper.new.parse_date(" ").should be_nil
+    end
+
+    it "returns nil when text is nil" do
+      XmlMapper.new.parse_date(nil).should be_nil
+    end
+
+    it "parses dates correctly" do
+      XmlMapper.new.parse_date("2010-09-01").should == Date.new(2010, 9, 1)
+    end
+  end
+  
   describe "#add_mapping" do
     it "adds the correct mappings when only one symbol given" do
       @mapper.add_mapping(:text, :title)

data/xml_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xml_mapper}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-04-07}
+  s.date = %q{2011-04-08}
   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: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +02:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency