im_onix 1.1.1 → 1.3.0

data/data/onix21/codelists/codelist-91.yml

@@ -15,7 +15,7 @@
   AT: Austria
   AU: Australia
   AW: Aruba
-  AX: "ÅlandIslands"
+  AX: AlandIslands
   AZ: Azerbaijan
   BA: BosniaAndHerzegovina
   BB: Barbados
@@ -26,7 +26,7 @@
   BH: Bahrain
   BI: Burundi
   BJ: Benin
-  BL: SaintBarthélemy
+  BL: SaintBarthelemy
   BM: Bermuda
   BN: BruneiDarussalam
   BO: BoliviaPlurinationalStateOf
@@ -54,7 +54,7 @@
   CS: SerbiaAndMontenegro
   CU: Cuba
   CV: CapeVerde
-  CW: Curaçao
+  CW: Curacao
   CX: ChristmasIsland
   CY: Cyprus
   CZ: CzechRepublic
@@ -94,7 +94,7 @@
   GS: SouthGeorgiaAndTheSouthSandwichIslands
   GT: Guatemala
   GU: Guam
-  GW: Guineabissau
+  GW: GuineaBissau
   GY: Guyana
   HK: HongKong
   HM: HeardIslandAndMcdonaldIslands
@@ -189,7 +189,7 @@
   PW: Palau
   PY: Paraguay
   QA: Qatar
-  RE: Réunion
+  RE: Reunion
   RO: Romania
   RS: Serbia
   RU: RussianFederation
@@ -222,7 +222,7 @@
   TH: Thailand
   TJ: Tajikistan
   TK: Tokelau
-  TL: Timorleste
+  TL: TimorLeste
   TM: Turkmenistan
   TN: Tunisia
   TO: Tonga

data/data/onix21/codelists/codelist-92.yml

@@ -2,7 +2,7 @@
 :codelist:
   '01': Proprietary
   '02': Proprietary
-  '04': BörsenvereinVerkehrsnummer
+  '04': BorsenvereinVerkehrsnummer
   '05': GermanIsbnAgencyPublisherIdentifier
   '06': Gln
   '07': San

data/data/onix21/codelists/codelist-93.yml

@@ -3,13 +3,13 @@
   '00': Unspecified
   '01': PublisherToRetailers
   '02': PublishersExclusiveDistributorToRetailers
-  '03': PublishersNonexclusiveDistributorToRetailers
+  '03': PublishersNonExclusiveDistributorToRetailers
   '04': Wholesaler
   '05': SalesAgent
   '06': PublishersDistributorToRetailers
   '07': PodSupplier
-  08: Retailer
-  09: PublisherToEndcustomers
-  '10': ExclusiveDistributorToEndcustomers
-  '11': NonexclusiveDistributorToEndcustomers
-  '12': DistributorToEndcustomers
+  '08': Retailer
+  '09': PublisherToEndCustomers
+  '10': ExclusiveDistributorToEndCustomers
+  '11': NonExclusiveDistributorToEndCustomers
+  '12': DistributorToEndCustomers

data/data/onix21/codelists/codelist-96.yml

@@ -66,7 +66,7 @@
   GNF: GuineaFranc
   GRD: GreeceDrachma
   GTQ: Quetzal
-  GWP: GuineabissauPeso
+  GWP: GuineaBissauPeso
   GYD: GuyanaDollar
   HKD: HongKongDollar
   HNL: Lempira

data/data/onix21/codelists/codelist-98.yml

@@ -5,8 +5,8 @@
   BRN: Brown
   BUR: Burgundymaroon
   CRE: Cream
-  FCO: Fourcolor
-  FCS: FourcolorAndSpotcolor
+  FCO: FourColor
+  FCS: FourColorAndSpotColor
   GLD: Gold
   GRN: Green
   GRY: Grey

data/data/onix21/codelists/codelist-99.yml

@@ -7,8 +7,8 @@
   '05': BondedBuffaloGrain
   '06': BondedCalfGrain
   '07': BondedCordova
-  08: BondedEelskin
-  09: BondedOstraleg
+  '08': BondedEelskin
+  '09': BondedOstraleg
   '10': BondedOstrich
   '11': BondedReptileGrain
   '12': BondedLeather
@@ -20,7 +20,7 @@
   '18': SofthideLeather
   '19': Metal
   '20': Velvet
-  '21': Motherofpearl
+  '21': MotherOfPearl
   '22': Papyrus
-  '23': Géltex
+  '23': Geltex
   '24': Guaflex

data/doc-src/handlers.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 class DSLHelpers
   def self.inflectors
     [['ox', 'oxes'],
@@ -47,6 +48,10 @@ class ElementDSLAttributeHandler < YARD::Handlers::Ruby::Base
   handles method_call(:element)
   namespace_only
 
+  def n
+    Float::INFINITY
+  end
+
   process do
     name = statement.parameters[0].jump(:tstring_content, :ident).source
     type = statement.parameters[1].jump(:tstring_content, :ident).source
@@ -93,6 +98,10 @@ class ElementsDSLAttributeHandler < YARD::Handlers::Ruby::Base
   handles method_call(:elements)
   namespace_only
 
+  def n
+    Float::INFINITY
+  end
+
   process do
     name = statement.parameters[0].jump(:tstring_content, :ident).source
     type = statement.parameters[1].jump(:tstring_content, :ident).source
@@ -133,10 +142,8 @@ class ElementsDSLAttributeHandler < YARD::Handlers::Ruby::Base
       register(object)
     end
   end
-
 end
 
-
 class DefDelegatorAttributeHandler < YARD::Handlers::Ruby::Base
   handles method_call(:def_delegator)
   namespace_only
@@ -152,3 +159,26 @@ class DefDelegatorAttributeHandler < YARD::Handlers::Ruby::Base
     register(object)
   end
 end
+
+class CodeAttributeHandler < YARD::Handlers::Ruby::Base
+  handles method_call(:code_identifier)
+  namespace_only
+
+  process do
+    name = statement.parameters[0].jump(:tstring_content, :ident).source
+    codelist_filename = File.dirname(__FILE__) + "/../data/codelists/codelist-#{name}.yml"
+    if File.exist?(codelist_filename)
+      codelist = YAML.load(File.read(codelist_filename))[:codelist]
+      humanized = []
+      codelist.each do |k,v|
+        humanized << "#{v} (#{k})"
+      end
+      returns = YARD::DocstringParser.new.parse("@return [String] humanized name (from code): "+humanized.join(", ")).to_docstring.tags.first
+      object = YARD::CodeObjects::MethodObject.new(namespace, "human", :instance)
+      object.dynamic = true
+      object.add_tag(returns) if returns
+      object[:group] = 'Low level'
+      register(object)
+    end
+  end
+end

data/im_onix.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "im_onix"
-  spec.version       = "1.1.1"
+  spec.version       = "1.3.0"
   spec.authors       = ["Julien Boulnois"]
   spec.email         = ["jboulnois@immateriel.fr"]
 
@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'shoulda'
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "ruby-prof"
 
   spec.required_ruby_version = '>= 2.1'
 

data/lib/onix/addressee.rb

@@ -2,9 +2,11 @@ require 'onix/identifier'
 
 module ONIX
   class Addressee < SubsetDSL
-    include GlnMethods
+    include IdentifiersMethods::Gln
 
-    elements "AddresseeIdentifier", :subset, :shortcut => :identifiers
-    element "AddresseeName", :text, :shortcut => :name
+    elements "AddresseeIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
+    element "AddresseeName", :text, :shortcut => :name, :cardinality => 0..1
+    element "ContactName", :text, :cardinality => 0..1
+    element "EmailAddress", :text, :cardinality => 0..1
   end
 end

data/lib/onix/ancillary_content.rb

@@ -0,0 +1,7 @@
+module ONIX
+  class AncillaryContent < SubsetDSL
+    element "AncillaryContentType", :subset, :cardinality => 1
+    elements "AncillaryContentDescription", :text, :cardinality => 0..n
+    element "Number", :integer, :cardinality => 0..1
+  end
+end

data/lib/onix/audience.rb

@@ -0,0 +1,7 @@
+module ONIX
+  class Audience < SubsetDSL
+    element "AudienceCodeType", :subset, :cardinality => 1
+    element "AudienceCodeTypeName", :text, :cardinality => 0..1
+    element "AudienceCodeValue", :text, :cardinality => 1
+  end
+end

data/lib/onix/audience_range.rb

@@ -0,0 +1,10 @@
+module ONIX
+  class AudienceRange < SubsetDSL
+    element "AudienceRangeQualifier", :subset, :cardinality => 1
+    element "AudienceRangePrecision", :subset, :cardinality => 1
+    element "AudienceRangeValue", :integer, :cardinality => 1
+
+    # element "AudienceRangePrecision", :subset, :cardinality => 0..1
+    # element "AudienceRangeValue", :integer, :cardinality => 0..1
+  end
+end

data/lib/onix/barcode.rb

@@ -0,0 +1,6 @@
+module ONIX
+  class Barcode < SubsetDSL
+    element "BarcodeType", :subset, :cardinality => 1
+    element "PositionOnProduct", :subset, :cardinality => 0..1
+  end
+end

data/lib/onix/builder.rb

@@ -0,0 +1,197 @@
+require 'onix/serializer'
+
+module ONIX
+  class BuilderInvalidArgument < StandardError
+  end
+
+  class BuilderInvalidCardinality < StandardError
+  end
+
+  class BuilderInvalidCode < StandardError
+  end
+
+  class BuilderInvalidChildElement < StandardError
+  end
+
+  class BuilderUndefinedElement < StandardError
+  end
+
+  class Builder
+    def initialize(options = {}, root = nil, &block)
+      if root
+        @doc = root
+        @parent = root
+      else
+        @parent = @doc = Root.new
+      end
+
+      @context = nil
+      @arity = nil
+
+      return unless block_given?
+
+      @arity = block.arity
+      if @arity <= 0
+        @context = eval("self", block.binding)
+        instance_eval(&block)
+      else
+        yield self
+      end
+
+      @lax = false
+
+      @parent = @doc
+    end
+
+    def serialize(xml)
+      ONIX::Serializer::Default.serialize(xml, @doc, "Root")
+    end
+
+    def dump(io = STDOUT)
+      ONIX::Serializer::Dump.serialize(io, @doc, "Root")
+    end
+
+    def to_xml
+      Nokogiri::XML::Builder.new(:encoding => "UTF-8") do |xml|
+        serialize(xml)
+      end.to_xml
+    end
+
+    # code in block will not check for validity
+    def lax &block
+      if block_given?
+        @lax = true
+        @arity ||= block.arity
+        if @arity <= 0
+          instance_eval(&block)
+        else
+          block.call(self)
+        end
+        @lax = false
+      end
+    end
+
+    def method_missing(method, *args, &block)
+      # :nodoc:
+      if @context && @context.respond_to?(method)
+        @context.send(method, *args, &block)
+      else
+        if @parent
+          parser_el = @parent.registered_elements[method.to_s]
+          if parser_el
+            if ONIX.const_defined?(parser_el.klass_name)
+              node = get_class(parser_el.klass_name, args)
+            end
+
+            if parser_el.is_array?
+              arr = @parent.send(parser_el.underscore_name)
+              case parser_el.type
+              when :ignore
+              when :subset
+                node.attributes = get_attributes(args[1]) if args.length > 1
+                arr << node
+              else
+                arr << get_primitive(args)
+              end
+            else
+              case parser_el.type
+              when :ignore
+              when :subset
+                # FIXME: dirty
+                if @parent.class.included_modules.include?(DateMethods) && node.is_a?(DateFormat)
+                  @parent.deprecated_date_format = true
+                end
+                node.attributes = get_attributes(args[1]) if args.length > 1
+                @parent.send(parser_el.underscore_name + "=", node)
+              when :datestamp
+                @parent.send(parser_el.underscore_name + "=", DateStamp.new(args[0], args[1] || "%Y%m%d"))
+              else
+                @parent.send(parser_el.underscore_name + "=", get_primitive(args))
+              end
+            end
+          else
+            raise BuilderInvalidChildElement, [@parent.class.to_s.sub("ONIX::", ""), method.to_s]
+          end
+        else
+          node = get_class(method, args)
+        end
+
+        insert(node, &block)
+      end
+    end
+
+    private
+
+    def get_primitive(args)
+      if args.length > 1
+        txt = TextWithAttributes.new(args[0])
+        txt.attributes = get_attributes(args[1])
+        txt
+      else
+        args[0]
+      end
+    end
+
+    def get_attributes(arg)
+      attrs = {}
+      arg.each do |k, v|
+        attr_klass = ONIX::Attributes.attribute_class(k.to_s)
+        attrs[k] = get_element_code(attr_klass, v) if attr_klass
+      end
+      attrs
+    end
+
+    def get_element_code(klass, arg)
+      if arg.is_a?(String)
+        el = klass.from_code(arg)
+        unless el.human
+          unless @lax
+            raise BuilderInvalidCode, [klass.to_s, arg]
+          end
+        end
+        el
+      else
+        if arg.is_a?(Symbol)
+          klass.from_human(arg.to_s)
+        else
+          raise BuilderInvalidArgument, [klass.to_s, arg]
+        end
+      end
+    end
+
+    def get_element(klass, args)
+      if klass.respond_to?(:from_code)
+        get_element_code(klass, args[0])
+      else
+        el = klass.new
+        if el.is_a?(ONIX::ONIXMessage)
+          el.release = args[0]
+        end
+        el
+      end
+    end
+
+    def get_class(nm, args)
+      if ONIX.const_defined?(nm)
+        klass = ONIX.const_get(nm)
+        get_element(klass, args)
+      else
+        raise BuilderUndefinedElement, nm
+      end
+    end
+
+    def insert(node, &block)
+      if block_given?
+        old_parent = @parent
+        @parent = node
+        @arity ||= block.arity
+        if @arity <= 0
+          instance_eval(&block)
+        else
+          block.call(self)
+        end
+        @parent = old_parent
+      end
+    end
+  end
+end

data/lib/onix/cited_content.rb

@@ -0,0 +1,15 @@
+module ONIX
+  class CitedContent < SubsetDSL
+    element "CitedContentType", :subset, :cardinality => 1
+    elements "ContentAudience", :subset, :cardinality => 0..n
+    element "Territory", :subset, :cardinality => 0..1
+    element "SourceType", :subset, :cardinality => 0..1
+    element "ReviewRating", :subset, :cardinality => 0..1
+    elements "SourceTitle", :text, :cardinality => 0..n
+    elements "ListName", :text, :cardinality => 0..n
+    element "PositionOnList", :integer, :cardinality => 0..1
+    elements "CitationNote", :text, :cardinality => 0..n
+    elements "ResourceLink", :text, :cardinality => 0..n
+    elements "ContentDate", :subset, :cardinality => 0..n
+  end
+end