im_onix 1.2.3 → 1.3.0

data/lib/onix/onix21.rb

@@ -2,26 +2,28 @@ module ONIX
   module ONIX21
     class ShortToRef
       def self.names
-        @shortnames ||= YAML.load(File.open(File.dirname(__FILE__) + "/../../data/onix21/shortnames.yml"))
+        @shortnames ||= YAML.load(File.open(File.dirname(__FILE__) + "/../../data/onix21/shortnames.yml")).freeze
       end
     end
 
     class RefToShort
       def self.names
-        @refnames ||= ShortToRef.names.invert
+        @refnames ||= ShortToRef.names.invert.freeze
       end
     end
 
     class SubsetDSL < ONIX::SubsetDSL
-      def self.short_to_ref(name)
-        ONIX::ONIX21::ShortToRef.names[name]
-      end
+      class << self
+        def short_to_ref(name)
+          ONIX::ONIX21::ShortToRef.names[name]
+        end
 
-      def self.ref_to_short(name)
-        ONIX::ONIX21::RefToShort.names[name]
+        def ref_to_short(name)
+          ONIX::ONIX21::RefToShort.names[name]
+        end
       end
 
-      def self.get_class(name)
+      def get_class(name)
         if ONIX::ONIX21.const_defined?(name, false)
           ONIX::ONIX21.const_get(name)
         else
@@ -34,11 +36,11 @@ module ONIX
 
     class CodeFromYaml < Code
       def self.hash
-        @hash ||= YAML.load(File.open(File.dirname(__FILE__) + "/../../data/onix21/codelists/codelist-#{self.code_ident}.yml"))[:codelist]
+        @hash ||= YAML.load(File.open(File.dirname(__FILE__) + "/../../data/onix21/codelists/codelist-#{self.code_ident}.yml"))[:codelist].freeze
       end
 
       def self.list
-        self.hash.to_a.map { |h| h.first }
+        self.hash.keys
       end
 
       def self.code_ident
@@ -131,8 +133,8 @@ module ONIX
     class Price < SubsetDSL
       element "PriceTypeCode", :subset, :klass => "PriceType"
       element "PriceAmount", :float, {
-          :shortcut => :amount,
-          :parse_lambda => lambda { |v| (v * 100).round }
+        :shortcut => :amount,
+        :parse_lambda => lambda { |v| (v * 100).round }
       }
       element "PriceQualifier", :subset, :shortcut => :qualifier
       element "DiscountCoded", :subset
@@ -196,8 +198,8 @@ module ONIX
       element "AvailabilityCode", :text
       element "ProductAvailability", :text
       element "OnSaleDate", :text, {
-          :shortcut => :availability_date,
-          :parse_lambda => lambda { |v| Date.strptime(v, "%Y%m%d") }
+        :shortcut => :availability_date,
+        :parse_lambda => lambda { |v| Date.strptime(v, "%Y%m%d") }
       }
       elements "Price", :subset
 
@@ -232,8 +234,8 @@ module ONIX
     end
 
     class RelatedProduct < SubsetDSL
-      include EanMethods
-      include ProprietaryIdMethods
+      include IdentifiersMethods::Ean
+      include IdentifiersMethods::ProprietaryId
 
       element "RelationCode", :text, :shortcut => :code
       elements "ProductIdentifier", :subset, :shortcut => :identifiers
@@ -246,17 +248,17 @@ module ONIX
       element "SubjectCode", :text, :shortcut => :code
       element "SubjectHeadingText", :text, :shortcut => :heading_text
       element "MainSubjectSchemeIdentifier", :subset, {
-          :shortcut => :scheme_identifier,
-          :klass => "SubjectSchemeIdentifier"
+        :shortcut => :scheme_identifier,
+        :klass => "SubjectSchemeIdentifier"
       }
       element "SubjectSchemeName", :text, :shortcut => :scheme_name
       element "SubjectSchemeVersion", :text, :shortcut => :scheme_version
     end
 
     class Product < SubsetDSL
-      include EanMethods
-      include IsbnMethods
-      include ProprietaryIdMethods
+      include IdentifiersMethods::Ean
+      include IdentifiersMethods::Isbn
+      include IdentifiersMethods::ProprietaryId
 
       element "RecordReference", :text
       elements "ProductIdentifier", :subset, :shortcut => :identifiers
@@ -281,7 +283,7 @@ module ONIX
 
       elements "OtherText", :subset
 
-      elements "SalesRights", :subset, {:pluralize => false}
+      elements "SalesRights", :subset, { :pluralize => false }
       elements "NotForSale", :subset
 
       element "BASICMainSubject", :text
@@ -289,7 +291,7 @@ module ONIX
       elements "Subject", :subset
 
       element "PublishingStatus", :text
-      element "PublicationDate", :text, {:parse_lambda => lambda { |v| Date.strptime(v, "%Y%m%d") }}
+      element "PublicationDate", :text, { :parse_lambda => lambda { |v| Date.strptime(v, "%Y%m%d") } }
 
       elements "RelatedProduct", :subset, :shortcut => :related
 
@@ -440,7 +442,7 @@ module ONIX
         nil
       end
 
-      include ProductSuppliesExtractor
+      include ProductSuppliesMethods
 
       # doesn't apply
       def parts

data/lib/onix/product.rb

@@ -3,6 +3,7 @@ require 'onix/helper'
 require 'onix/code'
 require 'onix/entity'
 require 'onix/identifier'
+require 'onix/barcode'
 require 'onix/descriptive_detail'
 require 'onix/publishing_detail'
 require 'onix/collateral_detail'
@@ -12,15 +13,15 @@ require 'onix/product_supply'
 require 'onix/content_detail'
 require 'onix/territory'
 require 'onix/error'
-require 'onix/product_supplies_extractor'
+require 'onix/product_supplies_methods'
 
 module ONIX
   class Product < SubsetDSL
     extend Forwardable
-    include EanMethods
-    include IsbnMethods
-    include ProprietaryIdMethods
-    include ProductSuppliesExtractor
+    include IdentifiersMethods::Ean
+    include IdentifiersMethods::Isbn
+    include IdentifiersMethods::ProprietaryId
+    include ProductSuppliesMethods
 
     element "RecordReference", :text, :cardinality => 1
     element "NotificationType", :subset, :cardinality => 1
@@ -29,10 +30,7 @@ module ONIX
     elements "RecordSourceIdentifier", :subset, :cardinality => 0..n
     element "RecordSourceName", :text, :cardinality => 0..1
     elements "ProductIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
-
-    # elements "Barcode", :subset, :cardinality => 0..n
-
-
+    elements "Barcode", :subset, :cardinality => 0..n
     element "DescriptiveDetail", :subset, :cardinality => 0..1
     element "CollateralDetail", :subset, :cardinality => 0..1
 

data/lib/onix/product_part.rb

@@ -1,8 +1,8 @@
 module ONIX
   # product part use full Product to provide file protection and file size
   class ProductPart < SubsetDSL
-    include EanMethods
-    include ProprietaryIdMethods
+    include IdentifiersMethods::Ean
+    include IdentifiersMethods::ProprietaryId
 
     element "PrimaryPart", :bool, :cardinality => 0..1
     elements "ProductIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n

data/lib/onix/{product_supplies_extractor.rb → product_supplies_methods.rb}

@@ -1,6 +1,6 @@
 module ONIX
   # flattened supplies extractor
-  module ProductSuppliesExtractor
+  module ProductSuppliesMethods
     # class must define a product_supplies returning an Array of objects responding to :
     # - availability_date (Date)
     # - countries (country code Array)
@@ -112,7 +112,7 @@ module ONIX
 
       # merge by territories
       grouped_territories_supplies = {}
-      grouped_supplies.each do |ksup, supply|
+      grouped_supplies.values.each do |supply|
         fsupply = supply.first
         pr_key = "#{fsupply[:available]}_#{fsupply[:including_tax]}_#{fsupply[:currency]}"
         supply.each do |s|
@@ -124,7 +124,7 @@ module ONIX
 
       supplies = []
 
-      grouped_territories_supplies.each do |ksup, supply|
+      grouped_territories_supplies.values.each do |supply|
         fsupply = supply.first.first
         supplies << {:including_tax => fsupply[:including_tax], :currency => fsupply[:currency],
                      :territory => supply.map { |fs| fs.map { |s| s[:territory] } }.flatten.uniq,

data/lib/onix/publisher_representative.rb

@@ -0,0 +1,11 @@
+module ONIX
+  class PublisherRepresentative < SubsetDSL
+    element "AgentRole", :subset, :cardinality => 1
+    elements "AgentIdentifier", :subset, :cardinality => 0..n
+    element "AgentName", :text, :cardinality => 0..1
+    elements "TelephoneNumber", :text, :cardinality => 0..n
+    elements "FaxNumber", :text, :cardinality => 0..n
+    elements "EmailAddress", :text, :cardinality => 0..n
+    elements "Website", :subset, :cardinality => 0..n
+  end
+end

data/lib/onix/related_product.rb

@@ -1,7 +1,7 @@
 module ONIX
   class RelatedProduct < SubsetDSL
-    include EanMethods
-    include ProprietaryIdMethods
+    include IdentifiersMethods::Ean
+    include IdentifiersMethods::ProprietaryId
 
     elements "ProductRelationCode", :subset, :shortcut => :codes, :cardinality => 1..n
     elements "ProductIdentifier", :subset, :shortcut => :identifiers, :cardinality => 1..n

data/lib/onix/related_work.rb

@@ -1,6 +1,7 @@
 module ONIX
   class RelatedWork < SubsetDSL
-    include EanMethods
+    include IdentifiersMethods::Ean
+
     element "WorkRelationCode", :subset, :shortcut => :code, :cardinality => 0..n
     elements "WorkIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
 

data/lib/onix/sender.rb

@@ -2,7 +2,7 @@ require 'onix/identifier'
 
 module ONIX
   class Sender < SubsetDSL
-    include GlnMethods
+    include IdentifiersMethods::Gln
 
     elements "SenderIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
     element "SenderName", :text, :shortcut => :name, :cardinality => 0..1

data/lib/onix/serializer.rb

@@ -18,10 +18,10 @@ module ONIX
           if subset.is_a?(ONIX::ONIXMessage)
             mod.const_get("Root").serialize(data, subset, "ONIXMessage", level)
           else
-            if subset.class.included_modules.include?(DateHelper)
+            if subset.class.included_modules.include?(DateMethods)
               mod.const_get("Date").serialize(data, subset, parent_tag, level)
             else
-              if subset.class.included_modules.include?(CodeHelper)
+              if subset.class.included_modules.include?(CodeMethods)
                 mod.const_get("Code").serialize(data, subset, parent_tag, level)
               else
                 mod.const_get("Subset").serialize(data, subset, parent_tag, level)
@@ -47,8 +47,8 @@ module ONIX
       end
 
       def self.recursive_serialize(mod, data, subset, parent_tag = nil, level = 0)
-        if subset.class.respond_to?(:ancestors_registered_elements)
-          subset.class.ancestors_registered_elements.each do |tag, element|
+        if subset.respond_to?(:registered_elements)
+          subset.registered_elements.each do |tag, element|
             next if element.short
             val = subset.instance_variable_get(element.to_instance)
             if val
@@ -112,7 +112,7 @@ module ONIX
           code_format = date.format_from_code(date_format.code)
 
           xml.send(parent_tag, nil) {
-            date.class.ancestors_registered_elements.each do |tag, element|
+            date.registered_elements.each do |tag, element|
               next if element.short
               val = date.instance_variable_get(element.to_instance)
               if val