elibri_onix 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69912737892405619e73b9ddeac017b128bac8b1919a437c3105b5287b3e49e
-  data.tar.gz: f3f5d46f1409ca1f0383b0aa177a729ee8019b9a1baf7bd1067cf2b5d0458cf7
+  metadata.gz: 2cdd498f6472afd58950a7d29d6e105b8ebda1c30d4cb79459c1ef398a6b6cd4
+  data.tar.gz: a371442b7450ded0b5b174fa78a34395cad1ac40f30e9f94675949be90aecabd
 SHA512:
-  metadata.gz: 01119d48727fbbaee300efe03479dd8a9fd30998916d9d3c0ad042ca7438c99ffbfc9e6eee3772d90b584c3ed32411b8eda35e9ba8853b6ea0ef1e194ad11e8a
-  data.tar.gz: 6280ee4543ed1c16b8b9a716bb3db38a75c6457d78b96e505affcb175e89140d0f0a9212cf0ac975b4f87b14f579518a42faea3a81703c7d1902e2467b9d5c39
+  metadata.gz: b27daea722145431c90f22c88c42c084846563889159e57b6b28bd2441f2f09bb4eb9e4910eb98c1ff7b366957023c1a85f7bb97bc1fd72eda15b850594e9be1
+  data.tar.gz: a0b0e1900efaba5ab42637c9a073ce4d7b0e5187b6d56f774b7f53440a0fabac82a6edeaf085dca225d6319a2d6746b14b1526ff40f714809bbfb0f24a8527ad

data/FIELDS.rdoc

@@ -59,7 +59,7 @@ inspect_include_fields
 
 == ONIXMessage
 === Attributes
-release, elibri_dialect, header
+release, header
 === Relations
 products
 
@@ -70,7 +70,7 @@ type, minimum_order_quantity, amount, currency_code, printed_on_product, positio
 
 == Product
 === Attributes
-elibri_dialect, 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, publisher, product_form, no_contributor, edition_statement, number_of_illustrations, publishing_status, publishing_date, premiere, front_cover, series_names, city_of_publication, elibri_product_category1_id, elibri_product_category2_id, preview_exists, short_description, sale_restricted_to_poland, technical_protection_onix_code, unlimited_licence, hyphenated_isbn, preorder_embargo_date
+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, publisher, product_form, no_contributor, edition_statement, 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
 === Relations
 contributors, related_products, languages, measures, supply_details, measures, title_details, collections, extents, subjects, audience_ranges, text_contents, supporting_resources, sales_restrictions, authors, ghostwriters, scenarists, originators, illustrators, photographers, author_of_prefaces, drawers, cover_designers, inked_or_colored_bys, editors, revisors, translators, editor_in_chiefs, read_bys
 

data/lib/elibri_onix.rb

@@ -12,7 +12,6 @@ require 'elibri_onix/external_id'
 require 'elibri_onix/hash_id'
 require 'elibri_onix/external_timestamp'
 require 'elibri_onix/releases'
-require 'elibri_onix/nokogiri_patch'
 require 'elibri_onix_dict'
 
 

data/lib/elibri_onix/external_id.rb

@@ -1,9 +1,5 @@
 module ExternalId
  
-#  def self.included(base)
-#    base.xml_accessor :id_before_type_cast, :from => "@sourcename"
-#  end
-
   def self.included(base)
     base.send(:attr_accessor, :id_before_type_cast)
   end
@@ -19,10 +15,4 @@ module ExternalId
       nil
     end
   end
-  
-  def id
-    Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-    eid
-  end
-
 end

data/lib/elibri_onix/onix_3_0/audience_range.rb

@@ -21,18 +21,9 @@ module Elibri
 
         def initialize(data)
           @old_xml = data.to_s
-          @qualifier = data.at_xpath('xmlns:AudienceRangeQualifier').try(:text)
-          @precision = data.at_xpath('xmlns:AudienceRangePrecision').try(:text)
-          @value = data.at_xpath('xmlns:AudienceRangeValue').try(:text).try(:to_i)
-        end
-
-        def eid
-          "#{@qualifier}-#{@precision}-#{@value}"
-        end
-        
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
+          @qualifier = data.at_css('AudienceRangeQualifier').try(:text)
+          @precision = data.at_css('AudienceRangePrecision').try(:text)
+          @value = data.at_css('AudienceRangeValue').try(:text).try(:to_i)
         end
 
       end

data/lib/elibri_onix/onix_3_0/contributor.rb

@@ -72,17 +72,17 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @number = data.at_xpath('xmlns:SequenceNumber').try(:text).try(:to_i)
-          @role = data.at_xpath('xmlns:ContributorRole').try(:text)
-          @person_name = data.at_xpath('xmlns:PersonName').try(:text)
-          @from_language = data.at_xpath('xmlns:FromLanguage').try(:text)
-          @titles_before_names = data.at_xpath('xmlns:TitlesBeforeNames').try(:text)
-          @names_before_key = data.at_xpath('xmlns:NamesBeforeKey').try(:text)
-          @prefix_to_key = data.at_xpath('xmlns:PrefixToKey').try(:text)
-          @key_names = data.at_xpath('xmlns:KeyNames').try(:text)
-          @names_after_key = data.at_xpath('xmlns:NamesAfterKey').try(:text)
-          @biographical_note = data.at_xpath('xmlns:BiographicalNote').try(:text)
-          @unnamed_persons = data.at_xpath('xmlns:UnnamedPersons').try(:text)
+          @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)
+          @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)
           set_eid(data)
           set_datestamp(data)
         end

data/lib/elibri_onix/onix_3_0/excerpt_info.rb

@@ -20,17 +20,36 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @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)
-          @link = data.text
-          @eid = data.attributes['id'].value.to_i
-        end
+          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)
+            @link = data.text
+            @eid = data.attributes['id'].value.to_i
+          elsif data.name == "ResourceVersion"
+
+            last_updated_node = data.css("ContentDate").find { |date| 
+                   date.css("ContentDateRole").first.inner_text == Elibri::ONIX::Dict::Release_3_0::ContentDateRole::LAST_UPDATED }
 
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
+            if last_updated_node
+              @updated_at = Time.parse(last_updated_node.css("Date").first.inner_text)
+            end
+            @link = data.css("ResourceLink").first.text
+            @eid =  @link.split("/")[4].to_i
+            @file_type = @link.split(".").last + "_excerpt"
+            data.css("ResourceVersionFeature").each do |feature|
+              feature_type = feature.css("ResourceVersionFeatureType").first.inner_text
+              feature_value = feature.css("FeatureValue").first.inner_text
+              if feature_type == Elibri::ONIX::Dict::Release_3_0::ResourceVersionFeatureType::MD5_HASH_VALUE
+                @md5 = feature_value
+              elsif feature_type == Elibri::ONIX::Dict::Release_3_0::ResourceVersionFeatureType::SIZE_IN_BYTES
+                @file_size = feature_value.to_i
+              end                 
+            end
+          else
+            raise ArgumentError, "Unknow element for ExcerptInfo: #{data.name}"
+          end
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/extent.rb

@@ -22,18 +22,9 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.xpath('xmlns:ExtentType').try(:text)
-          @value = data.xpath('xmlns:ExtentValue').try(:text).try(:to_i)
-          @unit = data.xpath('xmlns:ExtentUnit').try(:text)
-        end
-
-        def eid
-          @type.to_i
-        end
-        
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
+          @type = data.css('ExtentType').try(:text)
+          @value = data.css('ExtentValue').try(:text).try(:to_i)
+          @unit = data.css('ExtentUnit').try(:text)
         end
 
         def type_name

data/lib/elibri_onix/onix_3_0/file_info.rb

@@ -27,11 +27,6 @@ module Elibri
           @eid = data.attributes['id'].value.to_i
         end
 
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
-        end
-
         def inspect_include_fields
           [:file_type]
         end

data/lib/elibri_onix/onix_3_0/header.rb

@@ -32,8 +32,8 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @sent_date_time = Date.parse(data.xpath('xmlns:SentDateTime').try(:text)) if data.xpath('xmlns:SentDateTime')
-          @sender = Sender.new(data.at_xpath('xmlns:Sender')) if data.at_xpath('xmlns:Sender')
+          @sent_date_time = Date.parse(data.css('SentDateTime').try(:text)) if data.css('SentDateTime')
+          @sender = Sender.new(data.at_css('Sender')) if data.at_css('Sender')
         end        
         
       end

data/lib/elibri_onix/onix_3_0/imprint.rb

@@ -22,7 +22,7 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @name = data.at_xpath('xmlns:ImprintName').try(:text)
+          @name = data.at_css('ImprintName').try(:text)
         end
 
       end

data/lib/elibri_onix/onix_3_0/language.rb

@@ -36,8 +36,8 @@ module Elibri
         
         def initialize(data)
           @to_xml = data.to_s
-          @role = data.at_xpath('xmlns:LanguageRole').try(:text)
-          @code = data.at_xpath('xmlns:LanguageCode').try(:text)
+          @role = data.at_css('LanguageRole').try(:text)
+          @code = data.at_css('LanguageCode').try(:text)
         end
 
         #określenie roli jako string, np. language_of_text
@@ -53,18 +53,7 @@ module Elibri
         def inspect_include_fields
            [:role_name, :language]
         end
-
-        def eid
-          "#{@role}-#{@code}"
-        end
-        
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
-        end
-
       end
-
     end
   end
 end

data/lib/elibri_onix/onix_3_0/measure.rb

@@ -20,9 +20,9 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:MeasureType').try(:text)
-          @measurement = data.at_xpath('xmlns:Measurement').try(:text).try(:to_i)
-          @unit = data.at_xpath('xmlns:MeasureUnitCode').try(:text)
+          @type = data.at_css('MeasureType').try(:text)
+          @measurement = data.at_css('Measurement').try(:text).try(:to_i)
+          @unit = data.at_css('MeasureUnitCode').try(:text)
 
         end
 
@@ -34,15 +34,6 @@ module Elibri
           [:type_name]
         end
 
-  #      def eid
-  #        @type.to_i
-  #      end
-
-        def id
-          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
-          eid
-        end
-
       end
 
     end

data/lib/elibri_onix/onix_3_0/onix_message.rb

@@ -16,9 +16,6 @@ module Elibri
         #ONIX version number 
         attr_accessor :release
 
-        #:nodoc:
-        attr_accessor :elibri_dialect
-
         #returned message header - Elibri::ONIX::Release_3_0::Header
         attr_accessor :header
         
@@ -26,7 +23,7 @@ module Elibri
          
         #:nodoc:
         ATTRIBUTES = [
-          :release, :elibri_dialect, :header
+          :release, :header
         ]
         
         #:nodoc:
@@ -35,26 +32,17 @@ module Elibri
         ]
 
         def inspect_include_fields
-          [:header, :elibri_dialect, :release, :products]
+          [:header, :release, :products]
         end
         
-
-        def self.from_xml(data, *initialization_args)
-          Kernel.warn "[DEPRECATION] `from_xml` is deprecated. Please use `new` instead."
-          self.new(data, *initialization_args)
-        end
-
         def initialize(xml, *initialization_args)
           @to_xml = xml.to_s
           xml = Nokogiri::XML(xml) unless xml.is_a?(Nokogiri::XML::Document)
           onix_message = xml.children.first
           @release = onix_message['release']
-          @elibri_dialect = onix_message.at_xpath('elibri:Dialect').try(:text)
-          @header = Header.new(onix_message.at_xpath('xmlns:Header')) if onix_message.at_xpath('xmlns:Header')
-          @products = onix_message.xpath('xmlns:Product').map { |product_node| Product.new(product_node) }
+          @header = Header.new(onix_message.at_css('Header')) if onix_message.at_css('Header')
+          @products = onix_message.css('Product').map { |product_node| Product.new(product_node) }
         end
-
-
       end
 
     end

data/lib/elibri_onix/onix_3_0/price.rb

@@ -25,25 +25,25 @@ module Elibri
 
         def initialize(data)
           @to_xml = data.to_s
-          @type = data.at_xpath('xmlns:PriceType').try(:text).try(:to_i)
-          @minimum_order_quantity = data.at_xpath('xmlns:MinimumOrderQuantity').try(:text).try(:to_i)
-          @amount = BigDecimal(data.at_xpath('xmlns:PriceAmount').try(:text))
-          @currency_code = data.at_xpath('xmlns:CurrencyCode').try(:text)
-          @printed_on_product = data.at_xpath('xmlns:PrintedOnProduct').try(:text).try(:to_i)
-          @position_on_product = data.at_xpath('xmlns:PositionOnProduct').try(:text).try(:to_i)
-          if data.at_xpath('xmlns:Tax')
-            @tax_type = data.at_xpath('xmlns:Tax').at_xpath('xmlns:TaxType').try(:text).try(:to_i)
-            @tax_rate_percent = BigDecimal(data.at_xpath('xmlns:Tax').at_xpath('xmlns:TaxRatePercent').try(:text)) if data.at_xpath('xmlns:Tax').at_xpath('xmlns:TaxRatePercent')
+          @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)
+          if data.at_css('Tax')
+            @tax_type = data.at_css('Tax').at_css('TaxType').try(:text)
+            @tax_rate_percent = data.at_css('Tax').at_css('TaxRatePercent').text.to_i if data.at_css('Tax').at_css('TaxRatePercent')
           end
         end
 
         def printed_on_product?
-          @printed_on_product == 2
+          @printed_on_product == "02"
         end
 
 
         def vat
-          @tax_type == 1 ? @tax_rate_percent : nil
+          @tax_type == Elibri::ONIX::Dict::Release_3_0::TaxType::VAT ? @tax_rate_percent : nil
         end
 
       end

data/lib/elibri_onix/onix_3_0/product.rb

@@ -11,15 +11,15 @@ module Elibri
         #:nodoc:
         ATTRIBUTES =
         [
-          :elibri_dialect, :height, :width, :thickness, :weight, :ean, :isbn13, :number_of_pages, :duration, 
+          :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, 
           :publisher, :product_form, :no_contributor, :edition_statement, :number_of_illustrations, :publishing_status,
           :publishing_date, :premiere, :front_cover, :series_names, :city_of_publication,
-          :elibri_product_category1_id, :elibri_product_category2_id, :preview_exists, :short_description, :sale_restricted_to_poland,
-          :technical_protection_onix_code, :unlimited_licence, :hyphenated_isbn, :preorder_embargo_date
+          :preview_exists, :short_description, :sale_restricted_to_poland,
+          :technical_protection_onix_code, :unlimited_licence, :hyphenated_isbn, :preorder_embargo_date, :additional_trade_information
         ]
 
         #:nodoc:
@@ -27,7 +27,7 @@ module Elibri
         [
           :contributors, #IMPORTANT
           :related_products, :languages, :measures, :supply_details, :measures, :title_details,
-          :collections, :extents, :subjects, :audience_ranges,
+          :collections, :extents, :thema_subjects, :audience_ranges,
           :text_contents, #IMPORTANT
           :supporting_resources, #for example: cover
           :sales_restrictions, :authors,
@@ -115,12 +115,6 @@ module Elibri
         #krótki opis, jeśli wydawca takowy zamieści, instancja TextContent
         attr_reader :short_description
 
-        #id kategorii elibri (1)
-        attr_reader :elibri_product_category1_id
-
-        #id kategorii elibri (2)
-        attr_reader :elibri_product_category2_id
-
         #data końca licencji, jeśli licencja nie jest bezterminowa, w formacie YYYYMMDD
         attr_reader :licence_limited_to_before_type_cast
 
@@ -190,10 +184,12 @@ module Elibri
         #isbn z kreskami
         attr_reader :hyphenated_isbn
 
+        #dodatkowa informacja handlowa
+        attr_reader :additional_trade_information
+
         #:nodoc:
         attr_reader :text_contents
         attr_reader :file_size
-        attr_reader :elibri_dialect
         attr_reader :reviews
         attr_reader :excerpts
         attr_reader :trade_title
@@ -207,7 +203,7 @@ module Elibri
         attr_reader :title_details
         attr_reader :collections
         attr_reader :extents
-        attr_reader :subjects
+        attr_reader :thema_subjects
         attr_reader :audience_ranges
         attr_reader :supply_details
         attr_reader :identifiers
@@ -234,45 +230,70 @@ module Elibri
           @contributors = []
           @languages = []
           @extents = []
-          @subjects = []
+          @thema_subjects = []
           @audience_ranges = []
           ##publishing_details
           @sales_restrictions = []
-
+          @excerpt_infos = []
+          @cover_type = nil
           #moving to parsing attributes
 
-          @elibri_dialect = data.at_xpath('//elibri:Dialect').try(:text)
-          @record_reference = data.at_xpath('xmlns:RecordReference').try(:text)
-          @notification_type = data.at_xpath('xmlns:NotificationType').try(:text)
-          @deletion_text = data.at_xpath('xmlns:DeletionText').try(:text)
-          @cover_type = data.at_xpath('elibri:CoverType').try(:text)
-          @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)
-          @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)
-          @additional_info = data.at_xpath('elibri:AdditionalInfo').try(:text)
-
-          @preview_exists = (data.at_xpath('elibri:preview_exists').try(:text) == "true")
-          @identifiers = data.xpath('xmlns:ProductIdentifier').map { |ident_data| ProductIdentifier.new(ident_data) }
+          @record_reference = data.at_css('RecordReference').try(:text)
+          @notification_type = data.at_css('NotificationType').try(:text)
+          @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) 
+            @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)
+            @additional_info = data.at_xpath('elibri:AdditionalInfo').try(:text)
+          end
+
+          @identifiers = data.children.find_all { |node| node.name == 'ProductIdentifier' }.map { |ident_data| ProductIdentifier.new(ident_data) }
           begin
-            @related_products = data.at_xpath('xmlns:RelatedMaterial').xpath('xmlns:RelatedProduct').map { |related_data| RelatedProduct.new(related_data) }
+            @related_products = data.at_css('RelatedMaterial').css('RelatedProduct').map { |related_data| RelatedProduct.new(related_data) }
           rescue
             @related_products = []
           end
           begin
-            @supply_details = data.at_xpath('xmlns:ProductSupply').xpath('xmlns:SupplyDetail').map { |supply_data| SupplyDetail.new(supply_data) }
+            @supply_details = data.at_css('ProductSupply').css('SupplyDetail').map { |supply_data| SupplyDetail.new(supply_data) }
           rescue
             @supply_details = []
           end
-          descriptive_details_setup(data.at_xpath('xmlns:DescriptiveDetail')) if data.at_xpath('xmlns:DescriptiveDetail')
-          collateral_details_setup(data.at_xpath('xmlns:CollateralDetail')) if data.at_xpath('xmlns:CollateralDetail')
-          publishing_details_setup(data.at_xpath('xmlns:PublishingDetail')) if data.at_xpath('xmlns:PublishingDetail')
+
+          if data.namespaces.values.any? { |uri| uri =~ /elibri/ } && (data.at_xpath('elibri:Vat') || data.at_xpath('elibri:CoverPrice'))
+            @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 
+              @vat = price_sd.price.tax_rate_percent.to_i
+              @cover_price = price_sd.price.amount
+              @additional_trade_information = price_sd.additional_trade_information
+            end
+          end
+
+          descriptive_details_setup(data.at_css('DescriptiveDetail')) if data.at_css('DescriptiveDetail')
+          collateral_details_setup(data.at_css('CollateralDetail')) if data.at_css('CollateralDetail')
+
+          if data.namespaces.values.any? { |uri| uri =~ /elibri/ } && data.at_xpath('elibri:preview_exists')
+            @preview_exists = (data.at_xpath('elibri:preview_exists').text == "true")
+          else
+            @preview_exists = @supporting_resources.find { |sr| sr.content_type_name == "widget" && sr.link =~ /p.elibri.com.pl/ }.present?
+          end
+
+
+          publishing_details_setup(data.at_css('PublishingDetail')) if data.at_css('PublishingDetail')
           licence_information_setup(data)
           begin
             @excerpt_infos = data.at_xpath("elibri:excerpts").xpath("elibri:excerpt").map { |node| ExcerptInfo.new(node) }
           rescue
-            @excerpt_infos = []
+           demo = @supporting_resources.find { |sr| sr.content_type_name == "sample_content" }
+            if demo
+              @excerpt_infos = demo.data.css("ResourceVersion").map { |node| ExcerptInfo.new(node) }
+            end
+
           end
           begin
             @file_infos = data.at_xpath("elibri:masters").xpath("elibri:master").map { |node| FileInfo.new(node) }
@@ -282,69 +303,118 @@ module Elibri
           after_parse
         end
 
+        def self.determine_cover_type(product_form, product_form_detail)
+          if product_form == "BG"
+            "skórzana"
+          elsif product_form == "BF"
+            "gąbka"
+          elsif product_form == "BC"
+             if product_form_detail == "B504"
+              "miękka ze skrzydełkami"
+            elsif product_form_detail == "B412"
+              "zintegrowana"
+            else
+              "miękka"
+            end
+          elsif product_form == "BB"
+            if product_form_detail == "B501"
+              "twarda z obwolutą"
+            elsif product_form_detail == "B415"
+              "twarda lakierowana"
+            elsif product_form_detail == "B413"
+              "plastikowa"
+            else
+              "twarda"
+            end
+          end
+        end
+
         def licence_information_setup(data)
-          if data.at_xpath("elibri:SaleNotRestricted")
-            @unlimited_licence = true
-          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)
+          if data.namespaces.values.any? { |uri| uri =~ /elibri/ } && (data.at_xpath("elibri:SaleNotRestricted") || data.at_xpath("elibri:SaleRestrictedTo"))
+            if data.at_xpath("elibri:SaleNotRestricted")
+              @unlimited_licence = true
+            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)
+            end
+          else
+            daten = data.css('PublishingDate').find { |d| 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)
+              @unlimited_licence = false
+            else
+              @unlimited_licence = true
+            end
+
           end
         end
 
         def descriptive_details_setup(data)
-          @product_composition = data.at_xpath('xmlns:ProductComposition').try(:text)
-          @product_form = data.at_xpath('xmlns:ProductForm').try(:text)
+          @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 = self.class.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
-          @measures =  data.xpath('xmlns:Measure').map { |measure_data| Measure.new(measure_data) }
-          @title_details = data.xpath('xmlns:TitleDetail').map { |title_data| TitleDetail.new(title_data) }
-          @collections = data.xpath('xmlns:Collection').map { |collection_data| Collection.new(collection_data) }
-          @contributors = data.xpath('xmlns:Contributor').map { |contributor_data| Contributor.new(contributor_data) }
-          @no_contributor = !!data.at_xpath('xmlns:NoContributor')
-          @languages = data.xpath('xmlns:Language').map { |language_data| Language.new(language_data) }
-          @extents = data.xpath('xmlns:Extent').map { |extent_data| Extent.new(extent_data) }
-          @subjects = data.xpath('xmlns:Subject').map { |subject_data| Subject.new(subject_data) }
-          @audience_ranges = data.xpath('xmlns:AudienceRange').map { |audience_data| AudienceRange.new(audience_data) }
-
-          if data.xpath("xmlns:ProductFormDetail").size > 0
+          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
+          @measures =  data.css('Measure').map { |measure_data| Measure.new(measure_data) }
+          @title_details = data.children.find_all { |node| node.name == 'TitleDetail' }.map { |title_data| TitleDetail.new(title_data) }
+          @collections = data.css('Collection').map { |collection_data| Collection.new(collection_data) }
+          @contributors = data.css('Contributor').map { |contributor_data| Contributor.new(contributor_data) }
+          @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| 
+             %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).digital?
             @digital_formats = []
-            data.xpath("xmlns:ProductFormDetail").each do |format|
+            data.css("ProductFormDetail").each do |format|
               @digital_formats << Elibri::ONIX::Dict::Release_3_0::ProductFormDetail::find_by_onix_code(format.text).name.upcase.gsub("MOBIPOCKET", "MOBI")
             end
           end
 
           #zabezpiecznie pliku
-          if protection = data.at_xpath("xmlns:EpubTechnicalProtection").try(:text)
+          if protection = data.at_css("EpubTechnicalProtection").try(:text)
             @technical_protection =  Elibri::ONIX::Dict::Release_3_0::EpubTechnicalProtection::find_by_onix_code(protection).name
             @technical_protection_onix_code = protection
           end
 
-          @edition_statement = data.at_xpath('xmlns:EditionStatement').try(:text)
-          @number_of_illustrations = data.at_xpath('xmlns:NumberOfIllustrations').try(:text).try(:to_i)
+          @edition_statement = data.at_css('EditionStatement').try(:text)
+          @number_of_illustrations = data.at_css('NumberOfIllustrations').try(:text).try(:to_i)
         end
 
         def collateral_details_setup(data)
-          @text_contents = data.xpath('xmlns:TextContent').map { |text_detail| TextContent.new(text_detail) }
-          @supporting_resources = data.xpath('xmlns:SupportingResource').map { |supporting_data| SupportingResource.new(supporting_data) }
+          @text_contents = data.css('TextContent').map { |text_detail| TextContent.new(text_detail) }
+          @supporting_resources = data.css('SupportingResource').map { |supporting_data| SupportingResource.new(supporting_data) }
         end
 
         def publishing_details_setup(data)
-          @imprint = Imprint.new(data.at_xpath('xmlns:Imprint')) if data.at_xpath('xmlns:Imprint')
-          @publisher = Publisher.new(data.at_xpath('xmlns:Publisher')) if data.at_xpath('xmlns:Publisher')
-          @publishing_status = data.at_xpath('xmlns:PublishingStatus').try(:text)
-          @city_of_publication = data.at_xpath("xmlns:CityOfPublication").try(:text)
-          publication_dates = data.xpath('xmlns:PublishingDate').map do |node|
+          @imprint = Imprint.new(data.at_css('Imprint')) if data.at_css('Imprint')
+          @publisher = Publisher.new(data.at_css('Publisher')) if data.at_css('Publisher')
+          @publishing_status = data.at_css('PublishingStatus').try(:text)
+          @city_of_publication = data.at_css("CityOfPublication").try(:text)
+          publication_dates = data.css('PublishingDate').map do |node|
             PublishingDate.new(node)
           end
           @publishing_date = publication_dates.find { |date| date.role == Elibri::ONIX::Dict::Release_3_0::PublishingDateRole::PUBLICATION_DATE }
           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.xpath('xmlns: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_xpath(".//xmlns:CountriesIncluded").try(:text) == "PL"
+          if data.at_css("CountriesIncluded").try(:text) == "PL"
             @sale_restricted_to_poland = true
           else
             @sale_restricted_to_poland = false
@@ -456,6 +526,7 @@ module Elibri
           @publisher_id = @publisher.eid if publisher
           @imprint_name = @imprint.name if imprint
           @isbn13 = @identifiers.find { |identifier| identifier.identifier_type == "isbn13" }.try(:value)
+          @hyphenated_isbn ||= @isbn13
           @reading_age_from = @audience_ranges.find {|ar| (ar.qualifier == "18") && (ar.precision == "03")}.try(:value).try(:to_i)
           @reading_age_to = @audience_ranges.find {|ar| (ar.qualifier == "18") && (ar.precision == "04")}.try(:value).try(:to_i)
           @table_of_contents = @text_contents.find { |t| t.type_name == "table_of_contents" }
@@ -475,9 +546,6 @@ module Elibri
           @original_title = find_title(Elibri::ONIX::Dict::Release_3_0::TitleType::ORIGINAL_TITLE).try(:full_title)
           @trade_title = find_title(Elibri::ONIX::Dict::Release_3_0::TitleType::DISTRIBUTORS_TITLE).try(:full_title)
 
-          @elibri_product_category1_id = subjects[0].code if subjects[0]
-          @elibri_product_category2_id = subjects[1].code if subjects[1]
-
           compute_state!
         end