milkfarm-onix 0.7.7 → 0.8.3

data/lib/onix/stock.rb

@@ -3,7 +3,6 @@
 module ONIX
   class Stock
     include ROXML
-    include ONIX::Common
 
     xml_name "Stock"
 

data/lib/onix/subject.rb

@@ -3,7 +3,6 @@
 module ONIX
   class Subject
     include ROXML
-    include ONIX::Common
 
     xml_name "Subject"
 

data/lib/onix/supply_detail.rb

@@ -3,7 +3,6 @@
 module ONIX
   class SupplyDetail
     include ROXML
-    include ONIX::Common
 
     xml_name "SupplyDetail"
 

data/lib/onix/title.rb

@@ -3,7 +3,6 @@
 module ONIX
   class Title
     include ROXML 
-    include ONIX::Common
 
     xml_name "Title"
 

data/lib/onix/website.rb

@@ -3,7 +3,6 @@
 module ONIX
   class Website
     include ROXML
-    include ONIX::Common
 
     xml_name "Website"
 

data/lib/onix/writer.rb

@@ -77,7 +77,7 @@ module ONIX
     def start_document
       @output.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
       @output.write("<!DOCTYPE ONIXMessage SYSTEM \"#{DOCTYPE}\">\n")
-      @output.write("<ONIXMessage>\n")
+      @output.write("<ONIXMessage release=\"2.1\">\n")
       @output.write(@header.to_xml.to_s)
       @output.write("\n")
     end

data/spec/apa_product_spec.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'date'
 
 context "ONIX::APAProduct" do
@@ -10,7 +8,7 @@ context "ONIX::APAProduct" do
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(@data_path, "product.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @product_node = @doc.root
   end
 
@@ -57,3 +55,45 @@ context "ONIX::APAProduct" do
   end
 
 end
+
+context ONIX::APAProduct, "series method" do
+  specify "should set the nested series value on the underlying product class" do
+    apa = ONIX::APAProduct.new
+
+    apa.series = "Harry Potter"
+    apa.series.should eql("Harry Potter")
+    apa.to_xml.to_s.include?("<TitleOfSeries>Harry Potter</TitleOfSeries>").should be_true
+  end
+end
+
+context ONIX::APAProduct, "price method" do
+  before(:each) do
+    @data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(@data_path, "usd.xml")
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
+    @product_node = @doc.root
+  end
+
+  specify "should return the first price in the file, regardless of type" do
+    @product = ONIX::Product.from_xml(@product_node.to_s)
+    @apa     = ONIX::APAProduct.new(@product)
+
+    @apa.price.should eql(BigDecimal.new("99.95"))
+  end
+end
+
+context ONIX::APAProduct, "rrp_exc_sales_tax method" do
+  before(:each) do
+    @data_path = File.join(File.dirname(__FILE__),"..","data")
+    file1    = File.join(@data_path, "usd.xml")
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
+    @product_node = @doc.root
+  end
+
+  specify "should return the first price in the file of type 1" do
+    @product = ONIX::Product.from_xml(@product_node.to_s)
+    @apa     = ONIX::APAProduct.new(@product)
+
+    @apa.rrp_exc_sales_tax.should eql(BigDecimal.new("99.95"))
+  end
+end

data/spec/audience_range_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::AudienceRange" do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(data_path, "audience_range.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 
@@ -20,7 +18,7 @@ context "ONIX::AudienceRange" do
 
   specify "should provide read access to first level attibutes" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
-    
+
     aud.audience_range_qualifier.should eql(11)
     aud.audience_range_precisions.size.should eql(2)
     aud.audience_range_precisions[0].should eql(3)
@@ -32,13 +30,13 @@ context "ONIX::AudienceRange" do
 
   specify "should provide write access to first level attibutes" do
     aud = ONIX::AudienceRange.new
-    
+
     aud.audience_range_qualifier = 12
     aud.to_xml.to_s.include?("<AudienceRangeQualifier>12</AudienceRangeQualifier>").should be_true
 
     aud.audience_range_precisions[0] = 888
     aud.to_xml.to_s.include?("<AudienceRangePrecision>888</AudienceRangePrecision>").should be_true
-    
+
     aud.audience_range_values[0] = 999
     aud.to_xml.to_s.include?("<AudienceRangeValue>999</AudienceRangeValue>").should be_true
   end

data/spec/contributor_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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)
+    @doc = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/header_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Header" do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(data_path, "header.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc = Nokogiri::XML::Document.parse(File.read(file1))
     @header_node = @doc.root
   end
 

data/spec/imprint_spec.rb

@@ -1,16 +1,14 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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
+    file1     = File.join(data_path, "imprint.xml")
+    @doc      = Nokogiri::XML::Document.parse(File.read(file1))
+    @root     = @doc.root
   end
 
   specify "should correctly convert to a string" do

data/spec/language_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Language" do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(data_path, "language.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 
@@ -20,7 +18,7 @@ context "ONIX::Language" do
 
   specify "should provide read access to first level attibutes" do
     lan = ONIX::Language.from_xml(@root.to_s)
-    
+
     lan.language_role.should eql(1)
     lan.language_code.should eql("eng")
     lan.country_code.should eql("US")
@@ -28,13 +26,13 @@ context "ONIX::Language" do
 
   specify "should provide write access to first level attibutes" do
     lan = ONIX::Language.new
-    
+
     lan.language_role = 2
     lan.to_xml.to_s.include?("<LanguageRole>02</LanguageRole>").should be_true
 
     lan.language_code = "aar"
     lan.to_xml.to_s.include?("<LanguageCode>aar</LanguageCode>").should be_true
-    
+
     lan.country_code = "AD"
     lan.to_xml.to_s.include?("<CountryCode>AD</CountryCode>").should be_true
   end

data/spec/market_representation_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/measure_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/media_file_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/normaliser_spec.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Normaliser", "with a simple short tag file" do
 
@@ -27,79 +25,6 @@ context "ONIX::Normaliser", "with a simple short tag file" do
 
 end
 
-context "ONIX::Normaliser", "with an ISO-8859-1 file" do
-
-  before(:each) do
-    @data_path = File.join(File.dirname(__FILE__),"..","data")
-    @filename  = File.join(@data_path, "iso_8859_1.xml")
-    @outfile   = @filename + ".new"
-  end
-
-  after(:each) do
-    File.unlink(@outfile) if File.file?(@outfile)
-  end
-
-  specify "should correctly convert an iso-8859-1 file to UTF-8" do
-    ONIX::Normaliser.process(@filename, @outfile)
-
-    File.file?(@outfile).should be_true
-    content = File.read(@outfile)
-
-    content.include?("ISO-8859-1").should be_false
-    content.include?("UTF-8").should be_true
-
-    `isutf8 #{File.expand_path(@outfile)}`.strip.should eql("")
-  end
-
-end
-
-context "ONIX::Normaliser", "with an file using entities" do
-
-  before(:each) do
-    @data_path = File.join(File.dirname(__FILE__),"..","data")
-    @filename  = File.join(@data_path, "entities.xml")
-    @outfile   = @filename + ".new"
-  end
-
-  after(:each) do
-    File.unlink(@outfile) if File.file?(@outfile)
-  end
-
-  specify "should correctly convert named entities to numeric entities" do
-    ONIX::Normaliser.process(@filename, @outfile)
-
-    File.file?(@outfile).should be_true
-    content = File.read(@outfile)
-
-    content.include?("–").should be_false
-    content.include?("–").should be_true
-  end
-end
-
-context "ONIX::Normaliser", "with a utf8 file that has no declared encoding" do
-
-  before(:each) do
-    @data_path = File.join(File.dirname(__FILE__),"..","data")
-    @filename  = File.join(@data_path, "no_encoding.xml")
-    @outfile   = @filename + ".new"
-  end
-
-  after(:each) do
-    File.unlink(@outfile) if File.file?(@outfile)
-  end
-
-  # this is to test for a bug where an exception was raised on files that
-  # had no declared encoding
-  specify "should add a utf-8 marker to the file" do
-    ONIX::Normaliser.process(@filename, @outfile)
-
-    File.file?(@outfile).should be_true
-    content = File.read(@outfile)
-
-    content.include?("encoding=\"UTF-8\"").should be_true
-  end
-end
-
 context "ONIX::Normaliser", "with a utf8 file that has illegal control chars" do
 
   before(:each) do
@@ -112,8 +37,6 @@ context "ONIX::Normaliser", "with a utf8 file that has illegal control chars" do
     File.unlink(@outfile) if File.file?(@outfile)
   end
 
-  # this is to test for a bug where an exception was raised on files that
-  # had no declared encoding
   specify "should remove all control chars except LF, CR and TAB" do
     ONIX::Normaliser.process(@filename, @outfile)
 

data/spec/other_text_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 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)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/price_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Price" do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(data_path, "price.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end