elibri_onix 0.5.19 → 0.6.0

data/lib/elibri_onix/onix_3_0/supplier.rb

@@ -1,45 +1,27 @@
-
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class Supplier
-        
-        #from ONIX documentation:
-        #A group of data elements which together define a supplier. Mandatory in each occurrence of the <SupplyDetail> composite, and not repeatable.
 
-        ATTRIBUTES = [
-          :role, :name, :telephone_number, :email_address, :website, :nip
-        ]
-        
-        RELATIONS = [
-          :identifiers
-        ]
-        
-        include HashId
-        
         attr_accessor :role, :identifiers, :name, :telephone_number, :email_address, :website, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_css('SupplierRole').try(:text)
+          @role = data.at_css('SupplierRole')&.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)
+          @name = data.at_css('SupplierName')&.text
+          @telephone_number = data.at_css('TelephoneNumber')&.text
+          @email_address = data.at_css('EmailAddress')&.text
           if data.at_css('Website')
-            @website = data.at_css('Website').at_css('WebsiteLink').try(:text) 
+            @website = data.at_css('Website').at_css('WebsiteLink')&.text
           end
         end
 
         def nip
-          @identifiers.find {|identifier| (identifier.type == '02') && (identifier.type_name == 'NIP')}.try(:value)
+          @identifiers.find {|identifier| (identifier.type == '02') && (identifier.type_name == 'NIP')}&.value
         end
 
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/supplier_identifier.rb

@@ -1,34 +1,15 @@
-
-
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class SupplierIdentifier
-        
-        #from ONIX documentation:
-        #A repeatable group of data elements which together define the identifier of a supplier in accordance with a specified scheme,
-        #and allowing different types of supplier identifier to be included without defining additional data elements.
-        #Optional, but each occurrence of the <Supplier> composite must carry either at least one supplier identifier,
-        #or a <SupplierName>, or both.
-       
-       include HashId 
 
-        ATTRIBUTES = [
-          :type, :type_name, :value
-        ]
-        
-        RELATIONS = []
-        
         attr_accessor :type, :type_name, :value, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_css('SupplierIDType').try(:text)
-          @type_name = data.at_css('IDTypeName').try(:text)
-          @value = data.at_css('IDValue').try(:text)
+          @type = data.at_css('SupplierIDType')&.text
+          @type_name = data.at_css('IDTypeName')&.text
+          @value = data.at_css('IDValue')&.text
         end
 
       end

data/lib/elibri_onix/onix_3_0/supply_detail.rb

@@ -1,51 +1,34 @@
-
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class SupplyDetail
-        
-        #from ONIX documentation:
-        #A group of data elements which together give details of a supply source, and price and availability from that source.
-        #Mandatory in each occurrence of the <ProductSupply> block and repeatable.
-
-        include HashId
-        
 
-        ATTRIBUTES = [
-          :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, :additional_trade_information
+        attr_accessor :relation_code, :supplier, :product_availability, :pack_quantity, :prices,
+                      :on_hand, :quantity_coded, :to_xml, :additional_trade_information
 
-        RELATIONS = []
-        
         def initialize(data)
           @to_xml = data.to_s
-          @relation_code = data.at_css('ProductRelationCode').try(:text).try(:to_i)
+          @relation_code = data.at_css('ProductRelationCode')&.text&.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')
+          @product_availability = data.at_css('ProductAvailability')&.text&.to_i
+          @pack_quantity = data.at_css('PackQuantity')&.text&.to_i
+          @prices = data.css("Price").map { |p| Price.new(p) }
           if data.at_css('Stock')
-            @on_hand = data.at_css('Stock').at_css('OnHand').try(:text).try(:to_i)
+            @on_hand = data.at_css('Stock').at_css('OnHand')&.text&.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 
+              @additional_trade_information = own_coding.at_css('SupplierCodeValue').text
             end
           end
         end
 
         def quantity_code
-          @quantity_coded.try(:code)
+          @quantity_coded&.code
         end
 
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/supporting_resource.rb

@@ -1,5 +1,3 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
@@ -8,27 +6,16 @@ module Elibri
         include ExternalId
         include ExternalTimestamp
         include Inspector
-        
-        #from ONIX documentation:
-        #An optional and repeatable group of data elements which together describe a supporting resource.
-        
-        ATTRIBUTES = [
-          :content_type, :mode, :form, :link, :content_type_name, :mode_name, :form_name
-        ]
-        
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-        
+
         attr_accessor :content_type, :mode, :form, :link, :to_xml, :data
-        
+
         def initialize(data)
           @data = data
           @to_xml = data.to_s
-          @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)
+          @content_type = data.at_css('ResourceContentType')&.text
+          @mode = data.at_css('ResourceMode')&.text
+          @form = data.at_css('ResourceVersion').at_css('ResourceForm')&.text
+          @link = data.at_css('ResourceVersion').at_css('ResourceLink')&.text
           set_eid(data)
           set_datestamp(data)
         end
@@ -41,7 +28,7 @@ module Elibri
             raise ArgumentError, "Cannot find ResourceContentType for #{@content_type}"
           end
         end
- 
+
         #def audience_name
         #  Elibri::ONIX::Dict::Release_3_0::ContentAudience.find_by_onix_code(audience).const_name.downcase
         #end

data/lib/elibri_onix/onix_3_0/text_content.rb

@@ -1,46 +1,31 @@
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class TextContent
         include ExternalId
         include ExternalTimestamp
         include Inspector
-         
-        #from ONIX documentation:
-        #An optional and repeatable group of data elements which together carry text related to the product.
-  
-        #:nodoc:    
-        ATTRIBUTES = [
-          :type, :author, :source_title, :text, :source_url, :type_name
-        ]
-        
-        #:nodoc:
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-        
+
         attr_accessor :type, :author, :source_title, :text, :source_url, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_css('TextType').try(:text)
-          @author = data.at_css('TextAuthor').try(:text)
-          @source_title = data.at_css('SourceTitle').try(:text)
+          @type = data.at_css('TextType')&.text
+          @author = data.at_css('TextAuthor')&.text
+          @source_title = data.at_css('SourceTitle')&.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)
+            @text = data.at_css('Text').children.find { |x| x.cdata? }&.text #cdata => true ?
+            @source_url =  data.at_css('Text').attribute('sourcename')&.text
           end
           set_eid(data)
           set_datestamp(data)
         end
 
         def type_name
-          Elibri::ONIX::Dict::Release_3_0::OtherTextType.find_by_onix_code(@type).try(:const_name).try(:downcase)
+          Elibri::ONIX::Dict::Release_3_0::OtherTextType.find_by_onix_code(@type)&.const_name&.downcase
         end
 
- 
+
         def inspect_include_fields
           [:type_name, :text]
         end

data/lib/elibri_onix/onix_3_0/thema_subject.rb

@@ -1,27 +1,14 @@
-
 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)
+          @code = data.at_css('SubjectCode')&.text
+          @heading_text = data.at_css('SubjectHeadingText')&.text
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/title_detail.rb

@@ -1,32 +1,13 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class TitleDetail
-        
-        #from ONIX documentation:
-        #A repeatable group of data elements which together give the text of a collection title and specify its type.
-        #Optional, but the composite is required unless the collection title is carried in full, and word-for- word,
-        #as an integral part of the product title in P.6, in which case it should not be repeated in P.5.
-        
-        include HashId        
-        
-        ATTRIBUTES = [
-          :type, :type_name, :full_title, :product_level_title, :product_level, :collection_level_title,
-          :collection_level
-        ]
-        
-        RELATIONS = [
-          :elements, :inspect_include_fields
-        ]
-        
+
         attr_accessor :type, :elements, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_css('TitleType').try(:text)
+          @type = data.at_css('TitleType')&.text
           @elements = data.css('TitleElement').map { |element_data| TitleElement.new(element_data) }
         end
 
@@ -40,16 +21,16 @@ module Elibri
 
         def full_title
           String.new.tap do |_full_title|
-            _full_title << collection_level_title if collection_level_title.present?
-            if product_level_title.present?
-              _full_title << ". " if _full_title.present?
-              _full_title << product_level_title 
+            _full_title << collection_level_title if collection_level_title && collection_level_title.size > 0
+            if product_level_title && product_level_title.size > 0
+              _full_title << ". " if _full_title && _full_title.size > 0
+              _full_title << product_level_title
             end
           end
         end
 
         def product_level_title
-          product_level.try(:full_title)
+          product_level&.full_title
         end
 
         def product_level
@@ -57,7 +38,7 @@ module Elibri
         end
 
         def collection_level_title
-          collection_level.try(:full_title)
+          collection_level&.full_title
         end
 
         def collection_level

data/lib/elibri_onix/onix_3_0/title_element.rb

@@ -1,60 +1,35 @@
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class TitleElement
-      
-        #from ONIX documentation:
-        #A repeatable group of data elements which together represent an element of a collection title.
-        #At least one title element is mandatory in each occurrence of the <TitleDetail> composite.
-        #An instance of the <TitleElement> composite must include at least one of: <PartNumber>; <YearOfAnnual>; <TitleText>, or <TitlePrefix> together
-        #with <TitleWithoutPrefix>. In other words it must carry either the text of a title element or a part or year designation; and it may carry both.
-        #A title element must be designated as belonging to product level, collection level, or subcollection level
-        #(the first of these may not occur in a title element representing a collective identity, and the last-named may only occur
-        #in the case of a multi-level collection).
-        #In the simplest case, title detail sent in a <Collection> composite will consist of a single title element, at collection level.
-        #However, the composite structure in ONIX 3.0 allows more complex combinations of titles and part designations in multi-level
-        #collections to be correctly represented.
-
-
-        include HashId
 
-        ATTRIBUTES = [
-          :level, :part_number, :title, :subtitle, :full_title
-        ]
-        
-        RELATIONS = []
-        
         attr_accessor :level, :part_number, :title, :subtitle, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @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)
+          @level = data.at_css('TitleElementLevel')&.text
+          @part_number = data.at_css('PartNumber')&.text
+          @title = data.at_css('TitleText')&.text
+          @subtitle = data.at_css('Subtitle')&.text
         end
 
         def full_title
           String.new(self.title.to_s.strip).tap do |_full_title|
             if _full_title =~ /[\.!\?]$/ #czy kończy się ?!.
-              _full_title << " " + self.subtitle if self.subtitle.present?
+              _full_title << " " + self.subtitle if self.subtitle && self.subtitle.size > 0
             else
-              _full_title << ". " + self.subtitle if self.subtitle.present?
+              _full_title << ". " + self.subtitle if self.subtitle && self.subtitle.size > 0
             end
-            if self.part_number.present?
+            if self.part_number && self.part_number.size > 0
               if self.part_number.to_i.to_s == self.part_number
-                _full_title << " (##{self.part_number})" 
+                _full_title << " (##{self.part_number})"
               else
                 _full_title << " (#{self.part_number})"
-              end 
+              end
             end
           end
         end
-
       end
-
     end
   end
 end

data/lib/elibri_onix/releases.rb

@@ -4,7 +4,7 @@
     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 thema_subject publisher_subject
+    product onix_message excerpt_info file_info thema_subject publisher_subject price_identifier price_constraint_limit
   }.each do |file_name|
   require File.join(File.dirname(__FILE__), "onix_3_0", file_name)
-end  
+end

data/lib/elibri_onix/timestamp_parser.rb

@@ -0,0 +1,12 @@
+module TimestampParser
+
+  def parse_timestamp(value)
+    year = value[0...4].to_i
+    month = value[4...6].to_i
+    day = value[6...8].to_i
+    h = value[9...11].to_i
+    m = value[11...13].to_i
+    Time.new(year, month, day, h, m)
+  end
+end
+

data/lib/elibri_onix/version.rb

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

data/lib/elibri_onix.rb

@@ -1,16 +1,12 @@
-
-require 'bigdecimal'
+require 'i18n'
 require 'date'
-# Old ActiveSupport needs 'thread' to see Mutex:
-require 'thread'
-require 'active_support'
-require 'active_support/core_ext'
+require 'bigdecimal'
 require 'nokogiri'
 require 'elibri_onix/version'
 require 'elibri_onix/inspector'
 require 'elibri_onix/external_id'
-require 'elibri_onix/hash_id'
 require 'elibri_onix/external_timestamp'
+require 'elibri_onix/timestamp_parser'
 require 'elibri_onix/releases'
 require 'elibri_onix_dict'
 
@@ -18,7 +14,7 @@ require 'elibri_onix_dict'
 module Elibri
   module ONIX
     module Release_3_0; end
-    
+
   end
 end
 

data/test/elibri_audiobook_test.rb

@@ -12,7 +12,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     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 Time.new(2019, 7, 12, 21, 58), 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
 

data/test/elibri_contributors_test.rb

@@ -15,17 +15,17 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "contributorid:255", cont1.id_before_type_cast
     assert_equal 255, cont1.eid
     assert_equal "20111104T0905", cont1.datestamp_before_type_cast
-    assert_equal Date.new(2011, 11, 04).to_time + 9.hours + 5.minutes, cont1.datestamp
+    assert_equal Time.new(2011, 11, 04, 9, 5), cont1.datestamp
 
     assert_equal "author", cont1.role_name
     assert_equal "Św. Tomasz z Akwinu", cont1.person_name
     assert_equal ["Św. Tomasz z Akwinu"], product.authors
-    assert cont1.biographical_note.present?
+    assert cont1.biographical_note && cont1.biographical_note.size > 0
 
     assert_equal "translator", cont2.role_name
     assert_equal "prof. ks. Henryk von Hausswolff OP", cont2.person_name
     assert_equal ["prof. ks. Henryk von Hausswolff OP"], product.translators
-  
+
     product = load_fixture("onix_no_contributors_example.xml")
     assert product.no_contributor?
     assert !product.unnamed_persons?

data/test/elibri_ebook_files_test.rb

@@ -11,7 +11,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 2100230, e.file_size
     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 Time.new(2012, 12, 30, 15, 18), e.updated_at
     assert_equal "https://www.elibri.com.pl/excerpt/767/4b145ff46636b06f49225abdab70927f/fragment.epub", e.link
     assert_equal 767, e.eid
 
@@ -20,7 +20,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal 4197382, f.file_size
     assert_equal "e9353ce40eaa677f8c5d666c2f8bbb3f", f.md5
     assert_equal "epub", f.file_type
-    assert_equal Time.parse("2012-12-30 15:18 +00:00"), f.updated_at
+    assert_equal Time.new(2012, 12, 30, 15, 18), f.updated_at
     assert_equal 765, f.eid
   end
 

data/test/elibri_extensions_test.rb

@@ -3,18 +3,6 @@ require 'helper'
 
 describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
-  it "should be able to parse elibri extensions" do
-    product = load_fixture("onix_elibri_extensions_example.xml")
-
-    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 "VIC", product.pdw_exclusiveness
-    assert product.preview_exists?
-    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

data/test/elibri_group_contributor_test.rb

@@ -18,7 +18,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "author", cont1.role_name
     assert_nil cont1.person_name
     assert_equal ["praca zbiorowa"], product.authors
-    assert !cont1.biographical_note.present?
+    assert_nil cont1.biographical_note
 
   end
 

data/test/elibri_onix_release_3_0_onix_message_test.rb

@@ -16,11 +16,6 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
     product = onix.products.first
 
-    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
@@ -134,7 +129,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
       assert_equal 1000, supply_detail.on_hand
       assert_equal 7, supply_detail.pack_quantity
 
-      supply_detail.price.tap do |price|
+      supply_detail.prices[0].tap do |price|
         assert_equal "02", price.type
         assert_equal 20, price.minimum_order_quantity
         assert_equal 12.99, price.amount

data/test/elibri_record_identifiers_test.rb

@@ -4,11 +4,11 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
   it "should be able to parse record identifiers" do
     product = load_fixture("onix_record_identifiers_example.xml")
-    
+
     assert_equal "fdb8fa072be774d97a97", product.record_reference
     assert_equal '9788324799992', product.isbn13
     assert_equal '9788324788882', product.ean
-    assert_equal '978-83-2478-888-2', product.hyphenated_isbn
+    assert_equal '9788324799992', product.hyphenated_isbn
 
     assert_equal({"Olesiejuk" => "355006"}, product.proprietary_identifiers)
 

data/test/elibri_supporting_resources_test.rb

@@ -4,7 +4,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
 
   it "should be able to parse attachment informations" do
     product = load_fixture("onix_supporting_resources_example.xml")
-    
+
     assert_equal 2, product.supporting_resources.size
 
     assert_equal product.supporting_resources.first, product.front_cover
@@ -14,7 +14,7 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "downloadable_file", product.supporting_resources.first.form_name
 
     assert_equal "http://elibri.com.pl/sciezka/do/pliku.png", product.front_cover.link
-    assert_equal Date.new(2011, 12, 1) + 18.hours + 5.minutes, product.front_cover.datestamp
+    assert_equal Time.new(2011, 12, 1, 18, 5), product.front_cover.datestamp
     assert_equal 667, product.front_cover.eid
 
     assert_equal "widget", product.supporting_resources[1].content_type_name