onix 0.7.4 → 0.7.5

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.7.5 (8th September 2009)
+- Don't raise an exception on malformed dates when reading files
+
 v0.7.4 (2nd September 2009)
 - Expand ONIX::Normaliser
   - strip control chars

data/lib/onix.rb

@@ -16,7 +16,7 @@ module ONIX
   module Version #:nodoc:
     Major = 0
     Minor = 7
-    Tiny  = 4
+    Tiny  = 5
 
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/onix/header.rb

@@ -20,7 +20,13 @@ module ONIX
     xml_accessor :to_person,       :from => "ToPerson"
     xml_accessor :message_number,  :from => "MessageNumber"
     xml_accessor :message_repeat,  :from => "MessageRepeat", :as => Fixnum
-    xml_accessor :sent_date,       :from => "SentDate", :as => Date, :to_xml => ONIX::Formatters.yyyymmdd
+    xml_accessor(:sent_date,       :from => "SentDate", :to_xml => ONIX::Formatters.yyyymmdd) do |val|
+      begin
+        Date.parse(val)
+      rescue
+        nil
+      end
+    end
     xml_accessor :message_note,    :from => "MessageNote"
 
     # defaults

data/lib/onix/product.rb

@@ -24,7 +24,13 @@ module ONIX
     xml_accessor :imprints, :from => "Imprint", :as => [ONIX::Imprint]
     xml_accessor :publishers, :from => "Publisher", :as => [ONIX::Publisher]
     xml_accessor :publishing_status, :from => "PublishingStatus", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
-    xml_accessor :publication_date, :from => "PublicationDate", :as => Date, :to_xml => ONIX::Formatters.yyyymmdd
+    xml_accessor(:publication_date, :from => "PublicationDate", :to_xml => ONIX::Formatters.yyyymmdd) do |val|
+      begin
+        Date.parse(val)
+      rescue
+        nil
+      end
+    end
     xml_accessor :year_first_published, :from => "YearFirstPublished", :as => Fixnum
     xml_accessor :sales_restrictions, :from => "SalesRestriction", :as => [ONIX::SalesRestriction]
     xml_accessor :measurements, :from => "Measure", :as => [ONIX::Measure]

data/spec/header_spec.rb

@@ -110,3 +110,14 @@ context "ONIX::Header" do
     header.to_xml.to_s.include?("James > Healy").should  be_true
   end
 end
+
+context "ONIX::Header" do
+
+  specify "should correctly handle headers with an invalid sent date" do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file = File.join(data_path, "header_invalid_sentdate.xml")
+    header = ONIX::Header.from_xml(File.read(file))
+
+    header.sent_date.should be_nil
+  end
+end

data/spec/product_spec.rb

@@ -86,13 +86,11 @@ context "ONIX::Product" do
     product.to_xml.to_s.include?("<YearFirstPublished>1998</YearFirstPublished>").should be_true
   end
 
-  specify "should correctly from_xml files that have non-standard entties"
-=begin
-  do
-    file = File.join(@data_path, "extra_entities.xml")
+  specify "should correctly from_xml files that have an invalid publication date" do
+    file = File.join(@data_path, "product_invalid_pubdate.xml")
     product = ONIX::Product.from_xml(File.read(file))
 
-    product.titles.first.title_text.should eql("Ipod® & Itunes® for Dummies®, 4th Edition")
+    product.bic_main_subject.should eql("VXFC1")
+    product.publication_date.should be_nil
   end
-=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onix
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 +10:00
+date: 2009-09-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rbook
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A convient mapping between ruby objects and the ONIX XML specification