elibri_onix 0.5.13 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1470af5c74c8fda6805cccdc0d929fd6f967f5c596b1f66e01b533a3f148231
-  data.tar.gz: 2294442912e9f973455bf5b92dc8b38c6c604acdc032bc37b3f9b604fd1e603a
+  metadata.gz: d06b0bd4bdbb02d2ff2383d0bbda53df5053c5cb72cb05239751be6333a35d12
+  data.tar.gz: 6e8e96e0555ff9b9121159342dcdbf38f75fc6d62d468ab16ddbfabe10b9ecff
 SHA512:
-  metadata.gz: a0988a96fe595cb3db38bab08f3553a5e194211f2aeae1b11d1e700910891673c91d5bd76642db4f2fed2fa61d55d9a884abf2c83d49cb03aafb9ff4c35be7fb
-  data.tar.gz: e711486fc1a2e2c4b8b201ced29b8cd456f17846cd6fec45db23b49a12965cd893744bfffa79456c1e084bc6678d6129b34f0472aa4cfd52b216a4ff43a24e90
+  metadata.gz: cbfebade21b11fc42a93b821617eca9a435b14a3dc1a032597c4296a588b2813ef025ac1e5f39738083052ed93041be5378c4acda4490cde209cc8f02f5e6b97
+  data.tar.gz: ec612758dbcaa6d29f24c782978de4a91a33fb899081a0e766bae7c3ab4d3e49426a68d4609361386773281bebce2d2d5535fb3678a3cf2877d12402e93cae3e

data/lib/elibri_onix/onix_3_0/file_info.rb

@@ -5,32 +5,59 @@ module Elibri
     module Release_3_0
 
       class FileInfo
-        
+
         #Informacja o fragmencie publikacji (e-book)
-                
+
         ATTRIBUTES = [
           :file_type, :file_size, :md5, :updated_at
         ]
-        
+
         RELATIONS = [
           :inspect_include_fields
         ]
-        
+
         attr_accessor :file_type, :file_size, :md5, :updated_at, :eid, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @file_type = data.attributes['file_type'].value
-          @file_size = data.attributes['file_size'].value.to_i
-          @md5 = data.attributes['md5'].value
-          @updated_at = Time.parse(data.attributes['updated_at'].value)
-          @eid = data.attributes['id'].value.to_i
+
+          data.css("ResourceFileDate").each do |date|
+            if date.css("ResourceFileDateRole").first.inner_text == Elibri::ONIX::Dict::Release_3_0::ContentDateRole::LAST_UPDATED
+              @updated_at = Time.parse(date.css("Date").first.inner_text)
+            end
+          end
+
+          data.css("ResourceFileFeature").each do |feat|
+            ftype = feat.css("ResourceFileFeatureType").first.inner_text
+            fvalue = feat.css("ResourceFileFeatureValue").first.inner_text
+
+            if ftype == Elibri::ONIX::Dict::Release_3_0::ResourceFileFeatureType::EXACT_FILE_SIZE
+              @file_size = fvalue.to_i
+            elsif ftype == Elibri::ONIX::Dict::Release_3_0::ResourceFileFeatureType::MD5
+              @md5 = fvalue
+            end
+          end
+
+          fname = data.css("ResourceFileLink").first&.inner_text
+          if fname
+            if File.extname(fname) == ".zip"
+              @file_type = "mp3_in_zip"
+            else
+              @file_type = File.extname(fname)[1..-1]
+            end
+          end
+
+          data.css("ResourceIdentifier").each do |ident|
+            if ident.css("ResourceIDType").first&.inner_text == Elibri::ONIX::Dict::Release_3_0::ResourceIDType::PROPRIETARY
+              @eid = ident.css("IDValue").first&.inner_text&.to_i
+            end
+          end
         end
 
         def inspect_include_fields
           [:file_type]
         end
-    
+
       end
 
     end

data/lib/elibri_onix/onix_3_0/product.rb

@@ -11,11 +11,11 @@ module Elibri
         #:nodoc:
         ATTRIBUTES =
         [
-          :height, :width, :thickness, :weight, :ean, :isbn13, :number_of_pages, :duration, 
-          :file_size, :publisher_name, :publisher_id, :imprint_name, :current_state, :reading_age_from, :reading_age_to, 
+          :height, :width, :thickness, :weight, :ean, :isbn13, :number_of_pages, :duration,
+          :file_size, :publisher_name, :publisher_id, :imprint_name, :current_state, :reading_age_from, :reading_age_to,
           :table_of_contents, :description, :reviews, :excerpts, :series, :title, :subtitle, :collection_title,
           :collection_part, :full_title, :original_title, :trade_title, :parsed_publishing_date, :record_reference,
-          :deletion_text, :cover_type, :cover_price, :vat, :pkwiu, :additional_info, :product_composition, 
+          :deletion_text, :cover_type, :cover_price, :vat, :pkwiu, :additional_info, :product_composition,
           :publisher, :product_form, :no_contributor, :edition_statement, :edition_type_onix_code, :number_of_illustrations, :publishing_status,
           :publishing_date, :premiere, :front_cover, :series_names, :city_of_publication,
           :preview_exists, :short_description, :sale_restricted_to_poland,
@@ -151,7 +151,7 @@ module Elibri
         #AdditionalInfo
         attr_reader :additional_info
 
-        #kod ONIX typu produktu, np. 'BA' - lista dostępna pod adresem 
+        #kod ONIX typu produktu, np. 'BA' - lista dostępna pod adresem
         #https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/ProductFormCode.yml
         attr_reader :product_form
 
@@ -192,12 +192,12 @@ module Elibri
         #dodatkowa informacja handlowa
         attr_reader :additional_trade_information
 
-        #ilość elementów (puzzle, gry planszowe)      
+        #ilość elementów (puzzle, gry planszowe)
         attr_reader :number_of_pieces
 
         #min. ilość graczy - gry planszowe
         attr_reader :players_number_from
- 
+
         #max. ilość graczy - gry planszowe
         attr_reader :players_number_to
 
@@ -207,6 +207,13 @@ module Elibri
         #max. czas gry - gry planszowe
         attr_reader :playing_time_to
 
+        #cn code
+        attr_reader :cn_code
+
+        #kraj produkcji
+        attr_reader :country_of_manufacture
+
+
         #:nodoc:
         attr_reader :text_contents
         attr_reader :file_size
@@ -265,7 +272,7 @@ module Elibri
           @deletion_text = data.at_css('DeletionText').try(:text)
 
           if data.namespaces.values.any? { |uri| uri =~ /elibri/ }
-            @cover_type = data.at_xpath('elibri:CoverType').try(:text) 
+            @cover_type = data.at_xpath('elibri:CoverType').try(:text)
             @pkwiu = data.at_xpath('elibri:PKWiU').try(:text)
             @hyphenated_isbn = data.at_xpath('elibri:HyphenatedISBN').try(:text)
             @pdw_exclusiveness = data.at_xpath('elibri:PDWExclusiveness').try(:text)
@@ -288,8 +295,9 @@ module Elibri
             @cover_price = BigDecimal(data.at_xpath('elibri:CoverPrice').try(:text)) if data.at_xpath('elibri:CoverPrice')
             @vat = data.at_xpath('elibri:Vat').try(:text).try(:to_i)
           else
-            price_sd = @supply_details.find { |sd| sd.supplier && sd.supplier.role == Elibri::ONIX::Dict::Release_3_0::SupplierRole::PUB_TO_RET }
-            if price_sd && price_sd.price && price_sd.price && price_sd.price.type == Elibri::ONIX::Dict::Release_3_0::PriceTypeCode::RRP_WITH_TAX 
+            #00 - Supplier role - Unspecified
+            price_sd = @supply_details.find { |sd| sd.supplier && ["00", Elibri::ONIX::Dict::Release_3_0::SupplierRole::PUB_TO_RET].include?(sd.supplier.role) }
+            if price_sd && price_sd.price && price_sd.price && price_sd.price.type == Elibri::ONIX::Dict::Release_3_0::PriceTypeCode::RRP_WITH_TAX
               @vat = price_sd.price.tax_rate_percent.to_i
               @cover_price = price_sd.price.amount
               @additional_trade_information = price_sd.additional_trade_information
@@ -318,11 +326,7 @@ module Elibri
             end
 
           end
-          begin
-            @file_infos = data.at_xpath("elibri:masters").xpath("elibri:master").map { |node| FileInfo.new(node) }
-          rescue
-            @file_infos = []
-          end
+          @file_infos = data.css("BodyResource").map { |node| FileInfo.new(node) }
           after_parse
         end
 
@@ -333,14 +337,14 @@ module Elibri
             elsif date = data.at_xpath("elibri:SaleRestrictedTo").try(:text)
               @unlimited_licence = false
               @licence_limited_to_before_type_cast = date
-              @licence_limited_to = Date.new(date[0...4].to_i, date[4...6].to_i, date[6...8].to_i)
+              @licence_limited_to = _parse_date(date)
             end
           else
             daten = data.css('PublishingDate').find { |d| d.at_css("PublishingDateRole") && d.at_css("PublishingDateRole").text == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::OUT_OF_PRINT_DATE }
             if daten
               date = daten.at_css('Date').text
               @licence_limited_to_before_type_cast = date
-              @licence_limited_to = Date.new(date[0...4].to_i, date[4...6].to_i, date[6...8].to_i)
+              @licence_limited_to = _parse_date(date)
               @unlimited_licence = false
             else
               @unlimited_licence = true
@@ -367,6 +371,8 @@ module Elibri
         end
 
         def descriptive_details_setup(data)
+          @country_of_manufacture = data.at_css("CountryOfManufacture").try(:text)
+
           @product_composition = data.at_css('ProductComposition').try(:text)
           @product_form = data.at_css('ProductForm').try(:text)
           if @product_form
@@ -387,9 +393,14 @@ module Elibri
             end
 
           end
-          if classification = data.css('ProductClassification').find { |cl| 
-             cl.at_css('ProductClassificationType').text == Elibri::ONIX::Dict::Release_3_0::ProductClassificationType::PKWIU }
-            @pkwiu  = classification.at_css('ProductClassificationCode').text
+          data.css('ProductClassification').each do |cl|
+            cl_type = cl.at_css('ProductClassificationType').text
+            cl_value = cl.at_css('ProductClassificationCode').text
+            if cl_type == Elibri::ONIX::Dict::Release_3_0::ProductClassificationType::PKWIU
+              @pkwiu = cl_value
+            elsif cl_type == Elibri::ONIX::Dict::Release_3_0::ProductClassificationType::CN
+              @cn_code = cl_value
+            end
           end
           @measures =  data.css('Measure').map { |measure_data| Measure.new(measure_data) }
           @title_details = data.children.find_all { |node| node.name == 'TitleDetail' }.map { |title_data| TitleDetail.new(title_data) }
@@ -401,7 +412,7 @@ module Elibri
 
           @publisher_subjects = data.css('Subject').find_all { |sd|
              %w{24}.include?(sd.at_css('SubjectSchemeIdentifier').try(:text)) }.map { |sd| PublisherSubject.new(sd) }
-          @thema_subjects = data.css('Subject').find_all { |sd| 
+          @thema_subjects = data.css('Subject').find_all { |sd|
              %w{93 94 95 96 97 98 99}.include?(sd.at_css('SubjectSchemeIdentifier').try(:text)) }.map { |sd| ThemaSubject.new(sd) }
           @audience_ranges = data.css('AudienceRange').map { |audience_data| AudienceRange.new(audience_data) }
 
@@ -436,7 +447,7 @@ module Elibri
           preorder_embargo_date_as_object = publication_dates.find { |date| date.role == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::PREORDER_EMBARGO_DATE }
           @preorder_embargo_date = Date.new(*preorder_embargo_date_as_object.parsed) if preorder_embargo_date_as_object
 
-          @sales_restrictions = data.css('SalesRestriction').map { |restriction_data| SalesRestriction.new(restriction_data) }      
+          @sales_restrictions = data.css('SalesRestriction').map { |restriction_data| SalesRestriction.new(restriction_data) }
           #ograniczenia terytorialne
           if data.at_css("CountriesIncluded").try(:text) == "PL"
             @sale_restricted_to_poland = true
@@ -462,7 +473,7 @@ module Elibri
 
         #flaga - true, jeśli produkt nie ma żadnego autora
         def no_contributor?
-          @no_contributor 
+          @no_contributor
         end
 
         #flaga, czy książka to praca zbiorowa?
@@ -479,7 +490,7 @@ module Elibri
           unnamed_persons? ? ["praca zbiorowa"] : @contributors.find_all { |c| c.role_name == "author" }.map(&:person_name)
         end
 
-        [:ghostwriter, :scenarist, :originator, :illustrator, :photographer, :author_of_preface, :drawer, :cover_designer, 
+        [:ghostwriter, :scenarist, :originator, :illustrator, :photographer, :author_of_preface, :drawer, :cover_designer,
          :inked_or_colored_by, :editor, :revisor, :translator, :editor_in_chief, :read_by].each do |role|
           define_method "#{role}s" do
             @contributors.find_all { |c| c.role_name == role.to_s }.map(&:person_name)
@@ -514,7 +525,7 @@ module Elibri
         end
 
         #:nodoc:
-        def proprietary_identifiers 
+        def proprietary_identifiers
           @identifiers.find_all { |i| i.identifier_type == "proprietary" }.inject({}) { |res, ident| res[ident.type_name] = ident.value; res }
         end
 
@@ -598,6 +609,12 @@ module Elibri
             end
           end
         end
+
+        def _parse_date(string)
+          Date.new(string[0...4].to_i, string[4...6].to_i, string[6...8].to_i)
+        rescue ArgumentError
+          raise "Invalid date '#{string}' when parsing date for #{@record_reference}"
+        end
       end
 
     end

data/lib/elibri_onix/onix_3_0/sender.rb

@@ -2,43 +2,35 @@
 module Elibri
   module ONIX
     module Release_3_0
- 
+
       #Sender of the message
       class Sender
         include Inspector
-       
+
         #name of company, which sent the message
         attr_accessor :sender_name
 
-        #contact person 
-        attr_accessor :contact_name
-
-        #contact email
-        attr_accessor :email_address
-
         #xml representation of sender
         attr_accessor :to_xml
-        
+
         #:nodoc:
         ATTRIBUTES = [
           :sender_name, :contact_name, :email_address
         ]
-        
+
         #:nodoc:
         RELATIONS = []
 
         #:nodoc:
         def inspect_include_fields
-          [:sender_name, :contact_name, :email_address]
+          [:sender_name]
         end
-        
+
         def initialize(data)
           @to_xml = data.to_s
           @sender_name = data.at_css('SenderName').text
-          @contact_name = data.at_css('ContactName').text
-          @email_address = data.at_css('EmailAddress').text
         end
-        
+
       end
 
     end

data/lib/elibri_onix/version.rb

@@ -2,7 +2,7 @@ module Elibri
   module ONIX
     z = $VERBOSE
     $VERBOSE = nil
-    VERSION = "0.5.13"
+    VERSION = "0.5.17"
     Version = VERSION
     $VERBOSE = z
   end

data/test/elibri_ebook_files_test.rb

@@ -12,7 +12,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "4b145ff46636b06f49225abdab70927f", e.md5
     assert_equal "epub_excerpt", e.file_type
     assert_equal Time.parse("2012-12-30 15:18 +00:00"), e.updated_at
-    assert_equal "https://www.elibri.com.pl/excerpt/767", e.link
+    assert_equal "https://www.elibri.com.pl/excerpt/767/4b145ff46636b06f49225abdab70927f/fragment.epub", e.link
     assert_equal 767, e.eid
 
     assert_equal 2, product.file_infos.size

data/test/elibri_extensions_test.rb

@@ -21,7 +21,6 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 5, product.vat
     assert_equal "PROMO 20", product.additional_trade_information
     assert_equal "58.11.1", product.pkwiu
-    assert_equal "twarda z obwolutą", product.cover_type
   end
 
 end

data/test/elibri_onix_release_3_0_onix_message_test.rb

@@ -6,38 +6,36 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
   it "should be able to parse all attributes supported in Elibri" do
     xml_string = File.read File.join(File.dirname(__FILE__), "..", "test", "fixtures", "all_possible_tags.xml")
-    
+
     onix = Elibri::ONIX::Release_3_0::ONIXMessage.new(xml_string)
     assert_equal '3.0', onix.release
     assert_equal 'Elibri.com.pl', onix.header.sender.sender_name
-    assert_equal 'Tomasz Meka', onix.header.sender.contact_name
-    assert_equal 'kontakt@elibri.com.pl', onix.header.sender.email_address
     assert_equal Date.new(2011, 10, 5), onix.header.sent_date_time
 
-    assert_equal 1, onix.products.size 
+    assert_equal 1, onix.products.size
 
     product = onix.products.first
 
-    assert_equal 'miękka', product.cover_type 
+    assert_equal 'miękka', product.cover_type
     assert_equal 12.99, product.cover_price
     assert_equal 5, product.vat
     assert_equal '58.11.1', product.pkwiu
 
     assert_equal 'fdb8fa072be774d97a97', product.record_reference
     assert_equal '03', product.notification_type
-    assert_equal "Record had many errors", product.deletion_text 
+    assert_equal "Record had many errors", product.deletion_text
 
     assert_equal '9788324799992', product.isbn13
     assert_equal '9788324788882', product.ean
 
     assert_equal({"Gildia.pl" => "GILD-123", "PWN" => "pl.pwn.ksiegarnia.produkt.id.76734"}, product.proprietary_identifiers)
 
-    assert_equal "00", product.product_composition 
+    assert_equal "00", product.product_composition
     assert_equal 'BA', product.product_form
 
-    assert_equal 4, product.measures.size 
+    assert_equal 4, product.measures.size
 
-    assert_equal 195, product.height 
+    assert_equal 195, product.height
     assert_equal 125, product.width
     assert_equal 20, product.thickness
     assert_equal 90, product.weight
@@ -49,10 +47,10 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 'Trade title', product.trade_title
     assert_equal 'Collection title (Vol. 1). Title. Subtitle (part 5)', product.full_title
 
-    assert_equal 1, product.contributors.size 
+    assert_equal 1, product.contributors.size
     product.contributors.first.tap do |sienkiewicz|
-      assert_equal 'B06', sienkiewicz.role 
-      assert_equal 'pol', sienkiewicz.from_language 
+      assert_equal 'B06', sienkiewicz.role
+      assert_equal 'pol', sienkiewicz.from_language
       assert_equal "prof. Henryk von Sienkiewicz Ibrahim", sienkiewicz.person_name
       assert_equal "prof.", sienkiewicz.titles_before_names
       assert_equal "Henryk", sienkiewicz.names_before_key
@@ -71,7 +69,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 250, product.number_of_pages
     assert_equal 32, product.number_of_illustrations
 
-    assert_equal 7, product.reading_age_from 
+    assert_equal 7, product.reading_age_from
     assert_equal 25, product.reading_age_to
 
     assert_equal 1, product.text_contents.size
@@ -91,7 +89,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
     assert_equal 'National Geographic', product.imprint_name
 
-    assert_equal 'GREG', product.publisher.name 
+    assert_equal 'GREG', product.publisher.name
     assert_equal "01", product.publisher.role
 
     assert_equal "04", product.publishing_status
@@ -109,24 +107,24 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 2, product.related_products.size
 
     product.related_products.first.tap do |first_related|
-      #assert_equal 24, first_related.relation_code 
+      #assert_equal 24, first_related.relation_code
       #assert_equal '9788324705818', first_related.isbn13
       #assert_equal({"Gildia.pl" => "Title of facsimile"}, first_related.proprietary_identifiers)
     end
 
     product.related_products[1].tap do |second_related|
-      #assert_equal 23, second_related.relation_code 
+      #assert_equal 23, second_related.relation_code
       #assert_equal '9788324799992', second_related.isbn13
       #assert_equal({"PWN" => "Title of similar book"}, second_related.proprietary_identifiers)
     end
 
-    assert_equal 2, product.supply_details.size 
+    assert_equal 2, product.supply_details.size
 
     product.supply_details.first.tap do |supply_detail|
       supply_detail.supplier.tap do |supplier|
         assert_equal "03", supplier.role
         assert_equal '5213359408', supplier.nip
-        assert_equal 'Gildia.pl', supplier.name 
+        assert_equal 'Gildia.pl', supplier.name
         assert_equal "22 631 40 83", supplier.telephone_number
         assert_equal "bok@gildia.pl", supplier.email_address
         assert_equal "http://gildia.pl", supplier.website
@@ -140,7 +138,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
         assert_equal "02", price.type
         assert_equal 20, price.minimum_order_quantity
         assert_equal 12.99, price.amount
-        assert_equal 7, price.vat 
+        assert_equal 7, price.vat
         assert_equal 'PLN', price.currency_code
         assert_equal "02", price.printed_on_product
         assert price.printed_on_product?

data/test/elibri_production_country_test.rb

@@ -0,0 +1,12 @@
+require 'helper'
+
+describe Elibri::ONIX::Release_3_0::ONIXMessage do
+
+  it "should be able to parse production country and cn info" do
+    product = load_fixture("onix_cn_production_country_example.xml")
+
+    assert_equal "4901", product.cn_code
+    assert_equal "DE", product.country_of_manufacture
+  end
+
+end

data/test/fixtures/all_possible_tags.xml

@@ -269,8 +269,7 @@
             00 - RRRRMMDD
             01 - RRRRMM
             05 - RRRR -->
-        <DateFormat>05</DateFormat>
-        <Date>2011</Date>
+        <Date dateformat="05">2011</Date>
       </PublishingDate>
       <SalesRestriction>
         <!-- Typ restrykcji - zawsze 04 -->

data/test/fixtures/onix_announced_product_example.xml

@@ -56,8 +56,7 @@
       <PublishingStatus>02</PublishingStatus>
       <PublishingDate>
         <PublishingDateRole>01</PublishingDateRole>
-        <DateFormat>05</DateFormat>
-        <Date>2011</Date>
+        <Date dateformat="05">2011</Date>
       </PublishingDate>
       <SalesRights>
         <SalesRightsType>01</SalesRightsType>

data/test/fixtures/onix_audiobook_example.xml

@@ -58,7 +58,7 @@
         <KeyNames>Keyes</KeyNames>
         <BiographicalNote>&lt;p&gt;
  Daniel Keyes (1927-2014) – amerykański pisarz. Jego opowiadanie &lt;em&gt;Kwiaty dla Algernona&lt;/em&gt; otrzymało nagrodę Hugo w 1960 roku. Rozwinięte do formy powieści pod tym samym tytułem doczekało się z kolei nagrody Nebula w roku 1966, a dwa lata później zostało zekranizowane jako &lt;em&gt;Charly&lt;/em&gt;. Keyes opublikował także m.in. obsypaną nagrodami książkę non-fiction &lt;em&gt;Człowiek o 24 twarzach.&lt;/em&gt;&lt;/p&gt;
- 
+
 </BiographicalNote>
       </Contributor>
       <Contributor sourcename="contributorid:221077" datestamp="20190614T0946">
@@ -194,12 +194,11 @@
       <PublishingStatus>04</PublishingStatus>
       <PublishingDate>
         <!--PublishingDateRole: PUBLICATION_DATE--><PublishingDateRole>01</PublishingDateRole>
-        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <!--DateFormat: YYYYMMDD-->
         <Date dateformat="00">20190724</Date>
       </PublishingDate>
       <PublishingDate>
         <PublishingDateRole>13</PublishingDateRole>
-        <DateFormat>00</DateFormat>
         <Date dateformat="00">20250307</Date>
       </PublishingDate>
       <SalesRights>

data/test/fixtures/onix_board_game_example.xml

@@ -116,12 +116,12 @@
       <!--PublishingStatusCode: ACTIVE--><PublishingStatus>04</PublishingStatus>
       <PublishingDate>
         <!--PublishingDateRole: PUBLICATION_DATE--><PublishingDateRole>01</PublishingDateRole>
-        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <!--DateFormat: YYYYMMDD-->
         <Date dateformat="00">20180919</Date>
       </PublishingDate>
       <PublishingDate>
         <!--PublishingDateRole: PREORDER_EMBARGO_DATE--><PublishingDateRole>27</PublishingDateRole>
-        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <!--DateFormat: YYYYMMDD-->
         <Date dateformat="00">20180905</Date>
       </PublishingDate>
       <SalesRights>

data/test/fixtures/onix_cn_production_country_example.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<ONIXMessage release="3.0" xmlns="http://ns.editeur.org/onix/3.0/reference">
+  <Header>
+    <Sender>
+      <SenderName>Elibri.com.pl</SenderName>
+    </Sender>
+    <SentDateTime>20210713</SentDateTime>
+  </Header>
+  <Product>
+    <RecordReference>xxx</RecordReference>
+    <NotificationType>03</NotificationType>
+    <RecordSourceName>elibri</RecordSourceName>
+    <ProductIdentifier>
+      <ProductIDType>15</ProductIDType>
+      <IDValue>9788364057434</IDValue>
+    </ProductIdentifier>
+    <DescriptiveDetail>
+      <ProductComposition>00</ProductComposition>
+      <ProductForm>BA</ProductForm>
+      <CountryOfManufacture>DE</CountryOfManufacture>
+      <ProductClassification>
+        <ProductClassificationType>01</ProductClassificationType>
+        <ProductClassificationCode>4901</ProductClassificationCode>
+      </ProductClassification>
+      <TitleDetail>
+        <TitleType>01</TitleType>
+        <TitleElement>
+          <TitleElementLevel>01</TitleElementLevel>
+          <TitleText language="pol">Horror show</TitleText>
+        </TitleElement>
+      </TitleDetail>
+      <Contributor>
+        <ContributorRole>A01</ContributorRole>
+        <UnnamedPersons>04</UnnamedPersons>
+      </Contributor>
+    </DescriptiveDetail>
+    <PublishingDetail>
+      <Publisher>
+        <PublishingRole>01</PublishingRole>
+        <PublisherName>Helion</PublisherName>
+      </Publisher>
+      <PublishingStatus>07</PublishingStatus>
+      <PublishingDate>
+        <PublishingDateRole>01</PublishingDateRole>
+        <Date dateformat="05">2014</Date>
+      </PublishingDate>
+    </PublishingDetail>
+  </Product>
+</ONIXMessage>

data/test/fixtures/onix_ebook_with_files_example.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ONIXMessage release="3.0" xmlns="http://ns.editeur.org/onix/3.0/reference" xmlns:elibri="http://elibri.com.pl/ns/extensions">
-  <elibri:Dialect>3.0.1</elibri:Dialect>
+<ONIXMessage release="3.0" xmlns="http://ns.editeur.org/onix/3.0/reference">
   <Header>
     <Sender>
       <SenderName>Elibri.com.pl</SenderName>
-      <ContactName>Tomasz Meka</ContactName>
-      <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
     </Sender>
-    <SentDateTime>20130710</SentDateTime>
+    <SentDateTime>20210716</SentDateTime>
   </Header>
   <Product>
-    <RecordReference>fdb8fa072be774d97a97</RecordReference>
+    <RecordReference>xxx</RecordReference>
     <NotificationType>03</NotificationType>
+    <RecordSourceName>elibri</RecordSourceName>
     <ProductIdentifier>
       <ProductIDType>15</ProductIDType>
-      <IDValue>9788324799992</IDValue>
+      <IDValue>9788364057434</IDValue>
     </ProductIdentifier>
     <DescriptiveDetail>
       <ProductComposition>00</ProductComposition>
@@ -23,86 +21,119 @@
         <TitleType>01</TitleType>
         <TitleElement>
           <TitleElementLevel>01</TitleElementLevel>
-          <TitleText>Nielegalni</TitleText>
+          <TitleText language="pol">Horror show</TitleText>
         </TitleElement>
       </TitleDetail>
+      <Contributor>
+        <ContributorRole>A01</ContributorRole>
+        <UnnamedPersons>04</UnnamedPersons>
+      </Contributor>
     </DescriptiveDetail>
+    <CollateralDetail>
+      <SupportingResource>
+        <ResourceContentType>15</ResourceContentType>
+        <ContentAudience>00</ContentAudience>
+        <ResourceMode>04</ResourceMode>
+        <ResourceVersion>
+          <ResourceForm>02</ResourceForm>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>01</ResourceVersionFeatureType>
+            <FeatureValue>E101</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>06</ResourceVersionFeatureType>
+            <FeatureValue>4b145ff46636b06f49225abdab70927f</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>07</ResourceVersionFeatureType>
+            <FeatureValue>2100230</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceLink>https://www.elibri.com.pl/excerpt/767/4b145ff46636b06f49225abdab70927f/fragment.epub</ResourceLink>
+          <ContentDate>
+            <ContentDateRole>17</ContentDateRole>
+            <Date dateformat="13">20121230T1518Z</Date>
+          </ContentDate>
+        </ResourceVersion>
+        <ResourceVersion>
+          <ResourceForm>02</ResourceForm>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>01</ResourceVersionFeatureType>
+            <FeatureValue>E127</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>06</ResourceVersionFeatureType>
+            <FeatureValue>3b452923564374efebc5bfe1059f5fd2</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceVersionFeature>
+            <ResourceVersionFeatureType>07</ResourceVersionFeatureType>
+            <FeatureValue>2100244</FeatureValue>
+          </ResourceVersionFeature>
+          <ResourceLink>https://www.elibri.com.pl/excerpt/768/3b452923564374efebc5bfe1059f5fd2/fragment.mobi</ResourceLink>
+          <ContentDate>
+            <ContentDateRole>17</ContentDateRole>
+            <Date dateformat="13">20121230T1518Z</Date>
+          </ContentDate>
+        </ResourceVersion>
+      </SupportingResource>
+    </CollateralDetail>
     <PublishingDetail>
       <Publisher>
         <PublishingRole>01</PublishingRole>
-        <PublisherIdentifier>
-          <PublisherIDType>01</PublisherIDType>
-          <IDTypeName>ElibriPublisherCode</IDTypeName>
-          <IDValue>11</IDValue>
-        </PublisherIdentifier>
-        <PublisherName>GREG</PublisherName>
+        <PublisherName>Helion</PublisherName>
       </Publisher>
-      <CityOfPublication>Warszawa</CityOfPublication>
-      <PublishingStatus>04</PublishingStatus>
-      <SalesRights>
-        <SalesRightsType>01</SalesRightsType>
-        <Territory>
-          <RegionsIncluded>WORLD</RegionsIncluded>
-        </Territory>
-      </SalesRights>
+      <PublishingStatus>07</PublishingStatus>
+      <PublishingDate>
+        <PublishingDateRole>01</PublishingDateRole>
+        <Date dateformat="05">2014</Date>
+      </PublishingDate>
     </PublishingDetail>
-    <elibri:preview_exists>false</elibri:preview_exists>
-    <elibri:SaleNotRestricted/>
-    <elibri:excerpts>
-      <elibri:excerpt md5="4b145ff46636b06f49225abdab70927f" file_size="2100230" file_type="epub_excerpt" updated_at="2012-12-30T15:18:00+00:00" id="767">https://www.elibri.com.pl/excerpt/767</elibri:excerpt>
-      <elibri:excerpt md5="6f534ab6ab573845bb7ab221192aa86a" file_size="2101254" file_type="mobi_excerpt" updated_at="2012-12-30T15:16:00+00:00" id="768">https://www.elibri.com.pl/excerpt/768</elibri:excerpt>
-    </elibri:excerpts>
-    <elibri:masters>
-      <elibri:master id="765" md5="e9353ce40eaa677f8c5d666c2f8bbb3f" file_size="4197382" file_type="epub" updated_at="2012-12-30T15:18:00+00:00"/>
-      <elibri:master id="766" md5="d2c75a26973a1888f241125717b166cf" file_size="5246982" file_type="mobi" updated_at="2012-12-30T15:16:00+00:00"/>
-    </elibri:masters>
-  </Product>
-  <Product>
-    <RecordReference>fdb8fa072be774d97a98</RecordReference>
-    <NotificationType>03</NotificationType>
-    <ProductIdentifier>
-      <ProductIDType>15</ProductIDType>
-      <IDValue>9788324799993</IDValue>
-    </ProductIdentifier>
-    <DescriptiveDetail>
-      <ProductComposition>00</ProductComposition>
-      <ProductForm>EA</ProductForm>
-      <TitleDetail>
-        <TitleType>01</TitleType>
-        <TitleElement>
-          <TitleElementLevel>01</TitleElementLevel>
-          <TitleText>Legalni</TitleText>
-        </TitleElement>
-      </TitleDetail>
-    </DescriptiveDetail>
-    <PublishingDetail>
-      <Publisher>
-        <PublishingRole>01</PublishingRole>
-        <PublisherIdentifier>
-          <PublisherIDType>01</PublisherIDType>
-          <IDTypeName>ElibriPublisherCode</IDTypeName>
-          <IDValue>11</IDValue>
-        </PublisherIdentifier>
-        <PublisherName>GREG</PublisherName>
-      </Publisher>
-      <CityOfPublication>Warszawa</CityOfPublication>
-      <PublishingStatus>04</PublishingStatus>
-      <SalesRights>
-        <SalesRightsType>01</SalesRightsType>
-        <Territory>
-          <RegionsIncluded>WORLD</RegionsIncluded>
-        </Territory>
-      </SalesRights>
-    </PublishingDetail>
-    <elibri:preview_exists>false</elibri:preview_exists>
-    <elibri:SaleNotRestricted/>
-    <elibri:excerpts>
-      <elibri:excerpt md5="4b145ff46636b06f49225abdab70927f" file_size="2100230" file_type="epub_excerpt" updated_at="2012-12-30T15:18:00+00:00" id="777">https://www.elibri.com.pl/excerpt/767</elibri:excerpt>
-      <elibri:excerpt md5="6f534ab6ab573845bb7ab221192aa86a" file_size="2101254" file_type="mobi_excerpt" updated_at="2012-12-30T15:16:00+00:00" id="778">https://www.elibri.com.pl/excerpt/768</elibri:excerpt>
-    </elibri:excerpts>
-    <elibri:masters>
-      <elibri:master id="775" md5="e9353ce40eaa677f8c5d666c2f8bbb3f" file_size="4197382" file_type="epub" updated_at="2012-12-30T15:18:00+00:00"/>
-      <elibri:master id="776" md5="d2c75a26973a1888f241125717b166cf" file_size="5246982" file_type="mobi" updated_at="2012-12-30T15:16:00+00:00"/>
-    </elibri:masters>
+    <ProductionDetail>
+      <ProductionManifest>
+        <BodyManifest>
+          <BodyResource>
+            <SequenceNumber>1</SequenceNumber>
+            <ResourceIdentifier>
+              <ResourceIDType>01</ResourceIDType>
+              <IDTypeName>elibri internal numerical ID</IDTypeName>
+              <IDValue>765</IDValue>
+            </ResourceIdentifier>
+            <ResourceFileFeature>
+              <ResourceFileFeatureType>07</ResourceFileFeatureType>
+              <ResourceFileFeatureValue>4197382</ResourceFileFeatureValue>
+            </ResourceFileFeature>
+            <ResourceFileFeature>
+              <ResourceFileFeatureType>06</ResourceFileFeatureType>
+              <ResourceFileFeatureValue>e9353ce40eaa677f8c5d666c2f8bbb3f</ResourceFileFeatureValue>
+            </ResourceFileFeature>
+            <ResourceFileLink>pan-tadeusz.epub</ResourceFileLink>
+            <ResourceFileDate>
+              <ResourceFileDateRole>17</ResourceFileDateRole>
+              <Date dateformat="13">20121230T1518Z</Date>
+            </ResourceFileDate>
+          </BodyResource>
+          <BodyResource>
+            <SequenceNumber>2</SequenceNumber>
+            <ResourceIdentifier>
+              <ResourceIDType>01</ResourceIDType>
+              <IDTypeName>elibri internal numerical ID</IDTypeName>
+              <IDValue>2</IDValue>
+            </ResourceIdentifier>
+            <ResourceFileFeature>
+              <ResourceFileFeatureType>07</ResourceFileFeatureType>
+              <ResourceFileFeatureValue>9177122</ResourceFileFeatureValue>
+            </ResourceFileFeature>
+            <ResourceFileFeature>
+              <ResourceFileFeatureType>06</ResourceFileFeatureType>
+              <ResourceFileFeatureValue>44452923564374efebc5bfe1059f5fb8</ResourceFileFeatureValue>
+            </ResourceFileFeature>
+            <ResourceFileLink>pan-tadeusz.mobi</ResourceFileLink>
+            <ResourceFileDate>
+              <ResourceFileDateRole>17</ResourceFileDateRole>
+              <Date dateformat="13">20121230T1518Z</Date>
+            </ResourceFileDate>
+          </BodyResource>
+        </BodyManifest>
+      </ProductionManifest>
+    </ProductionDetail>
   </Product>
 </ONIXMessage>

data/test/fixtures/onix_preorder_product_example.xml

@@ -41,13 +41,11 @@
       <PublishingStatus>02</PublishingStatus>
       <PublishingDate>
         <PublishingDateRole>01</PublishingDateRole>
-        <DateFormat>00</DateFormat>
-        <Date>20110210</Date>
+        <Date dateformat="00">20110210</Date>
       </PublishingDate>
       <PublishingDate>
         <PublishingDateRole>27</PublishingDateRole>
-        <DateFormat>00</DateFormat>
-        <Date>20110201</Date>
+        <Date dateformat="00">20110201</Date>
       </PublishingDate>
       <SalesRights>
         <SalesRightsType>01</SalesRightsType>

data/test/fixtures/onix_published_product_example.xml

@@ -41,8 +41,7 @@
       <PublishingStatus>04</PublishingStatus>
       <PublishingDate>
         <PublishingDateRole>01</PublishingDateRole>
-        <DateFormat>01</DateFormat>
-        <Date>201102</Date>
+        <Date dateformat="01">201102</Date>
       </PublishingDate>
       <SalesRights>
         <SalesRightsType>01</SalesRightsType>

data/test/fixtures/onix_puzzle_example.xml

@@ -102,12 +102,12 @@
       <!--PublishingStatusCode: ACTIVE--><PublishingStatus>04</PublishingStatus>
       <PublishingDate>
         <!--PublishingDateRole: PUBLICATION_DATE--><PublishingDateRole>01</PublishingDateRole>
-        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <!--DateFormat: YYYYMMDD-->
         <Date dateformat="00">20190227</Date>
       </PublishingDate>
       <PublishingDate>
         <!--PublishingDateRole: PREORDER_EMBARGO_DATE--><PublishingDateRole>27</PublishingDateRole>
-        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <!--DateFormat: YYYYMMDD-->
         <Date dateformat="00">20190213</Date>
       </PublishingDate>
       <SalesRights>

data/test/fixtures/onix_sale_restrictions_example.xml

@@ -41,8 +41,7 @@
       <PublishingStatus>04</PublishingStatus>
       <PublishingDate>
         <PublishingDateRole>01</PublishingDateRole>
-        <DateFormat>00</DateFormat>
-        <Date>20120712</Date>
+        <Date dateformat="00">20120712</Date>
       </PublishingDate>
       <SalesRights>
         <SalesRightsType>01</SalesRightsType>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_onix
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.17
 platform: ruby
 authors:
 - Marcin Urbanski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,6 +220,7 @@ files:
 - test/elibri_onix_test.rb
 - test/elibri_product_form_features_test.rb
 - test/elibri_product_form_test.rb
+- test/elibri_production_country_test.rb
 - test/elibri_publisher_info_test.rb
 - test/elibri_publishing_status_test.rb
 - test/elibri_record_identifiers_test.rb
@@ -239,6 +240,7 @@ files:
 - test/fixtures/onix_audiobook_example.xml
 - test/fixtures/onix_audiobook_extent_example.xml
 - test/fixtures/onix_board_game_example.xml
+- test/fixtures/onix_cn_production_country_example.xml
 - test/fixtures/onix_collective_work_example.xml
 - test/fixtures/onix_contributors_example.xml
 - test/fixtures/onix_ebook_extent_example.xml
@@ -288,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: EDItEUR ONIX format subset implementation used in Elibri publication system