Refactor

.rvmrc

@@ -0,0 +1 @@
+rvm use ree@onix

Rakefile

@@ -3,19 +3,18 @@ require "bundler"
 Bundler.setup
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rspec/core/rake_task'
 
-
 desc "Default Task"
 task :default => [ :spec ]
 
-# run all rspecs
 desc "Run all rspec files"
 RSpec::Core::RakeTask.new("spec") do |t|
-  t.rspec_opts  = ["--color", "--format progress"]
+  t.rspec_opts  = ["-Ispec", "--color", "--format progress"]
 end
-desc 'Generate documentation'
+
+desc "Generate documentation"
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ONIX'

bin/onix_extract_codelists

@@ -1,16 +1,41 @@
 #!/usr/bin/ruby
 # coding: utf-8
 
-USAGE = "./onix_extract_codelists ONIX_BookProduct_CodeLists.xsd some_dir"
+# NB: When testing locally, you can run this as:
+#
+#   ruby -Ilib bin/onix_extract_codelists [options] xsd dir
 
-require 'rubygems'
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-require "onix"
+require 'optparse'
+
+def parse_options
+  options = {}
+  optparse = OptionParser.new do |parser|
+    parser.banner = [
+      "Usage: onix_extract_codelists [options] xsd_path output_dir_path",
+      "",
+      "  eg: onix_extract_codelists ONIX_BookProduct_CodeLists.xsd support/codes"
+    ].join("\n")
+
+    options[:format] = :tsv
+    parser.on("-f", "--format FMT", "Write to format (TSV or Ruby)") do |fmt|
+      options[:format] = fmt.downcase.to_sym
+    end
 
-unless ARGV.size == 2
-  puts USAGE
-  exit(1)
+    parser.on("-h", "--help", "Display this usage information") do
+      puts parser
+      exit
+    end
+  end
+  optparse.parse!
+  unless ARGV.size == 2
+    puts optparse
+    exit(1)
+  end
+  options
 end
 
-extractor = ONIX::CodeListExtractor.new(ARGV.shift)
+options = parse_options
+
+require "onix"
+extractor = ONIX::CodeListExtractor.new(ARGV.shift, options[:format])
 extractor.run(ARGV.shift)

data/product.xml

@@ -47,6 +47,13 @@
   <PublishingStatus>04</PublishingStatus>
   <PublicationDate>19980901</PublicationDate>
   <YearFirstPublished>1998</YearFirstPublished>
+  <RelatedProduct>
+    <RelationCode>13</RelationCode>
+    <ProductIdentifier>
+      <ProductIDType>15</ProductIDType>
+      <IDValue>9781742752020</IDValue>
+    </ProductIdentifier>
+  </RelatedProduct>
   <Measure>
     <MeasureTypeCode>08</MeasureTypeCode>
     <Measurement>720   </Measurement>

data/sales_rights.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product>
+  <RecordReference>365-9780194351898</RecordReference>
+  <NotificationType>03</NotificationType>
+  <ProductIdentifier>
+    <ProductIDType>03</ProductIDType>
+    <IDValue>9780194351898</IDValue>
+  </ProductIdentifier>
+
+  <SalesRights>
+    <SalesRightsType>01</SalesRightsType>
+    <RightsTerritory>WORLD</RightsTerritory>
+  </SalesRights>
+
+  <SalesRights>
+    <SalesRightsType>02</SalesRightsType>
+    <RightsCountry>AU NZ</RightsCountry>
+  </SalesRights>
+
+  <SalesRights>
+    <SalesRightsType>01</SalesRightsType>
+    <RightsRegion>000</RightsRegion>
+    <RightsRegion>001</RightsRegion>
+    <RightsRegion>002</RightsRegion>
+    <RightsRegion>003</RightsRegion>
+  </SalesRights>
+
+  <NotForSale>
+    <RightsCountry>GB</RightsCountry>
+    <ProductIdentifier>
+      <ProductIDType>03</ProductIDType>
+      <IDValue>9780194312345</IDValue>
+    </ProductIdentifier>
+  </NotForSale>
+</Product>

lib/onix.rb

@@ -4,7 +4,6 @@
 require 'cgi'
 require 'singleton'
 require 'roxml'
-require 'andand'
 
 module ONIX
   module Version #:nodoc:
@@ -15,6 +14,8 @@ module Version #:nodoc:
     String = [Major, Minor, Tiny].join('.')
   end
 
+  VERSION = ONIX::Version::String
+
   class Formatters
     def self.decimal
       lambda do |val|
@@ -51,43 +52,110 @@ def self.two_digit
         end
       end
     end
+
+    def self.space_separated
+      lambda { |val| [val.collect(&:to_s).join(" ")]  if val }
+    end
+
+    def self.boolean
+      lambda { |val| ""  if val }
+    end
   end
 end
 
-# core files
-# - ordering is important, classes need to be defined before any
-#   other class can use them
-require File.join(File.dirname(__FILE__), "onix", "sender_identifier")
-require File.join(File.dirname(__FILE__), "onix", "addressee_identifier")
-require File.join(File.dirname(__FILE__), "onix", "header")
-require File.join(File.dirname(__FILE__), "onix", "product_identifier")
-require File.join(File.dirname(__FILE__), "onix", "series_identifier")
-require File.join(File.dirname(__FILE__), "onix", "series")
-require File.join(File.dirname(__FILE__), "onix", "title")
-require File.join(File.dirname(__FILE__), "onix", "website")
-require File.join(File.dirname(__FILE__), "onix", "contributor")
-require File.join(File.dirname(__FILE__), "onix", "language")
-require File.join(File.dirname(__FILE__), "onix", "subject")
-require File.join(File.dirname(__FILE__), "onix", "audience_range")
-require File.join(File.dirname(__FILE__), "onix", "imprint")
-require File.join(File.dirname(__FILE__), "onix", "publisher")
-require File.join(File.dirname(__FILE__), "onix", "other_text")
-require File.join(File.dirname(__FILE__), "onix", "media_file")
-require File.join(File.dirname(__FILE__), "onix", "sales_restriction")
-require File.join(File.dirname(__FILE__), "onix", "stock")
-require File.join(File.dirname(__FILE__), "onix", "price")
-require File.join(File.dirname(__FILE__), "onix", "supply_detail")
-require File.join(File.dirname(__FILE__), "onix", "market_representation")
-require File.join(File.dirname(__FILE__), "onix", "measure")
-require File.join(File.dirname(__FILE__), "onix", "product")
-require File.join(File.dirname(__FILE__), "onix", "reader")
-require File.join(File.dirname(__FILE__), "onix", "writer")
-
-# product wrappers
-require File.join(File.dirname(__FILE__), "onix", "simple_product")
-require File.join(File.dirname(__FILE__), "onix", "apa_product")
-
-# misc
-require File.join(File.dirname(__FILE__), "onix", "lists")
-require File.join(File.dirname(__FILE__), "onix", "normaliser")
-require File.join(File.dirname(__FILE__), "onix", "code_list_extractor")
+
+# Ordering is important here; classes need to be defined before any
+# other class can use them.
+[
+  # core files
+  "core/element",
+  "core/lists",
+  "core/code",
+
+  # identifier mappings
+  "elements/identifier",
+  "elements/sender_identifier",
+  "elements/addressee_identifier",
+  "elements/person_name_identifier",
+  "elements/product_identifier",
+  "elements/series_identifier",
+  "elements/work_identifier",
+  "elements/agent_identifier",
+  "elements/conference_sponsor_identifier",
+  "elements/copyright_owner_identifier",
+  "elements/location_identifier",
+  "elements/sales_outlet_identifier",
+  "elements/supplier_identifier",
+  "elements/text_item_identifier",
+
+  # other element mappings
+  "elements/name_base",
+  "elements/name",
+  "elements/person_date",
+  "elements/professional_affiliation",
+  "elements/product_form_feature",
+  "elements/product_classification",
+  "elements/audience",
+  "elements/batch_bonus",
+  "elements/complexity",
+  "elements/copyright_owner",
+  "elements/copyright_statement",
+  "elements/discount_coded",
+  "elements/main_subject",
+  "elements/market_date",
+  "elements/new_supplier",
+  "elements/on_order_detail",
+  "elements/page_run",
+  "elements/prize",
+  "elements/sales_outlet",
+  "elements/stock_quantity_coded",
+  "elements/text_item",
+  "elements/title",
+  "elements/website",
+  "elements/contributor",
+  "elements/series",
+  "elements/set",
+  "elements/conference_sponsor",
+  "elements/conference",
+  "elements/extent",
+  "elements/illustrations",
+  "elements/language",
+  "elements/subject",
+  "elements/audience_range",
+  "elements/imprint",
+  "elements/publisher",
+  "elements/other_text",
+  "elements/media_file",
+  "elements/sales_restriction",
+  "elements/sales_rights",
+  "elements/not_for_sale",
+  "elements/stock",
+  "elements/price",
+  "elements/reissue",
+  "elements/supply_detail",
+  "elements/market_representation",
+  "elements/measure",
+  "elements/bible",
+  "elements/religious_text_feature",
+  "elements/religious_text",
+  "elements/content_item",
+  "elements/product_base",
+  "elements/contained_item",
+  "elements/related_product",
+  "elements/product",
+
+  # more core files
+  "core/header",
+  "core/reader",
+  "core/writer",
+
+  # product wrappers
+  "wrappers/simple_product",
+  "wrappers/apa_product",
+
+  # utilities
+  "utils/normaliser",
+  "utils/code_list_extractor"
+].each do |req|
+  require File.join("onix", req)
+end