milkfarm-onix 0.8.9 → 0.8.10

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.10 (25 May 2011)
+- Add DiscountCoded to Price composite
+- Add DiscountPercent to Price composite
+- Add PriceEffectiveFrom, PriceEffectiveUntil to Price composite
+- Create WorkIdentifiers module
+
 v0.8.9 (24 March 2011)
 - Add RelatedProduct composite (PR.23.7 - PR.23.33)
 - Create ProductIdentifiers module

data/lib/onix.rb

@@ -52,14 +52,19 @@ module ONIX
   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")
+
 # core files
 # - ordering is important, classes need to be defined before any
 #   other class can use them
-require File.join(File.dirname(__FILE__), "onix", "list_writer")
 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_identifiers")
 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")
@@ -77,6 +82,7 @@ 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")

data/lib/onix/discount_coded.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+module ONIX
+  class DiscountCoded
+    include ROXML
+    extend ONIX::ListWriter
+    include ONIX::Inflector
+    
+    xml_name "DiscountCoded"
+    
+    xml_reader :discount_code_type, :from => "DiscountCodeType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_accessor :discount_code_type_name, :from => "DiscountCodeTypeName"
+    xml_accessor :discount_code, :from => "DiscountCode"
+    list_writer :discount_code_type, :list => 100
+    
+  end
+end

data/lib/onix/discount_codeds.rb

@@ -0,0 +1,73 @@
+# coding: utf-8
+
+module ONIX
+  module DiscountCodeds
+    CODE_TYPES = {:bic => 1, :proprietary => 2, :boeksoort => 3, :german => 4}
+    DEFAULT_ATTRIBUTE = :discount_code_type
+    
+    def initialize_discount_codeds(options = {})
+      self.discount_codeds = options[:discount_codeds]
+    end
+    
+    def discount_codeds
+      @discount_codeds ||= []
+    end
+
+    # find the DiscountCoded matching a particular type
+    def find_discount_coded(options = {})
+      raise NoMethodError, "Must call initialize_discount_codeds first" unless defined?(@discount_codeds)
+      
+      # test find parameters
+      attribute, value = set_type_options(options).first
+      raise ArgumentError, "Find method passed unknown attribute '#{attribute}'" unless ONIX::DiscountCoded.new.attributes.include?(attribute.to_s)
+      
+      @discount_codeds.find { |obj| obj.send(attribute) == value }
+    end
+
+    # set the value of a particular DiscountCoded (found by type)
+    # type can be either type code or key from CODE_TYPES
+    def set_discount_coded(type, value)
+      obj = find_discount_coded(type)
+
+      # create a new discount_coded object if necessary
+      if obj.nil?
+        obj = ONIX::DiscountCoded.new(set_type_options(type))
+        @discount_codeds << obj
+      end
+
+      obj.discount_code = value
+    end
+    
+    def discount_codeds=(values)
+      values = [values] if values.nil? || values.is_a?(ONIX::DiscountCoded)
+      if values.is_a?(Array)
+        # Empty array
+        @discount_codeds = []
+        # Add any valid value
+        values.each do |value|
+          @discount_codeds << value if value.is_a?(ONIX::DiscountCoded)
+        end
+      else
+        raise ArgumentError, "Invalid DiscountCoded value: #{values.inspect}"
+      end
+    end
+
+    private
+
+    def set_type_options(options = {})
+      if options.is_a?(Fixnum)
+        # assume value is DEFAULT_ATTRIBUTE
+        options = {DEFAULT_ATTRIBUTE => options}
+      elsif options.is_a?(String) || options.is_a?(Symbol)
+        # assume value is the key to CODE_TYPES
+        if key = CODE_TYPES[options.to_sym]
+          options = {DEFAULT_ATTRIBUTE => CODE_TYPES[options.to_sym]}
+        else
+          raise ArgumentError, "Unknown key '#{options}'"
+        end
+      end
+      options
+    end
+
+  end
+end

data/lib/onix/inflector.rb

@@ -0,0 +1,24 @@
+# utf-8
+
+module ONIX
+  module Inflector
+    
+    def initialize(options = {})
+      initialize_attributes(options)
+    end
+    
+    def attributes
+      public_methods.map {|meth| meth.match(/^(?!roxml|taguri|=)(.+)=$/) ? $1 : nil }.compact
+    end
+    
+    private
+    
+    def initialize_attributes(options)
+      options.symbolize_keys!
+      attributes.each do |attribute|
+        self.send("#{attribute}=", options[attribute.to_sym]) if options[attribute.to_sym]
+      end
+    end
+    
+  end
+end

data/lib/onix/price.rb

@@ -3,6 +3,7 @@
 module ONIX
   class Price
     include ROXML
+    include ONIX::DiscountCodeds
 
     xml_name "Price"
 
@@ -13,8 +14,16 @@ module ONIX
     xml_accessor :minimum_order_qty, :from => "MinimumOrderQuantity", :as => Fixnum
     xml_accessor :class_of_trade, :from => "ClassOfTrade"
     xml_accessor :bic_discount_group_code, :from => "BICDiscountGroupCode"
+    xml_reader :discount_codeds, :from => "DiscountCoded", :as => [ONIX::DiscountCoded]
+    xml_accessor :discount_percent, :from => "DiscountPercent", :as => BigDecimal, :to_xml => ONIX::Formatters.decimal
     xml_accessor :price_status, :from => "PriceStatus", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
     xml_accessor :price_amount, :from => "PriceAmount", :as => BigDecimal, :to_xml => ONIX::Formatters.decimal
     xml_accessor :currency_code, :from => "CurrencyCode"
+    xml_accessor :price_effective_from, :from => "PriceEffectiveFrom", :to_xml => ONIX::Formatters.yyyymmdd
+    xml_accessor :price_effective_until, :from => "PriceEffectiveUntil", :to_xml => ONIX::Formatters.yyyymmdd
+
+    def initialize(options = {})
+      initialize_discount_codeds(options) # @discount_codeds array
+    end
   end
 end

data/lib/onix/product_identifier.rb

@@ -3,10 +3,14 @@
 module ONIX
   class ProductIdentifier
     include ROXML
+    extend ONIX::ListWriter
+    include ONIX::Inflector
 
     xml_name "ProductIdentifier"
 
-    xml_accessor :product_id_type, :from => "ProductIDType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
+    xml_reader :product_id_type, :from => "ProductIDType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
     xml_accessor :id_value, :from => "IDValue"
+    list_writer :product_id_type, :list => 5
+    
   end
 end

data/lib/onix/product_identifiers.rb

@@ -5,18 +5,17 @@ module ONIX
     ACCESSOR_METHODS = {:proprietary_id => 1, :ean => 3, :isbn10 => 2, :isbn13 => 15, :isbn => 15, :lccn => 13}
     
     def initialize_product_identifiers(options)
-      @product_identifiers ||= []
-      ACCESSOR_METHODS.keys.push(:product_identifiers).each do |name|
-        self.send("#{name}=", options[name]) if options[name]
-      end
+      self.product_identifiers = options[:product_identifiers]
+      # To initialize accessor methods, class in which this module is included
+      # must also include Inflector and call initialize_attributes
     end
     
     ACCESSOR_METHODS.each do |name, digit|
       define_method(name) do
-        identifier(digit).andand.id_value
+        find(digit).andand.id_value
       end
       define_method("#{name}=") do |value|
-        identifier_set(digit, value)
+        set(digit, value)
       end
     end
     
@@ -41,18 +40,26 @@ module ONIX
     end
 
     # find the ProductIdentifier matching a particular type
-    def identifier(type)
-      @product_identifiers.find { |obj| obj.product_id_type == type }
+    def find(options = {})
+      raise NoMethodError, "Must call initialize_product_identifiers first" unless defined?(@product_identifiers)
+      
+      # use default find 'product_id_type' if implied
+      options = {:product_id_type => options} unless options.is_a?(Hash)
+      
+      # test find parameters
+      attribute, value = options.first
+      raise ArgumentError, "Find method passed unknown attribute '#{attribute}'" unless ONIX::ProductIdentifier.new.attributes.include?(attribute.to_s)
+      
+      @product_identifiers.find { |obj| obj.send(attribute) == value }
     end
 
     # set the value of a particular ProductIdentifier (found by type)
-    def identifier_set(type, value)
-      obj = identifier(type)
+    def set(type, value)
+      obj = find(type)
 
       # create a new product identifier object if we necessary
       if obj.nil?
-        obj = ONIX::ProductIdentifier.new
-        obj.product_id_type = type
+        obj = ONIX::ProductIdentifier.new(:product_id_type => type)
         @product_identifiers << obj
       end
 

data/lib/onix/related_product.rb

@@ -5,6 +5,7 @@ module ONIX
     include ROXML
     include ONIX::ProductIdentifiers
     extend ONIX::ListWriter
+    include ONIX::Inflector
     
     xml_name "RelatedProduct"
 
@@ -13,9 +14,9 @@ module ONIX
     list_writer :relation_code, :list => 51
     
     def initialize(options = {})
-      options.symbolize_keys!
-      self.relation_code = options[:relation_code]
-      self.initialize_product_identifiers(options) # Must be called to setup @product_identifiers array
+      # Must initialize arrays prior to attributes
+      initialize_product_identifiers(options) # @product_identifiers array
+      initialize_attributes(options)
     end
     
   end

data/lib/onix/version.rb

@@ -1,3 +1,3 @@
 module ONIX
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/lib/onix/work_identifier.rb

@@ -4,6 +4,7 @@ module ONIX
   class WorkIdentifier
     include ROXML
     extend ONIX::ListWriter
+    include ONIX::Inflector
     
     xml_name "WorkIdentifier"
     
@@ -12,12 +13,5 @@ module ONIX
     xml_accessor :id_value, :from => "IDValue"
     list_writer :work_id_type, :list => 16
     
-    def initialize(options = {})
-      options.symbolize_keys!
-      self.work_id_type = options[:work_id_type]
-      @id_type_name = options[:id_type_name]
-      @id_value = options[:id_value]
-    end
-    
   end
 end

data/lib/onix/work_identifiers.rb

@@ -0,0 +1,74 @@
+# coding: utf-8
+
+module ONIX
+  module WorkIdentifiers
+    ID_TYPES = {:proprietary_id => 1, :isbn10 => 2, :isbn13 => 15, :isbn => 15}
+    
+    def initialize_work_identifiers(options = {})
+      self.work_identifiers = options[:work_identifiers]
+      # To initialize accessor methods, class in which this module is included
+      # must also include Inflector and call initialize_attributes
+    end
+    
+    def work_identifiers
+      @work_identifiers ||= []
+    end
+
+    # find the WorkIdentifier matching a particular type
+    def find_work_identifier(options = {})
+      raise NoMethodError, "Must call initialize_work_identifiers first" unless defined?(@work_identifiers)
+      
+      # test find parameters
+      attribute, value = set_type_options(options).first
+      raise ArgumentError, "Find method passed unknown attribute '#{attribute}'" unless ONIX::WorkIdentifier.new.attributes.include?(attribute.to_s)
+      
+      @work_identifiers.find { |obj| obj.send(attribute) == value }
+    end
+
+    # set the value of a particular WorkIdentifier (found by type)
+    # type can be either type code or key from ID_TYPES
+    def set_work_identifier(type, value)
+      obj = find_work_identifier(type)
+
+      # create a new work identifier object if necessary
+      if obj.nil?
+        obj = ONIX::WorkIdentifier.new(set_type_options(type))
+        @work_identifiers << obj
+      end
+
+      obj.id_value = value
+    end
+    
+    def work_identifiers=(values)
+      values = [values] if values.nil? || values.is_a?(ONIX::WorkIdentifier)
+      if values.is_a?(Array)
+        # Empty array
+        @work_identifiers = []
+        # Add any valid value
+        values.each do |value|
+          @work_identifiers << value if value.is_a?(ONIX::WorkIdentifier)
+        end
+      else
+        raise ArgumentError, "Invalid WorkIdentifier value: #{values.inspect}"
+      end
+    end
+
+    private
+
+    def set_type_options(options = {})
+      if options.is_a?(Fixnum)
+        # assume value is 'work_id_type'
+        options = {:work_id_type => options}
+      elsif options.is_a?(String) || options.is_a?(Symbol)
+        # assume value is the key to ID_TYPES
+        if key = ID_TYPES[options.to_sym]
+          options = {:work_id_type => ID_TYPES[options.to_sym]}
+        else
+          raise ArgumentError, "Unknown key '#{options}'"
+        end
+      end
+      options
+    end
+
+  end
+end

data/spec/discount_coded_spec.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ONIX::DiscountCoded do
+
+  before(:each) do
+    data_path = File.join(File.dirname(__FILE__), "..", "data")
+    file1     = File.join(data_path, "discount_coded.xml")
+    @doc      = Nokogiri::XML::Document.parse(File.read(file1))
+    @root     = @doc.root
+  end
+
+  it "should correctly convert to a string" do
+    t = ONIX::DiscountCoded.from_xml(@root.to_s)
+    t.to_xml.to_s[0,15].should eql("<DiscountCoded>")
+  end
+
+  it "should provide read access to first level attributes" do
+    t = ONIX::DiscountCoded.from_xml(@root.to_s)
+    t.discount_code_type.should eql(2)
+    t.discount_code_type_name.should eql("Proprietary Scheme")
+    t.discount_code.should eql("ABC123")
+  end
+
+  it "should provide write access to first level attributes" do
+    t = ONIX::DiscountCoded.new
+
+    t.discount_code_type = 1
+    t.to_xml.to_s.include?("<DiscountCodeType>01</DiscountCodeType>").should be_true
+
+    t.discount_code_type_name = "BIC Scheme"
+    t.to_xml.to_s.include?("<DiscountCodeTypeName>BIC Scheme</DiscountCodeTypeName>").should be_true
+
+    t.discount_code = "ABC123"
+    t.to_xml.to_s.include?("<DiscountCode>ABC123</DiscountCode>").should be_true
+  end
+  
+  it "should raise error writing discount_code_type value not in list" do
+    t = ONIX::DiscountCoded.new
+    lambda {t.discount_code_type = 999}.should raise_error
+    lambda {ONIX::DiscountCoded.new(:discount_code_type => 999)}.should raise_error
+  end
+  
+  it "should properly initialize attributes when calling new" do
+    t = ONIX::DiscountCoded.new(:discount_code_type => 1, :discount_code => "value", :discount_code_type_name => "name")
+    t.discount_code_type.should eql(1)
+    t.discount_code.should eql("value")
+    t.discount_code_type_name.should eql("name")
+  end
+
+end

data/spec/discount_codeds_spec.rb

@@ -0,0 +1,96 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ONIX::DiscountCodeds do
+  
+  module ONIX
+    class FakeDiscountEntity
+      include ROXML
+      include ONIX::DiscountCodeds
+      
+      xml_name "FakeDiscountEntity"
+      xml_reader :discount_codeds, :from => "DiscountCoded", :as => [ONIX::DiscountCoded]
+      
+      def initialize(options = {})
+        initialize_discount_codeds(options) # @discount_codeds array
+      end
+    end
+  end
+  
+  before :each do
+    @fake = ONIX::FakeDiscountEntity.new(:proprietary => 123456)
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file = File.join(data_path, "fake_entity.xml")
+    @doc = Nokogiri::XML::Document.parse(File.read(file))
+    @root = @doc.root
+  end
+  
+  it "should instantiate discount_codeds array" do
+    @fake.discount_codeds.should be_a(Array)
+  end
+  
+  it "should provide read access to discount_codeds" do
+    fe = ONIX::FakeDiscountEntity.from_xml(@root.to_s)
+    wid = fe.find_discount_coded(2)
+    wid.discount_code.should eql("PROPRIETARY_CODE")
+    wid = fe.find_discount_coded(:proprietary)
+    wid.discount_code.should eql("PROPRIETARY_CODE")
+    wid = fe.find_discount_coded(:bic)
+    wid.discount_code.should eql("BIC_CODE")
+  end
+
+  it "should provide write access to discount_codeds by discount_code_type" do
+    discount_code = "123456"
+    {:bic => 1, :proprietary => 2, :boeksoort => 3, :german => 4}.each do |key, discount_code_type|
+      fe = ONIX::FakeDiscountEntity.new
+      fe.set_discount_coded(discount_code_type, discount_code)
+      fe.to_xml.to_s.include?("<DiscountCodeType>#{sprintf('%02d', discount_code_type)}</DiscountCodeType>").should be_true
+      fe.to_xml.to_s.include?("<DiscountCode>#{discount_code}</DiscountCode>").should be_true
+    end
+  end
+  
+  it "should provide write access to discount_codeds by key" do
+    discount_code = "123456"
+    {:bic => 1, :proprietary => 2, :boeksoort => 3, :german => 4}.each do |key, discount_code_type|
+      fe = ONIX::FakeDiscountEntity.new
+      fe.set_discount_coded(key, discount_code)
+      fe.to_xml.to_s.include?("<DiscountCodeType>#{sprintf('%02d', discount_code_type)}</DiscountCodeType>").should be_true
+      fe.to_xml.to_s.include?("<DiscountCode>#{discount_code}</DiscountCode>").should be_true
+    end
+  end
+  
+  it "should fail to write discount_coded with invalid discount_code_type" do
+    discount_code = "123456"
+    discount_code_type = 99
+    fe = ONIX::FakeDiscountEntity.new
+    lambda {fe.set_discount_coded(discount_code_type, discount_code)}.should raise_error(ArgumentError)
+  end
+  
+  it "should fail to write discount_coded with invalid key" do
+    discount_code = "123456"
+    key = "bad_key"
+    fe = ONIX::FakeDiscountEntity.new
+    lambda {fe.set_discount_coded(key, discount_code)}.should raise_error(ArgumentError)
+  end
+  
+  it "should provide write access to discount_codeds array" do
+    id = ONIX::DiscountCoded.new
+    id.discount_code_type = 1
+    id.discount_code = "123456"
+    fe = ONIX::FakeDiscountEntity.new(:discount_codeds => id)
+  
+    fe.to_xml.to_s.include?("<DiscountCoded>").should be_true
+    fe.to_xml.to_s.include?("<DiscountCodeType>01</DiscountCodeType>").should be_true
+    fe.to_xml.to_s.include?("<DiscountCode>123456</DiscountCode>").should be_true
+  
+    id = ONIX::DiscountCoded.new
+    id.discount_code_type = 2
+    id.discount_code = "987654"
+    fe.discount_codeds << id
+  
+    fe.to_xml.to_s.include?("<DiscountCodeType>02</DiscountCodeType>").should be_true
+    fe.to_xml.to_s.include?("<DiscountCode>987654</DiscountCode>").should be_true
+  end
+
+end

data/spec/list_writer_spec.rb

@@ -5,11 +5,11 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe ONIX::ListWriter do
   
   module ONIX
-    class FakeEntity
+    class FakeListEntity
       include ROXML
       extend ONIX::ListWriter
       
-      xml_name "FakeEntity"
+      xml_name "FakeListEntity"
       xml_reader :series_id_type, :from => "SeriesIDType", :as => Fixnum, :to_xml => ONIX::Formatters.two_digit
       list_writer :series_id_type, :list => 13
       
@@ -21,26 +21,26 @@ describe ONIX::ListWriter do
   
   before :each do
     data_path = File.join(File.dirname(__FILE__),"..","data")
-    file1 = File.join(data_path, "fake_entity_for_lists.xml")
+    file1 = File.join(data_path, "fake_entity.xml")
     @doc = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
   
   it "should provide read access to first level attribute" do
-    fake = ONIX::FakeEntity.from_xml(@root.to_s)
+    fake = ONIX::FakeListEntity.from_xml(@root.to_s)
     fake.series_id_type.should eql(1)
   end
   
   it "should provide write access to first level attribute" do
-    fake = ONIX::FakeEntity.new(:series_id_type => 3)
+    fake = ONIX::FakeListEntity.new(:series_id_type => 3)
     fake.series_id_type.should eql(3)
     fake.to_xml.to_s.include?("<SeriesIDType>03</SeriesIDType>").should be_true
   end
   
   it "should raise error writing value not in list" do
-    fake = ONIX::FakeEntity.new
+    fake = ONIX::FakeListEntity.new
     lambda {fake.series_id_type = 100}.should raise_error
-    lambda {ONIX::FakeEntity.new(:series_id_type => 100)}.should raise_error
+    lambda {ONIX::FakeListEntity.new(:series_id_type => 100)}.should raise_error
   end
 
 end

data/spec/price_spec.rb

@@ -6,9 +6,9 @@ describe ONIX::Price do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
-    file1    = File.join(data_path, "price.xml")
-    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
-    @root = @doc.root
+    file1     = File.join(data_path, "price.xml")
+    @doc      = Nokogiri::XML::Document.parse(File.read(file1))
+    @root     = @doc.root
   end
 
   it "should correctly convert to a string" do
@@ -20,7 +20,27 @@ describe ONIX::Price do
     p = ONIX::Price.from_xml(@root.to_s)
 
     p.price_type_code.should eql(2)
+    p.discount_percent.should eql(BigDecimal.new("45"))
     p.price_amount.should eql(BigDecimal.new("7.5"))
+    p.price_effective_from.should eql("19990101")
+    p.price_effective_until.should eql("20001231")
+  end
+
+  it "should provide read access to discount_codeds" do
+    p = ONIX::Price.from_xml(@root.to_s)
+
+    d = p.find_discount_coded(1)
+    d.discount_code_type_name.should eql("britishco")
+    d.discount_code.should eql("999ZZZ")
+
+    d = p.find_discount_coded(:discount_code_type_name => 'bakertaylor')
+    d.discount_code_type.should eql(2)
+    d.discount_code_type_name.should eql("bakertaylor")
+    d.discount_code.should eql("ABC123")
+
+    d = p.find_discount_coded(:proprietary) # will retrieve first proprietary discount code
+    d.discount_code_type_name.should eql("ingram")
+    d.discount_code.should eql("XYZ987")
   end
 
   it "should provide write access to first level attributes" do
@@ -29,9 +49,36 @@ describe ONIX::Price do
     p.price_type_code = 1
     p.to_xml.to_s.include?("<PriceTypeCode>01</PriceTypeCode>").should be_true
 
+    p.discount_percent = BigDecimal.new("50")
+    p.to_xml.to_s.include?("<DiscountPercent>50.0</DiscountPercent>").should be_true
+
     p.price_amount = BigDecimal.new("7.5")
     p.to_xml.to_s.include?("<PriceAmount>7.5</PriceAmount>").should be_true
 
+    p.price_effective_from = Date.civil(1999,1,1)
+    p.to_xml.to_s.include?("<PriceEffectiveFrom>19990101</PriceEffectiveFrom>").should be_true
+
+    p.price_effective_until = Date.civil(2000,12,31)
+    p.to_xml.to_s.include?("<PriceEffectiveUntil>20001231</PriceEffectiveUntil>").should be_true
+  end
+
+  it "should provide write access to discount_codeds" do
+    d1 = ONIX::DiscountCoded.new(:discount_code_type => 1, :discount_code => "value1", :discount_code_type_name => "name1")
+    d2 = ONIX::DiscountCoded.new(:discount_code_type => 2, :discount_code => "value2", :discount_code_type_name => "name2")
+    d3 = ONIX::DiscountCoded.new(:discount_code_type => 3, :discount_code => "value3", :discount_code_type_name => "name3")
+    # p = ONIX::Price.new(:discount_codeds => [d1,d2])
+    p = ONIX::Price.new
+    p.discount_codeds = [d1, d2]
+    p.discount_codeds << d3
+    p.discount_codeds.size.should eql(3)
+    (1..p.discount_codeds.size).to_a.each do |i|
+      name = "name#{i}"
+      value = "value#{i}"
+      t = p.find_discount_coded(:discount_code_type_name => name)
+      t.discount_code_type.should eql(i)
+      t.discount_code.should eql(value)
+      t.discount_code_type_name.should eql(name)
+    end
   end
 
 end

data/spec/product_identifier_spec.rb

@@ -24,14 +24,20 @@ describe ONIX::ProductIdentifier do
   end
 
   it "should provide write access to first level attributes" do
-    id = ONIX::ProductIdentifier.new
+    id = ONIX::ProductIdentifier.new(:product_id_type => 1, :id_value => "TESTING")
+    id.to_xml.to_s.include?("<ProductIDType>01</ProductIDType>").should be_true
+    id.to_xml.to_s.include?("<IDValue>TESTING</IDValue>").should be_true
 
     id.product_id_type = 2
     id.to_xml.to_s.include?("<ProductIDType>02</ProductIDType>").should be_true
 
     id.id_value = "James"
     id.to_xml.to_s.include?("<IDValue>James</IDValue>").should be_true
-
+  end
+  
+  it "should raise error when writing invalid product_id_type" do
+    id = ONIX::ProductIdentifier.new
+    lambda {id.product_id_type = 999}.should raise_error
   end
 
 end

data/spec/product_identifiers_spec.rb

@@ -8,12 +8,15 @@ describe ONIX::ProductIdentifiers do
     class FakeEntity
       include ROXML
       include ONIX::ProductIdentifiers
+      include ONIX::Inflector
       
       xml_name "FakeEntity"
       xml_reader :product_identifiers, :from => "ProductIdentifier", :as => [ONIX::ProductIdentifier]
       
       def initialize(options = {})
-        self.initialize_product_identifiers(options)
+        # Must initialize arrays prior to attributes
+        initialize_product_identifiers(options) # @product_identifiers array
+        initialize_attributes(options)
       end
     end
   end

data/spec/work_identifier_spec.rb

@@ -41,5 +41,12 @@ describe ONIX::WorkIdentifier do
     lambda {t.work_id_type = 999}.should raise_error
     lambda {ONIX::WorkIdentifier.new(:work_id_type => 999)}.should raise_error
   end
+  
+  it "should properly initialize attributes when calling new" do
+    t = ONIX::WorkIdentifier.new(:work_id_type => 1, :id_value => "value", :id_type_name => "name")
+    t.work_id_type.should eql(1)
+    t.id_value.should eql("value")
+    t.id_type_name.should eql("name")
+  end
 
 end

data/spec/work_identifiers_spec.rb

@@ -0,0 +1,100 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe ONIX::WorkIdentifiers do
+  
+  module ONIX
+    class FakeWorkEntity
+      include ROXML
+      include ONIX::WorkIdentifiers
+      
+      xml_name "FakeWorkEntity"
+      xml_reader :work_identifiers, :from => "WorkIdentifier", :as => [ONIX::WorkIdentifier]
+      
+      def initialize(options = {})
+        initialize_work_identifiers(options) # @work_identifiers array
+      end
+    end
+  end
+  
+  before :each do
+    @fake = ONIX::FakeWorkEntity.new(:isbn => 123456)
+    data_path = File.join(File.dirname(__FILE__),"..","data")
+    file = File.join(data_path, "fake_entity.xml")
+    @doc = Nokogiri::XML::Document.parse(File.read(file))
+    @root = @doc.root
+  end
+  
+  it "should instantiate work identifiers array" do
+    @fake.work_identifiers.should be_a(Array)
+  end
+  
+  it "should provide read access to work identifiers" do
+    fe = ONIX::FakeWorkEntity.from_xml(@root.to_s)
+    wid = fe.find_work_identifier(1)
+    wid.id_value.should eql("WD_PROPRIETARY_ID")
+    wid = fe.find_work_identifier(:proprietary_id)
+    wid.id_value.should eql("WD_PROPRIETARY_ID")
+    wid = fe.find_work_identifier(:isbn10)
+    wid.id_value.should eql("WD_ISBN10")
+    wid = fe.find_work_identifier(:isbn13)
+    wid.id_value.should eql("WD_ISBN13")
+    wid = fe.find_work_identifier(:isbn)
+    wid.id_value.should eql("WD_ISBN13")
+  end
+
+  it "should provide write access to work identifiers by work_id_type" do
+    id_value = "123456"
+    {:proprietary_id => 1, :isbn10 => 2, :isbn13 => 15, :isbn => 15}.each do |key, work_id_type|
+      fe = ONIX::FakeWorkEntity.new
+      fe.set_work_identifier(work_id_type, id_value)
+      fe.to_xml.to_s.include?("<WorkIDType>#{sprintf('%02d', work_id_type)}</WorkIDType>").should be_true
+      fe.to_xml.to_s.include?("<IDValue>#{id_value}</IDValue>").should be_true
+    end
+  end
+  
+  it "should provide write access to work identifiers by key" do
+    id_value = "123456"
+    {:proprietary_id => 1, :isbn10 => 2, :isbn13 => 15, :isbn => 15}.each do |key, work_id_type|
+      fe = ONIX::FakeWorkEntity.new
+      fe.set_work_identifier(key, id_value)
+      fe.to_xml.to_s.include?("<WorkIDType>#{sprintf('%02d', work_id_type)}</WorkIDType>").should be_true
+      fe.to_xml.to_s.include?("<IDValue>#{id_value}</IDValue>").should be_true
+    end
+  end
+  
+  it "should fail to write work identifier with invalid work_id_type" do
+    id_value = "123456"
+    work_id_type = 99
+    fe = ONIX::FakeWorkEntity.new
+    lambda {fe.set_work_identifier(work_id_type, id_value)}.should raise_error(ArgumentError)
+  end
+  
+  it "should fail to write work identifier with invalid key" do
+    id_value = "123456"
+    key = "bad_key"
+    fe = ONIX::FakeWorkEntity.new
+    lambda {fe.set_work_identifier(key, id_value)}.should raise_error(ArgumentError)
+  end
+  
+  it "should provide write access to work_identifiers array" do
+    id = ONIX::WorkIdentifier.new
+    id.work_id_type = 1
+    id.id_value = "123456"
+    fe = ONIX::FakeWorkEntity.new(:work_identifiers => id)
+  
+    fe.to_xml.to_s.include?("<WorkIdentifier>").should be_true
+    fe.to_xml.to_s.include?("<WorkIDType>01</WorkIDType>").should be_true
+    fe.to_xml.to_s.include?("<IDValue>123456</IDValue>").should be_true
+  
+    id = ONIX::WorkIdentifier.new
+    id.work_id_type = 2
+    id.id_value = "987654"
+    fe.work_identifiers << id
+  
+    fe.to_xml.to_s.include?("<WorkIDType>02</WorkIDType>").should be_true
+    fe.to_xml.to_s.include?("<IDValue>987654</IDValue>").should be_true
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkfarm-onix
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - James Healy
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -07:00
+date: 2011-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,8 +123,11 @@ files:
 - lib/onix/audience_range.rb
 - lib/onix/code_list_extractor.rb
 - lib/onix/contributor.rb
+- lib/onix/discount_coded.rb
+- lib/onix/discount_codeds.rb
 - lib/onix/header.rb
 - lib/onix/imprint.rb
+- lib/onix/inflector.rb
 - lib/onix/language.rb
 - lib/onix/list_writer.rb
 - lib/onix/lists.rb
@@ -154,6 +157,7 @@ files:
 - lib/onix/version.rb
 - lib/onix/website.rb
 - lib/onix/work_identifier.rb
+- lib/onix/work_identifiers.rb
 - lib/onix/writer.rb
 - lib/onix.rb
 - support/codes/001.tsv
@@ -335,6 +339,8 @@ files:
 - spec/apa_product_spec.rb
 - spec/audience_range_spec.rb
 - spec/contributor_spec.rb
+- spec/discount_coded_spec.rb
+- spec/discount_codeds_spec.rb
 - spec/header_spec.rb
 - spec/imprint_spec.rb
 - spec/language_spec.rb
@@ -365,6 +371,7 @@ files:
 - spec/title_spec.rb
 - spec/website_spec.rb
 - spec/work_identifier_spec.rb
+- spec/work_identifiers_spec.rb
 - spec/writer_spec.rb
 has_rdoc: true
 homepage: http://github.com/milkfarm/onix
@@ -406,6 +413,8 @@ test_files:
 - spec/apa_product_spec.rb
 - spec/audience_range_spec.rb
 - spec/contributor_spec.rb
+- spec/discount_coded_spec.rb
+- spec/discount_codeds_spec.rb
 - spec/header_spec.rb
 - spec/imprint_spec.rb
 - spec/language_spec.rb
@@ -436,4 +445,5 @@ test_files:
 - spec/title_spec.rb
 - spec/website_spec.rb
 - spec/work_identifier_spec.rb
+- spec/work_identifiers_spec.rb
 - spec/writer_spec.rb