elibri_onix 0.1.23 → 0.2.0

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elibri_onix.gemspec
 gemspec
+# gem 'ruby-debug'

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    elibri_onix (0.1.23)
+    elibri_onix (0.2.0)
       activesupport (>= 2.3.5)
       elibri_onix_dict (>= 0.0.5)
       i18n
-      roxml (= 3.1.3)
+      nokogiri
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +23,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.3.5)
     nokogiri (1.5.2)
+    nokogiri (1.5.2-java)
     pry (0.9.9.6)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
@@ -33,9 +34,6 @@ GEM
       slop (>= 2.4.4, < 3)
       spoon (~> 0.0)
     rake (0.9.2.2)
-    roxml (3.1.3)
-      activesupport (>= 2.1.0)
-      nokogiri (>= 1.3.3)
     slop (2.4.4)
     spoon (0.0.1)
 

data/elibri_onix.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   ]
   
   gem.add_runtime_dependency 'activesupport', '>= 2.3.5'
-  gem.add_runtime_dependency 'roxml', '= 3.1.3'
+  gem.add_runtime_dependency 'nokogiri'
   gem.add_runtime_dependency 'i18n'
   gem.add_runtime_dependency 'elibri_onix_dict', '>= 0.0.5'
 
@@ -33,6 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest", ">= 0"
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rake"
+#  gem.add_development_dependency "ruby-debug"
   #gem.add_development_dependency "rcov", ">= 0"
   
 end

data/lib/elibri_onix.rb

@@ -1,16 +1,17 @@
 
 require 'bigdecimal'
+require 'date'
 # Old ActiveSupport needs 'thread' to see Mutex:
 require 'thread'
 require 'active_support'
 require 'active_support/core_ext'
-require 'roxml'
+require 'nokogiri'
 require 'elibri_onix/version'
 require 'elibri_onix/inspector'
 require 'elibri_onix/external_id'
 require 'elibri_onix/external_timestamp'
 require 'elibri_onix/releases'
-
+require 'elibri_onix/nokogiri_patch'
 require 'elibri_onix_dict'
 
 $KCODE = "UTF-8"

data/lib/elibri_onix/external_id.rb

@@ -1,11 +1,24 @@
 module ExternalId
  
+#  def self.included(base)
+#    base.xml_accessor :id_before_type_cast, :from => "@sourcename"
+#  end
+
   def self.included(base)
-    base.xml_accessor :id_before_type_cast, :from => "@sourcename"
+    base.send(:attr_accessor, :id_before_type_cast)
+  end
+  
+  def set_eid(data)
+    @id_before_type_cast = data.attr('sourcename')
   end
 
+  def eid
+    @id_before_type_cast.split(":")[1].to_i
+  end
+  
   def id
-    id_before_type_cast.split(":")[1].to_i
+    Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+    eid
   end
 
 end

data/lib/elibri_onix/external_timestamp.rb

@@ -1,7 +1,11 @@
 module ExternalTimestamp
 
   def self.included(base)
-    base.xml_accessor :datestamp_before_type_cast, :from => "@datestamp"
+    base.send(:attr_accessor, :datestamp_before_type_cast) #, :from => "@datestamp"
+  end
+  
+  def set_datestamp(data)
+    @datestamp_before_type_cast = data.attr('datestamp')
   end
 
   def datestamp

data/lib/elibri_onix/nokogiri_patch.rb

@@ -0,0 +1,17 @@
+module Nokogiri
+  module XML
+    class Node
+      alias_method :orig_xpath, :xpath
+      
+      def xpath *paths
+        unless Nokogiri.uses_libxml?
+          paths.each do |path|
+            path.gsub!(/xmlns:/, ' :') if path.is_a?(String)
+          end
+        end
+        orig_xpath *paths
+      end
+      
+    end
+  end
+end

data/lib/elibri_onix/onix_3_0/audience_range.rb

@@ -4,23 +4,29 @@ module Elibri
     module Release_3_0
 
       class AudienceRange
-        include ROXML
-        include Inspector
-
-        xml_name 'AudienceRange'
         
         ATTRIBUTES = [
           :qualifier, :precision, :value
         ]
         
         RELATIONS = []
+        
+        attr_accessor :qualifier, :precision, :value, :to_xml
 
-        xml_accessor :qualifier, :from => 'AudienceRangeQualifier'
-        xml_accessor :precision, :from => 'AudienceRangePrecision'
-        xml_accessor :value, :from => 'AudienceRangeValue', :as => Fixnum
+        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
-          "#{qualifier}-#{precision}-#{value}"
+          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+          eid
         end
 
       end

data/lib/elibri_onix/onix_3_0/collection.rb

@@ -4,10 +4,6 @@ module Elibri
     module Release_3_0
 
       class Collection
-        include ROXML
-        include Inspector
-
-        xml_name 'Collection'
         
         ATTRIBUTES = [
           :type, :title_detail, :full_title, :type_name
@@ -16,17 +12,22 @@ module Elibri
         RELATIONS = [
           :elements, :inspect_include_fields
         ]
-
-        xml_accessor :type, :from => 'CollectionType'
-        xml_accessor :elements, :as => [TitleElement]
-        xml_accessor :title_detail, :as => TitleDetail
+        
+        attr_accessor :type, :elements, :title_detail, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @type = data.at_xpath('xmlns:CollectionType').try(:text)
+          @elements = data.xpath('xmlns:TitleElement').map { |element_data| TitleElement.new(element_data) }
+          @title_detail = TitleDetail.new(data.at_xpath('xmlns:TitleDetail')) if data.at_xpath('xmlns:TitleDetail')
+        end
 
         def full_title
           title_detail.try(:full_title)
         end
 
         def type_name
-          Elibri::ONIX::Dict::Release_3_0::CollectionType.find_by_onix_code(type).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::CollectionType.find_by_onix_code(@type).const_name.downcase
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/contributor.rb

@@ -4,8 +4,6 @@ module Elibri
     module Release_3_0
 
       class Contributor
-        include ROXML
-        include Inspector
         include ExternalId
         include ExternalTimestamp
         
@@ -19,24 +17,29 @@ module Elibri
         [
           :inspect_include_fields
         ]
-
-        xml_name 'Contributor'
-
-        xml_accessor :number, :from => 'SequenceNumber', :as => Fixnum
-        xml_accessor :role, :from => 'ContributorRole'
-        xml_accessor :person_name, :from => 'PersonName'
-        xml_accessor :from_language, :from => 'FromLanguage'
-        xml_accessor :titles_before_names, :from => 'TitlesBeforeNames'
-        xml_accessor :names_before_key, :from => 'NamesBeforeKey'
-        xml_accessor :prefix_to_key, :from => 'PrefixToKey'
-        xml_accessor :key_names, :from => 'KeyNames'
-        xml_accessor :names_after_key, :from => 'NamesAfterKey'
-        xml_accessor :biographical_note, :from => 'BiographicalNote'
-
-        xml_accessor :unnamed_persons, :from => 'UnnamedPersons'
+        
+        attr_accessor :number, :role, :person_name, :from_language, :titles_before_names, :names_before_key, :prefix_to_key,
+          :key_names, :names_after_key, :biographical_note, :unnamed_persons, :to_xml
+          
+        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)
+          set_eid(data)
+          set_datestamp(data)
+        end
 
         def role_name
-          Elibri::ONIX::Dict::Release_3_0::ContributorRole.find_by_onix_code(self.role).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ContributorRole.find_by_onix_code(@role).const_name.downcase
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/extent.rb

@@ -5,14 +5,7 @@ module Elibri
     module Release_3_0
 
       class Extent
-        include ROXML
-        include Inspector
-
-        xml_name 'Extent'
-        xml_accessor :type, :from => 'ExtentType'
-        xml_accessor :value, :from => 'ExtentValue', :as => Fixnum
-        xml_accessor :unit, :from => 'ExtentUnit'
-        
+                
         ATTRIBUTES = [
           :type, :value, :unit, :type_name, :unit_name
         ]
@@ -20,17 +13,31 @@ module Elibri
         RELATIONS = [
           :inspect_include_fields
         ]
+        
+        attr_accessor :type, :value, :unit, :to_xml
+        
+        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
-          type.to_i
+          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+          eid
         end
 
         def type_name
-          Elibri::ONIX::Dict::Release_3_0::ExtentType.find_by_onix_code(type).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ExtentType.find_by_onix_code(@type).const_name.downcase
         end
  
         def unit_name
-          Elibri::ONIX::Dict::Release_3_0::ExtentUnit.find_by_onix_code(unit).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::ExtentUnit.find_by_onix_code(@unit).const_name.downcase
         end
 
         def inspect_include_fields

data/lib/elibri_onix/onix_3_0/header.rb

@@ -5,13 +5,8 @@ module Elibri
     module Release_3_0
 
       class Header
-        include ROXML
-        include Inspector
 
-        xml_name 'Header'
-        xml_accessor :sent_date_time, :as => Date, :from => 'SentDateTime'
-
-        xml_accessor :sender, :as => Sender
+        attr_accessor :sent_date_time, :sender, :to_xml
         
         ATTRIBUTES = [
           :sent_date_time, :sender
@@ -19,6 +14,12 @@ module Elibri
         
         RELATIONS = []
         
+        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')
+        end        
+        
       end
 
     end

data/lib/elibri_onix/onix_3_0/imprint.rb

@@ -5,10 +5,6 @@ module Elibri
     module Release_3_0
 
       class Imprint
-        include ROXML
-        include Inspector
-
-        xml_name 'Imprint'
         
         ATTRIBUTES = [
           :name
@@ -16,7 +12,12 @@ module Elibri
         
         RELATIONS = []
 
-        xml_accessor :name, :from => 'ImprintName'
+        attr_accessor :name, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @name = data.at_xpath('xmlns:ImprintName').try(:text)
+        end
 
       end
 

data/lib/elibri_onix/onix_3_0/language.rb

@@ -5,12 +5,6 @@ module Elibri
     module Release_3_0
 
       class Language
-        include ROXML
-        include Inspector
-        xml_name 'Language'
-
-        xml_accessor :role, :from => 'LanguageRole'
-        xml_accessor :code, :from => 'LanguageCode'
         
         ATTRIBUTES = [
           :role, :code, :role_name, :language
@@ -19,21 +13,34 @@ module Elibri
         RELATIONS = [
           :inspect_include_fields
         ]
+        
+        attr_accessor :role, :code, :to_xml
+        
+        def initialize(data)
+          @to_xml = data.to_s
+          @role = data.at_xpath('xmlns:LanguageRole').try(:text)
+          @code = data.at_xpath('xmlns:LanguageCode').try(:text)
+        end
 
         def role_name
-          Elibri::ONIX::Dict::Release_3_0::LanguageRole.find_by_onix_code(self.role).const_name.downcase
+          Elibri::ONIX::Dict::Release_3_0::LanguageRole.find_by_onix_code(@role).const_name.downcase
         end
    
         def language
-          Elibri::ONIX::Dict::Release_3_0::LanguageCode.find_by_onix_code(self.code).name(:pl).downcase
+          Elibri::ONIX::Dict::Release_3_0::LanguageCode.find_by_onix_code(@code).name(:pl).downcase
         end
 
         def inspect_include_fields
            [:role_name, :language]
         end
 
+        def eid
+          "#{@role}-#{@code}"
+        end
+        
         def id
-          "#{role}-#{code}"
+          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+          eid
         end
 
       end

data/lib/elibri_onix/onix_3_0/measure.rb

@@ -5,13 +5,6 @@ module Elibri
     module Release_3_0
 
       class Measure
-        include ROXML
-        include Inspector
-
-        xml_name 'Measure'
-        xml_accessor :type, :from => 'MeasureType'
-        xml_accessor :measurement, :from => 'Measurement', :as => Fixnum
-        xml_accessor :unit, :from => 'MeasureUnitCode'
         
         ATTRIBUTES = [
           :type, :measurement, :unit, :type_name
@@ -20,17 +13,32 @@ module Elibri
         RELATIONS = [
           :inspect_include_fields
         ]
+        
+        attr_accessor :type, :measurement, :unit, :type_name, :to_xml
+        
+        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)
+          
+        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).const_name.downcase
         end
 
         def inspect_include_fields
           [:type_name]
         end
 
+        def eid
+          @type.to_i
+        end
+        
         def id
-          type.to_i
+          Kernel.warn "[DEPRECATION] `id` is deprecated. Please use `eid` instead."
+          eid
         end
 
       end