im_onix 1.1.1 → 1.3.0

data/lib/onix/tax.rb

@@ -1,14 +1,20 @@
 module ONIX
   class Tax < SubsetDSL
-    element "TaxType", :subset
-    element "TaxRateCode", :subset, :shortcut => :rate_code
-    element "TaxRatePercent", :float, :shortcut => :rate_percent
+    elements "ProductIdentifier", :subset, :cardinality => 0..n
+    elements "PricePartDescription", :text, :cardinality => 0..n
+    element "TaxType", :subset, :cardinality => 0..1
+    element "TaxRateCode", :subset, :shortcut => :rate_code, :cardinality => 0..1
+    element "TaxRatePercent", :float, :shortcut => :rate_percent, :cardinality => 0..1
     element "TaxableAmount", :float, {
-        :parse_lambda => lambda { |v| (v * 100).round }
+        :parse_lambda => lambda { |v| (v * 100).round },
+        :serialize_lambda => lambda { |v| format("%.2f", v / 100.0) },
+        :cardinality => 0..1
     }
     element "TaxAmount", :float, {
         :shortcut => :amount,
-        :parse_lambda => lambda { |v| (v * 100).round }
+        :parse_lambda => lambda { |v| (v * 100).round },
+        :serialize_lambda => lambda { |v| format("%.2f", v / 100.0) },
+        :cardinality => 0..1
     }
   end
 end

data/lib/onix/territory.rb

@@ -1,10 +1,10 @@
 require 'onix/code'
 module ONIX
   class Territory < SubsetDSL
-    element "CountriesIncluded", :text
-    element "RegionsIncluded", :text
-    element "CountriesExcluded", :text
-    element "RegionsExcluded", :text
+    element "CountriesIncluded", :text, :cardinality => 0..1
+    element "RegionsIncluded", :text, :cardinality => 0..1
+    element "CountriesExcluded", :text, :cardinality => 0..1
+    element "RegionsExcluded", :text, :cardinality => 0..1
 
     # @!group High level
 
@@ -33,6 +33,7 @@ module ONIX
       self.class.worldwide?(self.countries)
     end
 
+    # @param [Array<String>] v
     def countries= v
       if (v.uniq & CountryCode.list).length == CountryCode.list.length
         @regions_included = "WORLD"
@@ -43,6 +44,8 @@ module ONIX
 
     # !@endgroup
 
+    # @param [String] region
+    # @return [Array<String>]
     def self.region_to_countries(region)
       case region
       when "WORLD"
@@ -55,6 +58,7 @@ module ONIX
       end
     end
 
+    # @return [Boolean]
     def self.worldwide?(countries)
       (countries & CountryCode.list).length == CountryCode.list.length
     end

data/lib/onix/text_content.rb

@@ -0,0 +1,13 @@
+module ONIX
+  class TextContent < SubsetDSL
+    element "TextType", :subset, :shortcut => :type, :cardinality => 1
+    element "ContentAudience", :subset, :cardinality => 1..n
+    element "Text", :text, :cardinality => 1..n
+    element "TextAuthor", :text, :cardinality => 0..n
+    element "TextSourceCorporate", :text, :cardinality => 0..1
+    element "SourceTitle", :text, :cardinality => 0..n
+
+    scope :description, lambda { human_code_match(:text_type, "Description") }
+    scope :short_description, lambda { human_code_match(:text_type, "ShortDescriptionannotation") }
+  end
+end

data/lib/onix/text_item.rb

@@ -0,0 +1,12 @@
+require 'onix/code'
+require 'onix/identifier'
+require 'onix/page_run'
+
+module ONIX
+  class TextItem < SubsetDSL
+    element "TextItemType", :subset, :cardinality => 1
+    elements "TextItemIdentifier", :subset, :cardinality => 0..n
+    elements "PageRun", :subset, :cardinality => 0..n
+    element "NumberOfPages", :integer, :cardinality => 0..1
+  end
+end

data/lib/onix/title_detail.rb

@@ -2,14 +2,15 @@ require 'onix/title_element'
 
 module ONIX
   class TitleDetail < SubsetDSL
-    element "TitleType", :subset, :shortcut => :type
-    elements "TitleElement", :subset
-    element "TitleStatement", :text
+    element "TitleType", :subset, :shortcut => :type, :cardinality => 1
+    elements "TitleElement", :subset, :cardinality => 1..n
+    element "TitleStatement", :text, :cardinality => 0..1
 
     scope :distinctive_title, lambda { human_code_match(:title_type, /DistinctiveTitle/) }
 
     # :category: High level
     # flatten title string
+    # @return [String]
     def title
       return title_statement if title_statement
 

data/lib/onix/title_element.rb

@@ -1,27 +1,30 @@
 module ONIX
   class TitleElement < SubsetDSL
-    element "TitleElementLevel", :subset, :shortcut => :level
-    element "TitleText", :text
-    element "TitlePrefix", :text
-    element "TitleWithoutPrefix", :text
-    element "Subtitle", :text
-    element "PartNumber", :integer
-    element "SequenceNumber", :integer
+    element "SequenceNumber", :integer, :cardinality => 0..1
+    element "TitleElementLevel", :subset, :shortcut => :level, :cardinality => 1
+    element "PartNumber", :text, :cardinality => 0..1
+    element "YearOfAnnual", :text, :cardinality => 0..1
+    element "TitleText", :text, :cardinality => 0..1
+    element "TitlePrefix", :text, :cardinality => 0..1
+    element "NoPrefix", :bool, :cardinality => 0..1
+    element "TitleWithoutPrefix", :text, :cardinality => 0..1
+    element "Subtitle", :text, :cardinality => 0..1
 
     scope :product_level, lambda { human_code_match(:title_element_level, /Product/) }
     scope :collection_level, lambda { human_code_match(:title_element_level, /collection/i) }
 
     # @!group High level
     # flatten title string
+    # @return [String]
     def title
-      if @title_text
-        @title_text
+      if title_text
+        title_text
       else
-        if @title_without_prefix
-          if @title_prefix
-            "#{@title_prefix} #{@title_without_prefix}"
+        if title_without_prefix
+          if title_prefix
+            "#{title_prefix} #{title_without_prefix}"
           else
-            @title_without_prefix
+            title_without_prefix
           end
         end
       end

data/lib/onix/website.rb

@@ -1,8 +1,9 @@
 require 'onix/code'
+
 module ONIX
   class Website < SubsetDSL
-    element "WebsiteRole", :subset, :shortcut => :role
-    element "WebsiteLink", :text, :shortcut => :link
-    element "WebsiteDescription", :text, :shortcut => :description
+    element "WebsiteRole", :subset, :shortcut => :role, :cardinality => 0..1
+    element "WebsiteDescription", :text, :shortcut => :description, :cardinality => 0..n
+    element "WebsiteLink", :text, :shortcut => :link, :cardinality => 1..n
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: im_onix
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Julien Boulnois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -180,9 +208,35 @@ files:
 - data/codelists/codelist-203.yml
 - data/codelists/codelist-204.yml
 - data/codelists/codelist-21.yml
+- data/codelists/codelist-215.yml
+- data/codelists/codelist-216.yml
+- data/codelists/codelist-217.yml
+- data/codelists/codelist-218.yml
+- data/codelists/codelist-219.yml
 - data/codelists/codelist-22.yml
+- data/codelists/codelist-220.yml
+- data/codelists/codelist-221.yml
+- data/codelists/codelist-222.yml
+- data/codelists/codelist-223.yml
+- data/codelists/codelist-224.yml
+- data/codelists/codelist-225.yml
+- data/codelists/codelist-226.yml
+- data/codelists/codelist-227.yml
+- data/codelists/codelist-228.yml
+- data/codelists/codelist-229.yml
 - data/codelists/codelist-23.yml
+- data/codelists/codelist-230.yml
+- data/codelists/codelist-238.yml
+- data/codelists/codelist-239.yml
 - data/codelists/codelist-24.yml
+- data/codelists/codelist-240.yml
+- data/codelists/codelist-241.yml
+- data/codelists/codelist-242.yml
+- data/codelists/codelist-243.yml
+- data/codelists/codelist-244.yml
+- data/codelists/codelist-245.yml
+- data/codelists/codelist-246.yml
+- data/codelists/codelist-247.yml
 - data/codelists/codelist-25.yml
 - data/codelists/codelist-26.yml
 - data/codelists/codelist-27.yml
@@ -426,36 +480,64 @@ files:
 - im_onix.gemspec
 - lib/im_onix.rb
 - lib/onix/addressee.rb
+- lib/onix/ancillary_content.rb
+- lib/onix/audience.rb
+- lib/onix/audience_range.rb
+- lib/onix/barcode.rb
+- lib/onix/builder.rb
+- lib/onix/cited_content.rb
 - lib/onix/code.rb
 - lib/onix/collateral_detail.rb
 - lib/onix/collection.rb
 - lib/onix/collection_sequence.rb
+- lib/onix/comparison_product_price.rb
+- lib/onix/complexity.rb
+- lib/onix/content_detail.rb
+- lib/onix/content_item.rb
 - lib/onix/contributor.rb
+- lib/onix/contributor_place.rb
+- lib/onix/copyright_statement.rb
 - lib/onix/date.rb
 - lib/onix/descriptive_detail.rb
+- lib/onix/discount.rb
 - lib/onix/discount_coded.rb
 - lib/onix/entity.rb
+- lib/onix/epub_license.rb
+- lib/onix/epub_license_expression.rb
 - lib/onix/epub_usage_constraint.rb
 - lib/onix/epub_usage_limit.rb
 - lib/onix/error.rb
 - lib/onix/extent.rb
+- lib/onix/header.rb
 - lib/onix/helper.rb
 - lib/onix/identifier.rb
 - lib/onix/language.rb
 - lib/onix/market.rb
 - lib/onix/market_publishing_detail.rb
+- lib/onix/measure.rb
 - lib/onix/onix21.rb
 - lib/onix/onix_message.rb
+- lib/onix/page_run.rb
 - lib/onix/price.rb
+- lib/onix/prize.rb
 - lib/onix/product.rb
+- lib/onix/product_classification.rb
+- lib/onix/product_contact.rb
 - lib/onix/product_form_feature.rb
 - lib/onix/product_part.rb
-- lib/onix/product_supplies_extractor.rb
+- lib/onix/product_supplies_methods.rb
 - lib/onix/product_supply.rb
+- lib/onix/professional_affiliation.rb
+- lib/onix/publisher_representative.rb
 - lib/onix/publishing_detail.rb
 - lib/onix/related_material.rb
 - lib/onix/related_product.rb
 - lib/onix/related_work.rb
+- lib/onix/resource_feature.rb
+- lib/onix/resource_version.rb
+- lib/onix/resource_version_feature.rb
+- lib/onix/returns_conditions.rb
+- lib/onix/review_rating.rb
 - lib/onix/sales_outlet.rb
 - lib/onix/sales_restriction.rb
 - lib/onix/sales_rights.rb
@@ -463,10 +545,14 @@ files:
 - lib/onix/serializer.rb
 - lib/onix/subject.rb
 - lib/onix/subset.rb
+- lib/onix/supplier_own_coding.rb
+- lib/onix/supply_contact.rb
 - lib/onix/supply_detail.rb
 - lib/onix/supporting_resource.rb
 - lib/onix/tax.rb
 - lib/onix/territory.rb
+- lib/onix/text_content.rb
+- lib/onix/text_item.rb
 - lib/onix/title_detail.rb
 - lib/onix/title_element.rb
 - lib/onix/website.rb