elibri_onix 0.5.19 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37003b2ae4622d77476776909412cc7a9d48b4e25363244a8d3c45fcd6aaffe3
-  data.tar.gz: 65ba9e79b43513d0d26840ec1599f0f605faf66a3ec8df58882ff7a7e4e5a49c
+  metadata.gz: bba229e4695b80bfae5a39c57de112d2138e12929b3adea66365313fa2e8465e
+  data.tar.gz: 0a84191b7cd8a532a9eeeb5d2ef5ee57f79470f043cb49d0eaab36307fae9002
 SHA512:
-  metadata.gz: a9964327c8934259778d663562bf814f39248877cf4b2eb97cdf85680d3306100664d8822ca8b754e1866b8d8db889c8ef11db4b90b97cc53562b52397b57127
-  data.tar.gz: b10744c7de5f78ae9e7b57dd3fd835949fc8b0a5fc2c772618650e910e8e92f4cca5ac6e97e2eb77fc5c088f8c8f4e86e1f3d0a96baf674015b2404e12b5c8d2
+  metadata.gz: 0f25ff63e528bb3bd1cadedd36f30753562576e06c71acecf65a31e17076f0d3e294344b28bc0daa71d681e98e2bc805a931a7cb42f22f7dea6976f6cc59c414
+  data.tar.gz: 58d6369ddfa282f469480b3793855d3cb0a3eb47faf289b2c1a3dfc4d8cd9eeef1aadd306609996e928cf27c5140de3ffc0569f5a3fd2e6af5a39f13d945f3fb

data/lib/elibri_onix/external_timestamp.rb

@@ -3,7 +3,7 @@ module ExternalTimestamp
   def self.included(base)
     base.send(:attr_accessor, :datestamp_before_type_cast) #, :from => "@datestamp"
   end
-  
+
   def set_datestamp(data)
     @datestamp_before_type_cast = data.attr('datestamp')
   end
@@ -15,7 +15,7 @@ module ExternalTimestamp
     h = datestamp_before_type_cast[9...11].to_i
     m = datestamp_before_type_cast[11...13].to_i
 
-    Date.new(year, month, day) + h.hours + m.minutes
+    Time.new(year, month, day, h, m)
   end
 
 end

data/lib/elibri_onix/onix_3_0/audience_range.rb

@@ -1,29 +1,16 @@
-
 module Elibri
   module ONIX
     module Release_3_0
 
       class AudienceRange
-        
-        #from ONIX documentation:
-        #An optional and repeatable group of data elements which together describe an audience or readership range for which a product
-        #is intended.
- 
-        #:nodoc:       
-        ATTRIBUTES = [
-          :qualifier, :precision, :value
-        ]
-        
-        #:nodoc:
-        RELATIONS = []
-        
+
         attr_reader :qualifier, :precision, :value, :to_xml
 
         def initialize(data)
           @old_xml = data.to_s
-          @qualifier = data.at_css('AudienceRangeQualifier').try(:text)
-          @precision = data.at_css('AudienceRangePrecision').try(:text)
-          @value = data.at_css('AudienceRangeValue').try(:text).try(:to_i)
+          @qualifier = data.at_css('AudienceRangeQualifier')&.text
+          @precision = data.at_css('AudienceRangePrecision')&.text
+          @value = data.at_css('AudienceRangeValue')&.text&.to_i
         end
 
       end

data/lib/elibri_onix/onix_3_0/contributor.rb

@@ -2,39 +2,16 @@
 module Elibri
   module ONIX
     module Release_3_0
-
       class Contributor
         include ExternalId
         include ExternalTimestamp
         include Inspector
 
-        #from ONIX documentation:
-        #Authorship and other forms of contribution are described by repeats of the <Contributor> composite, 
-        #within which the recommended form of representation of a person name is the structured data element 
-        #group consisting of Person name part 1 to Person name part 8. A single occurrence of the composite may
-        #carry both the primary name of a contributor, and one or more alternative names,
-        #for example if a contributor is referenced both by their real name and by a pseudonym,
-        #or by the name given on the title page and by an authority-controlled name.
-        #In addition, more than one representation of the same name may be sent.
-
-        #:nodoc:
-        ATTRIBUTES = 
-        [
-          :number, :role, :person_name, :from_language, :titles_before_names, :names_before_key, :prefix_to_key,
-          :key_names, :names_after_key, :biographical_note, :unnamed_persons, :role_name
-        ]
-
-        #:nodoc:
-        RELATIONS =
-        [
-          :inspect_include_fields
-        ]
-
         #:nodoc:
         attr_reader :number
 
         #:doc:
-        #kod ONIX dla roli - np. 'A01' - autor, pełna lista pod adresem 
+        #kod ONIX dla roli - np. 'A01' - autor, pełna lista pod adresem
         #https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/ProductFormCode.yml
         attr_reader :role
 
@@ -78,20 +55,20 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @number = data.at_css('SequenceNumber').try(:text).try(:to_i)
-          @role = data.at_css('ContributorRole').try(:text)
-          @person_name = data.at_css('PersonName').try(:text)
-          @person_name_inverted = data.at_css('PersonNameInverted').try(:text)
-          @from_language = data.at_css('FromLanguage').try(:text)
-          @titles_before_names = data.at_css('TitlesBeforeNames').try(:text)
-          @names_before_key = data.at_css('NamesBeforeKey').try(:text)
-          @prefix_to_key = data.at_css('PrefixToKey').try(:text)
-          @key_names = data.at_css('KeyNames').try(:text)
-          @names_after_key = data.at_css('NamesAfterKey').try(:text)
-          @biographical_note = data.at_css('BiographicalNote').try(:text)
-          @unnamed_persons = data.at_css('UnnamedPersons').try(:text)
-          @corporate_name = data.at_css('CorporateName').try(:text)
-          @corporate_name_inverted = data.at_css('CorporateNameInverted').try(:text)
+          @number = data.at_css('SequenceNumber')&.text&.to_i
+          @role = data.at_css('ContributorRole')&.text
+          @person_name = data.at_css('PersonName')&.text
+          @person_name_inverted = data.at_css('PersonNameInverted')&.text
+          @from_language = data.at_css('FromLanguage')&.text
+          @titles_before_names = data.at_css('TitlesBeforeNames')&.text
+          @names_before_key = data.at_css('NamesBeforeKey')&.text
+          @prefix_to_key = data.at_css('PrefixToKey')&.text
+          @key_names = data.at_css('KeyNames')&.text
+          @names_after_key = data.at_css('NamesAfterKey')&.text
+          @biographical_note = data.at_css('BiographicalNote')&.text
+          @unnamed_persons = data.at_css('UnnamedPersons')&.text if data.at_css('UnnamedPersons')&.text && data.at_css('UnnamedPersons')&.text.size > 0
+          @corporate_name = data.at_css('CorporateName')&.text
+          @corporate_name_inverted = data.at_css('CorporateNameInverted')&.text
           set_eid(data)
           set_datestamp(data)
         end

data/lib/elibri_onix/onix_3_0/excerpt_info.rb

@@ -1,39 +1,27 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class ExcerptInfo
-        
-        #Informacja o fragmencie publikacji (e-book)
-                
-        ATTRIBUTES = [
-          :file_type, :file_size, :md5, :updated_at, :link
-        ]
-        
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-        
+
+        include TimestampParser
         attr_accessor :file_type, :file_size, :md5, :updated_at, :link, :eid, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
           if data.name == "excerpt"
             @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)
+            @updated_at = parse_timestamp(data.attributes['updated_at'].value)
             @link = data.text
             @eid = data.attributes['id'].value.to_i
           elsif data.name == "ResourceVersion"
 
-            last_updated_node = data.css("ContentDate").find { |date| 
+            last_updated_node = data.css("ContentDate").find { |date|
                    date.css("ContentDateRole").first.inner_text == Elibri::ONIX::Dict::Release_3_0::ContentDateRole::LAST_UPDATED }
 
             if last_updated_node
-              @updated_at = Time.parse(last_updated_node.css("Date").first.inner_text)
+              @updated_at = parse_timestamp(last_updated_node.css("Date").first.inner_text)
             end
             @link = data.css("ResourceLink").first.text
             @eid =  @link.split("/")[4].to_i
@@ -45,7 +33,7 @@ module Elibri
                 @md5 = feature_value
               elsif feature_type == Elibri::ONIX::Dict::Release_3_0::ResourceVersionFeatureType::SIZE_IN_BYTES
                 @file_size = feature_value.to_i
-              end                 
+              end
             end
           else
             raise ArgumentError, "Unknow element for ExcerptInfo: #{data.name}"
@@ -55,9 +43,8 @@ module Elibri
         def inspect_include_fields
           [:link]
         end
-    
-      end
 
+      end
     end
   end
 end

data/lib/elibri_onix/onix_3_0/extent.rb

@@ -1,44 +1,29 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class Extent
-        
-        #from ONIX documentation:
-        #covers product extents, in terms of pages, running times, file sizes etc, as may be appropriate to each media type.
-        #For products whose content is primarily readable text, it also covers illustrations and other kinds of ancillary matter such as the inclusion of a bibliography or index.
-                
-        ATTRIBUTES = [
-          :type, :value, :unit, :type_name, :unit_name
-        ]
-        
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-        
+
         attr_accessor :type, :value, :unit, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.css('ExtentType').try(:text).try(:strip)
-          @value = data.css('ExtentValue').try(:text).try(:strip).try(:to_i)
-          @unit = data.css('ExtentUnit').try(:text).try(:strip)
+          @type = data.css('ExtentType')&.text&.strip
+          @value = data.css('ExtentValue')&.text&.strip&.to_i
+          @unit = data.css('ExtentUnit')&.text&.strip
         end
 
         def type_name
-          Elibri::ONIX::Dict::Release_3_0::ExtentType.find_by_onix_code(@type).try(:const_name).try(:downcase)
+          Elibri::ONIX::Dict::Release_3_0::ExtentType.find_by_onix_code(@type)&.const_name&.downcase
         end
- 
+
         def unit_name
-          Elibri::ONIX::Dict::Release_3_0::ExtentUnit.find_by_onix_code(@unit).try(:const_name).try(:downcase)
+          Elibri::ONIX::Dict::Release_3_0::ExtentUnit.find_by_onix_code(@unit)&.const_name&.downcase
         end
 
         def inspect_include_fields
           [:type_name, :unit_name]
         end
-    
+
       end
 
     end

data/lib/elibri_onix/onix_3_0/file_info.rb

@@ -1,20 +1,9 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class FileInfo
 
-        #Informacja o fragmencie publikacji (e-book)
-
-        ATTRIBUTES = [
-          :file_type, :file_size, :md5, :updated_at
-        ]
-
-        RELATIONS = [
-          :inspect_include_fields
-        ]
+        include TimestampParser
 
         attr_accessor :file_type, :file_size, :md5, :updated_at, :eid, :to_xml
 
@@ -23,7 +12,7 @@ module Elibri
 
           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)
+              @updated_at = parse_timestamp(date.css("Date").first.inner_text)
             end
           end
 

data/lib/elibri_onix/onix_3_0/header.rb

@@ -1,5 +1,3 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
@@ -7,35 +5,27 @@ module Elibri
       #Class representing ONIX header
       class Header
         include Inspector
-       
+
         #date, at which message was sent
         attr_accessor :sent_date_time
-   
+
         #sender of the message - Elibri::ONIX::Release_3_0::Sender
         attr_accessor :sender
- 
+
         #xml representation of message header
         attr_accessor :to_xml
- 
-        #:nodoc:       
-        ATTRIBUTES = [
-          :sent_date_time, :sender
-        ]
-        
+
         #:nodoc:
-        RELATIONS = []
- 
-        #:nodoc: 
         def inspect_include_fields
           [:sender]
         end
 
         def initialize(data)
           @to_xml = data.to_s
-          @sent_date_time = Date.parse(data.css('SentDateTime').try(:text)) if data.css('SentDateTime')
+          @sent_date_time = Date.parse(data.at_css('SentDateTime').text) if data.at_css('SentDateTime')
           @sender = Sender.new(data.at_css('Sender')) if data.at_css('Sender')
-        end        
-        
+        end
+
       end
 
     end

data/lib/elibri_onix/onix_3_0/imprint.rb

@@ -1,32 +1,16 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class Imprint
-        
-        include HashId
-        
-        #from ONIX documentation:
-        #A repeatable group of data elements which together identify an imprint or brand under which the product is marketed.
-        #The composite must carry either a name identifier or a name or both.
-        
-        ATTRIBUTES = [
-          :name
-        ]
-        
-        RELATIONS = []
 
         attr_accessor :name, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
-          @name = data.at_css('ImprintName').try(:text)
+          @name = data.at_css('ImprintName')&.text
         end
 
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/language.rb

@@ -1,29 +1,12 @@
-
-
 module Elibri
   module ONIX
     module Release_3_0
-
       class Language
 
-        #from ONIX documentation:
-        #An optional and repeatable group of data elements which together represent a language, and specify its role and,
-        #where required, whether it is a country variant.
-
         include Inspector
 
-        #:nodoc:       
-        ATTRIBUTES = [
-          :role, :code, :role_name, :language
-        ]
-
-        #:nodoc:
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-
-        #:doc:       
-        #kod onix roli, np. '01' 
+        #:doc:
+        #kod onix roli, np. '01'
         #pełna lista ról: https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/LanguageRole.yml
         attr_reader :role
 
@@ -36,8 +19,8 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_css('LanguageRole').try(:text)
-          @code = data.at_css('LanguageCode').try(:text)
+          @role = data.at_css('LanguageRole')&.text
+          @code = data.at_css('LanguageCode')&.text
         end
 
         #określenie roli jako string, np. language_of_text
@@ -48,7 +31,7 @@ module Elibri
         #język, np. 'polski'
         def language
           Elibri::ONIX::Dict::Release_3_0::LanguageCode.find_by_onix_code(@code).name(:pl).downcase rescue nil
-        rescue 
+        rescue
 
         end
 

data/lib/elibri_onix/onix_3_0/measure.rb

@@ -1,33 +1,20 @@
-
 module Elibri
   module ONIX
     module Release_3_0
-
-      #klasa abstahuje parsowanie wymiarów książki.
       class Measure
 
-        include HashId
-
-        ATTRIBUTES = [
-          :type, :measurement, :unit, :type_name
-        ]
-
-        RELATIONS = [
-          :inspect_include_fields
-        ]
-
         attr_accessor :type, :measurement, :unit, :to_xml
 
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_css('MeasureType').try(:text)
-          @measurement = data.at_css('Measurement').try(:text).try(:to_i)
-          @unit = data.at_css('MeasureUnitCode').try(:text)
+          @type = data.at_css('MeasureType')&.text
+          @measurement = data.at_css('Measurement')&.text&.to_i
+          @unit = data.at_css('MeasureUnitCode')&.text
 
         end
 
         def type_name
-           Elibri::ONIX::Dict::Release_3_0::MeasureType.find_by_onix_code(@type).try(:const_name).try(:downcase)
+           Elibri::ONIX::Dict::Release_3_0::MeasureType.find_by_onix_code(@type)&.const_name&.downcase
         end
 
         def inspect_include_fields
@@ -35,7 +22,6 @@ module Elibri
         end
 
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/onix_message.rb

@@ -1,10 +1,7 @@
-
 module Elibri
   module ONIX
     module Release_3_0
-
-      #class representing whole ONIX response from eLibri server
-      class ONIXMessage   
+      class ONIXMessage
         include Inspector
 
         #list of all products returned in this mnessage
@@ -13,7 +10,7 @@ module Elibri
         #xml representation of this message
         attr_accessor :to_xml
 
-        #ONIX version number 
+        #ONIX version number
         attr_accessor :release
 
         #returned message header - Elibri::ONIX::Release_3_0::Header
@@ -22,18 +19,6 @@ module Elibri
         # attributes of root ONIXMessage node
         attr_reader :attributes
 
-        include HashId
-
-        #:nodoc:
-        ATTRIBUTES = [
-          :release, :header
-        ]
-
-        #:nodoc:
-        RELATIONS = [
-          :products
-        ]
-
         def inspect_include_fields
           [:header, :release, :products]
         end

data/lib/elibri_onix/onix_3_0/price.rb

@@ -1,40 +1,29 @@
-
-
-
-
 module Elibri
   module ONIX
     module Release_3_0
 
       class Price
 
-        #from ONIX documentation:
-        #A repeatable group of data elements which together specify a unit price.
-
-                include HashId
-
-        ATTRIBUTES = [
-          :type, :minimum_order_quantity, :amount, :currency_code, :printed_on_product,
-          :position_on_product, :tax_type, :tax_rate_percent, :vat
-        ]
-
-        RELATIONS = []
-
-        attr_accessor :type, :minimum_order_quantity, :amount, :currency_code, :printed_on_product,
-          :position_on_product, :tax_type, :tax_rate_percent, :to_xml
+        attr_accessor :type, :minimum_order_quantity, :amount, :currency_code, :printed_on_product, :price_identifier,
+          :position_on_product, :tax_type, :tax_rate_percent, :price_qualifier, :price_constraint_limits, :to_xml
 
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_css('PriceType').try(:text)
-          @minimum_order_quantity = data.at_css('MinimumOrderQuantity').try(:text).try(:to_i)
-          @amount = BigDecimal(data.at_css('PriceAmount').try(:text))
-          @currency_code = data.at_css('CurrencyCode').try(:text)
-          @printed_on_product = data.at_css('PrintedOnProduct').try(:text)
-          @position_on_product = data.at_css('PositionOnProduct').try(:text)
+          @type = data.at_css('PriceType')&.text
+          @price_qualifier = data.at_css("PriceQualifier")&.text
+          @minimum_order_quantity = data.at_css('MinimumOrderQuantity')&.text&.to_i
+          @amount = BigDecimal(data.at_css('PriceAmount')&.text)
+          @currency_code = data.at_css('CurrencyCode')&.text
+          @printed_on_product = data.at_css('PrintedOnProduct')&.text
+          @position_on_product = data.at_css('PositionOnProduct')&.text
           if data.at_css('Tax')
-            @tax_type = data.at_css('Tax').at_css('TaxType').try(:text)
+            @tax_type = data.at_css('Tax').at_css('TaxType')&.text
             @tax_rate_percent = data.at_css('Tax').at_css('TaxRatePercent').text.to_i if data.at_css('Tax').at_css('TaxRatePercent')
           end
+          @price_constraint_limits = data.css("PriceConstraintLimit").map { |pc| PriceConstraintLimit.new(pc) }
+          if pi = data.at_css("PriceIdentifier")
+            @price_identifier = PriceIdentifier.new(pi)
+          end
         end
 
         def printed_on_product?

data/lib/elibri_onix/onix_3_0/price_constraint_limit.rb

@@ -0,0 +1,22 @@
+module Elibri
+  module ONIX
+    module Release_3_0
+      class PriceConstraintLimit
+
+        attr_accessor :unit, :value, :to_xml
+
+        def initialize(data)
+          @to_xml = data.to_s
+          @unit = data.at_css('PriceConstraintUnit')&.text
+          @value = data.at_css("Quantity")&.text
+          if @unit == Elibri::ONIX::Dict::Release_3_0::PriceConstraintUnit::VALID_FROM
+            @value = Date.new(@value[0...4].to_i, @value[4...6].to_i, @value[6...8].to_i)
+          else
+            @value = @value.to_i
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/elibri_onix/onix_3_0/price_identifier.rb

@@ -0,0 +1,18 @@
+module Elibri
+  module ONIX
+    module Release_3_0
+      class PriceIdentifier
+
+        attr_accessor :type, :type_name, :value, :to_xml
+
+        def initialize(data)
+          @to_xml = data.to_s
+          @type = data.at_css('PriceIDType')&.text
+          @type_name = data.at_css("IDTypeName")&.text
+          @value = data.at_css("IDValue")&.text
+        end
+
+      end
+    end
+  end
+end