elibri_onix 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff669eaa352e69ad1d7bc7e8261db9a2f478793a2f9fc0a2c9bd07efc665ccd2
-  data.tar.gz: f7a6a113cf206e37fbf8e135d3fc8367c6959a1c93f60c1c2a4d0db99f25c814
+  metadata.gz: e5ea523876f8d6c3592cb2a0db236799034257c23b8e2b7a66ee9b1554138348
+  data.tar.gz: 75d75d545d5a86401dd99152e56dc8dfcc8215aa6e6073c9c3695d00cac5d7f1
 SHA512:
-  metadata.gz: f9d76b9732944ec1e3835e12cc4f8ffff8c9e988d9105b45d6fd3d1982bc0935b22db900e595a492330149c144a41570ca5baeebd1220bb4710e0d4554041a21
-  data.tar.gz: efa8683c0d127665652caa2abc96d4091c2653267125796d2c3d066e4b2d9d1f85adfc43e2d4ad55621e78ead2925ae9d8c1dc36f73b9d7db0576b79893751d8
+  metadata.gz: a6b5248d7dbb0b983bf2e58fa8debd020a8157645e979c8311c8d1c817c12dda7efeecc135d9b2fc07bd4cabc6a5bc1cce7007c47749766a4a7ac5e58191df32
+  data.tar.gz: 18602e1caa0e78b55ea9f541aa4dc67500ae28bf311d5e03be459731b78a54cd9c3000e38ef88d1622ec2870d2d4a8b0f77b1410d1e027cd0337c941fd0580d4

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

@@ -269,7 +269,7 @@ 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 }
+            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
@@ -316,9 +316,8 @@ module Elibri
               @licence_limited_to = Date.new(date[0...4].to_i, date[4...6].to_i, date[6...8].to_i)
             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)
@@ -332,12 +331,24 @@ module Elibri
 
         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| 
              cl.at_css('ProductClassificationType').text == Elibri::ONIX::Dict::Release_3_0::ProductClassificationType::PKWIU }
@@ -354,15 +365,6 @@ module Elibri
              %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)
@@ -534,21 +536,23 @@ 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

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.8"
     Version = VERSION
     $VERBOSE = z
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elibri_onix
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 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: 2020-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -284,7 +284,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: EDItEUR ONIX format subset implementation used in Elibri publication system