elibri_onix 0.5.7 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff669eaa352e69ad1d7bc7e8261db9a2f478793a2f9fc0a2c9bd07efc665ccd2
-  data.tar.gz: f7a6a113cf206e37fbf8e135d3fc8367c6959a1c93f60c1c2a4d0db99f25c814
+  metadata.gz: dfc49b1d70bb6f2b9845bdf86cbb50ab1c3a17b4cbb833d720ed2d8e5f7c641c
+  data.tar.gz: 8f36e62235c9ceb753dea48729cf95d33171a1bef06f4895f09d279ff6e217ed
 SHA512:
-  metadata.gz: f9d76b9732944ec1e3835e12cc4f8ffff8c9e988d9105b45d6fd3d1982bc0935b22db900e595a492330149c144a41570ca5baeebd1220bb4710e0d4554041a21
-  data.tar.gz: efa8683c0d127665652caa2abc96d4091c2653267125796d2c3d066e4b2d9d1f85adfc43e2d4ad55621e78ead2925ae9d8c1dc36f73b9d7db0576b79893751d8
+  metadata.gz: 6c3195abd309afe4d00b8d399a62a52e36f6a3c711900f2e3615483944d437153cf583602be6c726af4b03acc2451c1422c8df6748b75ac772e554aa4ed0ec10
+  data.tar.gz: 250a4a7957ae090d5984816dc91e862a807442f1ee3b48df96d6962e4bb89e23822a7460706120fa7bb688df205b90ce1fe3a50649dbe4698f8591fa6d39c955

data/lib/elibri_onix/onix_3_0/contributor.rb

@@ -7,7 +7,7 @@ module Elibri
         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 
@@ -16,20 +16,20 @@ module Elibri
         #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
 
@@ -41,6 +41,9 @@ module Elibri
         #pełne imię i nazwisko - to pole jest zawsze uzupełnione
         attr_reader :person_name
 
+        #jednak czasami, nie ma :person_name, jest za to :person_name_inverted - e-isbn
+        attr_reader :person_name_inverted
+
         #w przypadku tłumacza kod języka oryginału, lista języków dostępna pod adresem
         #https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/LanguageCode.yml
         attr_reader :from_language
@@ -56,7 +59,7 @@ module Elibri
 
         #nazwisko lub nazwiska
         attr_reader :key_names
-   
+
         #dodatkowe oznaczenia, np. OHP (zakon)
         attr_reader :names_after_key
 
@@ -65,16 +68,20 @@ module Elibri
 
         #:nodoc:
         attr_reader :unnamed_persons
- 
+
+        attr_reader :corporate_name
+        attr_reader :corporate_name_inverted
+
         #reprezentacja danych w xml-u
         attr_reader :to_xml
-          
+
 
         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)
@@ -83,18 +90,20 @@ module Elibri
           @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)
           set_eid(data)
           set_datestamp(data)
         end
 
         def role_name
-          Elibri::ONIX::Dict::Release_3_0::ContributorRole.find_by_onix_code(@role).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ContributorRole.find_by_onix_code(@role).const_name.downcase rescue nil
         end
 
         def inspect_include_fields
           [:role_name, :person_name]
         end
-         
+
       end
 
     end

data/lib/elibri_onix/onix_3_0/language.rb

@@ -5,23 +5,23 @@ module Elibri
     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' 
         #pełna lista ról: https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/LanguageRole.yml
@@ -33,7 +33,7 @@ module Elibri
 
         #reprezentacja w xml
         attr_reader :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
           @role = data.at_css('LanguageRole').try(:text)
@@ -44,10 +44,12 @@ module Elibri
         def role_name
           Elibri::ONIX::Dict::Release_3_0::LanguageRole.find_by_onix_code(@role).const_name.downcase
         end
-   
+
         #język, np. 'polski'
         def language
-          Elibri::ONIX::Dict::Release_3_0::LanguageCode.find_by_onix_code(@code).name(:pl).downcase
+          Elibri::ONIX::Dict::Release_3_0::LanguageCode.find_by_onix_code(@code).name(:pl).downcase rescue nil
+        rescue 
+
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/measure.rb

@@ -27,7 +27,7 @@ module Elibri
         end
 
         def type_name
-           Elibri::ONIX::Dict::Release_3_0::MeasureType.find_by_onix_code(@type).const_name.downcase
+           Elibri::ONIX::Dict::Release_3_0::MeasureType.find_by_onix_code(@type).try(:const_name).try(:downcase)
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/product.rb

@@ -11,15 +11,17 @@ module Elibri
         #:nodoc:
         ATTRIBUTES =
         [
-          :height, :width, :thickness, :weight, :ean, :isbn13, :number_of_pages, :duration, 
-          :file_size, :publisher_name, :publisher_id, :imprint_name, :current_state, :reading_age_from, :reading_age_to, 
+          :height, :width, :thickness, :weight, :ean, :isbn13, :number_of_pages, :duration,
+          :file_size, :publisher_name, :publisher_id, :imprint_name, :current_state, :reading_age_from, :reading_age_to,
           :table_of_contents, :description, :reviews, :excerpts, :series, :title, :subtitle, :collection_title,
           :collection_part, :full_title, :original_title, :trade_title, :parsed_publishing_date, :record_reference,
-          :deletion_text, :cover_type, :cover_price, :vat, :pkwiu, :additional_info, :product_composition, 
+          :deletion_text, :cover_type, :cover_price, :vat, :pkwiu, :additional_info, :product_composition,
           :publisher, :product_form, :no_contributor, :edition_statement, :edition_type_onix_code, :number_of_illustrations, :publishing_status,
           :publishing_date, :premiere, :front_cover, :series_names, :city_of_publication,
           :preview_exists, :short_description, :sale_restricted_to_poland,
-          :technical_protection_onix_code, :unlimited_licence, :hyphenated_isbn, :preorder_embargo_date, :additional_trade_information
+          :technical_protection_onix_code, :unlimited_licence, :hyphenated_isbn, :preorder_embargo_date, :additional_trade_information,
+          :number_of_pieces, :players_number_from, :players_number_to, :playing_time_from, :playing_time_to
+
         ]
 
         #:nodoc:
@@ -27,7 +29,7 @@ module Elibri
         [
           :contributors, #IMPORTANT
           :related_products, :languages, :measures, :supply_details, :measures, :title_details,
-          :collections, :extents, :thema_subjects, :audience_ranges,
+          :collections, :extents, :thema_subjects, :publisher_subjects, :audience_ranges,
           :text_contents, #IMPORTANT
           :supporting_resources, #for example: cover
           :sales_restrictions, :authors,
@@ -149,7 +151,7 @@ module Elibri
         #AdditionalInfo
         attr_reader :additional_info
 
-        #kod ONIX typu produktu, np. 'BA' - lista dostępna pod adresem 
+        #kod ONIX typu produktu, np. 'BA' - lista dostępna pod adresem
         #https://github.com/elibri/elibri_onix_dict/blob/master/lib/elibri_onix_dict/onix_3_0/serialized/ProductFormCode.yml
         attr_reader :product_form
 
@@ -190,6 +192,21 @@ module Elibri
         #dodatkowa informacja handlowa
         attr_reader :additional_trade_information
 
+        #ilość elementów (puzzle, gry planszowe)
+        attr_reader :number_of_pieces
+
+        #min. ilość graczy - gry planszowe
+        attr_reader :players_number_from
+
+        #max. ilość graczy - gry planszowe
+        attr_reader :players_number_to
+
+        #min. czas gry - gry planszowe
+        attr_reader :playing_time_from
+
+        #max. czas gry - gry planszowe
+        attr_reader :playing_time_to
+
         #:nodoc:
         attr_reader :text_contents
         attr_reader :file_size
@@ -207,6 +224,7 @@ module Elibri
         attr_reader :collections
         attr_reader :extents
         attr_reader :thema_subjects
+        attr_reader :publisher_subjects
         attr_reader :audience_ranges
         attr_reader :supply_details
         attr_reader :identifiers
@@ -234,6 +252,7 @@ module Elibri
           @languages = []
           @extents = []
           @thema_subjects = []
+          @publisher_subjects = []
           @audience_ranges = []
           ##publishing_details
           @sales_restrictions = []
@@ -246,7 +265,7 @@ module Elibri
           @deletion_text = data.at_css('DeletionText').try(:text)
 
           if data.namespaces.values.any? { |uri| uri =~ /elibri/ }
-            @cover_type = data.at_xpath('elibri:CoverType').try(:text) 
+            @cover_type = data.at_xpath('elibri:CoverType').try(:text)
             @pkwiu = data.at_xpath('elibri:PKWiU').try(:text)
             @hyphenated_isbn = data.at_xpath('elibri:HyphenatedISBN').try(:text)
             @pdw_exclusiveness = data.at_xpath('elibri:PDWExclusiveness').try(:text)
@@ -269,8 +288,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.role == Elibri::ONIX::Dict::Release_3_0::SupplierRole::PUB_TO_RET }
-            if price_sd && price_sd.price && price_sd.price && price_sd.price.type == Elibri::ONIX::Dict::Release_3_0::PriceTypeCode::RRP_WITH_TAX 
+            price_sd = @supply_details.find { |sd| sd.supplier && sd.supplier.role == Elibri::ONIX::Dict::Release_3_0::SupplierRole::PUB_TO_RET }
+            if price_sd && price_sd.price && price_sd.price && price_sd.price.type == Elibri::ONIX::Dict::Release_3_0::PriceTypeCode::RRP_WITH_TAX
               @vat = price_sd.price.tax_rate_percent.to_i
               @cover_price = price_sd.price.amount
               @additional_trade_information = price_sd.additional_trade_information
@@ -286,6 +305,7 @@ module Elibri
             @preview_exists = @supporting_resources.find { |sr| sr.content_type_name == "widget" && sr.link =~ /p.elibri.com.pl/ }.present?
           end
 
+          product_form_features_setup(data.css("ProductFormFeature"))
 
           publishing_details_setup(data.at_css('PublishingDetail')) if data.at_css('PublishingDetail')
           licence_information_setup(data)
@@ -313,15 +333,14 @@ module Elibri
             elsif date = data.at_xpath("elibri:SaleRestrictedTo").try(:text)
               @unlimited_licence = false
               @licence_limited_to_before_type_cast = date
-              @licence_limited_to = Date.new(date[0...4].to_i, date[4...6].to_i, date[6...8].to_i)
+              @licence_limited_to = _parse_date(date)
             end
           else
-            daten = data.css('PublishingDate').find { |d| d.at_css("PublishingDateRole").text == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::OUT_OF_PRINT_DATE }
+            daten = data.css('PublishingDate').find { |d| d.at_css("PublishingDateRole") && d.at_css("PublishingDateRole").text == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::OUT_OF_PRINT_DATE }
             if daten
-          
               date = daten.at_css('Date').text
               @licence_limited_to_before_type_cast = date
-              @licence_limited_to = Date.new(date[0...4].to_i, date[4...6].to_i, date[6...8].to_i)
+              @licence_limited_to = _parse_date(date)
               @unlimited_licence = false
             else
               @unlimited_licence = true
@@ -330,16 +349,45 @@ module Elibri
           end
         end
 
+        def product_form_features_setup(data)
+          data.each do |feature|
+            ftype = feature.at_css("ProductFormFeatureType").inner_text
+            v1, v2 = feature.at_css("ProductFormFeatureValue, ProductFormFeatureDescription").inner_text.split("-").map(&:to_i)
+
+            if ftype == Elibri::ONIX::Dict::Release_3_0::ProductFormFeatureType::NUMBER_OF_GAME_PIECES
+              @number_of_pieces = v1
+            elsif ftype == Elibri::ONIX::Dict::Release_3_0::ProductFormFeatureType::GAME_PLAYERS
+              @players_number_from = v1
+              @players_number_to = v2
+            elsif ftype == Elibri::ONIX::Dict::Release_3_0::ProductFormFeatureType::GAME_PLAY_TIME
+              @playing_time_from = v1
+              @playing_time_to = v2
+            end
+          end
+        end
+
         def descriptive_details_setup(data)
           @product_composition = data.at_css('ProductComposition').try(:text)
-          @product_form = data.at_css('ProductForm').text
-          if @product_form.starts_with?("B") && !@cover_type
-            @cover_type = Elibri::ONIX::Dict::CoverType.determine_cover_type(@product_form, data.at_css('ProductFormDetail').try(:text))
-          end
-          if Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(@product_form)
-            @product_form_name = Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(@product_form).name(:en).downcase
+          @product_form = data.at_css('ProductForm').try(:text)
+          if @product_form
+            if @product_form.starts_with?("B") && !@cover_type
+              @cover_type = Elibri::ONIX::Dict::CoverType.determine_cover_type(@product_form, data.at_css('ProductFormDetail').try(:text))
+            end
+            if Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(@product_form)
+              @product_form_name = Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(@product_form).name(:en).downcase
+            end
+
+            simplified_product_form = @product_form.starts_with?("B") ? "BA" : @product_form
+            if Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(simplified_product_form).try!(:digital?)
+              @digital_formats = []
+              data.css("ProductFormDetail").each do |format|
+                format_name = Elibri::ONIX::Dict::Release_3_0::ProductFormDetail::find_by_onix_code(format.text).try(:name)
+                @digital_formats << format_name.upcase.gsub("MOBIPOCKET", "MOBI") if format_name
+              end
+            end
+
           end
-          if classification = data.css('ProductClassification').find { |cl| 
+          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
           end
@@ -350,19 +398,13 @@ module Elibri
           @no_contributor = !!data.at_css('NoContributor')
           @languages = data.css('Language').map { |language_data| Language.new(language_data) }
           @extents = data.css('Extent').map { |extent_data| Extent.new(extent_data) }
-          @thema_subjects = data.css('Subject').find_all { |sd| 
+
+          @publisher_subjects = data.css('Subject').find_all { |sd|
+             %w{24}.include?(sd.at_css('SubjectSchemeIdentifier').try(:text)) }.map { |sd| PublisherSubject.new(sd) }
+          @thema_subjects = data.css('Subject').find_all { |sd|
              %w{93 94 95 96 97 98 99}.include?(sd.at_css('SubjectSchemeIdentifier').try(:text)) }.map { |sd| ThemaSubject.new(sd) }
           @audience_ranges = data.css('AudienceRange').map { |audience_data| AudienceRange.new(audience_data) }
 
-          simplified_product_form = @product_form.starts_with?("B") ? "BA" : @product_form
-          if Elibri::ONIX::Dict::Release_3_0::ProductFormCode::find_by_onix_code(simplified_product_form).try!(:digital?)
-            @digital_formats = []
-            data.css("ProductFormDetail").each do |format|
-              format_name = Elibri::ONIX::Dict::Release_3_0::ProductFormDetail::find_by_onix_code(format.text).try(:name)
-              @digital_formats << format_name.upcase.gsub("MOBIPOCKET", "MOBI") if format_name
-            end
-          end
-
           #zabezpiecznie pliku
           if protection = data.at_css("EpubTechnicalProtection").try(:text)
             @technical_protection =  Elibri::ONIX::Dict::Release_3_0::EpubTechnicalProtection::find_by_onix_code(protection).try(:name)
@@ -394,7 +436,7 @@ module Elibri
           preorder_embargo_date_as_object = publication_dates.find { |date| date.role == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::PREORDER_EMBARGO_DATE }
           @preorder_embargo_date = Date.new(*preorder_embargo_date_as_object.parsed) if preorder_embargo_date_as_object
 
-          @sales_restrictions = data.css('SalesRestriction').map { |restriction_data| SalesRestriction.new(restriction_data) }      
+          @sales_restrictions = data.css('SalesRestriction').map { |restriction_data| SalesRestriction.new(restriction_data) }
           #ograniczenia terytorialne
           if data.at_css("CountriesIncluded").try(:text) == "PL"
             @sale_restricted_to_poland = true
@@ -420,7 +462,7 @@ module Elibri
 
         #flaga - true, jeśli produkt nie ma żadnego autora
         def no_contributor?
-          @no_contributor 
+          @no_contributor
         end
 
         #flaga, czy książka to praca zbiorowa?
@@ -437,7 +479,7 @@ module Elibri
           unnamed_persons? ? ["praca zbiorowa"] : @contributors.find_all { |c| c.role_name == "author" }.map(&:person_name)
         end
 
-        [:ghostwriter, :scenarist, :originator, :illustrator, :photographer, :author_of_preface, :drawer, :cover_designer, 
+        [:ghostwriter, :scenarist, :originator, :illustrator, :photographer, :author_of_preface, :drawer, :cover_designer,
          :inked_or_colored_by, :editor, :revisor, :translator, :editor_in_chief, :read_by].each do |role|
           define_method "#{role}s" do
             @contributors.find_all { |c| c.role_name == role.to_s }.map(&:person_name)
@@ -463,6 +505,8 @@ module Elibri
         #data premiery, jako instancja Date (tylko wtedy, gdy dokładna data jest znana)
         def premiere
           Date.new(*parsed_publishing_date) if parsed_publishing_date.size == 3
+        rescue ArgumentError
+          nil
         end
 
         def related_products_record_references
@@ -470,7 +514,7 @@ module Elibri
         end
 
         #:nodoc:
-        def proprietary_identifiers 
+        def proprietary_identifiers
           @identifiers.find_all { |i| i.identifier_type == "proprietary" }.inject({}) { |res, ident| res[ident.type_name] = ident.value; res }
         end
 
@@ -534,24 +578,32 @@ module Elibri
 
 
         def compute_state!
-          if @notification_type == "01"
-            @current_state = :announced
-          elsif @notification_type == "02"
-            @current_state = :preorder
-          elsif @notification_type == "05"
-            @current_state = :deleted
-          else
-            if @publishing_status == "04"
-              @current_state = :published
-            elsif @publishing_status == "07"
-              @current_state = :out_of_print
-            elsif @notification_type == "03"
-              @current_state = :published
+          if @notification_type || @publishing_status
+            if @notification_type == "01"
+              @current_state = :announced
+            elsif @notification_type == "02"
+              @current_state = :preorder
+            elsif @notification_type == "05"
+              @current_state = :deleted
             else
-              raise "cannot determine the state of the product #{@record_reference}"
+              if @publishing_status == "04"
+                @current_state = :published
+              elsif @publishing_status == "07"
+                @current_state = :out_of_print
+              elsif @notification_type == "03"
+                @current_state = :published
+              else
+                raise "cannot determine the state of the product #{@record_reference}"
+              end
             end
           end
         end
+
+        def _parse_date(string)
+          Date.new(string[0...4].to_i, string[4...6].to_i, string[6...8].to_i)
+        rescue ArgumentError
+          raise "Invalid date '#{string}' when parsing date for #{@record_reference}"
+        end
       end
 
     end

data/lib/elibri_onix/onix_3_0/publisher_subject.rb

@@ -0,0 +1,32 @@
+
+module Elibri
+  module ONIX
+    module Release_3_0
+
+      class PublisherSubject
+
+        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/publishing_date.rb

@@ -6,26 +6,26 @@ module Elibri
     module Release_3_0
 
       class PublishingDate
-        
+
         #from ONIX documentation:
         #A repeatable group of data elements which together specify a date associated with the publishing of the product.
         #Optional, but a date of publication must be specified either or in <MarketPublishingDetail> (P.25).
         #Other dates related to the publishing of a product can be sent in further repeats.
 
         include HashId
-        
+
         ATTRIBUTES = [
           :role, :format, :date, :parsed
         ]
-        
+
         RELATIONS = []
-        
+
         attr_accessor :role, :format, :date, :to_xml
-        
+
         def initialize(data)
           @to_xml = data.to_s
           @role = data.at_css('PublishingDateRole').try(:text)
-          @format = data.at_css('DateFormat').try(:text)
+          @format = data.at_css('DateFormat').try(:text) || data.at_css('Date')['dateformat'] || '00'
           @date = data.at_css('Date').try(:text)
         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
+    product onix_message excerpt_info file_info thema_subject publisher_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.5.7"
+    VERSION = "0.5.14"
     Version = VERSION
     $VERBOSE = z
   end

data/test/elibri_product_form_features_test.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+describe Elibri::ONIX::Release_3_0::ONIXMessage do
+
+  it "should be able to parse number of pieces info" do
+    product = load_fixture("onix_puzzle_example.xml")
+
+    assert_equal 25, product.number_of_pieces
+  end
+
+  it "should be able to parse playing time and number of players" do
+    product = load_fixture("onix_board_game_example.xml")
+
+    assert_equal 2, product.players_number_from
+    assert_equal 5, product.players_number_to
+    assert_equal 20, product.playing_time_from
+    assert_nil product.playing_time_to
+  end
+
+end

data/test/elibri_subjects_test.rb

@@ -25,6 +25,12 @@ describe Elibri::ONIX::Release_3_0::ONIXMessage do
     assert_equal "Kwalifikatory chronologiczne / od ok. 1500 do dzisiaj / XX wiek (ok. 1900–1999) " +
                          "/ 1. poł. XX wieku (ok. 1900–1950) / Dwudziestolecie międzywojenne (ok. 1919–1939) / ok. 1920–1929", s3.heading_text
 
+    assert_equal 1, product.publisher_subjects.count
+
+    p1 = product.publisher_subjects[0]
+
+    assert_equal "191", p1.code
+    assert_equal "Beletrystyka: Horror", p1.heading_text
   end
 
 end

data/test/fixtures/onix_board_game_example.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ONIXMessage xmlns="http://ns.editeur.org/onix/3.0/reference" release="3.0">
+  <Header>
+    <Sender>
+      <SenderName>Elibri.com.pl</SenderName>
+      <ContactName>Tomasz Meka</ContactName>
+      <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+    </Sender>
+    <SentDateTime>20200118</SentDateTime>
+  </Header>
+  <Product>
+    <RecordReference>76843e73500beb04ddf8</RecordReference>
+    <!--NotificationType: CONFIRMED_ON_PUBLICATION--><NotificationType>03</NotificationType>
+    <ProductIdentifier>
+      <!--ProductIDType: EAN--><ProductIDType>03</ProductIDType>
+      <IDValue>5902719470332</IDValue>
+    </ProductIdentifier>
+    <DescriptiveDetail>
+      <!--ProductComposition: SINGLE_COMPONENT_RETAIL_PRODUCT--><ProductComposition>00</ProductComposition>
+      <!--ProductFormCode: GAME--><ProductForm>ZE</ProductForm>
+      <ProductFormFeature>
+        <!--ProductFormFeatureType: GAME_PLAYERS--><ProductFormFeatureType>23</ProductFormFeatureType>
+        <ProductFormFeatureDescription>2-5 graczy</ProductFormFeatureDescription>
+      </ProductFormFeature>
+      <ProductFormFeature>
+        <!--ProductFormFeatureType: GAME_PLAY_TIME--><ProductFormFeatureType>24</ProductFormFeatureType>
+        <ProductFormFeatureValue>20</ProductFormFeatureValue>
+      </ProductFormFeature>
+      <ProductClassification>
+        <!--ProductClassificationType: PKWIU--><ProductClassificationType>12</ProductClassificationType>
+        <ProductClassificationCode>32.40.39.0</ProductClassificationCode>
+      </ProductClassification>
+      <Collection>
+        <!--CollectionType: PUBLISHER_COLLECTION--><CollectionType>10</CollectionType>
+        <TitleDetail>
+          <!--TitleType: DISTINCTIVE_TITLE--><TitleType>01</TitleType>
+          <TitleElement>
+            <!--TitleElementLevel: COLLECTION--><TitleElementLevel>02</TitleElementLevel>
+            <TitleText>Gry planszowe</TitleText>
+          </TitleElement>
+        </TitleDetail>
+      </Collection>
+      <TitleDetail>
+        <!--TitleType: DISTINCTIVE_TITLE--><TitleType>01</TitleType>
+        <TitleElement>
+          <!--TitleElementLevel: PRODUCT--><TitleElementLevel>01</TitleElementLevel>
+          <TitleText>Jamniki</TitleText>
+        </TitleElement>
+      </TitleDetail>
+      <TitleDetail>
+        <!--TitleType: DISTRIBUTORS_TITLE--><TitleType>10</TitleType>
+        <TitleElement>
+          <!--TitleElementLevel: PRODUCT--><TitleElementLevel>01</TitleElementLevel>
+          <TitleText>JAMNIKI</TitleText>
+        </TitleElement>
+      </TitleDetail>
+      <Contributor sourcename="contributorid:201641" datestamp="20200118T2047">
+        <SequenceNumber>1</SequenceNumber>
+        <!--ContributorRole: AUTHOR--><ContributorRole>A01</ContributorRole>
+        <PersonName>David Short</PersonName>
+        <NamesBeforeKey>David</NamesBeforeKey>
+        <KeyNames>Short</KeyNames>
+      </Contributor>
+      <Contributor sourcename="contributorid:201642" datestamp="20200118T2047">
+        <SequenceNumber>2</SequenceNumber>
+        <!--ContributorRole: ILLUSTRATOR--><ContributorRole>A12</ContributorRole>
+        <PersonName>Maciej Szymanowicz</PersonName>
+        <NamesBeforeKey>Maciej</NamesBeforeKey>
+        <KeyNames>Szymanowicz</KeyNames>
+      </Contributor>
+      <Language>
+        <!--LanguageRole: LANGUAGE_OF_TEXT--><LanguageRole>01</LanguageRole>
+        <!--LanguageCode: Polish--><LanguageCode>pol</LanguageCode>
+      </Language>
+      <Subject>
+        <!--SubjectSchemeIdentifier: PROPRIETARY--><SubjectSchemeIdentifier>24</SubjectSchemeIdentifier>
+        <SubjectSchemeName>Nasza Księgarnia</SubjectSchemeName>
+        <SubjectCode>871</SubjectCode>
+        <SubjectHeadingText>Gry planszowe</SubjectHeadingText>
+      </Subject>
+      <AudienceRange>
+        <!--AudienceRangeQualifier: READING_AGE--><AudienceRangeQualifier>18</AudienceRangeQualifier>
+        <!--AudienceRangePrecision: FROM--><AudienceRangePrecision>03</AudienceRangePrecision>
+        <AudienceRangeValue>6</AudienceRangeValue>
+      </AudienceRange>
+      <AudienceRange>
+        <!--AudienceRangeQualifier: READING_AGE--><AudienceRangeQualifier>18</AudienceRangeQualifier>
+        <!--AudienceRangePrecision: TO--><AudienceRangePrecision>04</AudienceRangePrecision>
+        <AudienceRangeValue>106</AudienceRangeValue>
+      </AudienceRange>
+    </DescriptiveDetail>
+    <CollateralDetail>
+      <TextContent sourcename="textid:109999" datestamp="20200118T2047">
+        <!--OtherTextType: MAIN_DESCRIPTION--><TextType>03</TextType>
+        <!--ContentAudience: UNRESTRICTED--><ContentAudience>00</ContentAudience>
+        <Text>
+          <![CDATA[<p>
+ <strong>UBIERZ JAMNIKA W KUBRACZEK!</strong></p>
+ <p>
+ Podczas gry Twój jamnik będzie rósł, musisz więc ubierać go w coraz większy kubraczek. Staraj się, aby na kubraczku było jak najwięcej symboli kostek – zdobędziesz za nie punkty! Dodatkowe punkty dostaniesz za kolory kubraczka.</p>
+]]>
+        </Text>
+      </TextContent>
+    </CollateralDetail>
+    <PublishingDetail>
+      <Publisher>
+        <PublishingRole>01</PublishingRole>
+        <PublisherIdentifier>
+          <PublisherIDType>01</PublisherIDType>
+          <IDTypeName>ElibriPublisherCode</IDTypeName>
+          <IDValue>41</IDValue>
+        </PublisherIdentifier>
+        <PublisherName>Nasza Księgarnia</PublisherName>
+      </Publisher>
+      <CityOfPublication>Warszawa</CityOfPublication>
+      <!--PublishingStatusCode: ACTIVE--><PublishingStatus>04</PublishingStatus>
+      <PublishingDate>
+        <!--PublishingDateRole: PUBLICATION_DATE--><PublishingDateRole>01</PublishingDateRole>
+        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <Date dateformat="00">20180919</Date>
+      </PublishingDate>
+      <PublishingDate>
+        <!--PublishingDateRole: PREORDER_EMBARGO_DATE--><PublishingDateRole>27</PublishingDateRole>
+        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <Date dateformat="00">20180905</Date>
+      </PublishingDate>
+      <SalesRights>
+        <!--SalesRightsType: FOR_SALE_WITH_EXLUSIVE_RIGHTS--><SalesRightsType>01</SalesRightsType>
+        <Territory>
+          <CountriesIncluded>PL</CountriesIncluded>
+        </Territory>
+      </SalesRights>
+    </PublishingDetail>
+    <ProductSupply>
+      <SupplyDetail>
+        <Supplier>
+          <!--SupplierRole: PUB_TO_RET--><SupplierRole>01</SupplierRole>
+          <SupplierIdentifier>
+            <!--SupplierIDType: VAT_IDENTITY_NUMBER--><SupplierIDType>23</SupplierIDType>
+            <IDValue>PL5260205285</IDValue>
+          </SupplierIdentifier>
+          <SupplierName>Nasza Księgarnia</SupplierName>
+        </Supplier>
+        <!--ProductAvailabilityType: IN_STOCK--><ProductAvailability>21</ProductAvailability>
+        <Stock>
+          <OnHand>200</OnHand>
+          <!--Proximity: MORE_THAN--><Proximity>07</Proximity>
+        </Stock>
+        <PackQuantity>12</PackQuantity>
+        <Price>
+          <!--PriceTypeCode: RRP_WITH_TAX--><PriceType>02</PriceType>
+          <PriceAmount>59.9</PriceAmount>
+          <Tax>
+            <!--TaxType: VAT--><TaxType>01</TaxType>
+            <TaxRatePercent>23</TaxRatePercent>
+          </Tax>
+          <CurrencyCode>PLN</CurrencyCode>
+          <!--PricePrintedOnProduct: NO--><PrintedOnProduct>01</PrintedOnProduct>
+        </Price>
+      </SupplyDetail>
+    </ProductSupply>
+  </Product>
+</ONIXMessage>

data/test/fixtures/onix_puzzle_example.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ONIXMessage xmlns="http://ns.editeur.org/onix/3.0/reference" release="3.0">
+  <Header>
+    <Sender>
+      <SenderName>Elibri.com.pl</SenderName>
+      <ContactName>Tomasz Meka</ContactName>
+      <EmailAddress>kontakt@elibri.com.pl</EmailAddress>
+    </Sender>
+    <SentDateTime>20200118</SentDateTime>
+  </Header>
+  <Product>
+    <RecordReference>85b3ad798e01c3b5ee67</RecordReference>
+    <!--NotificationType: CONFIRMED_ON_PUBLICATION--><NotificationType>03</NotificationType>
+    <ProductIdentifier>
+      <!--ProductIDType: EAN--><ProductIDType>03</ProductIDType>
+      <IDValue>5902719471810</IDValue>
+    </ProductIdentifier>
+    <DescriptiveDetail>
+      <!--ProductComposition: SINGLE_COMPONENT_RETAIL_PRODUCT--><ProductComposition>00</ProductComposition>
+      <!--ProductFormCode: JIGSAW--><ProductForm>ZJ</ProductForm>
+      <ProductFormFeature>
+        <!--ProductFormFeatureType: NUMBER_OF_GAME_PIECES--><ProductFormFeatureType>22</ProductFormFeatureType>
+        <ProductFormFeatureValue>25</ProductFormFeatureValue>
+      </ProductFormFeature>
+      <ProductClassification>
+        <!--ProductClassificationType: PKWIU--><ProductClassificationType>12</ProductClassificationType>
+        <ProductClassificationCode>32.40.32</ProductClassificationCode>
+      </ProductClassification>
+      <Collection>
+        <!--CollectionType: PUBLISHER_COLLECTION--><CollectionType>10</CollectionType>
+        <TitleDetail>
+          <!--TitleType: DISTINCTIVE_TITLE--><TitleType>01</TitleType>
+          <TitleElement>
+            <!--TitleElementLevel: COLLECTION--><TitleElementLevel>02</TitleElementLevel>
+            <TitleText>Puzzle</TitleText>
+          </TitleElement>
+        </TitleDetail>
+      </Collection>
+      <TitleDetail>
+        <!--TitleType: DISTINCTIVE_TITLE--><TitleType>01</TitleType>
+        <TitleElement>
+          <!--TitleElementLevel: PRODUCT--><TitleElementLevel>01</TitleElementLevel>
+          <TitleText>Pucio. Puzzle: Co tu pasuje?</TitleText>
+        </TitleElement>
+      </TitleDetail>
+      <TitleDetail>
+        <!--TitleType: DISTRIBUTORS_TITLE--><TitleType>10</TitleType>
+        <TitleElement>
+          <!--TitleElementLevel: PRODUCT--><TitleElementLevel>01</TitleElementLevel>
+          <TitleText>PUCIO. PUZZLE: CO TU PASUJE?</TitleText>
+        </TitleElement>
+      </TitleDetail>
+      <Contributor sourcename="contributorid:210002" datestamp="20190116T1724">
+        <SequenceNumber>1</SequenceNumber>
+        <!--ContributorRole: AUTHOR--><ContributorRole>A01</ContributorRole>
+        <PersonName>Marta Galewska-Kustra</PersonName>
+        <NamesBeforeKey>Marta</NamesBeforeKey>
+        <KeyNames>Galewska-Kustra</KeyNames>
+      </Contributor>
+      <Contributor sourcename="contributorid:210003" datestamp="20190116T1724">
+        <SequenceNumber>2</SequenceNumber>
+        <!--ContributorRole: ILLUSTRATOR--><ContributorRole>A12</ContributorRole>
+        <PersonName>Joanna Kłos</PersonName>
+        <NamesBeforeKey>Joanna</NamesBeforeKey>
+        <KeyNames>Kłos</KeyNames>
+      </Contributor>
+      <Language>
+        <!--LanguageRole: LANGUAGE_OF_TEXT--><LanguageRole>01</LanguageRole>
+        <!--LanguageCode: Polish--><LanguageCode>pol</LanguageCode>
+      </Language>
+    </DescriptiveDetail>
+    <CollateralDetail>
+      <TextContent sourcename="textid:115723" datestamp="20190116T1724">
+        <!--OtherTextType: MAIN_DESCRIPTION--><TextType>03</TextType>
+        <!--ContentAudience: UNRESTRICTED--><ContentAudience>00</ContentAudience>
+        <Text>
+          <![CDATA[<p>
+ <strong>Wreszcie są! Długo wyczekiwane, mądre i piękne zabawki z PUCIEM!</strong></p>
+ <p>
+ Uwielbiany przez dzieci i rodziców bohater bestsellerowej serii Marty Galewskiej-Kustry, fenomenalnie ilustrowanej przez Joannę Kłos, w końcu wykracza poza karty książek i pojawia się także na puzzlach! Zapraszamy do wspólnej zabawy i nauki!</p>
+ <p>
+ Puzzle przeznaczone dla dzieci od 2 lat. Składają się z 5 obrazków głównych oraz 20 uzupełniających. Na obrazkach głównych jest Pucio w znanych dziecku codziennych sytuacjach (np. jedzenie posiłku, poranna toaleta, ubieranie się). Elementy uzupełniające przedstawiają pojedyncze obiekty zaprezentowane także na obrazku głównym (np. kanapka, szczoteczka do zębów, czapka). Dziecko ma się przyjrzeć obrazkowi głównemu, odnaleźć pasujące do niego elementy uzupełniające i dołączyć je do obrazka głównego.</p>
+ <p>
+ To na pozór proste zadanie wymaga skupienia uwagi na ilustracji, rozwija spostrzegawczość i mowę, ale przede wszystkim pobudza do myślenia. Mimo niedużej liczby elementów puzzle dają okazję do wielu zabaw o różnym stopniu trudności. </p>
+ <p>
+ Wyprodukowano w Polsce.</p>
+]]>
+        </Text>
+      </TextContent>
+    </CollateralDetail>
+    <PublishingDetail>
+      <Publisher>
+        <PublishingRole>01</PublishingRole>
+        <PublisherIdentifier>
+          <PublisherIDType>01</PublisherIDType>
+          <IDTypeName>ElibriPublisherCode</IDTypeName>
+          <IDValue>41</IDValue>
+        </PublisherIdentifier>
+        <PublisherName>Nasza Księgarnia</PublisherName>
+      </Publisher>
+      <CityOfPublication>Warszawa</CityOfPublication>
+      <!--PublishingStatusCode: ACTIVE--><PublishingStatus>04</PublishingStatus>
+      <PublishingDate>
+        <!--PublishingDateRole: PUBLICATION_DATE--><PublishingDateRole>01</PublishingDateRole>
+        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <Date dateformat="00">20190227</Date>
+      </PublishingDate>
+      <PublishingDate>
+        <!--PublishingDateRole: PREORDER_EMBARGO_DATE--><PublishingDateRole>27</PublishingDateRole>
+        <!--DateFormat: YYYYMMDD--><DateFormat>00</DateFormat>
+        <Date dateformat="00">20190213</Date>
+      </PublishingDate>
+      <SalesRights>
+        <!--SalesRightsType: FOR_SALE_WITH_EXLUSIVE_RIGHTS--><SalesRightsType>01</SalesRightsType>
+        <Territory>
+          <CountriesIncluded>PL</CountriesIncluded>
+        </Territory>
+      </SalesRights>
+    </PublishingDetail>
+    <ProductSupply>
+      <SupplyDetail>
+        <Supplier>
+          <!--SupplierRole: PUB_TO_RET--><SupplierRole>01</SupplierRole>
+          <SupplierIdentifier>
+            <!--SupplierIDType: VAT_IDENTITY_NUMBER--><SupplierIDType>23</SupplierIDType>
+            <IDValue>PL5260205285</IDValue>
+          </SupplierIdentifier>
+          <SupplierName>Nasza Księgarnia</SupplierName>
+        </Supplier>
+        <!--ProductAvailabilityType: NOT_AVAILABLE--><ProductAvailability>40</ProductAvailability>
+        <Stock>
+          <OnHand>0</OnHand>
+          <!--Proximity: EXACTLY--><Proximity>03</Proximity>
+        </Stock>
+        <Price>
+          <!--PriceTypeCode: RRP_WITH_TAX--><PriceType>02</PriceType>
+          <PriceAmount>24.9</PriceAmount>
+          <Tax>
+            <!--TaxType: VAT--><TaxType>01</TaxType>
+            <TaxRatePercent>23</TaxRatePercent>
+          </Tax>
+          <CurrencyCode>PLN</CurrencyCode>
+          <!--PricePrintedOnProduct: NO--><PrintedOnProduct>01</PrintedOnProduct>
+        </Price>
+      </SupplyDetail>
+    </ProductSupply>
+  </Product>
+</ONIXMessage>

data/test/fixtures/onix_subjects_example.xml

@@ -25,21 +25,6 @@
           <TitleText>Nielegalni</TitleText>
         </TitleElement>
       </TitleDetail>
-      <Subject>
-        <MainSubject/>
-        <SubjectSchemeIdentifier>24</SubjectSchemeIdentifier>
-        <SubjectSchemeName>elibri.com.pl</SubjectSchemeName>
-        <SubjectSchemeVersion>1.0</SubjectSchemeVersion>
-        <SubjectCode>1110</SubjectCode>
-        <SubjectHeadingText>Historia / II Wojna Światowa / Ruch oporu</SubjectHeadingText>
-      </Subject>
-      <Subject>
-        <SubjectSchemeIdentifier>24</SubjectSchemeIdentifier>
-        <SubjectSchemeName>elibri.com.pl</SubjectSchemeName>
-        <SubjectSchemeVersion>1.0</SubjectSchemeVersion>
-        <SubjectCode>491</SubjectCode>
-        <SubjectHeadingText>Szkoła i nauczanie / Lektury szkolne z opracowaniami</SubjectHeadingText>
-      </Subject>
       <Subject>
         <SubjectSchemeIdentifier>93</SubjectSchemeIdentifier>
         <SubjectSchemeVersion>1.3</SubjectSchemeVersion>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_onix
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.14
 platform: ruby
 authors:
 - Marcin Urbanski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,6 +187,7 @@ files:
 - lib/elibri_onix/onix_3_0/product.rb
 - lib/elibri_onix/onix_3_0/product_identifier.rb
 - lib/elibri_onix/onix_3_0/publisher.rb
+- lib/elibri_onix/onix_3_0/publisher_subject.rb
 - lib/elibri_onix/onix_3_0/publishing_date.rb
 - lib/elibri_onix/onix_3_0/related_product.rb
 - lib/elibri_onix/onix_3_0/sales_restriction.rb
@@ -217,6 +218,7 @@ files:
 - test/elibri_onix_message_attributes_test.rb
 - test/elibri_onix_release_3_0_onix_message_test.rb
 - test/elibri_onix_test.rb
+- test/elibri_product_form_features_test.rb
 - test/elibri_product_form_test.rb
 - test/elibri_publisher_info_test.rb
 - test/elibri_publishing_status_test.rb
@@ -236,6 +238,7 @@ files:
 - test/fixtures/onix_audience_range_example.xml
 - test/fixtures/onix_audiobook_example.xml
 - test/fixtures/onix_audiobook_extent_example.xml
+- test/fixtures/onix_board_game_example.xml
 - test/fixtures/onix_collective_work_example.xml
 - test/fixtures/onix_contributors_example.xml
 - test/fixtures/onix_ebook_extent_example.xml
@@ -252,6 +255,7 @@ files:
 - test/fixtures/onix_published_group_product_example.xml
 - test/fixtures/onix_published_product_example.xml
 - test/fixtures/onix_publisher_info_example.xml
+- test/fixtures/onix_puzzle_example.xml
 - test/fixtures/onix_record_identifiers_example.xml
 - test/fixtures/onix_related_products_example.xml
 - test/fixtures/onix_removed_elibri_extensions.xml
@@ -284,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: EDItEUR ONIX format subset implementation used in Elibri publication system