ruby-batik 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,6 @@
+.rvmrc
 *.gem
 .bundle
 Gemfile.lock
+.rspec-tm
 pkg/*

data/lib/ruby-batik/transcoder.rb

@@ -1,3 +1,5 @@
+java_import 'org.apache.batik.transcoder.ErrorHandler'
+
 module Batik
   class Transcoder
     def initialize(options={})
@@ -18,4 +20,20 @@ module Batik
     end
     alias_method :to_tif, :to_tiff
   end
+
+  class DefaultErrorHandler
+    include Java::OrgApacheBatikTranscoder::ErrorHandler
+
+ 	  def error(exception)
+   		raise exception
+  	end
+
+  	def fatalError(eexception)
+   		raise exception
+  	end
+
+  	def warning(exception)
+      raise exception
+  	end
+  end
 end

data/lib/ruby-batik/transcoders/abstract.rb

@@ -17,7 +17,7 @@ module Batik
       
       def self.default_options
         {
-          :execute_onload => true, # true/false
+          :execute_onload => nil, # true/false
           :allowed_script_types => nil, # text/ecmascript, application/java-archive
           :constrain_script_origin => nil, # true/false
           :snapshot_time => nil,
@@ -40,22 +40,23 @@ module Batik
         out_io = StringIO.new('','w+b')
 
         transcoder = klass.new
+        transcoder.setErrorHandler(Batik::DefaultErrorHandler.new)
         options.each_pair do |key, val|
           next if val.nil?
 
-          java_type = java_type_for(key)
-          transcoder.java_send(:addTranscodingHint,
-                               [TranscodingHints::Key, java.lang.Object],
-                               transcoder.class.const_get("key_#{key}".upcase), 
-                               val.to_java(java_type))
+          transcoder.addTranscodingHint(transcoder.class.const_get("key_#{key}".upcase), val.to_java(java_type_for(key)))
         end
-        input = TranscoderInput.java_class.constructor(java.io.InputStream).new_instance(in_io.to_inputstream)
-        output = TranscoderOutput.java_class.constructor(java.io.OutputStream).new_instance(out_io.to_outputstream)
 
-        transcoder.transcode(input, output)
+        transcoder.transcode(TranscoderInput.new(in_io.to_inputstream), TranscoderOutput.new(out_io.to_outputstream))
         out_io.flush
-        out_io.rewind
-        out_io.read
+
+        # Sometimes this is closed for read. If so, we must use the #string method
+        if out_io.closed_read?
+          out_io.string
+        else
+          out_io.rewind
+          out_io.read
+        end
       end
 
       private

data/lib/ruby-batik/version.rb

@@ -1,3 +1,3 @@
 module Batik
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/ruby-batik.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "ruby-batik"
 
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rspec", ">= 2.6.0"
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec"
 end

data/spec/files/svg_with_invalid_script.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="12cm" height="3.6cm" viewBox="0 0 1000 300" version="1.1"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <path id="MyPath" d="M 100 200  C 200 100 300   0 400 100
+             C 500 200 600 300 700 200
+             C 800 100 900 100 900 100" />
+  </defs>
+  <use xlink:href="#MyPath" fill="none" stroke="red"  />
+  <text font-size="42.5" fill="blue" >
+    <textPath xlink:href="#MyPath">
+      We go up, then we go down, then up again
+    </textPath>
+  </text>
+
+  <rect x="1" y="1" width="998" height="298" fill="none" stroke="blue" stroke-width="2" />
+  <script type="text/ecmascript">
+    <![CDATA[
+      unknown_function(15);
+    ]]></script>
+</svg>

data/spec/files/svg_with_valid_script.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="12cm" height="3.6cm" viewBox="0 0 1000 300" version="1.1"
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <path id="MyPath" d="M 100 200  C 200 100 300   0 400 100
+             C 500 200 600 300 700 200
+             C 800 100 900 100 900 100" />
+  </defs>
+  <use xlink:href="#MyPath" fill="none" stroke="red"  />
+  <text font-size="42.5" fill="blue" >
+    <textPath id="test" xlink:href="#MyPath">
+      We go up, then we go down, then up again
+    </textPath>
+  </text>
+
+  <rect x="1" y="1" width="998" height="298" fill="none" stroke="blue" stroke-width="2" />
+  <script type="text/ecmascript">
+    <![CDATA[
+      document.getElementById('test').firstChild.nodeValue = 'This should be here';
+    ]]>
+  </script>
+</svg>

data/spec/script_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('spec_helper.rb', File.dirname(__FILE__))
+
+describe "script execution" do
+  it "should fail with invalid javascript" do
+    transcoder = Batik::Transcoder.new
+    svg = File.read(File.expand_path('svg_with_invalid_script.svg', File.dirname(__FILE__) + '/files'))
+    expect {
+      transcoder.to_png(svg, :execute_onload => true)
+    }.to raise_error(NativeException)
+  end
+
+  it "should not fail with valid_javascript" do
+    transcoder = Batik::Transcoder.new
+    svg = File.read(File.expand_path('svg_with_valid_script.svg', File.dirname(__FILE__) + '/files'))
+    expect {
+      File.open("/tmp/foo.png", 'wb+') { |fp| fp.write(transcoder.to_png(svg, :execute_onload => true)) }
+    }.to_not raise_error
+  end
+
+  it "should equal the prerendered test file" do
+    transcoder = Batik::Transcoder.new
+    svg = File.read(File.expand_path('svg_with_valid_script.svg', File.dirname(__FILE__) + '/files'))
+    expect {
+      transcoder.to_png(svg, :execute_onload => true).size.should eq(File.size(File.expand_path('svg_with_valid_script.png', File.dirname(__FILE__) + '/files')))
+    }.to_not raise_error
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'rspec'
+$LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
+require 'ruby-batik'

metadata

@@ -2,7 +2,7 @@
 name: ruby-batik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
   - Kelley Reynolds
@@ -10,19 +10,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 Z
+date: 2012-01-03 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: bundler
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 1.0.0
     type: :development
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.6.0
+    type: :development
+    version_requirements: *id002
 description: Wrapper for SVG Transcoding using Apache Batik
 email: 
   - kelley.reynolds@rubyscale.com
@@ -34,7 +45,6 @@ extra_rdoc_files: []
 
 files: 
   - .gitignore
-  - .rvmrc
   - Gemfile
   - README.rdoc
   - Rakefile
@@ -46,6 +56,11 @@ files:
   - lib/ruby-batik/transcoders/tiff.rb
   - lib/ruby-batik/version.rb
   - ruby-batik.gemspec
+  - spec/files/svg_with_invalid_script.svg
+  - spec/files/svg_with_valid_script.png
+  - spec/files/svg_with_valid_script.svg
+  - spec/script_spec.rb
+  - spec/spec_helper.rb
 homepage: https://github.com/kreynolds/ruby-batik
 licenses: []
 
@@ -73,5 +88,9 @@ rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Wrapper for SVG Transcoding using Apache Batik
-test_files: []
-
+test_files: 
+  - spec/files/svg_with_invalid_script.svg
+  - spec/files/svg_with_valid_script.png
+  - spec/files/svg_with_valid_script.svg
+  - spec/script_spec.rb
+  - spec/spec_helper.rb

data/.rvmrc

@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="jruby-1.6.5@ruby-batik"
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-#
-# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
-#
-#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
-#
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create use  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
-# then
-#   printf "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && command -v bundle
-# then
-#   bundle install
-# fi
-
-if [[ $- == *i* ]] # check for interactive shells
-then
-    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-else 
-	echo "Using: $GEM_HOME" # don't use colors in interactive shells
-fi
-