elibri_onix 0.4.4 → 0.5.0

data/lib/elibri_onix/onix_3_0/product_identifier.rb

@@ -32,9 +32,9 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:ProductIDType').try(:text)
-          @type_name = data.at_xpath('xmlns:IDTypeName').try(:text)
-          @value = data.at_xpath('xmlns:IDValue').try(:text)
+          @type = data.at_css('ProductIDType').try(:text)
+          @type_name = data.at_css('IDTypeName').try(:text)
+          @value = data.at_css('IDValue').try(:text)
         end
 
         #returs the string name of value type

data/lib/elibri_onix/onix_3_0/publisher.rb

@@ -27,24 +27,17 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_xpath('xmlns:PublishingRole').try(:text)
-          @name = data.at_xpath('xmlns:PublisherName').try(:text)
-          if data.at_xpath('xmlns:PublisherIdentifier')
-            @eid = data.at_xpath('xmlns:PublisherIdentifier').at_xpath('xmlns:IDValue').try(:text).try(:to_i)
+          @role = data.at_css('PublishingRole').try(:text)
+          @name = data.at_css('PublisherName').try(:text)
+          if data.at_css('PublisherIdentifier')
+            @eid = data.at_css('PublisherIdentifier').at_css('IDValue').try(:text).try(:to_i)
           end
         end
 
         def inspect_include_fields
           [:eid, :name]
         end
-        
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          @eid
-        end
-        
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/publishing_date.rb

@@ -24,9 +24,9 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_xpath('xmlns:PublishingDateRole').try(:text)
-          @format = data.at_xpath('xmlns:DateFormat').try(:text)
-          @date = data.at_xpath('xmlns:Date').try(:text)
+          @role = data.at_css('PublishingDateRole').try(:text)
+          @format = data.at_css('DateFormat').try(:text)
+          @date = data.at_css('Date').try(:text)
         end
 
         def parsed

data/lib/elibri_onix/onix_3_0/related_product.rb

@@ -27,8 +27,8 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @relation_code = data.at_xpath('xmlns:ProductRelationCode').try(:text)
-          @identifiers = data.xpath('xmlns:ProductIdentifier').map { |identifier_data| ProductIdentifier.new(identifier_data) }
+          @relation_code = data.at_css('ProductRelationCode').try(:text)
+          @identifiers = data.css('ProductIdentifier').map { |identifier_data| ProductIdentifier.new(identifier_data) }
         end
 
         

data/lib/elibri_onix/onix_3_0/sales_restriction.rb

@@ -23,11 +23,11 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:SalesRestrictionType').try(:text).try(:to_i)
-          if data.at_xpath('xmlns:SalesOutlet')
-            @outlet_name = data.at_xpath('xmlns:SalesOutlet').at_xpath('xmlns:SalesOutletName').try(:text)
+          @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)
           end
-          @end_date = Date.parse(data.at_xpath('xmlns:EndDate').try(:text)) if data.at_xpath('xmlns:EndDate')
+          @end_date = Date.parse(data.at_css('EndDate').try(:text)) if data.at_css('EndDate')
         end
 
       end

data/lib/elibri_onix/onix_3_0/sender.rb

@@ -34,9 +34,9 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @sender_name = data.at_xpath('xmlns:SenderName').text
-          @contact_name = data.at_xpath('xmlns:ContactName').text
-          @email_address = data.at_xpath('xmlns:EmailAddress').text
+          @sender_name = data.at_css('SenderName').text
+          @contact_name = data.at_css('ContactName').text
+          @email_address = data.at_css('EmailAddress').text
         end
         
       end

data/lib/elibri_onix/onix_3_0/stock_quantity_coded.rb

@@ -21,8 +21,8 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @code_type = data.at_xpath('xmlns:StockQuantityCodeType').try(:text).try(:to_i)
-          @code = data.at_xpath('xmlns:StockQuantityCode').try(:text)
+          @code_type = data.at_css('StockQuantityCodeType').try(:text).try(:to_i)
+          @code = data.at_css('StockQuantityCode').try(:text)
         end
         
       end

data/lib/elibri_onix/onix_3_0/supplier.rb

@@ -24,13 +24,13 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_xpath('xmlns:SupplierRole').try(:text).try(:to_i)
-          @identifiers = data.xpath('xmlns:SupplierIdentifier').map { |identifier_data| SupplierIdentifier.new(identifier_data) }
-          @name = data.at_xpath('xmlns:SupplierName').try(:text)
-          @telephone_number = data.at_xpath('xmlns:TelephoneNumber').try(:text)
-          @email_address = data.at_xpath('xmlns:EmailAddress').try(:text)
-          if data.at_xpath('xmlns:Website')
-            @website = data.at_xpath('xmlns:Website').at_xpath('xmlns:WebsiteLink').try(:text) 
+          @role = data.at_css('SupplierRole').try(:text)
+          @identifiers = data.css('SupplierIdentifier').map { |identifier_data| SupplierIdentifier.new(identifier_data) }
+          @name = data.at_css('SupplierName').try(:text)
+          @telephone_number = data.at_css('TelephoneNumber').try(:text)
+          @email_address = data.at_css('EmailAddress').try(:text)
+          if data.at_css('Website')
+            @website = data.at_css('Website').at_css('WebsiteLink').try(:text) 
           end
         end
 

data/lib/elibri_onix/onix_3_0/supplier_identifier.rb

@@ -26,9 +26,9 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:SupplierIDType').try(:text)
-          @type_name = data.at_xpath('xmlns:IDTypeName').try(:text)
-          @value = data.at_xpath('xmlns:IDValue').try(:text)
+          @type = data.at_css('SupplierIDType').try(:text)
+          @type_name = data.at_css('IDTypeName').try(:text)
+          @value = data.at_css('IDValue').try(:text)
         end
 
       end

data/lib/elibri_onix/onix_3_0/supply_detail.rb

@@ -15,23 +15,28 @@ module Elibri
         
 
         ATTRIBUTES = [
-          :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :quantity_code
+          :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :quantity_code, :additional_trade_information
         ]
         
-        attr_accessor :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :to_xml
+        attr_accessor :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :to_xml, :additional_trade_information
 
         RELATIONS = []
         
         def initialize(data)
           @to_xml = data.to_s
-          @relation_code = data.at_xpath('xmlns:ProductRelationCode').try(:text).try(:to_i)
-          @supplier = Supplier.new(data.at_xpath('xmlns:Supplier')) if data.at_xpath('xmlns:Supplier')
-          @product_availability = data.at_xpath('xmlns:ProductAvailability').try(:text).try(:to_i)
-          @pack_quantity = data.at_xpath('xmlns:PackQuantity').try(:text).try(:to_i)
-          @price = Price.new(data.at_xpath('xmlns:Price')) if data.at_xpath('xmlns:Price')
-          if data.at_xpath('xmlns:Stock')
-            @on_hand = data.at_xpath('xmlns:Stock').at_xpath('xmlns:OnHand').try(:text).try(:to_i)
-            @quantity_coded = StockQuantityCoded.new(data.at_xpath('xmlns:Stock').at_xpath('xmlns:StockQuantityCoded')) if data.at_xpath('xmlns:Stock').at_xpath('xmlns:StockQuantityCoded')
+          @relation_code = data.at_css('ProductRelationCode').try(:text).try(:to_i)
+          @supplier = Supplier.new(data.at_css('Supplier')) if data.at_css('Supplier')
+          @product_availability = data.at_css('ProductAvailability').try(:text).try(:to_i)
+          @pack_quantity = data.at_css('PackQuantity').try(:text).try(:to_i)
+          @price = Price.new(data.at_css('Price')) if data.at_css('Price')
+          if data.at_css('Stock')
+            @on_hand = data.at_css('Stock').at_css('OnHand').try(:text).try(:to_i)
+            @quantity_coded = StockQuantityCoded.new(data.at_css('Stock').at_css('StockQuantityCoded')) if data.at_css('Stock').at_css('StockQuantityCoded')
+          end
+          if own_coding = data.at_css('SupplierOwnCoding')
+            if own_coding.at_css('SupplierCodeType').text == Elibri::ONIX::Dict::Release_3_0::SupplierOwnCodeType::SUPPLIERS_SALES_CLASSIFICATION
+              @additional_trade_information = own_coding.at_css('SupplierCodeValue').text 
+            end
           end
         end
 

data/lib/elibri_onix/onix_3_0/supporting_resource.rb

@@ -20,14 +20,15 @@ module Elibri
           :inspect_include_fields
         ]
         
-        attr_accessor :content_type, :mode, :form, :link, :to_xml
+        attr_accessor :content_type, :mode, :form, :link, :to_xml, :data
         
         def initialize(data)
+          @data = data
           @to_xml = data.to_s
-          @content_type = data.at_xpath('xmlns:ResourceContentType').try(:text)
-          @mode = data.at_xpath('xmlns:ResourceMode').try(:text)
-          @form = data.at_xpath('xmlns:ResourceVersion').at_xpath('xmlns:ResourceForm').try(:text)
-          @link = data.at_xpath('xmlns:ResourceVersion').at_xpath('xmlns:ResourceLink').try(:text)
+          @content_type = data.at_css('ResourceContentType').try(:text)
+          @mode = data.at_css('ResourceMode').try(:text)
+          @form = data.at_css('ResourceVersion').at_css('ResourceForm').try(:text)
+          @link = data.at_css('ResourceVersion').at_css('ResourceLink').try(:text)
           set_eid(data)
           set_datestamp(data)
         end

data/lib/elibri_onix/onix_3_0/text_content.rb

@@ -25,12 +25,12 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:TextType').try(:text)
-          @author = data.at_xpath('xmlns:TextAuthor').try(:text)
-          @source_title = data.at_xpath('xmlns:SourceTitle').try(:text)
-          if data.at_xpath('xmlns:Text')
-            @text = data.at_xpath('xmlns:Text').children.find { |x| x.cdata? }.try(:text) #cdata => true ?
-            @source_url =  data.at_xpath('xmlns:Text').attribute('sourcename').try(:text)
+          @type = data.at_css('TextType').try(:text)
+          @author = data.at_css('TextAuthor').try(:text)
+          @source_title = data.at_css('SourceTitle').try(:text)
+          if data.at_css('Text')
+            @text = data.at_css('Text').children.find { |x| x.cdata? }.try(:text) #cdata => true ?
+            @source_url =  data.at_css('Text').attribute('sourcename').try(:text)
           end
           set_eid(data)
           set_datestamp(data)

data/lib/elibri_onix/onix_3_0/thema_subject.rb

@@ -0,0 +1,33 @@
+
+module Elibri
+  module ONIX
+    module Release_3_0
+
+      #Kategoria Themy
+      class ThemaSubject
+
+        include HashId
+
+        ATTRIBUTES = [
+          :code, :heading_text
+        ]
+
+        RELATIONS = [
+          :inspect_include_fields
+        ]
+
+        attr_accessor :code, :heading_text, :to_xml
+
+        def initialize(data)
+          @to_xml = data.to_s
+          @code = data.at_css('SubjectCode').try(:text)
+          @heading_text = data.at_css('SubjectHeadingText').try(:text)
+        end
+
+        def inspect_include_fields
+          [:code]
+        end
+      end
+    end
+  end
+end

data/lib/elibri_onix/onix_3_0/title_detail.rb

@@ -26,17 +26,8 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:TitleType').try(:text)
-          @elements = data.xpath('xmlns:TitleElement').map { |element_data| TitleElement.new(element_data) }
-        end
-
-    #    def eid
-    #      @type.to_i
-    #    end 
-        
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
+          @type = data.at_css('TitleType').try(:text)
+          @elements = data.css('TitleElement').map { |element_data| TitleElement.new(element_data) }
         end
 
         def type_name

data/lib/elibri_onix/onix_3_0/title_element.rb

@@ -30,10 +30,10 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @level = data.at_xpath('xmlns:TitleElementLevel').try(:text)
-          @part_number = data.at_xpath('xmlns:PartNumber').try(:text)
-          @title = data.at_xpath('xmlns:TitleText').try(:text)
-          @subtitle = data.at_xpath('xmlns:Subtitle').try(:text)
+          @level = data.at_css('TitleElementLevel').try(:text)
+          @part_number = data.at_css('PartNumber').try(:text)
+          @title = data.at_css('TitleText').try(:text)
+          @subtitle = data.at_css('Subtitle').try(:text)
         end
 
         def full_title

data/lib/elibri_onix/releases.rb

@@ -1,10 +1,10 @@
 
 
 %w{
-    sender header product_identifier measure title_element title_detail collection contributor subject
+    sender header product_identifier measure title_element title_detail collection contributor
     language extent audience_range text_content supporting_resource imprint publisher publishing_date
     sales_restriction related_product supplier_identifier stock_quantity_coded price supplier supply_detail
-    product onix_message excerpt_info file_info
+    product onix_message excerpt_info file_info thema_subject
   }.each do |file_name|
   require File.join(File.dirname(__FILE__), "onix_3_0", file_name)
 end  

data/lib/elibri_onix/version.rb

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

data/test/cover_test.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+
+describe "CoverType" do
+
+  it "should be able to determine the cover type" do
+    assert_equal "gąbka",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BF", nil)
+    assert_equal "miękka",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BC", nil)
+    assert_equal "miękka ze skrzydełkami",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BC", "B504")
+    assert_equal "plastikowa",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BB", "B413")
+    assert_equal "skórzana",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BG", nil)
+    assert_equal "twarda",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BB", nil)
+    assert_equal "twarda lakierowana",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BB", "B415")
+    assert_equal "twarda z obwolutą",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BB", "B501")
+    assert_equal "zintegrowana",  Elibri::ONIX::Release_3_0::Product.determine_cover_type("BC", "B412")
+  end
+
+end

data/test/elibri_audiobook_test.rb

@@ -0,0 +1,33 @@
+#encoding: UTF-8
+require 'helper'
+
+describe Elibri::ONIX::Release_3_0::ONIXMessage do
+
+  it "should be able to parse audiobook info" do
+    product = load_fixture("onix_audiobook_example.xml")
+
+    assert_equal 1, product.excerpt_infos.size
+    e = product.excerpt_infos[0]
+
+    assert_equal 2589928, e.file_size
+    assert_equal "0bf20c528f323dd2a6d91627ccddf52e", e.md5
+    assert_equal "mp3_excerpt", e.file_type
+    assert_equal Time.parse("20190712T2158Z"), e.updated_at
+    assert_equal "https://www.elibri.com.pl/excerpt/109048/0bf20c528f323dd2a6d91627ccddf52e/kwiaty-dla-algernona-fragment.mp3", e.link
+    assert_equal 109048, e.eid
+
+    assert_equal 524, product.duration
+    assert_equal "audio recording file", product.product_form_name
+
+    assert_equal 23, product.vat
+    assert_equal 34.90, product.cover_price
+
+    assert_equal '9788380625952', product.isbn13
+    assert_equal '9788380625952', product.hyphenated_isbn
+
+    assert_equal "20250307", product.licence_limited_to_before_type_cast
+    assert_equal Date.new(2025, 3, 7), product.licence_limited_to
+    refute product.unlimited_licence
+  end
+
+end

data/test/elibri_extensions_test.rb

@@ -15,4 +15,13 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "PROMOCJA!", product.additional_info
   end
 
+  it "should be able to parse the info without the propertiary extensions" do
+    product = load_fixture("onix_removed_elibri_extensions.xml")
+    assert_equal 12.99, product.cover_price
+    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

@@ -9,7 +9,6 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     
     onix = Elibri::ONIX::Release_3_0::ONIXMessage.new(xml_string)
     assert_equal '3.0', onix.release
-    assert_equal '3.0.1', onix.elibri_dialect
     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
@@ -18,7 +17,6 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 1, onix.products.size 
 
     product = onix.products.first
-    assert_equal '3.0.1', product.elibri_dialect
 
     assert_equal 'miękka', product.cover_type 
     assert_equal 12.99, product.cover_price
@@ -73,18 +71,6 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 250, product.number_of_pages
     assert_equal 32, product.number_of_illustrations
 
-    assert_equal 2, product.subjects.size 
-    assert !product.subjects[1].main_subject?
-
-    product.subjects[0].tap do |first_subject|
-      assert first_subject.main_subject?
-      assert_equal 24, first_subject.scheme_identifier
-      assert_equal 'elibri.com.pl', first_subject.scheme_name
-      assert_equal '1.0', first_subject.scheme_version
-      assert_equal '1110', first_subject.code
-      assert_equal 'Beletrystyka / Literatura popularna / Powieść historyczna', first_subject.heading_text
-    end
-
     assert_equal 7, product.reading_age_from 
     assert_equal 25, product.reading_age_to
 
@@ -138,7 +124,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
     product.supply_details.first.tap do |supply_detail|
       supply_detail.supplier.tap do |supplier|
-        assert_equal 3, supplier.role
+        assert_equal "03", supplier.role
         assert_equal '5213359408', supplier.nip
         assert_equal 'Gildia.pl', supplier.name 
         assert_equal "22 631 40 83", supplier.telephone_number
@@ -151,14 +137,14 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
       assert_equal 7, supply_detail.pack_quantity
 
       supply_detail.price.tap do |price|
-        assert_equal 2, price.type
+        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 'PLN', price.currency_code
-        assert_equal 2, price.printed_on_product
+        assert_equal "02", price.printed_on_product
         assert price.printed_on_product?
-        assert_equal 0, price.position_on_product
+        assert_equal "00", price.position_on_product
       end
     end