milkfarm-onix 0.8.10 → 0.8.11

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.8.11 (27 May 2011)
+- Add Territory, CountryExcluded, TerritoryExcluded to Price composite
+- Add CountryCode to Price composite
+
 v0.8.10 (25 May 2011)
 - Add DiscountCoded to Price composite
 - Add DiscountPercent to Price composite

data/lib/onix/list_writer.rb

@@ -9,11 +9,31 @@ module ONIX
         raise ArgumentError, "Must specify code list number as ':list => Integer'"
       end
       define_method("#{name}=") do |value|
-        if value.nil? || ONIX::Lists.list(options[:list]).keys.include?(value)
-          self.instance_variable_set("@#{name}", value)
+        # Value can be Array, String or Fixnum
+        # To iterate over all classes, convert all to Array
+        # NB: Some entities (j303, j304, j305) can be space-separated string of values
+        values = case value.class.to_s
+        when 'Array'
+          value
+        when 'String'
+          value.split(/\s+/)
         else
-          raise ArgumentError, "Invalid #{("_" + name.to_s).downcase.gsub!(/_(.)/) { $1.upcase }} '#{value}' -- Refer to ONIX Code List #{options[:list]}"
+          [value]
         end
+        values.each do |value|
+          unless value.nil? || ONIX::Lists.list(options[:list]).keys.include?(value)
+            raise ArgumentError, "Invalid #{("_" + name.to_s).downcase.gsub!(/_(.)/) { $1.upcase }} '#{value}' -- Refer to ONIX Code List #{options[:list]}"
+          end
+        end
+        # :as option determines how value is stored in instance variable
+        values = if options[:as] == Array || options[:as] == []
+          values
+        elsif options[:as] == String
+          values.join(" ")
+        else
+          values.first
+        end
+        self.instance_variable_set("@#{name}", values)
       end
     end
     

data/lib/onix/price.rb

@@ -4,6 +4,7 @@ module ONIX
   class Price
     include ROXML
     include ONIX::DiscountCodeds
+    extend ONIX::ListWriter
 
     xml_name "Price"
 
@@ -19,11 +20,20 @@ module ONIX
     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_reader :country_codes, :from => "CountryCode", :as => []
+    list_writer :country_codes, :list => 91, :as => []
+    xml_reader :territory, :from => "Territory"
+    list_writer :territory, :list => 49, :as => String
+    xml_reader :country_excluded, :from => "CountryExcluded"
+    list_writer :country_excluded, :list => 91, :as => String
+    xml_reader :territory_excluded, :from => "TerritoryExcluded"
+    list_writer :territory_excluded, :list => 49, :as => String
     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
+      @country_codes = []
     end
   end
 end

data/lib/onix/version.rb

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

data/spec/price_spec.rb

@@ -24,6 +24,11 @@ describe ONIX::Price do
     p.price_amount.should eql(BigDecimal.new("7.5"))
     p.price_effective_from.should eql("19990101")
     p.price_effective_until.should eql("20001231")
+    p.country_codes.should be_a(Array)
+    p.country_codes[0].should eql("US")
+    p.territory.should eql("WORLD")
+    p.country_excluded.should eql("AD AE")
+    p.territory_excluded.should eql("AU-CT AU-NS")
   end
 
   it "should provide read access to discount_codeds" do
@@ -55,6 +60,19 @@ describe ONIX::Price do
     p.price_amount = BigDecimal.new("7.5")
     p.to_xml.to_s.include?("<PriceAmount>7.5</PriceAmount>").should be_true
 
+    p.country_codes = ["AD", "AE"]
+    p.to_xml.to_s.include?("<CountryCode>AD</CountryCode>").should be_true
+    p.to_xml.to_s.include?("<CountryCode>AE</CountryCode>").should be_true
+
+    p.territory = "AU-CT AU-NS"
+    p.to_xml.to_s.include?("<Territory>AU-CT AU-NS</Territory>").should be_true
+
+    p.country_excluded = "AD AE"
+    p.to_xml.to_s.include?("<CountryExcluded>AD AE</CountryExcluded>").should be_true
+
+    p.territory_excluded = "AU-CT AU-NS"
+    p.to_xml.to_s.include?("<TerritoryExcluded>AU-CT AU-NS</TerritoryExcluded>").should be_true
+
     p.price_effective_from = Date.civil(1999,1,1)
     p.to_xml.to_s.include?("<PriceEffectiveFrom>19990101</PriceEffectiveFrom>").should be_true
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkfarm-onix
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 8
-  - 10
-  version: 0.8.10
+  - 11
+  version: 0.8.11
 platform: ruby
 authors: 
 - James Healy
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency