elibri_onix 0.5.15 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7367d6b1d07cbd4a161bbd6a7ae0760466d4b6b3ace59975e06f026573e5944
-  data.tar.gz: 22f863fc8e21306ed1dbf320fa7efa3c20f18f55932cae3795e9c32d60c98f36
+  metadata.gz: ca0645c584580d719c89e9b25ff1908512fe60640860f8db37d1a9f38e27f46f
+  data.tar.gz: ee00d482ce6d81af64b2d0298dad3246defe9a95e254b3f98b6c07b3641b1545
 SHA512:
-  metadata.gz: 907a89cfdf1d7431eeafc4b98fb27f8eacf7145cd2c396351f53eddac38e3aa253fae78a097a7a3d2103581b864b25fd43437abe0e3d21c101ea492cf1c2017c
-  data.tar.gz: fc336cb061e06884535668ef61869a5c4f7b06eb327c8bddf2f49af9a54b603cf1cdd41b67330197193f92e4029a7996892000f92a70b16d7570ee7292c2b0c2
+  metadata.gz: 5d9f3bc6101130b9dba2636d17513d46333e178cb565a3bd241bfd54452ee0fad96f1e64a1cf1e079ad0bdfcddb07a1cc878804991663498f9c5bfc2f7be263d
+  data.tar.gz: 62a3deb1650b9fbee4e97a471db03737a1d0c992b6cc14318c82742d088624419d13cdc06d154a80034782ea6c156dbdf805c3e0886cfb31651d8a885648cb58

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

@@ -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
@@ -288,7 +295,8 @@ 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 }
+            #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
@@ -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
 
@@ -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) }
@@ -443,7 +454,12 @@ module Elibri
           else
             @sale_restricted_to_poland = false
           end
+        end
 
+        def exclusive_distributor_onix_code
+          if @sales_restrictions.size > 0
+            @sales_restrictions[0].outlet_code
+          end
         end
 
         def sales_restrictions?

data/lib/elibri_onix/onix_3_0/sales_restriction.rb

@@ -7,25 +7,29 @@ module Elibri
 
       class SalesRestriction
 
-        #from ONIX documentation:        
+        #from ONIX documentation:
         #A group of data elements which together identify a non-territorial sales restriction which a publisher applies to a product.
         #Optional and repeatable.
 
         include HashId
-        
+
         ATTRIBUTES = [
           :type, :outlet_name, :end_date
         ]
-        
+
         RELATIONS = []
-        
-        attr_accessor :type, :outlet_name, :end_date, :to_xml
-        
+
+        attr_accessor :type, :outlet_name, :outlet_code, :end_date, :to_xml
+
         def initialize(data)
           @to_xml = data.to_s
           @type = data.at_css('SalesRestrictionType').try(:text).try(:to_i)
           if data.at_css('SalesOutlet')
             @outlet_name = data.at_css('SalesOutlet').at_css('SalesOutletName').try(:text)
+            outlet_id_struct = data.at_css('SalesOutlet').at_css('SalesOutletIdentifier')
+            if outlet_id_struct && outlet_id_struct.at_css("SalesOutletIDType").try(:text) == "03"
+              @outlet_code = outlet_id_struct.at_css("IDValue").try(:text)
+            end
           end
           @end_date = Date.parse(data.at_css('EndDate').try(:text)) if data.at_css('EndDate')
         end

data/lib/elibri_onix/version.rb

@@ -2,7 +2,7 @@ module Elibri
   module ONIX
     z = $VERBOSE
     $VERBOSE = nil
-    VERSION = "0.5.15"
+    VERSION = "0.5.18"
     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_exclusive_distributor_test.rb

@@ -0,0 +1,11 @@
+require 'helper'
+
+describe Elibri::ONIX::Release_3_0::ONIXMessage do
+
+  it "should be able to parse information about exclusive distrubution restriction" do
+    product = load_fixture("onix_exclusive_distributor_example.xml")
+    assert product.sales_restrictions?
+    assert_equal "EMP", product.exclusive_distributor_onix_code
+  end
+
+end

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_formats_and_protection_test.rb

@@ -7,7 +7,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
     product = load_fixture("onix_epub_details_example.xml")
     assert_equal ["EPUB", "MOBI"], product.digital_formats
-    assert_equal "DRM", product.technical_protection
-    assert_equal "01", product.technical_protection_onix_code
+    assert_equal "watermark", product.technical_protection
+    assert_equal "02", product.technical_protection_onix_code
   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_epub_details_example.xml

@@ -21,7 +21,7 @@
       <ProductForm>EA</ProductForm>
       <ProductFormDetail>E101</ProductFormDetail>
       <ProductFormDetail>E127</ProductFormDetail>
-      <EpubTechnicalProtection>01</EpubTechnicalProtection>
+      <EpubTechnicalProtection>02</EpubTechnicalProtection>
       <TitleDetail>
         <TitleType>01</TitleType>
         <TitleElement>

data/test/fixtures/onix_exclusive_distributor_example.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>20111111</SentDateTime>
+  </Header>
+  <Product>
+    <RecordReference>fdb8fa072be774d97a97</RecordReference>
+    <NotificationType>03</NotificationType>
+    <ProductIdentifier>
+      <ProductIDType>15</ProductIDType>
+      <IDValue>9788324799992</IDValue>
+    </ProductIdentifier>
+    <DescriptiveDetail>
+      <ProductComposition>00</ProductComposition>
+      <ProductForm>EA</ProductForm>
+      <TitleDetail>
+        <TitleType>01</TitleType>
+        <TitleElement>
+          <TitleElementLevel>01</TitleElementLevel>
+          <TitleText>Nielegalni</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>
+      <PublishingDate>
+        <PublishingDateRole>01</PublishingDateRole>
+        <Date dateformat="00">20120712</Date>
+      </PublishingDate>
+      <SalesRights>
+        <SalesRightsType>01</SalesRightsType>
+        <Territory>
+          <RegionsIncluded>WORLD</RegionsIncluded>
+        </Territory>
+      </SalesRights>
+      <SalesRestriction>
+        <SalesRestrictionType>04</SalesRestrictionType>
+        <SalesOutlet>
+          <SalesOutletIdentifier>
+            <SalesOutletIDType>03</SalesOutletIDType>
+            <IDValue>EMP</IDValue>
+          </SalesOutletIdentifier>
+        </SalesOutlet>
+      </SalesRestriction>
+    </PublishingDetail>
+  </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.15
+  version: 0.5.18
 platform: ruby
 authors:
 - Marcin Urbanski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -208,6 +208,7 @@ files:
 - test/elibri_contributors_test.rb
 - test/elibri_ebook_files_test.rb
 - test/elibri_edition_test.rb
+- test/elibri_exclusive_distributor_test.rb
 - test/elibri_extensions_test.rb
 - test/elibri_extent_test.rb
 - test/elibri_formats_and_protection_test.rb
@@ -220,6 +221,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 +241,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
@@ -246,6 +249,7 @@ files:
 - test/fixtures/onix_edition_example.xml
 - test/fixtures/onix_elibri_extensions_example.xml
 - test/fixtures/onix_epub_details_example.xml
+- test/fixtures/onix_exclusive_distributor_example.xml
 - test/fixtures/onix_languages_example.xml
 - test/fixtures/onix_measurement_example.xml
 - test/fixtures/onix_no_contributors_example.xml
@@ -288,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: EDItEUR ONIX format subset implementation used in Elibri publication system