rack-xslview 0.1.3 → 0.2.0

data/Rakefile

@@ -7,19 +7,19 @@ begin
     gem.name = "rack-xslview"
     gem.summary = %Q{XSL rack middleware.}
     gem.description = %Q{A rack middleware for transforming XML with XSL.}
-    gem.email = "albert.lash@docunext.com"
-    gem.homepage = "http://www.docunext.com/wiki/Rack-XSLView"
-    gem.authors = ["Albert Lash"]
-    gem.rubyforge_project = ""
-    gem.add_development_dependency "shoulda"
+    gem.email = 'albert.lash@docunext.com'
+    gem.homepage = 'http://www.docunext.com/wiki/Rack-XSLView'
+    gem.authors = ['Albert Lash']
+    gem.rubyforge_project = ''
+    gem.add_development_dependency 'shoulda'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
+    rubyforge.doc_task = 'rdoc'
   end
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts 'Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler'
 end
 
 
@@ -46,6 +46,7 @@ end
 task :test => :check_dependencies
 
 task :default => :test
+task :spec => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/rack-xslview.rb

@@ -1,12 +1,16 @@
-# MIT License
+# Copyright 2010 Savonix Corporation
+# Author Albert L. Lash, IV
+# License MIT
 module Rack
   class XSLView
+
+    class XSLViewError < StandardError ; end
+
     def initialize(app, options)
-      @my_path_info = String.new
       @app = app
-      @myhash = {}
       @options = {:myxsl => nil}.merge(options)
-      if @options[:myxsl] == nil
+      if @options[:myxsl].nil?
+        require 'rexml/document'
         @xslt = XML::XSLT.new()
         @xslt.xsl = REXML::Document.new '<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml"><xsl:import href="http://github.com/docunext/1bb02b59/raw/master/standard.html.xsl"/><xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="no" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" indent="yes"/></xsl:stylesheet>'
       else
@@ -15,44 +19,73 @@ module Rack
     end
 
     def call(env)
-      if checknoxsl(env)
-        @app.call(env)
-      else
-        if @options[:reload] == true
-          puts @options[:filepath]
-          @xslt     = XML::XSLT.new()
-          @xslt.xsl = REXML::Document.new @options[:xslfile]
-        end
-        unless @options[:passenv] == nil
-          @options[:passenv].each { |envkey|
-            if (mp = env[envkey])
-              @myhash[envkey] = "#{mp}"
-            end
-          }
-          @xslt.parameters = @myhash
-        end
-        status, headers, body = @app.call(env)
+      # No matter what, @app will be called
+      status, headers, body = @app.call(env)
 
-        # Obtain entire request body
-        parts = ''
-        body.each { |part| parts << part.to_s }
+      # If setup includes paths to exclude from xslt processing, check them
+      checknoxsl(env) if @options[:noxsl]
 
-        # TODO Refactor
-        if ((parts.include? "<html") || !(parts.include? "<"))
-          [status, headers, body]
-        else
-          headers.delete('Content-Length')
-          @xslt.xml = parts
-          newbody = []
-          newbody << @xslt.serve
-          headers['Content-Length'] = newbody[0].length.to_s
-          [status, headers, newbody]
-        end
+      # Obtain entire request body, check to make sure it can be processed
+      myxml = getResponse(body)
+
+      # Should XSL file be reloaded?
+      if @options[:reload] == true
+        @xslt     = XML::XSLT.new()
+        @xslt.xsl = REXML::Document.new @options[:xslfile]
       end
+
+      # Set XML for stylesheet
+      @xslt.xml = myxml
+
+      # If setup includes env vars to pass through as params, do so
+      unless @options[:passenv].nil?
+        @myhash = {}
+        @options[:passenv].each { |envkey|
+          # Does env var exist?
+          @myhash[envkey] = "#{env[envkey]}" if env[envkey]
+        }
+        @xslt.parameters = @myhash unless @myhash.empty?
+      end
+
+      # Perform the transformation
+      newbody = Array.[](@xslt.serve)
+
+      # If we've made it this far, we can alter the headers
+      headers.delete('Content-Length')
+      headers['Content-Length'] = newbody[0].length.to_s
+      [status, headers, newbody]
+
+    rescue XSLViewError
+      # TODO Logging: "Rack XSLView not processed" if env['RACK_ENV'] == 'development'
+      [status, headers, body]
     end
 
     private
+    def checknoxsl(env)
+      @options[:noxsl].each { |path|
+        raise XSLViewError if env["PATH_INFO"].index(path)
+      }
+    end
+    def getResponse(body)
+      raise XSLViewError if body.nil?
+      newbody = ''
+      body.each { |part|
+        # Only check the first chunk to ensure 1) its not HTML and 2) its XML
+        checkForXml(part) if newbody.empty?
+        newbody << part.to_s
+      }
+      return newbody
+    end
+    def checkForXml(x)
+      # Abort processing if content cannot be processed by libxslt
+      raise XSLViewError unless x[0,1] == '<'
+      if @options[:excludehtml] == true
+        raise XSLViewError if x.include? '<html'
+      end
+    end
+
     def choosesheet(env)
+      # Not used yet, this may be used to match stylesheets with paths
       @options[:xslhash].each_key { |path|
         if env["PATH_INFO"].index(path)
           return @options[:xslhash][path]
@@ -60,14 +93,6 @@ module Rack
       }
       return false
     end
-    def checknoxsl(env)
-      @options[:noxsl].each { |path|
-        if env["PATH_INFO"].index(path)
-          return true
-        end
-      }
-      return false
-    end
   end
 end
 

data/test/rack-xslview_test.rb

@@ -8,6 +8,7 @@ class RackXslviewTest < Test::Unit::TestCase
 
   end
 
+
   def self.should_not_halt
     should "not halt the rack chain" do
       @app.expects(:call).once
@@ -15,6 +16,15 @@ class RackXslviewTest < Test::Unit::TestCase
     end
   end
 
+  def self.should_be_a_rack_response
+    should 'be a rack a response' do
+      ret = @rack.call(call_args)
+      assert ret.is_a?(Array), 'return value is not a valid rack response'
+      assert_equal 3, ret.size, 'should have 3 arguments'
+    end
+  end
+
+  
   context 'Given an app' do
     setup do
       @app = Class.new { def call(app); true; end }.new
@@ -26,6 +36,7 @@ class RackXslviewTest < Test::Unit::TestCase
         passenv = ['PATH_INFO', 'RACK_MOUNT_PATH']
         @rack = Rack::XSLView.new(@app, :noxsl => omitpaths, :passenv => passenv)
       }
+      should_be_a_rack_response
       should_not_halt
     end
     context 'Trying out the xslhash' do
@@ -35,7 +46,7 @@ class RackXslviewTest < Test::Unit::TestCase
         xslhash.default("/path/to/output.xhtml10.xsl")
         @rack = Rack::XSLView.new(@app, :noxsl => omitpaths, :xslhash => xslhash)
       }
-      should_not_halt
+      should_be_a_rack_response
     end
   end
 end

data/test/test_install.rb

@@ -1,2 +1 @@
-require 'rubygems'
-require 'rack-xslview'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-xslview
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Albert Lash
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -05:00
+date: 2010-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency