onix 0.4.7 → 0.5.0

data/lib/onix/sales_restriction.rb

@@ -2,6 +2,8 @@ module ONIX
   class SalesRestriction
     include ROXML
 
-    xml_accessor :sales_restriction_type, :twodigit, :from =>"SalesRestrictionType"
+    xml_name "SalesRestriction"
+
+    xml_accessor :sales_restriction_type, :from =>"SalesRestrictionType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
   end
 end

data/lib/onix/sender_identifier.rb

@@ -2,7 +2,9 @@ module ONIX
   class SenderIdentifier
     include ROXML
 
-    xml_accessor :sender_id_type, :from => "SenderIDType"
+    xml_name "SenderIdentifier"
+
+    xml_accessor :sender_id_type, :from => "SenderIDType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
     xml_accessor :id_type_name,   :from => "IDTypeName"
     xml_accessor :id_value,       :from => "IDValue"
   end

data/lib/onix/simple_product.rb

@@ -12,6 +12,10 @@ module ONIX
       
       include Forwardable
 
+      def from_xml(xml)
+        self.new(::ONIX::Product.from_xml(xml))
+      end
+
       def parse_file(filename)
         self.new(::ONIX::Product.parse(File.read(filename)))
       end

data/lib/onix/stock.rb

@@ -2,6 +2,8 @@ module ONIX
   class Stock
     include ROXML
 
+    xml_name "Stock"
+
     # NOTE: these *should* be numeric fields according to the spec,
     #       but heaps of ONIX files in the wild use text
     xml_accessor :on_hand, :from => "OnHand"

data/lib/onix/subject.rb

@@ -2,10 +2,12 @@ module ONIX
   class Subject
     include ROXML
 
-    xml_accessor :subject_scheme_id,   :twodigit, :from => "SubjectSchemeIdentifier"
-    xml_accessor :subject_scheme_name,            :from => "SubjectSchemeName"
-    xml_accessor :subject_scheme_version,         :from => "SubjectSchemeVersion"
-    xml_accessor :subject_code,                   :from => "SubjectCode"
-    xml_accessor :subject_heading_text,           :from => "SubjectHeadingText"
+    xml_name "Subject"
+
+    xml_accessor :subject_scheme_id,      :from => "SubjectSchemeIdentifier", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :subject_scheme_name,    :from => "SubjectSchemeName"
+    xml_accessor :subject_scheme_version, :from => "SubjectSchemeVersion"
+    xml_accessor :subject_code,           :from => "SubjectCode"
+    xml_accessor :subject_heading_text,   :from => "SubjectHeadingText"
   end
 end

data/lib/onix/supply_detail.rb

@@ -2,20 +2,27 @@ module ONIX
   class SupplyDetail
     include ROXML
 
+    xml_name "SupplyDetail"
+
     xml_accessor :supplier_ean_location_number, :from => "SupplierEANLocationNumber"
     xml_accessor :supplier_san, :from => "SupplierSAN"
     xml_accessor :supplier_name, :from => "SupplierName"
     xml_accessor :telephone_number, :from => "TelephoneNumber"
     xml_accessor :fax_number, :from => "FaxNumber"
     xml_accessor :email_address, :from => "EmailAddress"
-    xml_accessor :websites, [ONIX::Website], :from => "Website"
-    xml_accessor :supplier_role, :twodigit, :from => "SupplierRole"
+    xml_accessor :websites, :from => "Website", :as => [ONIX::Website]
+    xml_accessor :supplier_role, :from => "SupplierRole", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
     xml_accessor :supply_to_country, :from => "SupplyToCountry"
     xml_accessor :supply_to_territory, :from => "SupplyToTerritory"
-    xml_accessor :availability_status_code, :twodigit, :from => "AvailabilityStatusCode"
-    xml_accessor :product_availability, :twodigit, :from => "ProductAvailability"
-    xml_accessor :stock, [ONIX::Stock], :from => "Stock"
-    xml_accessor :prices, [ONIX::Price], :from => "Price"
+    xml_accessor :availability_status_code, :from => "AvailabilityStatusCode", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :product_availability, :from => "ProductAvailability", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :stock, :from => "Stock", :as => [ONIX::Stock]
+    xml_accessor :prices, :from => "Price", :as => [ONIX::Price]
 
+    def initialize
+      self.websites = []
+      self.stock = []
+      self.prices = []
+    end
   end
 end

data/lib/onix/title.rb

@@ -2,9 +2,11 @@ module ONIX
   class Title
     include ROXML 
 
-    xml_accessor :title_type, :twodigit, :from => "TitleType"
-    xml_accessor :title_text, :etext,    :from => "TitleText"
-    xml_accessor :subtitle,   :etext,    :from => "Subtitle"
+    xml_name "Title"
+
+    xml_accessor :title_type, :from => "TitleType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :title_text, :from => "TitleText"
+    xml_accessor :subtitle,   :from => "Subtitle"
 
   end
 end

data/lib/onix/website.rb

@@ -2,8 +2,10 @@ module ONIX
   class Website
     include ROXML
 
-    xml_accessor :website_role,        :twodigit, :from => "WebsiteRole"
-    xml_accessor :website_description,            :from => "WebsiteDescription"
-    xml_accessor :website_link,                   :from => "WebsiteLink"
+    xml_name "Website"
+
+    xml_accessor :website_role,        :from => "WebsiteRole", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :website_description, :from => "WebsiteDescription"
+    xml_accessor :website_link,        :from => "WebsiteLink"
   end
 end

data/spec/contributor_spec.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::Contributor" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "contributor.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    header = ONIX::Contributor.from_xml(@root.to_s)
+    header.to_xml.to_s[0,13].should eql("<Contributor>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    contrib = ONIX::Contributor.from_xml(@root.to_s)
+
+    contrib.contributor_role.should eql("A01")
+    contrib.person_name_inverted.should eql("SHAPIRO")
+    contrib.sequence_number.should eql(1)
+  end
+
+  specify "should provide write access to first level attibutes" do
+    contrib = ONIX::Contributor.new
+
+    contrib.contributor_role = "A02"
+    contrib.to_xml.to_s.include?("<ContributorRole>A02</ContributorRole>").should be_true
+
+    contrib.person_name_inverted = "Healy, James"
+    contrib.to_xml.to_s.include?("<PersonNameInverted>Healy, James</PersonNameInverted>").should be_true
+
+    contrib.sequence_number = 1
+    contrib.to_xml.to_s.include?("<SequenceNumber>1</SequenceNumber>").should be_true
+  end
+
+end

data/spec/header_spec.rb

@@ -14,12 +14,12 @@ context "ONIX::Header" do
   end
 
   specify "should correctly convert to a string" do
-    header = ONIX::Header.parse(@header_node.to_s)
+    header = ONIX::Header.from_xml(@header_node.to_s)
     header.to_xml.to_s[0,8].should eql("<Header>")
   end
 
   specify "should provide read access to first level attibutes" do
-    header = ONIX::Header.parse(@header_node.to_s)
+    header = ONIX::Header.from_xml(@header_node.to_s)
 
     header.from_ean_number.should eql("1111111111111")
     header.from_san.should eql("1111111")
@@ -48,52 +48,53 @@ context "ONIX::Header" do
     header = ONIX::Header.new
 
     header.from_ean_number = "1111111111111"
-    header.from_ean_number.should eql("1111111111111")
+    #puts header.to_xml.to_s
+    header.to_xml.to_s.include?("<FromEANNumber>1111111111111</FromEANNumber>").should be_true
 
     header.from_san = "1111111"
-    header.from_san.should eql("1111111")
+    header.to_xml.to_s.include?("<FromSAN>1111111</FromSAN>").should be_true
 
     header.from_company = "Text Company"
-    header.from_company.should eql("Text Company")
+    header.to_xml.to_s.include?("<FromCompany>Text Company</FromCompany>").should be_true
 
     header.from_email = "james@rainbowbooks.com.au"
-    header.from_email.should eql("james@rainbowbooks.com.au")
+    header.to_xml.to_s.include?("<FromEmail>james@rainbowbooks.com.au</FromEmail>").should be_true
 
     header.from_person = "James"
-    header.from_person.should eql("James")
+    header.to_xml.to_s.include?("<FromPerson>James</FromPerson>").should be_true
 
     header.to_ean_number = "2222222222222"
-    header.to_ean_number.should eql("2222222222222")
+    header.to_xml.to_s.include?("<ToEANNumber>2222222222222</ToEANNumber>").should be_true
 
     header.to_san = "2222222"
-    header.to_san.should eql("2222222")
+    header.to_xml.to_s.include?("<ToSAN>2222222</ToSAN>").should be_true
 
     header.to_company = "Company 2"
-    header.to_company.should eql("Company 2")
+    header.to_xml.to_s.include?("<ToCompany>Company 2</ToCompany>").should be_true
 
     header.to_person = "Chris"
-    header.to_person.should eql("Chris")
+    header.to_xml.to_s.include?("<ToPerson>Chris</ToPerson>").should be_true
 
     header.message_note = "A Message"
-    header.message_note.should eql("A Message")
+    header.to_xml.to_s.include?("<MessageNote>A Message</MessageNote>").should be_true
 
     header.message_repeat = 1
-    header.message_repeat.should eql(1)
+    header.to_xml.to_s.include?("<MessageRepeat>1</MessageRepeat>").should be_true
 
     header.sent_date = Date.civil(2008,5,19)
-    header.sent_date.should eql(Date.civil(2008,5,19))
+    header.to_xml.to_s.include?("<SentDate>20080519</SentDate>").should be_true
 
     header.default_language_of_text = "aaa"
-    header.default_language_of_text.should eql("aaa")
+    header.to_xml.to_s.include?("<DefaultLanguageOfText>aaa</DefaultLanguageOfText>").should be_true
 
     header.default_price_type_code = 1
-    header.default_price_type_code.should eql(1)
+    header.to_xml.to_s.include?("<DefaultPriceTypeCode>01</DefaultPriceTypeCode>").should be_true
 
     header.default_currency_code = "ccc"
-    header.default_currency_code.should eql("ccc")
+    header.to_xml.to_s.include?("<DefaultCurrencyCode>ccc</DefaultCurrencyCode>").should be_true
 
     header.default_class_of_trade = "f"
-    header.default_class_of_trade.should eql("f")
+    header.to_xml.to_s.include?("<DefaultClassOfTrade>f</DefaultClassOfTrade>").should be_true
   end
 
   specify "should correctly handle text with & < and >" do

data/spec/imprint_spec.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::Imprint" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "imprint.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    imp = ONIX::Imprint.from_xml(@root.to_s)
+    imp.to_xml.to_s[0,9].should eql("<Imprint>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    imp = ONIX::Imprint.from_xml(@root.to_s)
+
+    imp.imprint_name.should eql("Oxford University Press UK")
+  end
+
+  specify "should provide write access to first level attibutes" do
+    imp = ONIX::Imprint.new
+
+    imp.imprint_name = "Paulist Press"
+    imp.to_xml.to_s.include?("<ImprintName>Paulist Press</ImprintName>").should be_true
+
+    imp.name_code_type = 1
+    imp.to_xml.to_s.include?("<NameCodeType>01</NameCodeType>").should be_true
+
+  end
+
+end
+

data/spec/market_representation_spec.rb

@@ -0,0 +1,41 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::MarketRepresentation" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "market_representation.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    rep = ONIX::MarketRepresentation.from_xml(@root.to_s)
+    rep.to_xml.to_s[0,22].should eql("<MarketRepresentation>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    rep = ONIX::MarketRepresentation.from_xml(@root.to_s)
+
+    rep.agent_name.should eql("Allen & Unwin")
+    rep.agent_role.should eql(7)
+  end
+
+  specify "should provide write access to first level attibutes" do
+    rep = ONIX::MarketRepresentation.new
+
+    rep.agent_name = "Rainbow Book Agencies"
+    rep.to_xml.to_s.include?("<AgentName>Rainbow Book Agencies</AgentName>").should be_true
+
+    rep.agent_role = 3
+    rep.to_xml.to_s.include?("<AgentRole>03</AgentRole>").should be_true
+
+  end
+
+end
+
+

data/spec/measure_spec.rb

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::Measure" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "measure.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    m = ONIX::Measure.from_xml(@root.to_s)
+    m.to_xml.to_s[0,9].should eql("<Measure>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    m = ONIX::Measure.from_xml(@root.to_s)
+
+    m.measure_type_code.should eql(1)
+    m.measurement.should eql(210)
+    m.measure_unit_code.should eql("mm")
+  end
+
+  specify "should provide write access to first level attibutes" do
+    m = ONIX::Measure.new
+
+    m.measure_type_code = 1
+    m.to_xml.to_s.include?("<MeasureTypeCode>01</MeasureTypeCode>").should be_true
+
+    m.measurement = 300
+    m.to_xml.to_s.include?("<Measurement>300</Measurement>").should be_true
+
+    m.measure_unit_code = "mm"
+    m.to_xml.to_s.include?("<MeasureUnitCode>mm</MeasureUnitCode>").should be_true
+  end
+
+end
+

data/spec/media_file_spec.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::MediaFile" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "media_file.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    mf = ONIX::MediaFile.from_xml(@root.to_s)
+    mf.to_xml.to_s[0,11].should eql("<MediaFile>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    mf = ONIX::MediaFile.from_xml(@root.to_s)
+    mf.media_file_type_code.should eql(4)
+    mf.media_file_link_type_code.should eql(1)
+    mf.media_file_link.should eql("http://www.allenandunwin.com/BookCovers/resized_9788888028729_224_297_FitSquare.jpg")
+  end
+
+  specify "should provide write access to first level attibutes" do
+    mf = ONIX::MediaFile.new
+
+    mf.media_file_type_code = 2
+    mf.to_xml.to_s.include?("<MediaFileTypeCode>02</MediaFileTypeCode>").should be_true
+
+    mf.media_file_link_type_code = 1
+    mf.to_xml.to_s.include?("<MediaFileLinkTypeCode>01</MediaFileLinkTypeCode>").should be_true
+
+    mf.media_file_link = "http://www.google.com"
+    mf.to_xml.to_s.include?("<MediaFileLink>http://www.google.com</MediaFileLink>").should be_true
+  end
+
+end
+

data/spec/other_text_spec.rb

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+
+require 'onix'
+
+context "ONIX::OtherText" do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(data_path, "other_text.xml")
+    @doc = LibXML::XML::Document.file(file1)
+    @root = @doc.root
+  end
+
+  specify "should correctly convert to a string" do
+    ot = ONIX::OtherText.from_xml(@root.to_s)
+    ot.to_xml.to_s[0,11].should eql("<OtherText>")
+  end
+
+  specify "should provide read access to first level attibutes" do
+    ot = ONIX::OtherText.from_xml(@root.to_s)
+
+    ot.text_type_code.should eql(2)
+    ot.text[0,7].should eql("A woman")
+  end
+
+  specify "should provide write access to first level attibutes" do
+    ot = ONIX::OtherText.new
+
+    ot.text_type_code = 2
+    ot.to_xml.to_s.include?("<TextTypeCode>02</TextTypeCode>").should be_true
+
+    ot.text = "James Healy"
+    ot.to_xml.to_s.include?("<Text>James Healy</Text>").should be_true
+
+  end
+
+end
+