milkfarm-onix 0.8.11 → 0.8.12

data/CHANGELOG

@@ -1,3 +1,17 @@
+v0.8.12 (28 November 2011)
+- Cherry pick yob's commits from 13 April to 7 November:
+  - Relax activesupport dependency to work with rails 3 or 3.1
+  - Switch back to the vanilla roxml gem
+  - Clarify comments explaining encoding behaviour
+  - Add options hash to ONIX::Reader. Only option at this stage is :encoding,
+    which allows the user to override the assumed encoding of the input XML
+  - API change
+- Skipped yob's implementation of discount_coded
+  - It has already been addressed in this fork
+	  NB: differing syntax discounts_coded v. discount_codeds (this fork uses latter)
+- Add SalesRights (thanks joseph), with ordering adjustment
+- Replace andand with try
+
 v0.8.11 (27 May 2011)
 - Add Territory, CountryExcluded, TerritoryExcluded to Price composite
 - Add CountryCode to Price composite

data/README.markdown

@@ -21,6 +21,10 @@ ONIX::Normaliser to convert any short tag files to reference tags.
 
 ONIX::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
+away into irrelevant obscurity.
+
 ## DTD Loading
 
 To correctly handle named entities when reading an ONIX file, this gem attempts

data/lib/onix.rb

@@ -4,7 +4,6 @@ require 'bigdecimal'
 require 'cgi'
 require 'singleton'
 require 'roxml'
-require 'andand'
 
 module ONIX
   class Formatters
@@ -49,55 +48,61 @@ module ONIX
         end
       end
     end
+
+    def self.space_separated
+      lambda { |val| val.join(" ")  if val }
+    end
   end
 end
 
 # helper modules
-require File.join(File.dirname(__FILE__), "onix", "list_writer")
-require File.join(File.dirname(__FILE__), "onix", "inflector")
-require File.join(File.dirname(__FILE__), "onix", "product_identifiers")
-require File.join(File.dirname(__FILE__), "onix", "work_identifiers")
-require File.join(File.dirname(__FILE__), "onix", "discount_codeds")
+require "onix/list_writer"
+require "onix/inflector"
+require "onix/product_identifiers"
+require "onix/work_identifiers"
+require "onix/discount_codeds"
 
 # 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", "set")
-require File.join(File.dirname(__FILE__), "onix", "title")
-require File.join(File.dirname(__FILE__), "onix", "work_identifier")
-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", "discount_coded")
-require File.join(File.dirname(__FILE__), "onix", "price")
-require File.join(File.dirname(__FILE__), "onix", "related_product")
-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")
+require "onix/sender_identifier"
+require "onix/addressee_identifier"
+require "onix/header"
+require "onix/product_identifier"
+require "onix/series_identifier"
+require "onix/series"
+require "onix/set"
+require "onix/title"
+require "onix/work_identifier"
+require "onix/website"
+require "onix/contributor"
+require "onix/language"
+require "onix/subject"
+require "onix/audience_range"
+require "onix/imprint"
+require "onix/publisher"
+require "onix/other_text"
+require "onix/media_file"
+require "onix/sales_restriction"
+require "onix/sales_rights"
+require "onix/not_for_sale"
+require "onix/stock"
+require "onix/discount_coded"
+require "onix/price"
+require "onix/related_product"
+require "onix/supply_detail"
+require "onix/market_representation"
+require "onix/measure"
+require "onix/product"
+require "onix/reader"
+require "onix/writer"
 
 # product wrappers
-require File.join(File.dirname(__FILE__), "onix", "simple_product")
-require File.join(File.dirname(__FILE__), "onix", "apa_product")
-require File.join(File.dirname(__FILE__), "onix", "sl_product")
+require "onix/simple_product"
+require "onix/apa_product"
+require "onix/sl_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")
+require "onix/lists"
+require "onix/normaliser"
+require "onix/code_list_extractor"

data/lib/onix/apa_product.rb

@@ -26,7 +26,7 @@ module ONIX
 
     # retrieve the current EAN
     def ean
-      identifier(3).andand.id_value
+      identifier(3).try(:id_value)
     end
 
     # set a new EAN
@@ -36,7 +36,7 @@ module ONIX
 
     # retrieve the proprietary ID
     def proprietary_id
-      identifier(1).andand.id_value
+      identifier(1).try(:id_value)
     end
 
     # set a new proprietary ID
@@ -46,7 +46,7 @@ module ONIX
 
     # retrieve the current ISBN 10
     def isbn10
-      identifier(2).andand.id_value
+      identifier(2).try(:id_value)
     end
 
     # set a new ISBN 10
@@ -56,7 +56,7 @@ module ONIX
 
     # retrieve the current ISBN 13
     def isbn13
-      identifier(15).andand.id_value
+      identifier(15).try(:id_value)
     end
 
     # set a new ISBN 13
@@ -108,7 +108,7 @@ module ONIX
 
     def series
       composite = product.series.first
-      composite.andand.title_of_series
+      composite.try(:title_of_series)
     end
 
     def series=(val)
@@ -122,7 +122,7 @@ module ONIX
 
     # retrieve the current publisher website for this particular product
     def publisher_website
-      website(2).andand.website_link
+      website(2).try(:website_link)
     end
 
     # set a new publisher website for this particular product
@@ -132,7 +132,7 @@ module ONIX
 
     # retrieve the current supplier website for this particular product
     def supplier_website
-      website(12).andand.website_link
+      website(12).try(:website_link)
     end
 
     # set a new supplier website for this particular product
@@ -181,7 +181,7 @@ module ONIX
 
     # retrieve the url to the product cover image
     def cover_url
-      media_file(4).andand.media_file_link
+      media_file(4).try(:media_file_link)
     end
 
     # set the url to the product cover image
@@ -193,7 +193,7 @@ module ONIX
 
     # retrieve the url to the high quality product cover image
     def cover_url_hq
-      media_file(6).andand.media_file_link
+      media_file(6).try(:media_file_link)
     end
 
     # set the url to the high quality product cover image
@@ -205,7 +205,7 @@ module ONIX
 
     # retrieve the url to the product thumbnail
     def thumbnail_url
-      media_file(7).andand.media_file_link
+      media_file(7).try(:media_file_link)
     end
 
     # set the url to the product cover image
@@ -217,7 +217,7 @@ module ONIX
 
     # retrieve the main description
     def main_description
-      other_text(1).andand.text
+      other_text(1).try(:text)
     end
 
     # set the main description
@@ -227,7 +227,7 @@ module ONIX
 
     # retrieve the short description
     def short_description
-      other_text(2).andand.text
+      other_text(2).try(:text)
     end
 
     # set the short description
@@ -237,7 +237,7 @@ module ONIX
 
     # retrieve the long description
     def long_description
-      other_text(3).andand.text
+      other_text(3).try(:text)
     end
 
     # set the long description
@@ -263,7 +263,7 @@ module ONIX
 
     # retrieve the publisher
     def publisher
-      publisher_get(1).andand.publisher_name
+      publisher_get(1).try(:publisher_name)
     end
 
     # set a new publisher
@@ -417,7 +417,7 @@ module ONIX
 
     # retrieve the rrp excluding any sales tax
     def rrp_exc_sales_tax
-      price_get(1).andand.price_amount
+      price_get(1).try(:price_amount)
     end
 
     # set the rrp excluding any sales tax
@@ -427,7 +427,7 @@ module ONIX
 
     # retrieve the rrp including any sales tax
     def rrp_inc_sales_tax
-      price_get(2).andand.price_amount
+      price_get(2).try(:price_amount)
     end
 
     # set the rrp including any sales tax
@@ -438,7 +438,7 @@ module ONIX
     # just get the first price we can find, regardless of the type.
     # useful as a backup for reading files from that don't contain a type
     def price
-      price_get(nil).andand.price_amount
+      price_get(nil).try(:price_amount)
     end
 
     # retrieve the height of the product
@@ -448,7 +448,7 @@ module ONIX
     #
     def height
       # TODO: auto unit conversion
-      measurement(1).andand.measurement
+      measurement(1).try(:measurement)
     end
 
     # set the height of the book
@@ -471,7 +471,7 @@ module ONIX
     #
     def width
       # TODO: auto unit conversion
-      measurement(2).andand.measurement
+      measurement(2).try(:measurement)
     end
 
     # set the width of the product
@@ -494,7 +494,7 @@ module ONIX
     #
     def weight
       # TODO: auto unit conversion
-      measurement(8).andand.measurement
+      measurement(8).try(:measurement)
     end
 
     # set the weight of the product
@@ -517,7 +517,7 @@ module ONIX
     #
     def thickness
       # TODO: auto unit conversion
-      measurement(3).andand.measurement
+      measurement(3).try(:measurement)
     end
 
     # set the thickness of the product

data/lib/onix/not_for_sale.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+
+module ONIX
+
+  # See also: SalesRights. ONIX 2.1 prefers NotForSale blocks if a product is
+  # not for sale, but this can also be specified with SalesRightsType in
+  # SalesRights.
+  #
+  class NotForSale
+
+    include ROXML
+
+    xml_name "NotForSale"
+    xml_accessor(:rights_countries, :from => "RightsCountry", :to_xml => ONIX::Formatters.space_separated) { |v| v.split  if v }
+    xml_accessor(:rights_territories, :from => "RightsTerritory", :to_xml => ONIX::Formatters.space_separated) { |v| v.split  if v }
+    xml_accessor(:product_identifiers, :from => "ProductIdentifier", :as => [ONIX::ProductIdentifier])
+    xml_accessor(:publisher_name, :from => "PublisherName")
+
+  end
+
+end

data/lib/onix/product.rb

@@ -42,6 +42,8 @@ module ONIX
     end
     xml_accessor :copyright_year, :from => "CopyrightYear", :as => Integer
     xml_accessor :year_first_published, :from => "YearFirstPublished", :as => Fixnum
+    xml_accessor :sales_rights, :from => "SalesRights", :as => [ONIX::SalesRights]
+    xml_accessor :not_for_sales, :from => "NotForSale", :as => [ONIX::NotForSale]
     xml_accessor :sales_restrictions, :from => "SalesRestriction", :as => [ONIX::SalesRestriction]
     xml_accessor :measurements, :from => "Measure", :as => [ONIX::Measure]
     xml_accessor :related_products, :from => "RelatedProduct", :as => [ONIX::RelatedProduct]

data/lib/onix/product_identifiers.rb

@@ -12,7 +12,7 @@ module ONIX
     
     ACCESSOR_METHODS.each do |name, digit|
       define_method(name) do
-        find(digit).andand.id_value
+        find(digit).try(:id_value)
       end
       define_method("#{name}=") do |value|
         set(digit, value)

data/lib/onix/reader.rb

@@ -25,7 +25,7 @@ module ONIX
   # in a shim that provides simple accessor access to common attributes, pass the
   # shim class as a second argument
   #
-  #   reader = ONIX::Reader.new("somefile.xml", ONIX::APAProduct)
+  #   reader = ONIX::Reader.new("somefile.xml", :product_class => ONIX::APAProduct)
   #
   #   puts reader.header.inspect
   #
@@ -39,7 +39,7 @@ module ONIX
   # As well as accessing the file header, there are handful of other read only
   # attributes that might be useful
   #
-  #   reader = ONIX::Reader.new("somefile.xml", ONIX::APAProduct)
+  #   reader = ONIX::Reader.new("somefile.xml")
   #
   #   puts reader.version
   #   puts reader.xml_lang
@@ -50,23 +50,50 @@ module ONIX
   # ONIX spec, and you may need to handle the file differently based on what
   # version it is.
   #
+  # == File Encoding
+  #
+  # ONIX::Reader returns all strings as UTF-8. Source file encoding is detected by
+  # the encoding declaration at the top of the file, like so:
+  #
+  #   <?xml version="1.0" encoding="iso-8859-1"?>
+  #
+  # If the encoding declaration is missing the file is assumed to be UTF-8.
+  #
+  # If the encoding declaration is missing or wrong and the file isn't UTF-8,
+  # you can manually set or override it like so:
+  #
+  #   reader = ONIX::Reader.new("somefile.xml", :encoding => "iso-8859-1")
+  #
+  # If the file contains invalid bytes for the source encoding an exception will
+  # be raised. This isn't ideal, but I'm still looking for ways to make this
+  # behaviour configurable.
+  #
+  # If you're running 1.9, you might imagine passing an IO stream that auto
+  # transcodes to UTF-8 into ONIX::Reader might have the same effect, but that
+  # isn't the case. Nokogiri is used to parse the file, and it seems to ignore
+  # IO encoding and just read raw bytes.
+  #
   class Reader
     include Enumerable
 
     attr_reader :header, :release
 
-    def initialize(input, product_klass = ::ONIX::Product)
+    def initialize(input, *args)
+      opts = args.last.kind_of?(Hash) ? args.pop : {}
+      if args.size > 0
+        ActiveSupport::Deprecation.warn("Passing a klass as ONIX::Reader's second argument is deprecated, use the :product_class option instead", caller)
+      end
+      @product_klass = opts[:product_class] || args.pop || ::ONIX::Product
+
       if input.kind_of?(String)
         @file   = File.open(input, "r")
-        @reader = Nokogiri::XML::Reader(@file) { |cfg| cfg.dtdload.noent }
+        @reader = Nokogiri::XML::Reader(@file, nil, opts[:encoding]) { |cfg| cfg.dtdload.noent }
       elsif input.kind_of?(IO)
-        @reader = Nokogiri::XML::Reader(input) { |cfg| cfg.dtdload.noent }
+        @reader = Nokogiri::XML::Reader(input, nil, opts[:encoding]) { |cfg| cfg.dtdload.noent }
       else
         raise ArgumentError, "Unable to read from file or IO stream"
       end
 
-      @product_klass = product_klass
-
       @release = find_release
       @header = find_header
 

data/lib/onix/sales_rights.rb

@@ -0,0 +1,19 @@
+# coding: utf-8
+
+module ONIX
+
+  # See also: NotForSale. It's possible to set not for sale here as well.
+  #
+  class SalesRights
+    include ROXML
+
+    xml_name "SalesRights"
+    xml_accessor :sales_rights_type, :from => "SalesRightsType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor(:rights_countries, :from => "RightsCountry", :to_xml => ONIX::Formatters.space_separated) { |v| v.split  if v }
+    xml_accessor(:rights_territories, :from => "RightsTerritory", :to_xml => ONIX::Formatters.space_separated) { |v| v.split  if v }
+
+    # Deprecated accessors
+    xml_accessor(:rights_region, :from => "RightsRegion", :as => [])
+
+  end
+end

data/lib/onix/series.rb

@@ -15,7 +15,7 @@ module ONIX
 
     # retrieve the proprietary series ID
     def proprietary_series_id
-      series_identifier(1).andand.id_value
+      series_identifier(1).try(:id_value)
     end
 
     # set a new proprietary series ID
@@ -25,7 +25,7 @@ module ONIX
 
     # retrieve the issn
     def issn
-      series_identifier(2).andand.id_value
+      series_identifier(2).try(:id_value)
     end
 
     # set a new issn

data/lib/onix/version.rb

@@ -1,3 +1,3 @@
 module ONIX
-  VERSION = "0.8.11"
+  VERSION = "0.8.12"
 end

data/spec/not_for_sale_spec.rb

@@ -0,0 +1,31 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ONIX::NotForSale do
+
+  before(:each) do
+    load_doc_and_root("sales_rights.xml")
+    @nfs = @root.at_css("NotForSale")
+  end
+
+
+  it "should correctly convert to a string" do
+    rep = ONIX::NotForSale.from_xml(@nfs.to_s)
+    rep.should produce_the_tag("<NotForSale>")
+  end
+
+
+  it "should provide read access to first level attributes" do
+    p = ONIX::Product.from_xml(@root.to_s)
+    p.not_for_sales[0].rights_countries.should eql(["UK"])
+  end
+
+
+  it "should provide write access to first level attributes" do
+    nfs = ONIX::NotForSale.new
+    nfs.rights_countries = ["UK", "US", "IR"]
+    nfs.should include_the_xml("<RightsCountry>UK US IR</RightsCountry>")
+  end
+
+end

data/spec/reader_spec.rb

@@ -12,6 +12,7 @@ describe ONIX::Reader do
     @entity_file = File.join(@data_path, "entities.xml")
     @utf_16_file = File.join(@data_path, "utf_16.xml")
     @iso_8859_1_file = File.join(@data_path, "iso_8859_1.xml")
+    @no_encoding_decl_file = File.join(@data_path, "aau.xml")
   end
 
   it "should initialize with a filename" do
@@ -90,19 +91,36 @@ describe ONIX::Reader do
 
   it "should transparently convert a iso-8859-1 file to utf-8" do
     reader = ONIX::Reader.new(@iso_8859_1_file)
-    product = nil
-    reader.each do |p|
-      product = p
-    end
+    reader.each do |product|
+      if RUBY_VERSION >= "1.9"
+        utf8 = Encoding.find("utf-8")
+        product.contributors[0].person_name_inverted.encoding.should eql(utf8)
+      end
 
-    # ROXML appears to munge the string encodings
-    if RUBY_VERSION >= "1.9"
-      utf8 = Encoding.find("utf-8")
-      product.contributors[0].person_name_inverted.encoding.should eql(utf8)
+      product.contributors[0].person_name_inverted.should eql("Küng, Hans")
     end
+  end
 
-    product.contributors[0].person_name_inverted.should eql("Küng, Hans")
+  # This isn't ideal behaviour, but i'm somewhat hamstrung by nokogiri API. It'd
+  # be nice to have the option to replace unrecognised bytes with a valid char.
+  it "should raise an exception when an iso-8859-1 file isn't declared as such" do
+    reader = ONIX::Reader.new(@no_encoding_decl_file)
+    lambda {
+      reader.each do |product|
+      end
+    }.should raise_error(Nokogiri::XML::SyntaxError)
+  end
+
+  it "should transparently convert an iso-8859-1 file to utf-8 when there's no declaration but the user manually specifies iso-8859-1" do
+    reader = ONIX::Reader.new(@no_encoding_decl_file, :encoding => "iso-8859-1")
+    reader.each do |product|
+      if RUBY_VERSION >= "1.9"
+        utf8 = Encoding.find("utf-8")
+        product.contributors[0].person_name_inverted.encoding.should eql(utf8)
+      end
 
+      product.contributors[0].person_name_inverted.should eql("Melo,Patr¡cia")
+    end
   end
 
   it "should transparently convert a utf-16 file to utf-8" do
@@ -119,6 +137,19 @@ describe ONIX::Reader do
     end
 
     product.contributors[0].person_name_inverted.should eql("Küng, Hans")
+  end
 
+  it "should support returning an APAProduct using deprecated API" do
+    reader = ONIX::Reader.new(@file1, ONIX::APAProduct)
+    reader.each do |product|
+      product.should be_a_kind_of(ONIX::APAProduct)
+    end
+  end
+
+  it "should support returning an APAProduct using new API" do
+    reader = ONIX::Reader.new(@file1, :product_class => ONIX::APAProduct)
+    reader.each do |product|
+      product.should be_a_kind_of(ONIX::APAProduct)
+    end
   end
 end

data/spec/sales_rights_spec.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ONIX::SalesRights do
+
+  before(:each) do
+    load_doc_and_root("sales_rights.xml")
+    @first_right = @root.at_css("SalesRights")
+  end
+
+
+  it "should correctly convert to a string" do
+    rep = ONIX::SalesRights.from_xml(@first_right.to_s)
+    rep.should produce_the_tag("<SalesRights")
+  end
+
+
+  it "should provide read access to first level attributes" do
+    p = ONIX::Product.from_xml(@root.to_s)
+    p.sales_rights[0].sales_rights_type.should eql(1)
+    p.sales_rights[1].rights_countries.should eql(["AU", "NZ"])
+  end
+
+
+  it "should provide write access to first level attributes" do
+    sr = ONIX::SalesRights.new
+    sr.sales_rights_type = 2
+    sr.should include_the_xml("<SalesRightsType>02</SalesRightsType>")
+    sr.rights_territories = ["WORLD"]
+    sr.should include_the_xml("<RightsTerritory>WORLD</RightsTerritory>")
+  end
+
+  it "should provide an array for deprecated rights regions" do
+    p = ONIX::Product.from_xml(@root.to_s)
+    p.sales_rights[2].rights_region.should eql(["001", "002", "003", "004"])
+  end
+
+end

data/spec/spec_helper.rb

@@ -8,3 +8,38 @@ require 'date'
 require 'stringio'
 require 'rubygems'
 require 'onix'
+
+
+module ONIX::SpecHelpers
+
+  def load_doc_and_root(subpath)
+    data_path = File.join(File.dirname(__FILE__), '..', 'data')
+    file1 = File.join(data_path, subpath)
+    @doc = Nokogiri::XML::Document.parse(File.read(file1))
+    @root = @doc.root
+  end
+
+end
+
+include ONIX::SpecHelpers
+
+
+RSpec::Matchers.define(:produce_the_tag) do |expected|
+  match do |actual|
+    actual.to_xml.to_s[0, expected.size] == expected
+  end
+end
+
+RSpec::Matchers.define(:include_the_xml) do |expected|
+  match do |actual|
+    actual.to_xml.to_s.include?(expected)
+  end
+
+  failure_message_for_should do |actual|
+    "expected '#{actual.to_xml.to_s}' to include the xml '#{expected}'"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected '#{actual.to_xml.to_s}' not to include the xml '#{expected}'"
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkfarm-onix
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 8
-  - 11
-  version: 0.8.11
+  - 12
+  version: 0.8.12
 platform: ruby
 authors: 
 - James Healy
@@ -16,14 +16,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
-default_executable: 
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: roxml
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -31,26 +32,28 @@ dependencies:
         - 1
         - 6
         version: 3.1.6
-  prerelease: false
   type: :runtime
-  requirement: *id001
-  name: roxml
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
+        - 3
         - 0
-        version: "0"
-  prerelease: false
+        - 3
+        version: 3.0.3
   type: :runtime
-  requirement: *id002
-  name: i18n
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: i18n
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,27 +62,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id003
-  name: andand
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
         - 1
         - 4
         version: "1.4"
-  prerelease: false
   type: :runtime
-  requirement: *id004
-  name: nokogiri
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +91,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id005
-  name: rake
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -103,10 +106,8 @@ dependencies:
         - 2
         - 1
         version: "2.1"
-  prerelease: false
   type: :development
-  requirement: *id006
-  name: rspec
+  version_requirements: *id006
 description: A fork of the original onix gem by James Healy. Differs from original mainly in it's adjustments for the US school/library market as applied in the product wrapper SLProduct.
 email: 
 - jimmy@deefa.com
@@ -135,6 +136,7 @@ files:
 - lib/onix/measure.rb
 - lib/onix/media_file.rb
 - lib/onix/normaliser.rb
+- lib/onix/not_for_sale.rb
 - lib/onix/other_text.rb
 - lib/onix/price.rb
 - lib/onix/product.rb
@@ -144,6 +146,7 @@ files:
 - lib/onix/reader.rb
 - lib/onix/related_product.rb
 - lib/onix/sales_restriction.rb
+- lib/onix/sales_rights.rb
 - lib/onix/sender_identifier.rb
 - lib/onix/series.rb
 - lib/onix/series_identifier.rb
@@ -350,6 +353,7 @@ files:
 - spec/measure_spec.rb
 - spec/media_file_spec.rb
 - spec/normaliser_spec.rb
+- spec/not_for_sale_spec.rb
 - spec/other_text_spec.rb
 - spec/price_spec.rb
 - spec/product_identifier_spec.rb
@@ -359,6 +363,7 @@ files:
 - spec/reader_spec.rb
 - spec/related_product_spec.rb
 - spec/sales_restriction_spec.rb
+- spec/sales_rights_spec.rb
 - spec/sender_identifier.rb
 - spec/series_identifier_spec.rb
 - spec/series_spec.rb
@@ -373,7 +378,6 @@ files:
 - spec/work_identifier_spec.rb
 - spec/work_identifiers_spec.rb
 - spec/writer_spec.rb
-has_rdoc: true
 homepage: http://github.com/milkfarm/onix
 licenses: []
 
@@ -405,10 +409,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A convient mapping between ruby objects and the ONIX XML specification
+summary: A convenient mapping between Ruby objects and the ONIX XML specification
 test_files: 
 - spec/apa_product_spec.rb
 - spec/audience_range_spec.rb
@@ -424,6 +428,7 @@ test_files:
 - spec/measure_spec.rb
 - spec/media_file_spec.rb
 - spec/normaliser_spec.rb
+- spec/not_for_sale_spec.rb
 - spec/other_text_spec.rb
 - spec/price_spec.rb
 - spec/product_identifier_spec.rb
@@ -433,6 +438,7 @@ test_files:
 - spec/reader_spec.rb
 - spec/related_product_spec.rb
 - spec/sales_restriction_spec.rb
+- spec/sales_rights_spec.rb
 - spec/sender_identifier.rb
 - spec/series_identifier_spec.rb
 - spec/series_spec.rb