rack-xslview 0.2.2 → 0.2.3

data/Rakefile

@@ -43,8 +43,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 task :spec => :test
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/rack-xslview.rb

@@ -21,10 +21,10 @@ module Rack
     def call(env)
 
       # No matter what, @app will be called
-      status, headers, body = original_response = @app.call(env)
-      
+      status, headers, body = @app.call(env)
+      original_response = Array[status, headers, body]
       exluded_status = Array[204, 301, 302, 304]
-      return original_response if exluded_status.include?(status)
+      return original_response if exluded_status.include?(status) || body.nil?
 
       return original_response unless headers["Content-Type"].to_s.match(/(ht|x)ml/) 
 
@@ -33,9 +33,12 @@ module Rack
 
       # Obtain entire request body, ensuring sure it can be processed
       myxml = getResponse(body)
+	
+      # One more check for an empty respone
+      return original_response if myxml.empty?
 
       # Should XSL file be reloaded?
-      if @options[:reload] == true
+      unless @options[:reload] == true
         @xslt     = XML::XSLT.new()
         @xslt.xsl = REXML::Document.new @options[:xslfile]
       end
@@ -59,6 +62,12 @@ module Rack
       # If we've made it this far, we can alter the headers
       headers.delete('Content-Length')
       headers['Content-Length'] = newbody[0].length.to_s
+
+      # Content type override?
+      unless @options[:content_type].nil?
+        headers["Content-Type"] = @options[:content_type]
+      end
+
       [status, headers, newbody]
 
     rescue XSLViewError
@@ -73,18 +82,20 @@ module Rack
       }
     end
     def getResponse(body)
-      raise XSLViewError if body.nil?
-      newbody = ''
+      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
+      return newbody.join('')
     end
     def checkForXml(x)
       # Abort processing if content cannot be processed by libxslt
+      #puts "test for xml"
+      #puts x[0]
       raise XSLViewError unless x[0] == '<'
+      #puts "end xml test"
       if @options[:excludehtml] == true
         raise XSLViewError if x.include? '<html'
       end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-xslview
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Albert Lash
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -04:00
+date: 2010-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A rack middleware for transforming XML with XSL.
 email: albert.lash@docunext.com
 executables: []
@@ -55,18 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ""
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: XSL rack middleware.