onix 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.5 (21st December 2010)
+- switch back to the vanilla roxml gem. Ben is maintaining it again and
+  he has merged in my bug fixes
+- update packaging - use bundler and rspec 2.x
+- support normalising short tag files that include HTML tags
+
 v0.8.4 (18th October 2010)
 - some small fixes to xml names from Tim
 - make all code lists available via the ONIX::Lists class

data/lib/onix.rb

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

data/spec/apa_product_spec.rb

@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'date'
 
-context "ONIX::APAProduct" do
+describe "ONIX::APAProduct" do
 
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -12,7 +12,7 @@ context "ONIX::APAProduct" do
     @product_node = @doc.root
   end
 
-  specify "should provide read access to attributes" do
+  it "should provide read access to attributes" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @apa     = ONIX::APAProduct.new(@product)
 
@@ -26,7 +26,7 @@ context "ONIX::APAProduct" do
     @apa.pack_quantity.should eql(12)
   end
 
-  specify "should provide write access to attributes" do
+  it "should provide write access to attributes" do
     apa = ONIX::APAProduct.new
 
     apa.notification_type = 3
@@ -56,8 +56,8 @@ context "ONIX::APAProduct" do
 
 end
 
-context ONIX::APAProduct, "series method" do
-  specify "should set the nested series value on the underlying product class" do
+describe ONIX::APAProduct, "series method" do
+  it "should set the nested series value on the underlying product class" do
     apa = ONIX::APAProduct.new
 
     apa.series = "Harry Potter"
@@ -66,7 +66,7 @@ context ONIX::APAProduct, "series method" do
   end
 end
 
-context ONIX::APAProduct, "price method" do
+describe ONIX::APAProduct, "price method" do
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(@data_path, "usd.xml")
@@ -74,7 +74,7 @@ context ONIX::APAProduct, "price method" do
     @product_node = @doc.root
   end
 
-  specify "should return the first price in the file, regardless of type" do
+  it "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)
 
@@ -82,7 +82,7 @@ context ONIX::APAProduct, "price method" do
   end
 end
 
-context ONIX::APAProduct, "rrp_exc_sales_tax method" do
+describe 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")
@@ -90,7 +90,7 @@ context ONIX::APAProduct, "rrp_exc_sales_tax method" do
     @product_node = @doc.root
   end
 
-  specify "should return the first price in the file of type 1" do
+  it "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)
 

data/spec/audience_range_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::AudienceRange" do
+describe ONIX::AudienceRange do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@ context "ONIX::AudienceRange" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
     aud.to_xml.to_s[0,15].should eql("<AudienceRange>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
 
     aud.audience_range_qualifier.should eql(11)
@@ -28,7 +28,7 @@ context "ONIX::AudienceRange" do
     aud.audience_range_values[1].should eql(5)
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     aud = ONIX::AudienceRange.new
 
     aud.audience_range_qualifier = 12

data/spec/contributor_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Contributor" do
+describe ONIX::Contributor do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@ context "ONIX::Contributor" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "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 attributes" do
+  it "should provide read access to first level attributes" do
     contrib = ONIX::Contributor.from_xml(@root.to_s)
 
     contrib.contributor_role.should eql("A01")
@@ -24,7 +24,7 @@ context "ONIX::Contributor" do
     contrib.sequence_number.should eql(1)
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     contrib = ONIX::Contributor.new
 
     contrib.contributor_role = "A02"

data/spec/header_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Header" do
+describe ONIX::Header do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@ context "ONIX::Header" do
     @header_node = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     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 attributes" do
+  it "should provide read access to first level attributes" do
     header = ONIX::Header.from_xml(@header_node.to_s)
 
     header.from_ean_number.should eql("1111111111111")
@@ -42,7 +42,7 @@ context "ONIX::Header" do
     header.default_class_of_trade.should eql("f")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     header = ONIX::Header.new
 
     header.from_ean_number = "1111111111111"
@@ -95,7 +95,7 @@ context "ONIX::Header" do
     header.to_xml.to_s.include?("<DefaultClassOfTrade>f</DefaultClassOfTrade>").should be_true
   end
 
-  specify "should correctly handle text with & < and >" do
+  it "should correctly handle text with & < and >" do
     header = ONIX::Header.new
 
     header.from_company = "James & Healy"
@@ -109,9 +109,9 @@ context "ONIX::Header" do
   end
 end
 
-context "ONIX::Header" do
+describe ONIX::Header do
 
-  specify "should correctly handle headers with an invalid sent date" do
+  it "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))

data/spec/imprint_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Imprint" do
+describe ONIX::Imprint do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,18 +11,18 @@ context "ONIX::Imprint" do
     @root     = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "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 attributes" do
+  it "should provide read access to first level attributes" 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 attributes" do
+  it "should provide write access to first level attributes" do
     imp = ONIX::Imprint.new
 
     imp.imprint_name = "Paulist Press"

data/spec/language_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Language" do
+describe ONIX::Language do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@ context "ONIX::Language" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "should correctly convert to a string" do
     lan = ONIX::Language.from_xml(@root.to_s)
     lan.to_xml.to_s[0,10].should eql("<Language>")
   end
 
-  specify "should provide read access to first level attributes" do
+  it "should provide read access to first level attributes" do
     lan = ONIX::Language.from_xml(@root.to_s)
 
     lan.language_role.should eql(1)
@@ -24,7 +24,7 @@ context "ONIX::Language" do
     lan.country_code.should eql("US")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     lan = ONIX::Language.new
 
     lan.language_role = 2

data/spec/lists_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context ONIX::Lists, "list method" do
+describe ONIX::Lists, "list method" do
 
   it "should return a hash containing the ProductForm code list" do
     forms = ONIX::Lists.list(7)
@@ -12,7 +12,7 @@ context ONIX::Lists, "list method" do
 
 end
 
-context ONIX::Lists, "product_form shortcut method" do
+describe ONIX::Lists, "product_form shortcut method" do
 
   it "should return a hash containing the ProductForm code list" do
     forms = ONIX::Lists.product_form
@@ -22,7 +22,7 @@ context ONIX::Lists, "product_form shortcut method" do
 
 end
 
-context ONIX::Lists, "PRODUCT_FORM shortcut constant" do
+describe ONIX::Lists, "PRODUCT_FORM shortcut constant" do
 
   it "should return a hash containing the ProductForm code list" do
     forms = ONIX::Lists::PRODUCT_FORM

data/spec/market_representation_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::MarketRepresentation" do
+describe ONIX::MarketRepresentation do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,19 +11,19 @@ context "ONIX::MarketRepresentation" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "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 attributes" do
+  it "should provide read access to first level attributes" 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 attributes" do
+  it "should provide write access to first level attributes" do
     rep = ONIX::MarketRepresentation.new
 
     rep.agent_name = "Rainbow Book Agencies"
@@ -35,5 +35,3 @@ context "ONIX::MarketRepresentation" do
   end
 
 end
-
-

data/spec/measure_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Measure" do
+describe ONIX::Measure do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,12 +11,12 @@ context "ONIX::Measure" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "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 attributes" do
+  it "should provide read access to first level attributes" do
     m = ONIX::Measure.from_xml(@root.to_s)
 
     m.measure_type_code.should eql(1)
@@ -24,7 +24,7 @@ context "ONIX::Measure" do
     m.measure_unit_code.should eql("mm")
   end
 
-  specify "should provide write access to first level attributes" do
+  it "should provide write access to first level attributes" do
     m = ONIX::Measure.new
 
     m.measure_type_code = 1

data/spec/media_file_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::MediaFile" do
+describe ONIX::MediaFile do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -11,19 +11,19 @@ context "ONIX::MediaFile" do
     @root = @doc.root
   end
 
-  specify "should correctly convert to a string" do
+  it "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 attributes" do
+  it "should provide read access to first level attributes" 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 attributes" do
+  it "should provide write access to first level attributes" do
     mf = ONIX::MediaFile.new
 
     mf.media_file_type_code = 2

data/spec/normaliser_spec.rb

@@ -2,7 +2,7 @@
 
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
-context "ONIX::Normaliser", "with a simple short tag file" do
+describe ONIX::Normaliser, "with a simple short tag file" do
 
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -14,7 +14,7 @@ context "ONIX::Normaliser", "with a simple short tag file" do
     File.unlink(@outfile) if File.file?(@outfile)
   end
 
-  specify "should correctly convert short tag file to reference tag" do
+  it "should correctly convert short tag file to reference tag" do
     ONIX::Normaliser.process(@filename, @outfile)
 
     File.file?(@outfile).should be_true
@@ -22,10 +22,33 @@ context "ONIX::Normaliser", "with a simple short tag file" do
     content.include?("<m174>").should be_false
     content.include?("<FromCompany>").should be_true
   end
+end
+
+describe ONIX::Normaliser, "with a short tag file that include HTML tags" do
+
+  before(:each) do
+    @data_path = File.join(File.dirname(__FILE__),"..","data")
+    @filename  = File.join(@data_path, "short_tags_ivp.xml")
+    @outfile   = @filename + ".new"
+  end
+
+  after(:each) do
+    File.unlink(@outfile) if File.file?(@outfile)
+  end
+
+  it "should correctly convert short tag file to reference tag" do
+    ONIX::Normaliser.process(@filename, @outfile)
+
+    File.file?(@outfile).should be_true
+    content = File.read(@outfile)
+    content.include?("<m174>").should be_false
+    content.include?("<FromCompany>").should be_true
+    content.include?("<em>Discipleship Essentials</em>").should be_true
+  end
 
 end
 
-context "ONIX::Normaliser", "with a utf8 file that has illegal control chars" do
+describe ONIX::Normaliser, "with a utf8 file that has illegal control chars" do
 
   before(:each) do
     @data_path = File.join(File.dirname(__FILE__),"..","data")
@@ -37,7 +60,7 @@ context "ONIX::Normaliser", "with a utf8 file that has illegal control chars" do
     File.unlink(@outfile) if File.file?(@outfile)
   end
 
-  specify "should remove all control chars except LF, CR and TAB" do
+  it "should remove all control chars except LF, CR and TAB" do
     ONIX::Normaliser.process(@filename, @outfile)
 
     File.file?(@outfile).should be_true