milkfarm-onix 0.8.3 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.3 (9th September 2010)
+- Fix for race condition in ONIX::Normaliser
+  - thanks to pixelvixen for reporting
+- force roxml to be 3.1.6 or higher. Earlier versions misbehaved when monkey
+  patching nokogiri
+
 v0.8.2 (6th May 2010)
 - fix APAProduct#series and APAProduct#series=
 

data/lib/onix.rb

@@ -9,7 +9,7 @@ module ONIX
   module Version #:nodoc:
     Major = 0
     Minor = 8
-    Tiny  = 3
+    Tiny  = 5
 
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/onix/normaliser.rb

@@ -78,8 +78,8 @@ module ONIX
     def next_tempfile
       p = nil
       Tempfile.open("onix") do |tf|
-        tf.close
         p = tf.path
+        tf.close!
       end
       p
     end

data/lib/onix/product.rb

@@ -19,6 +19,7 @@ module ONIX
     xml_accessor :edition_number, :from => "EditionNumber", :as => Fixnum
     xml_accessor :languages, :from => "Language", :as => [ONIX::Language]
     xml_accessor :number_of_pages, :from => "NumberOfPages", :as => Fixnum
+    xml_accessor :basic_main_subject, :from => "BASICMainSubject"
     xml_accessor :bic_main_subject, :from => "BICMainSubject"
     xml_accessor :subjects, :from => "Subject", :as => [ONIX::Subject]
     xml_accessor :audience_code, :from => "AudienceCode", :to_xml => ONIX::Formatters.two_digit

data/lib/onix/sl_product.rb

@@ -6,6 +6,7 @@ module ONIX
     delegate :audience_code, :audience_code=
     delegate :copyright_year, :copyright_year=
     delegate :product_form_detail, :product_form_detail=
+    delegate :basic_main_subject, :basic_main_subject=
     
     # retrieve the value of a particular ID
     def series(str)

data/spec/apa_product_spec.rb

@@ -12,7 +12,7 @@ context "ONIX::APAProduct" do
     @product_node = @doc.root
   end
 
-  specify "should provide read access to attibutes" do
+  specify "should provide read access to attributes" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @apa     = ONIX::APAProduct.new(@product)
 
@@ -26,7 +26,7 @@ context "ONIX::APAProduct" do
     @apa.pack_quantity.should eql(12)
   end
 
-  specify "should provide write access to attibutes" do
+  specify "should provide write access to attributes" do
     apa = ONIX::APAProduct.new
 
     apa.notification_type = 3

data/spec/audience_range_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::AudienceRange" do
     aud.to_xml.to_s[0,15].should eql("<AudienceRange>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     aud = ONIX::AudienceRange.from_xml(@root.to_s)
 
     aud.audience_range_qualifier.should eql(11)
@@ -28,7 +28,7 @@ context "ONIX::AudienceRange" do
     aud.audience_range_values[1].should eql(5)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     aud = ONIX::AudienceRange.new
 
     aud.audience_range_qualifier = 12

data/spec/contributor_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::Contributor" do
     header.to_xml.to_s[0,13].should eql("<Contributor>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     contrib = ONIX::Contributor.from_xml(@root.to_s)
 
     contrib.contributor_role.should eql("A01")
@@ -24,7 +24,7 @@ context "ONIX::Contributor" do
     contrib.sequence_number.should eql(1)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     contrib = ONIX::Contributor.new
 
     contrib.contributor_role = "A02"

data/spec/header_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::Header" do
     header.to_xml.to_s[0,8].should eql("<Header>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     header = ONIX::Header.from_xml(@header_node.to_s)
 
     header.from_ean_number.should eql("1111111111111")
@@ -42,7 +42,7 @@ context "ONIX::Header" do
     header.default_class_of_trade.should eql("f")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     header = ONIX::Header.new
 
     header.from_ean_number = "1111111111111"

data/spec/imprint_spec.rb

@@ -16,13 +16,13 @@ context "ONIX::Imprint" do
     imp.to_xml.to_s[0,9].should eql("<Imprint>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     imp = ONIX::Imprint.from_xml(@root.to_s)
 
     imp.imprint_name.should eql("Oxford University Press UK")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     imp = ONIX::Imprint.new
 
     imp.imprint_name = "Paulist Press"

data/spec/language_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::Language" do
     lan.to_xml.to_s[0,10].should eql("<Language>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     lan = ONIX::Language.from_xml(@root.to_s)
 
     lan.language_role.should eql(1)
@@ -24,7 +24,7 @@ context "ONIX::Language" do
     lan.country_code.should eql("US")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     lan = ONIX::Language.new
 
     lan.language_role = 2

data/spec/market_representation_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::MarketRepresentation" do
     rep.to_xml.to_s[0,22].should eql("<MarketRepresentation>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     rep = ONIX::MarketRepresentation.from_xml(@root.to_s)
 
     rep.agent_name.should eql("Allen & Unwin")
     rep.agent_role.should eql(7)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     rep = ONIX::MarketRepresentation.new
 
     rep.agent_name = "Rainbow Book Agencies"

data/spec/measure_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::Measure" do
     m.to_xml.to_s[0,9].should eql("<Measure>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     m = ONIX::Measure.from_xml(@root.to_s)
 
     m.measure_type_code.should eql(1)
@@ -24,7 +24,7 @@ context "ONIX::Measure" do
     m.measure_unit_code.should eql("mm")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     m = ONIX::Measure.new
 
     m.measure_type_code = 1

data/spec/media_file_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::MediaFile" do
     mf.to_xml.to_s[0,11].should eql("<MediaFile>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     mf = ONIX::MediaFile.from_xml(@root.to_s)
     mf.media_file_type_code.should eql(4)
     mf.media_file_link_type_code.should eql(1)
     mf.media_file_link.should eql("http://www.allenandunwin.com/BookCovers/resized_9788888028729_224_297_FitSquare.jpg")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     mf = ONIX::MediaFile.new
 
     mf.media_file_type_code = 2

data/spec/other_text_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::OtherText" do
     ot.to_xml.to_s[0,11].should eql("<OtherText>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     ot = ONIX::OtherText.from_xml(@root.to_s)
 
     ot.text_type_code.should eql(2)
     ot.text[0,7].should eql("A woman")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     ot = ONIX::OtherText.new
 
     ot.text_type_code = 2

data/spec/price_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::Price" do
     p.to_xml.to_s[0,7].should eql("<Price>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     p = ONIX::Price.from_xml(@root.to_s)
 
     p.price_type_code.should eql(2)
     p.price_amount.should eql(BigDecimal.new("7.5"))
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     p = ONIX::Price.new
 
     p.price_type_code = 1

data/spec/product_identifier_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::ProductIdentifier" do
     id.to_xml.to_s[0,19].should eql("<ProductIdentifier>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     id = ONIX::ProductIdentifier.from_xml(@root.to_s)
 
     id.product_id_type.should eql(2)
     id.id_value.should eql("0858198363")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     id = ONIX::ProductIdentifier.new
 
     id.product_id_type = 2

data/spec/product_spec.rb

@@ -11,7 +11,7 @@ context "ONIX::Product" do
     @product_node = @doc.root
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     product = ONIX::Product.from_xml(@product_node.to_s)
 
     product.record_reference.should eql("365-9780194351898")
@@ -52,7 +52,7 @@ context "ONIX::Product" do
     product.measurements.size.should eql(1)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     product = ONIX::Product.new
 
     product.notification_type = 3

data/spec/publisher_spec.rb

@@ -16,13 +16,13 @@ context "ONIX::Publisher" do
     pub.to_xml.to_s[0,11].should eql("<Publisher>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     pub = ONIX::Publisher.from_xml(@root.to_s)
     pub.publishing_role.should eql(1)
     pub.publisher_name.should eql("Desbooks Publishing")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     pub = ONIX::Publisher.new
 
     pub.publisher_name = "Paulist Press"

data/spec/sales_restriction_spec.rb

@@ -16,13 +16,13 @@ context "ONIX::SalesRestriction" do
     sr.to_xml.to_s[0,18].should eql("<SalesRestriction>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     sr = ONIX::SalesRestriction.from_xml(@root.to_s)
 
     sr.sales_restriction_type.should eql(0)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     sr = ONIX::SalesRestriction.new
 
     sr.sales_restriction_type = 1

data/spec/sender_identifier.rb

@@ -16,14 +16,14 @@ context "ONIX::SenderIdentifier" do
     id.to_xml.to_s[0,18].should eql("<SenderIdentifier>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     id = ONIX::SenderIdentifier.from_xml(@root.to_s)
 
     id.sender_id_type.should eql(1)
     id.id_value.should eql("123456")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     id = ONIX::SenderIdentifier.new
 
     id.sender_id_type = 1

data/spec/series_identifier_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::SeriesIdentifier" do
     series.to_xml.to_s[0,18].should eql("<SeriesIdentifier>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     series = ONIX::SeriesIdentifier.from_xml(@root.to_s)
 
     series.series_id_type.should eql(1)
     series.id_value.should eql("10001")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     series = ONIX::SeriesIdentifier.new
 
     series.series_id_type = 9

data/spec/series_spec.rb

@@ -16,13 +16,13 @@ context "ONIX::Series" do
     series.to_xml.to_s[0,8].should eql("<Series>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     series = ONIX::Series.from_xml(@root.to_s)
 
     series.title_of_series.should eql("Citizens and Their Governments")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     series = ONIX::Series.new
 
     series.title_of_series = "Cool Science Careers"

data/spec/set_spec.rb

@@ -16,13 +16,13 @@ context "ONIX::Set" do
     set.to_xml.to_s[0,5].should eql("<Set>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     set = ONIX::Set.from_xml(@root.to_s)
 
     set.title_of_set.should eql("Citizens and Their Governments")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     set = ONIX::Set.new
 
     set.title_of_set = "Cool Science Careers"

data/spec/sl_product_spec.rb

@@ -12,7 +12,7 @@ context "ONIX::SLProduct" do
     @product_node = @doc.root
   end
 
-  specify "should provide read access to attibutes" do
+  specify "should provide read access to attributes" do
     @product = ONIX::Product.from_xml(@product_node.to_s)
     @sl     = ONIX::SLProduct.new(@product)
 
@@ -26,7 +26,7 @@ context "ONIX::SLProduct" do
     @sl.pack_quantity.should eql(12)
   end
 
-  specify "should provide write access to attibutes" do
+  specify "should provide write access to attributes" do
     sl = ONIX::SLProduct.new
 
     sl.notification_type = 3
@@ -41,8 +41,8 @@ context "ONIX::SLProduct" do
     sl.number_of_pages = 100
     sl.to_xml.to_s.include?("<NumberOfPages>100</NumberOfPages>").should be_true
 
-    sl.bic_main_subject = "EB"
-    sl.to_xml.to_s.include?("<BICMainSubject>EB</BICMainSubject>").should be_true
+    sl.basic_main_subject = "JNF053090"
+    sl.to_xml.to_s.include?("<BASICMainSubject>JNF053090</BASICMainSubject>").should be_true
 
     sl.publishing_status = 4
     sl.to_xml.to_s.include?("<PublishingStatus>04</PublishingStatus>").should be_true

data/spec/spec_helper.rb

@@ -3,6 +3,5 @@
 require 'date'
 require 'stringio'
 require 'rubygems'
-gem "activesupport", "<= 2.9.9"
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'onix'

data/spec/stock_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::Stock" do
     s.to_xml.to_s[0,7].should eql("<Stock>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     s = ONIX::Stock.from_xml(@root.to_s)
 
     # note that these fields *should* be numeric according to the ONIX spec,
@@ -25,7 +25,7 @@ context "ONIX::Stock" do
     s.on_order.should eql("0")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     s = ONIX::Stock.new
 
     s.on_hand = "123"

data/spec/subject_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::Subject" do
     sub.to_xml.to_s[0,9].should eql("<Subject>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     sub = ONIX::Subject.from_xml(@root.to_s)
     sub.subject_scheme_id.should eql(3)
     sub.subject_scheme_name.should eql("RBA Subjects")
     sub.subject_code.should eql("AABB")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     sub = ONIX::Subject.new
 
     sub.subject_scheme_id = 2

data/spec/supply_detail_spec.rb

@@ -16,7 +16,7 @@ context "ONIX::SupplyDetail" do
     sd.to_xml.to_s[0,14].should eql("<SupplyDetail>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     sd = ONIX::SupplyDetail.from_xml(@root.to_s)
 
     sd.supplier_name.should eql("Rainbow Book Agencies")
@@ -28,7 +28,7 @@ context "ONIX::SupplyDetail" do
     sd.prices.size.should eql(1)
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     sd = ONIX::SupplyDetail.new
 
     sd.supplier_name = "RBA"

data/spec/title_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::Title" do
     t.to_xml.to_s[0,7].should eql("<Title>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     t = ONIX::Title.from_xml(@root.to_s)
     t.title_type.should eql(1)
     t.title_text.should eql("Good Grief")
     t.subtitle.should   eql("A Constructive Approach to the Problem of Loss")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     t = ONIX::Title.new
 
     t.title_type = 1

data/spec/website_spec.rb

@@ -16,14 +16,14 @@ context "ONIX::Website" do
     web.to_xml.to_s[0,9].should eql("<Website>")
   end
 
-  specify "should provide read access to first level attibutes" do
+  specify "should provide read access to first level attributes" do
     web = ONIX::Website.from_xml(@root.to_s)
 
     web.website_role.should eql(1)
     web.website_link.should eql("http://www.rainbowbooks.com.au")
   end
 
-  specify "should provide write access to first level attibutes" do
+  specify "should provide write access to first level attributes" do
     web = ONIX::Website.new
 
     web.website_role = 2

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkfarm-onix
 version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - James Healy
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -07:00
+date: 2010-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: roxml
+  name: yob-roxml
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 3
         - 1
-        - 1
-        version: 3.1.1
+        - 6
+        version: 3.1.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: andand
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,29 +52,17 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
         version: "1.4"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - <=
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 9
-        - 9
-        version: 2.9.9
-  type: :runtime
-  version_requirements: *id004
 description: A convient mapping between ruby objects and the ONIX XML specification
 email: jimmy@deefa.com
 executables: []
@@ -193,23 +186,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rbook
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A convient mapping between ruby objects and the ONIX XML specification