elibri_onix 0.1.23 → 0.2.0

data/lib/elibri_onix/onix_3_0/publishing_date.rb

@@ -6,23 +6,24 @@ module Elibri
     module Release_3_0
 
       class PublishingDate
-        include ROXML
-        include Inspector
-
-        xml_name 'PublishingDate'
-
-        xml_accessor :role, :from => 'PublishingDateRole'
-        xml_accessor :format, :from => 'DateFormat'
-        xml_accessor :date, :from => 'Date'
         
         ATTRIBUTES = [
           :role, :format, :date, :parsed
         ]
         
         RELATIONS = []
+        
+        attr_accessor :role, :format, :date, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @role = data.at_xpath('xmlns:PublishingDateRole').try(:text)
+          @format = data.at_xpath('xmlns:DateFormat').try(:text)
+          @date = data.at_xpath('xmlns:Date').try(:text)
+        end
 
         def parsed
-          case format
+          case @format
             when '00' then [date[0...4].to_i, date[4...6].to_i, date[6...8].to_i]
             when '01' then [date[0...4].to_i, date[4...6].to_i]
             when '05' then [date[0...4].to_i]

data/lib/elibri_onix/onix_3_0/related_product.rb

@@ -7,38 +7,33 @@ module Elibri
     module Release_3_0
 
       class RelatedProduct
-        include ROXML
-        include Inspector
-
-        xml_name 'RelatedProduct'
-
-        xml_accessor :relation_code, :from => 'ProductRelationCode'
-        xml_accessor :identifiers, :as => [ProductIdentifier]
         
         ATTRIBUTES = [
-          :relation_code, :isbn13, :proprietary_identifiers, :record_reference
+          :relation_code, :proprietary_identifiers, :record_reference
         ]
         
         RELATIONS = [
           :identifiers
         ]
         
-
-
-        def isbn13
-          identifiers.find {|identifier| identifier.type == 15}.try(:value)
+        attr_accessor :relation_code, :identifiers, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @relation_code = data.at_xpath('xmlns:ProductRelationCode').try(:text)
+          @identifiers = data.xpath('xmlns:ProductIdentifier').map { |identifier_data| ProductIdentifier.new(identifier_data) }
         end
 
         
         def record_reference
-          identifiers.find {|identifier| identifier.type.to_s == '01' && identifier.type_name == 'elibri' }.try(:value)          
+          @identifiers.find {|identifier| identifier.type == '01' && identifier.type_name == 'elibri' }.try(:value)          
         end
 
 
         def proprietary_identifiers
           Hash.new.tap do |hash|
-            identifiers.each do |identifier|
-              hash[identifier.type_name] = identifier.value if identifier.type == 1
+            @identifiers.each do |identifier|
+              hash[identifier.type_name] = identifier.value if identifier.type == '01'
             end
           end
         end

data/lib/elibri_onix/onix_3_0/sales_restriction.rb

@@ -6,20 +6,23 @@ module Elibri
     module Release_3_0
 
       class SalesRestriction
-        include ROXML
-        include Inspector
-
-        xml_name 'SalesRestriction'
-
-        xml_accessor :type, :from => 'SalesRestrictionType', :as => Fixnum
-        xml_accessor :outlet_name, :from => 'SalesOutletName', :in => 'SalesOutlet'
-        xml_accessor :end_date, :from => 'EndDate', :as => Date
         
         ATTRIBUTES = [
           :type, :outlet_name, :end_date
         ]
         
         RELATIONS = []
+        
+        attr_accessor :type, :outlet_name, :end_date, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @type = data.at_xpath('xmlns:SalesRestrictionType').try(:text).try(:to_i)
+          if data.at_xpath('xmlns:SalesOutlet')
+            @outlet_name = data.at_xpath('xmlns:SalesOutlet').at_xpath('xmlns:SalesOutletName').try(:text)
+          end
+          @end_date = Date.parse(data.at_xpath('xmlns:EndDate').try(:text)) if data.at_xpath('xmlns:EndDate')
+        end
 
       end
 

data/lib/elibri_onix/onix_3_0/sender.rb

@@ -4,14 +4,8 @@ module Elibri
     module Release_3_0
 
       class Sender
-        include ROXML
-        include Inspector
-
-        xml_name 'Sender'
-
-        xml_accessor :sender_name, :from => 'SenderName'
-        xml_accessor :contact_name, :from => 'ContactName'
-        xml_accessor :email_address, :from => 'EmailAddress'
+        
+        attr_accessor :sender_name, :contact_name, :email_address, :to_xml
         
         ATTRIBUTES = [
           :sender_name, :contact_name, :email_address
@@ -19,6 +13,13 @@ module Elibri
         
         RELATIONS = []
         
+        def initialize(data)
+          @to_xml = data.to_s
+          @sender_name = data.at_xpath('xmlns:SenderName').text
+          @contact_name = data.at_xpath('xmlns:ContactName').text
+          @email_address = data.at_xpath('xmlns:EmailAddress').text
+        end
+        
       end
 
     end

data/lib/elibri_onix/onix_3_0/stock_quantity_coded.rb

@@ -1,26 +1,23 @@
-
-
-
-
 module Elibri
   module ONIX
     module Release_3_0
 
       class StockQuantityCoded
-        include ROXML
-        include Inspector
 
-        xml_name 'StockQuantityCoded'
-
-        xml_accessor :code_type, :from => 'StockQuantityCodeType', :as => Fixnum
-        xml_accessor :code, :from => 'StockQuantityCode'
-        
         ATTRIBUTES = [
           :code_type, :code
         ]
         
         RELATIONS = []
         
+        attr_accessor :code_type, :code, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @code_type = data.at_xpath('xmlns:StockQuantityCodeType').try(:text).try(:to_i)
+          @code = data.at_xpath('xmlns:StockQuantityCode').try(:text)
+        end
+        
       end
 
     end

data/lib/elibri_onix/onix_3_0/subject.rb

@@ -5,30 +5,36 @@ module Elibri
     module Release_3_0
 
       class Subject
-        include ROXML
-        include Inspector
-
-        xml_name 'Subject'
-        xml_accessor :scheme_identifier, :from => 'SubjectSchemeIdentifier', :as => Fixnum
-        xml_accessor :scheme_name, :from => 'SubjectSchemeName'
-        xml_accessor :scheme_version, :from => 'SubjectSchemeVersion'
-        xml_accessor :code, :from => 'SubjectCode'
-        xml_accessor :heading_text, :from => 'SubjectHeadingText'
-
-        xml_accessor :main_subject, :from => 'MainSubject'
         
         ATTRIBUTES = [
           :scheme_identifier, :scheme_name, :scheme_version, :code, :heading_text, :main_subject
         ]
         
+        attr_accessor :scheme_identifier, :scheme_name, :scheme_version, :code, :heading_text, :main_subject, :to_xml
+        
         RELATIONS = []
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @scheme_identifier = data.xpath('xmlns:SubjectSchemeIdentifier').try(:text).try(:to_i)
+          @scheme_name = data.xpath('xmlns:SubjectSchemeName').try(:text)
+          @scheme_version = data.xpath('xmlns:SubjectSchemeVersion').try(:text)
+          @code = data.xpath('xmlns:SubjectCode').try(:text)
+          @heading_text = data.xpath('xmlns:SubjectHeadingText').try(:text)
+          @main_subject = data.xpath('xmlns:MainSubject').blank? ? nil : '' 
+        end  
 
         def main_subject?
-          main_subject == ''
+          @main_subject == ''
         end
 
+        def eid
+          @code
+        end
+        
         def id
-          code
+          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+          eid
         end
 
       end

data/lib/elibri_onix/onix_3_0/supplier.rb

@@ -6,17 +6,6 @@ module Elibri
     module Release_3_0
 
       class Supplier
-        include ROXML
-        include Inspector
-
-        xml_name 'Supplier'
-
-        xml_accessor :role, :from => 'SupplierRole', :as => Fixnum
-        xml_accessor :identifiers, :as => [SupplierIdentifier]
-        xml_accessor :name, :from => 'SupplierName'
-        xml_accessor :telephone_number, :from => 'TelephoneNumber'
-        xml_accessor :email_address, :from => 'EmailAddress'
-        xml_accessor :website, :from => 'WebsiteLink', :in => 'Website'
 
         ATTRIBUTES = [
           :role, :name, :telephone_number, :email_address, :website, :nip
@@ -25,9 +14,23 @@ module Elibri
         RELATIONS = [
           :identifiers
         ]
+        
+        attr_accessor :role, :identifiers, :name, :telephone_number, :email_address, :website, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @role = data.at_xpath('xmlns:SupplierRole').try(:text).try(:to_i)
+          @identifiers = data.xpath('xmlns:SupplierIdentifier').map { |identifier_data| SupplierIdentifier.new(identifier_data) }
+          @name = data.at_xpath('xmlns:SupplierName').try(:text)
+          @telephone_number = data.at_xpath('xmlns:TelephoneNumber').try(:text)
+          @email_address = data.at_xpath('xmlns:EmailAddress').try(:text)
+          if data.at_xpath('xmlns:Website')
+            @website = data.at_xpath('xmlns:Website').at_xpath('xmlns:WebsiteLink').try(:text) 
+          end
+        end
 
         def nip
-          identifiers.find {|identifier| (identifier.type == 2) && (identifier.type_name == 'NIP')}.try(:value)
+          @identifiers.find {|identifier| (identifier.type == '02') && (identifier.type_name == 'NIP')}.try(:value)
         end
 
       end

data/lib/elibri_onix/onix_3_0/supplier_identifier.rb

@@ -7,20 +7,21 @@ module Elibri
     module Release_3_0
 
       class SupplierIdentifier
-        include ROXML
-        include Inspector
-
-        xml_name 'SupplierIdentifier'
-
-        xml_accessor :type, :from => 'SupplierIDType', :as => Fixnum
-        xml_accessor :type_name, :from => 'IDTypeName'
-        xml_accessor :value, :from => 'IDValue'
 
         ATTRIBUTES = [
           :type, :type_name, :value
         ]
         
         RELATIONS = []
+        
+        attr_accessor :type, :type_name, :value, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @type = data.at_xpath('xmlns:SupplierIDType').try(:text)
+          @type_name = data.at_xpath('xmlns:IDTypeName').try(:text)
+          @value = data.at_xpath('xmlns:IDValue').try(:text)
+        end
 
       end
     end

data/lib/elibri_onix/onix_3_0/supply_detail.rb

@@ -6,29 +6,30 @@ module Elibri
     module Release_3_0
 
       class SupplyDetail
-        include ROXML
-        include Inspector
-
-        xml_name 'SupplyDetail'
-
-        xml_accessor :relation_code, :from => 'ProductRelationCode', :as => Fixnum
-        xml_accessor :supplier, :as => Supplier
-        xml_accessor :product_availability, :from => 'ProductAvailability', :as => Fixnum
-        xml_accessor :pack_quantity, :from => 'PackQuantity', :as => Fixnum
-        xml_accessor :price, :as => Price
-
-        
-        xml_accessor :on_hand, :in => 'Stock', :from => 'OnHand', :as => Fixnum
-        xml_accessor :quantity_coded, :in => 'Stock', :as => StockQuantityCoded
 
         ATTRIBUTES = [
           :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :quantity_code
         ]
+        
+        attr_accessor :relation_code, :supplier, :product_availability, :pack_quantity, :price, :on_hand, :quantity_coded, :to_xml
 
         RELATIONS = []
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @relation_code = data.at_xpath('xmlns:ProductRelationCode').try(:text).try(:to_i)
+          @supplier = Supplier.new(data.at_xpath('xmlns:Supplier')) if data.at_xpath('xmlns:Supplier')
+          @product_availability = data.at_xpath('xmlns:ProductAvailability').try(:text).try(:to_i)
+          @pack_quantity = data.at_xpath('xmlns:PackQuantity').try(:text).try(:to_i)
+          @price = Price.new(data.at_xpath('xmlns:Price')) if data.at_xpath('xmlns:Price')
+          if data.at_xpath('xmlns:Stock')
+            @on_hand = data.at_xpath('xmlns:Stock').at_xpath('xmlns:OnHand').try(:text).try(:to_i)
+            @quantity_coded = StockQuantityCoded.new(data.at_xpath('xmlns:Stock').at_xpath('xmlns:StockQuantityCoded')) if data.at_xpath('xmlns:Stock').at_xpath('xmlns:StockQuantityCoded')
+          end
+        end
 
         def quantity_code
-          quantity_coded.try(:code)
+          @quantity_coded.try(:code)
         end
 
       end

data/lib/elibri_onix/onix_3_0/supporting_resource.rb

@@ -5,20 +5,8 @@ module Elibri
     module Release_3_0
 
       class SupportingResource
-        include ROXML
-        include Inspector
         include ExternalId
         include ExternalTimestamp
-
-
-        xml_name 'SupportingResource'
-
-        xml_accessor :content_type, :from => 'ResourceContentType'
-        #xml_accessor :audience, :from => 'ContentAudience' - always unrestricted
-        xml_accessor :mode, :from => 'ResourceMode'
-
-        xml_accessor :form, :in => 'ResourceVersion', :from => 'ResourceForm'
-        xml_accessor :link, :in => 'ResourceVersion', :from => 'ResourceLink'
         
         ATTRIBUTES = [
           :content_type, :mode, :form, :link, :content_type_name, :mode_name, :form_name
@@ -27,9 +15,21 @@ module Elibri
         RELATIONS = [
           :inspect_include_fields
         ]
+        
+        attr_accessor :content_type, :mode, :form, :link, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @content_type = data.at_xpath('xmlns:ResourceContentType').try(:text)
+          @mode = data.at_xpath('xmlns:ResourceMode').try(:text)
+          @form = data.at_xpath('xmlns:ResourceVersion').at_xpath('xmlns:ResourceForm').try(:text)
+          @link = data.at_xpath('xmlns:ResourceVersion').at_xpath('xmlns:ResourceLink').try(:text)
+          set_eid(data)
+          set_datestamp(data)
+        end
 
         def content_type_name
-          Elibri::ONIX::Dict::Release_3_0::ResourceContentType.find_by_onix_code(content_type).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ResourceContentType.find_by_onix_code(@content_type).const_name.downcase
         end
  
         #def audience_name
@@ -37,11 +37,11 @@ module Elibri
         #end
 
         def mode_name
-          Elibri::ONIX::Dict::Release_3_0::ResourceMode.find_by_onix_code(mode).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ResourceMode.find_by_onix_code(@mode).const_name.downcase
         end
 
         def form_name
-          Elibri::ONIX::Dict::Release_3_0::ResourceForm.find_by_onix_code(form).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ResourceForm.find_by_onix_code(@form).const_name.downcase
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/text_content.rb

@@ -4,20 +4,8 @@ module Elibri
     module Release_3_0
 
       class TextContent
-        include ROXML
-        include Inspector
-        include ExternalId
-        include ExternalTimestamp
-
-        xml_name 'TextContent'
-
-        xml_accessor :type, :from => 'TextType'
-        #xml_accessor :audience, :from => 'ContentAudience' - always unrestricted
-        xml_accessor :author, :from => 'TextAuthor'
-        xml_accessor :source_title, :from => 'SourceTitle'
-
-        xml_accessor :text, :from => 'Text', :cdata => true
-        xml_accessor :source_url, :from => '@sourcename', :in => 'Text'
+         include ExternalId
+         include ExternalTimestamp
         
         ATTRIBUTES = [
           :type, :author, :source_title, :text, :source_url, :type_name
@@ -26,9 +14,24 @@ module Elibri
         RELATIONS = [
           :inspect_include_fields
         ]
+        
+        attr_accessor :type, :author, :source_title, :text, :source_url, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @type = data.at_xpath('xmlns:TextType').try(:text)
+          @author = data.at_xpath('xmlns:TextAuthor').try(:text)
+          @source_title = data.at_xpath('xmlns:SourceTitle').try(:text)
+          if data.at_xpath('xmlns:Text')
+            @text = data.at_xpath('xmlns:Text').children.find { |x| x.cdata? }.try(:text) #cdata => true ?
+            @source_url =  data.at_xpath('xmlns:Text').attribute('sourcename').try(:text)
+          end
+          set_eid(data)
+          set_datestamp(data)
+        end
 
         def type_name
-          Elibri::ONIX::Dict::Release_3_0::OtherTextType.find_by_onix_code(type).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::OtherTextType.find_by_onix_code(@type).const_name.downcase
         end