onix 0.7.8 → 0.8.0

data/spec/website_spec.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Website" do
 
   before(:each) do
     data_path = File.join(File.dirname(__FILE__),"..","data")
     file1    = File.join(data_path, "website.xml")
-    @doc = LibXML::XML::Document.file(file1)
+    @doc     = Nokogiri::XML::Document.parse(File.read(file1))
     @root = @doc.root
   end
 

data/spec/writer_spec.rb

@@ -1,9 +1,6 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'onix'
-require 'stringio'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 context "ONIX::Writer" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onix
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +11:00
+date: 2009-10-31 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,29 +18,29 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.3
+        version: 3.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: andand
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: andand
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.4"
     version: 
 description: A convient mapping between ruby objects and the ONIX XML specification
 email: jimmy@deefa.com
@@ -51,103 +51,103 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/onix/writer.rb
+- lib/onix/title.rb
+- lib/onix/simple_product.rb
+- lib/onix/publisher.rb
+- lib/onix/stock.rb
+- lib/onix/contributor.rb
+- lib/onix/subject.rb
+- lib/onix/apa_product.rb
+- lib/onix/imprint.rb
+- lib/onix/series.rb
+- lib/onix/website.rb
+- lib/onix/sender_identifier.rb
 - lib/onix/header.rb
-- lib/onix/price.rb
-- lib/onix/product.rb
-- lib/onix/reader.rb
+- lib/onix/measure.rb
 - lib/onix/lists/product_form.rb
+- lib/onix/lists/notification_type.rb
+- lib/onix/lists/language_role.rb
+- lib/onix/lists/country_code.rb
+- lib/onix/lists/product_form_detail.rb
 - lib/onix/lists/product_availability.rb
 - lib/onix/lists/audience_code.rb
-- lib/onix/lists/country_code.rb
 - lib/onix/lists/language_code.rb
-- lib/onix/lists/language_role.rb
-- lib/onix/lists/notification_type.rb
-- lib/onix/lists/product_form_detail.rb
-- lib/onix/addressee_identifier.rb
-- lib/onix/apa_product.rb
-- lib/onix/contributor.rb
-- lib/onix/imprint.rb
-- lib/onix/media_file.rb
-- lib/onix/other_text.rb
-- lib/onix/product_identifier.rb
-- lib/onix/publisher.rb
-- lib/onix/website.rb
-- lib/onix/sales_restriction.rb
-- lib/onix/sender_identifier.rb
-- lib/onix/simple_product.rb
-- lib/onix/stock.rb
-- lib/onix/subject.rb
-- lib/onix/supply_detail.rb
-- lib/onix/title.rb
 - lib/onix/market_representation.rb
-- lib/onix/measure.rb
-- lib/onix/writer.rb
-- lib/onix/common.rb
-- lib/onix/normaliser.rb
 - lib/onix/audience_range.rb
+- lib/onix/product_identifier.rb
+- lib/onix/supply_detail.rb
 - lib/onix/language.rb
-- lib/onix/series.rb
 - lib/onix/series_identifier.rb
+- lib/onix/addressee_identifier.rb
+- lib/onix/normaliser.rb
+- lib/onix/other_text.rb
+- lib/onix/price.rb
+- lib/onix/sales_restriction.rb
+- lib/onix/reader.rb
+- lib/onix/product.rb
+- lib/onix/media_file.rb
 - lib/onix.rb
 - README.markdown
 - TODO
 - CHANGELOG
+- dtd/2.1r3/iso-mopf.ent
 - dtd/2.1r3/onix-international.dtd
-- dtd/2.1r3/onix-xhtml.elt
-- dtd/2.1r3/reference.elt
+- dtd/2.1r3/iso-mfrk.ent
 - dtd/2.1r3/iso-amsa.ent
-- dtd/2.1r3/iso-amsb.ent
 - dtd/2.1r3/iso-amsc.ent
-- dtd/2.1r3/iso-amsn.ent
-- dtd/2.1r3/iso-amso.ent
+- dtd/2.1r3/iso-tech.ent
+- dtd/2.1r3/iso-num.ent
+- dtd/2.1r3/iso-dia.ent
+- dtd/2.1r3/iso-num.old.ent
+- dtd/2.1r3/xhtml-symbol.ent
+- dtd/2.1r3/iso-pub.ent
+- dtd/2.1r3/reference.elt
 - dtd/2.1r3/iso-amsr.ent
-- dtd/2.1r3/iso-box.ent
 - dtd/2.1r3/iso-cyr1.ent
-- dtd/2.1r3/iso-cyr2.ent
-- dtd/2.1r3/iso-dia.ent
-- dtd/2.1r3/iso-grk3.ent
+- dtd/2.1r3/iso-amsn.ent
 - dtd/2.1r3/iso-lat1.ent
-- dtd/2.1r3/iso-lat2.ent
-- dtd/2.1r3/iso-mfrk.ent
-- dtd/2.1r3/iso-mopf.ent
+- dtd/2.1r3/iso-box.ent
 - dtd/2.1r3/iso-mscr.ent
-- dtd/2.1r3/iso-num.ent
-- dtd/2.1r3/iso-num.old.ent
-- dtd/2.1r3/iso-pub.ent
-- dtd/2.1r3/iso-tech.ent
 - dtd/2.1r3/xhtml-special.ent
-- dtd/2.1r3/xhtml-symbol.ent
+- dtd/2.1r3/iso-lat2.ent
+- dtd/2.1r3/iso-cyr2.ent
+- dtd/2.1r3/iso-amsb.ent
+- dtd/2.1r3/iso-amso.ent
+- dtd/2.1r3/iso-grk3.ent
+- dtd/2.1r3/onix-xhtml.elt
+- support/switch-onix-2.1-short-to-reference.xsl
+- support/entities.txt
 - support/switch-onix-tagnames-2.0.xsl
-- support/switch-onix-tagnames-1.1.xsl
 - support/extract.rb
-- support/entities.txt
-- support/switch-onix-2.1-short-to-reference.xsl
-- spec/header_spec.rb
-- spec/product_spec.rb
-- spec/reader_spec.rb
-- spec/writer_spec.rb
-- spec/contributor_spec.rb
-- spec/imprint_spec.rb
-- spec/market_representation_spec.rb
-- spec/website_spec.rb
-- spec/measure_spec.rb
+- support/switch-onix-tagnames-1.1.xsl
+- spec/series_spec.rb
 - spec/media_file_spec.rb
+- spec/normaliser_spec.rb
 - spec/other_text_spec.rb
-- spec/price_spec.rb
-- spec/product_identifier_spec.rb
+- spec/reader_spec.rb
 - spec/publisher_spec.rb
+- spec/website_spec.rb
 - spec/sales_restriction_spec.rb
-- spec/sender_identifier.rb
+- spec/series_identifier_spec.rb
 - spec/stock_spec.rb
-- spec/subject_spec.rb
-- spec/supply_detail_spec.rb
+- spec/writer_spec.rb
+- spec/header_spec.rb
 - spec/title_spec.rb
-- spec/normaliser_spec.rb
 - spec/apa_product_spec.rb
-- spec/audience_range_spec.rb
 - spec/language_spec.rb
-- spec/series_identifier_spec.rb
-- spec/series_spec.rb
+- spec/sender_identifier.rb
+- spec/audience_range_spec.rb
+- spec/supply_detail_spec.rb
+- spec/contributor_spec.rb
+- spec/market_representation_spec.rb
+- spec/spec_helper.rb
+- spec/subject_spec.rb
+- spec/measure_spec.rb
+- spec/product_identifier_spec.rb
+- spec/imprint_spec.rb
+- spec/product_spec.rb
+- spec/price_spec.rb
 has_rdoc: true
 homepage: http://github.com/yob/onix/tree/master
 licenses: []
@@ -179,29 +179,30 @@ signing_key:
 specification_version: 3
 summary: A convient mapping between ruby objects and the ONIX XML specification
 test_files: 
-- spec/header_spec.rb
-- spec/product_spec.rb
-- spec/reader_spec.rb
-- spec/writer_spec.rb
-- spec/contributor_spec.rb
-- spec/imprint_spec.rb
-- spec/market_representation_spec.rb
-- spec/website_spec.rb
-- spec/measure_spec.rb
+- spec/series_spec.rb
 - spec/media_file_spec.rb
+- spec/normaliser_spec.rb
 - spec/other_text_spec.rb
-- spec/price_spec.rb
-- spec/product_identifier_spec.rb
+- spec/reader_spec.rb
 - spec/publisher_spec.rb
+- spec/website_spec.rb
 - spec/sales_restriction_spec.rb
-- spec/sender_identifier.rb
+- spec/series_identifier_spec.rb
 - spec/stock_spec.rb
-- spec/subject_spec.rb
-- spec/supply_detail_spec.rb
+- spec/writer_spec.rb
+- spec/header_spec.rb
 - spec/title_spec.rb
-- spec/normaliser_spec.rb
 - spec/apa_product_spec.rb
-- spec/audience_range_spec.rb
 - spec/language_spec.rb
-- spec/series_identifier_spec.rb
-- spec/series_spec.rb
+- spec/sender_identifier.rb
+- spec/audience_range_spec.rb
+- spec/supply_detail_spec.rb
+- spec/contributor_spec.rb
+- spec/market_representation_spec.rb
+- spec/spec_helper.rb
+- spec/subject_spec.rb
+- spec/measure_spec.rb
+- spec/product_identifier_spec.rb
+- spec/imprint_spec.rb
+- spec/product_spec.rb
+- spec/price_spec.rb

data/lib/onix/common.rb

@@ -1,26 +0,0 @@
-module ONIX
-  # methods we want to be available on all our ROXML classes
-  module Common
-
-    # After an input string has been marshalled into an object,
-    # ROXML will automatically call this method.
-    #
-    # LibXML (and therefore ROXML) appears to forget the encoding
-    # of the input data, a damn shame considering the Ruby 1.9 encoding
-    # support can be vey useful.
-    #
-    # Since we only ever pass our ROXML objects strings we know are utf-8
-    # encoded, it should be safe enough to force every string attribute
-    # back once the marshalling is done.
-    #
-    def after_parse
-      self.class.roxml_attrs.each do |attr|
-        var = instance_variable_get("@#{attr.variable_name}")
-        if var && var.respond_to?(:force_encoding)
-          var.force_encoding("utf-8")
-        end
-      end
-    end
-  end
-end
-