Respect lowercase product tags

.gitignore

@@ -1,2 +1,3 @@
 pkg
 Gemfile.lock
+data/*.xml.new

.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - "2.1.5"
+script: bundle exec rspec

CHANGELOG

@@ -1,3 +1,8 @@
+v1.0.0 (4th December 2014)
+- Rename ONIX to ONIX2
+- Add SalesRight to Product
+- Remove Normaliser
+
 v0.9.5 (28th December 2012)
 - Bugfix: AudienceRangeValue can be non-numeric
 
@@ -18,7 +23,7 @@ v0.9.0 (14th April 2011)
 - switch back to the vanilla roxml gem. Ben is maintaining it again and
   he has merged in my bug fixes
 - clarify comments explaining encoding behaviour
-- Add options hash to ONIX::Reader. Only option at this stage is :encoding,
+- Add options hash to ONIX2::Reader. Only option at this stage is :encoding,
   which allows the user to override the assumed encoding of the input XML
 - API change, so new minor version
 
@@ -28,10 +33,10 @@ v0.8.5 (21st December 2010)
 
 v0.8.4 (18th October 2010)
 - some small fixes to xml names from Tim
-- make all code lists available via the ONIX::Lists class
+- make all code lists available via the ONIX2::Lists class
 
 v0.8.3 (9th September 2010)
-- Fix for race condition in ONIX::Normaliser
+- Fix for race condition in ONIX2::Normaliser
   - thanks to pixelvixen for reporting
 - force roxml to be 3.1.6 or higher. Earlier versions misbehaved when monkey
   patching nokogiri
@@ -41,16 +46,16 @@ v0.8.2 (6th May 2010)
 
 v0.8.1 (5th January 2010)
 - Use nokogiri's support for transparent entity conversion when reading an ONIX file
-- Removed entity replacement from ONIX::Normaliser
+- Removed entity replacement from ONIX2::Normaliser
   - the external dependency on sed made me uncomfortable, and it wasn't really
     necessary now that nokogiri can do it for us
-- Removed utf-8 normalisation from ONIX::Normaliser
+- Removed utf-8 normalisation from ONIX2::Normaliser
   - nokogiri also handles this really cleanly and transparently. Regardless of
     the source file encoding, Nokogiri::Reader returns utf-8 encoded data
 - Add the release attribute to files we generate
   - it's optional in 2.1, but mandatory in 3.0. As we start to see 3.0 files in the
     wild it will help to have a rapid way to distinguish between them
-- Add ONIX::Reader#release - to detect the release version of files we read in
+- Add ONIX2::Reader#release - to detect the release version of files we read in
 
 v0.8.0 (31st October 2009)
 - Replace LibXML dependency with Nokogiri. Nokogiri is under active development, has
@@ -67,7 +72,7 @@ v0.7.8 (19th October 2009)
   - thanks tim
 
 v0.7.7 (1st October 2009)
-- optimise sed usage in ONIX::Normaliser. *huge* speed improvement on
+- optimise sed usage in ONIX2::Normaliser. *huge* speed improvement on
   large files.
 
 v0.7.6 (21st September 2009)
@@ -77,7 +82,7 @@ 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
+- Expand ONIX2::Normaliser
   - strip control chars
   - add encoding declaration to valid utf-8 files that aren't declared
     as such
@@ -87,7 +92,7 @@ v0.7.3 (19th August 2009)
   to reference tags
 
 v0.7.2 (19th August 2009)
-- Added ONIX::Normaliser class
+- Added ONIX2::Normaliser class
   - for normalising various ONIX files into a form that makes them easy
     to process. Shouldn't be necesary to pre-process files like this, but
     I'm sick of trying to wrestle the libxml ruby bindings
@@ -101,7 +106,7 @@ v0.7.0 (17th June 2009)
     that seems to be the source of our instability
 - Various Ruby 1.9 compatability tweaks
   - add source file coding declarations. All source files are UTF-8
-  - ONIX::Reader ensures all input data is converted to UTF-8
+  - ONIX2::Reader ensures all input data is converted to UTF-8
   - the ROXML based objects seem to forget the encoding when they're marshalled,
     so force string based attributes *back* to UTF-8
 
@@ -135,7 +140,7 @@ v0.6.1 (Unreleased)
     libxml
 
 v0.6.0 (18th March 2009)
-- remove use of threads in ONIX::Reader
+- remove use of threads in ONIX2::Reader
   - a producer/consumer pattern was useful in the REXML stream parsing days, but
     now LibXML's Reader binding provides a better alternative
   - API left unchanged, this was all under the hood
@@ -170,7 +175,7 @@ v0.4.2 (1st November 2008)
 
 v0.4.1 (UNRELEASED)
 - Added accessors to various product measurements. Height, weight, etc.
-- Reduced time for an ONIX::Reader class to initialise
+- Reduced time for an ONIX2::Reader class to initialise
 
 v0.4.0 (28th October 2008)
 - Major rework: now based on ROXML instead of xml-mapping

Gemfile

@@ -1,3 +1,8 @@
-source :gemcutter
+source 'https://rubygems.org'
 
+# Specify your gem's dependencies in onix.gemspec
 gemspec
+
+# explicitly depend on HEAD representable, because of the :render_filter option.
+
+gem 'representable', github: 'apotonick/representable'

README.markdown

@@ -1,5 +1,7 @@
 ## ONIX
 
+[![Build Status](https://travis-ci.org/exAspArk/onix2.svg?branch=master)](https://travis-ci.org/exAspArk/onix2)
+
 The ONIX standard is a somewhat verbose XML format that is rapidly becoming the
 industry standard for electronic data sharing in the book and publishing
 industries.
@@ -16,10 +18,10 @@ This library currently only handles ONIX 2.1 files (all revisions). At some
 point I'll need to work out what to do about supporting ONIX 3.0 files. I
 suspect a separate library will be the simplest solution.
 
-ONIX::Reader only handles the reference tag versions of ONIX 2.1. Use
-ONIX::Normaliser to convert any short tag files to reference tags.
+ONIX2::Reader only handles the reference tag versions of ONIX 2.1. Use
+ONIX2::Normaliser to convert any short tag files to reference tags.
 
-ONIX::Writer only generates reference tag ONIX files.
+ONIX2::Writer only generates reference tag ONIX files.
 
 It baffles me why anyone thought designing two parallel versions of the ONIX
 spec was a good idea. Use reference tags my friends, and let short tags fade
@@ -46,10 +48,10 @@ http://github.com/yob/onix-dtd
 See files in the examples directory to get started quickly. For further reading
 view the comments to the following classes:
 
-* ONIX::Reader - For reading ONIX files
-* ONIX::Writer - For writing ONIX files
-* ONIX::Normaliser - For normalising ONIX files before reading them. Fixes encoding issues, etc
-* ONIX::Lists  - For building hashes of code lists from the ONIX spec
+* ONIX2::Reader - For reading ONIX files
+* ONIX2::Writer - For writing ONIX files
+* ONIX2::Normaliser - For normalising ONIX files before reading them. Fixes encoding issues, etc
+* ONIX2::Lists  - For building hashes of code lists from the ONIX spec
 
 ## Licensing
 

Rakefile

@@ -1,9 +1,8 @@
 require "rubygems"
-require "bundler"
-Bundler.setup
+require "bundler/setup"
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rspec/core/rake_task'
 
 
@@ -18,7 +17,7 @@ end
 desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ONIX'
+  rdoc.title    = 'ONIX2'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.markdown')
   rdoc.rdoc_files.include('TODO')

bin/onix_extract_codelists

@@ -12,5 +12,5 @@ unless ARGV.size == 2
   exit(1)
 end
 
-extractor = ONIX::CodeListExtractor.new(ARGV.shift)
+extractor = ONIX2::CodeListExtractor.new(ARGV.shift)
 extractor.run(ARGV.shift)

data/addressee.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AddresseeIdentifier>
+  <AddresseeIDType>01</AddresseeIDType>
+  <IDValue>123456</IDValue>
+</AddresseeIdentifier>

data/discount_coded.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DiscountCoded>
+  <DiscountCodeType>02</DiscountCodeType>
+  <DiscountCodeTypeName>IngramDC</DiscountCodeTypeName>
+  <DiscountCode>AHACP033</DiscountCode>
+</DiscountCoded>
+

data/header.xml

@@ -18,4 +18,12 @@
   <DefaultLinearUnit>dd</DefaultLinearUnit>
   <DefaultWeightUnit>ee</DefaultWeightUnit>
   <DefaultClassOfTrade>f</DefaultClassOfTrade>
+  <SenderIdentifier>
+    <SenderIDType>01</SenderIDType>
+    <IDValue>123456</IDValue>
+  </SenderIdentifier>
+  <SenderIdentifier>
+    <SenderIDType>02</SenderIDType>
+    <IDValue>7891002</IDValue>
+  </SenderIdentifier>
 </Header>

data/price.xml

@@ -2,4 +2,15 @@
 <Price>
   <PriceTypeCode>02</PriceTypeCode>
   <PriceAmount>7.5</PriceAmount>
+  <DiscountCoded>
+    <DiscountCodeType>01</DiscountCodeType>
+    <DiscountCodeTypeName>IngramDC1</DiscountCodeTypeName>
+    <DiscountCode>AHACP011</DiscountCode>
+  </DiscountCoded>
+  <DiscountCoded>
+    <DiscountCodeType>02</DiscountCodeType>
+    <DiscountCodeTypeName>IngramDC2</DiscountCodeTypeName>
+    <DiscountCode>AHACP022</DiscountCode>
+  </DiscountCoded>
+  <DiscountPercent>0.4</DiscountPercent>
 </Price>

data/product.xml

@@ -15,6 +15,7 @@
     <IDValue>9780194351898</IDValue>
   </ProductIdentifier>
   <ProductForm>BC</ProductForm>
+  <EpubType>029</EpubType>
   <Series>
     <TitleOfSeries>DICTIONARIES BEGINNER TO PRE-INTERMED</TitleOfSeries>
   </Series>

data/series.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Series>
+  <SeriesIdentifier>
+    <SeriesIDType>01</SeriesIDType>
+    <IDValue>10001</IDValue>
+  </SeriesIdentifier>
+  <SeriesIdentifier>
+    <SeriesIDType>02</SeriesIDType>
+    <IDValue>20002</IDValue>
+  </SeriesIdentifier>
   <TitleOfSeries>Citizens and Their Governments</TitleOfSeries>
 </Series>
 

data/supply_detail.xml

@@ -15,4 +15,12 @@
     <PriceTypeCode>02</PriceTypeCode>
     <PriceAmount>7.5</PriceAmount>
   </Price>
+  <Website>
+    <WebsiteRole>01</WebsiteRole>
+    <WebsiteLink>http://www.rainbowbooks.com.au</WebsiteLink>
+  </Website>
+  <Website>
+    <WebsiteRole>02</WebsiteRole>
+    <WebsiteLink>http://www.google.com</WebsiteLink>
+  </Website>
 </SupplyDetail>

examples/reader.rb

@@ -2,11 +2,11 @@
 
 require 'onix'
 
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","0705NHP.XML"))
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","9780194351898.xml"))
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","jul.xml"))
-reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","bookwise.xml"))
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","rba_FANT.xml"))
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","0705NHP.XML"))
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","9780194351898.xml"))
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","jul.xml"))
+reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","bookwise.xml"))
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","rba_FANT.xml"))
 counter = 0
 
 # display header info

examples/reader_apa.rb

@@ -2,11 +2,11 @@
 
 require 'onix'
 
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","Bookwise_July_2008.xml"), ::ONIX::APAProduct)
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","Ashgate Other.xml"), ::ONIX::APAProduct)
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","9780194351898.xml"), ::ONIX::APAProduct)
-reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","jul.xml"), ::ONIX::APAProduct)
-#reader = ONIX::Reader.new(File.join(File.dirname(__FILE__),"..","data","rba_FANT.xml"))
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","Bookwise_July_2008.xml"), ::ONIX2::APAProduct)
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","Ashgate Other.xml"), ::ONIX2::APAProduct)
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","9780194351898.xml"), ::ONIX2::APAProduct)
+reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","jul.xml"), ::ONIX2::APAProduct)
+#reader = ONIX2::Reader.new(File.join(File.dirname(__FILE__),"..","data","rba_FANT.xml"))
 counter = 0
 
 # display header info

examples/writer.rb

@@ -3,11 +3,11 @@
 require 'onix'
 
 File.open('output.xml', "w") do |output|
-  header = ONIX::Header.new
+  header = ONIX2::Header.new
   header.from_company = "Sample Company"
   header.from_person  = "James"
 
-  writer = ONIX::Writer.new(output, header)
+  writer = ONIX2::Writer.new(output, header)
 
   writer.end_document
 end

examples/writer_apa.rb

@@ -3,14 +3,14 @@
 require 'onix'
 
 File.open('output.xml', "w") do |output|
-  header = ONIX::Header.new
+  header = ONIX2::Header.new
   header.from_company = "Sample Company"
   header.from_person  = "James"
   header.sent_date = Time.now
 
-  writer = ONIX::Writer.new(output, header)
+  writer = ONIX2::Writer.new(output, header)
 
-  product = ONIX::APAProduct.new
+  product = ONIX2::APAProduct.new
   product.notification_type = 2
   product.record_reference = 1
   product.isbn10 = "1844836902"