onix 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.7.3 (19th August 2009)
+- Switch from java to xsltproc to convert short tag ONIX files
+  to reference tags
+
 v0.7.2 (19th August 2009)
 - Added ONIX::Normaliser class
   - for normalising various ONIX files into a form that makes them easy

data/lib/onix.rb

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

data/lib/onix/normaliser.rb

@@ -39,10 +39,10 @@ module ONIX
     def initialize(oldfile, newfile)
       raise ArgumentError, "#{oldfile} does not exist" unless File.file?(oldfile)
       raise ArgumentError, "#{newfile} already exists" if File.file?(newfile)
-      raise "java app not found"    unless app_available?("which")
-      raise "isutf8 app not found"  unless app_available?("isutf8")
-      raise "iconv app not found"   unless app_available?("iconv")
-      raise "sed app not found"     unless app_available?("sed")
+      raise "xsltproc app not found" unless app_available?("xsltproc")
+      raise "isutf8 app not found"   unless app_available?("isutf8")
+      raise "iconv app not found"    unless app_available?("iconv")
+      raise "sed app not found"      unless app_available?("sed")
 
       @oldfile = oldfile
       @newfile = newfile
@@ -98,11 +98,8 @@ module ONIX
     def to_reference_tags(src, dest)
       inpath = File.expand_path(src)
       outpath = File.expand_path(dest)
-      xsltpath = File.dirname(__FILE__) + "/../../support/switch-onix-tagnames-1.1.xsl"
-      # xsltproc doesn't set the DTD correctly in the output. Using
-      # saxon instead.
-      #`xsltproc -o #{outpath} #{xsltpath} #{inpath}`
-      `java -jar /usr/share/java/saxon.jar #{inpath} #{xsltpath} > #{outpath}`
+      xsltpath = File.dirname(__FILE__) + "/../../support/switch-onix-2.1-short-to-reference.xsl"
+      `xsltproc -o #{outpath} #{xsltpath} #{inpath}`
     end
 
     # ensure the file is valid utf8, then make sure it's declared as such

data/spec/normaliser_spec.rb

@@ -21,6 +21,7 @@ context "ONIX::Normaliser", "with a simple short tag file" do
 
     File.file?(@outfile).should be_true
     content = File.read(@outfile)
+    puts content
     content.include?("<m174>").should be_false
     content.include?("<FromCompany>").should be_true
   end

data/support/switch-onix-2.1-short-to-reference.xsl

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:variable name="target"><xsl:choose>
+	<xsl:when test="/ONIXMessage">short</xsl:when>
+	<xsl:otherwise>reference</xsl:otherwise>
+</xsl:choose></xsl:variable>
+<xsl:output method="xml" doctype-system="http://www.editeur.org/onix/2.1/reference/onix-international.dtd"/>
+<xsl:template match="*">
+	<xsl:variable name="target-name">
+		<xsl:choose>
+			<xsl:when test="$target='short'"><xsl:value-of select="@shortname"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="@refname"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+ <xsl:element name="{$target-name}">
+  <xsl:copy-of select="@*[not(name()='refname' or name()='shortname')]"/>
+  <xsl:apply-templates select="*|text()"/>
+ </xsl:element>
+</xsl:template>
+<xsl:template match="text()">
+ <xsl:copy/>
+</xsl:template>
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onix
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - James Healy
@@ -111,6 +111,7 @@ files:
 - 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