RubyGems - rack-pygments - Versions diffs - 0.2 → 0.3 - Mend

rack-pygments 0.2 → 0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/lib/rack/pygments/version.rb +9 -0
data/lib/rack/pygments.rb +19 -15
data/spec/lib/rack/pygments_spec.rb +75 -0
data/spec/spec.opts +2 -0
data/spec/spec_helper.rb +2 -0
metadata +23 -7

data/lib/rack/pygments/version.rb ADDED Viewed

@@ -0,0 +1,9 @@
+module Rack
+  class Pygments
+    module Version
+      STRING = "0.3"
+      MAJOR  = 0
+      MINOR  = 3
+    end
+  end
+end

data/lib/rack/pygments.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Rack
     def initialize(app, opts={})
       @app = app
-      @tag = opts[:html_tag].nil? ? 'highlight' : opts[:html_tag]
+      @tag = opts[:html_tag].nil? ? 'highlight' : opts[:html_tag]
       @attr = opts[:html_attr].nil? ? 'lang' : opts[:html_attr]
       if system("which pygmentize > /dev/null")
         @bin = `which pygmentize`.chomp
@@ -15,22 +15,26 @@ module Rack
     end
     def call(env)
-      if env["PATH_INFO"] !~ /.*\.css$/
       status, headers, response = @app.call(env)
-      content = response.each.map.join
-        document = Nokogiri::HTML(content)
-        nodes = document.css(@tag)
-        nodes.each do |node|
-          lang = node.attribute(@attr).nil? ? 'bash' : node.attribute(@attr).value
-          pygmentize = `echo '#{node.content}' | #{@bin} -l #{lang} -f html`
-          node.replace(Nokogiri::HTML(pygmentize).css("div.highlight").first)
-        end
-        response = document.to_s
-        headers["Content-Length"] = response.length.to_s
-        [status,headers,[response]]
-      else
-        @app.call(env)
+      return [status, headers, response] unless pygmentize?(status, headers)
+      response_body = pygmentize(response.join)
+      headers["Content-Length"] = response_body.length.to_s
+      [status,headers,[response_body]]
+    end
+    def pygmentize?(status, headers)
+      status == 200 && headers['Content-Type'] =~ /html/
+    end
+    def pygmentize(content)
+      document = Nokogiri::HTML(content)
+      nodes = document.css(@tag)
+      nodes.each do |node|
+        lang = node.attribute(@attr).nil? ? 'bash' : node.attribute(@attr).value
+        pygmentized = `echo '#{node.content}' | #{@bin} -l #{lang} -f html`
+        node.replace(Nokogiri::HTML(pygmentized).css("div.highlight").first)
       end
+      document.to_s
     end
   end
 end

data/spec/lib/rack/pygments_spec.rb ADDED Viewed

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'nokogiri'
+class App
+  def initialize(env={})
+    @env = env
+  end
+  def call(env={})
+    [@env[:status], @env[:headers], @env[:response]]
+  end
+end
+shared_examples_for "a pass-through" do
+  it "passes the status, headers, and response through unchanged" do
+    pygments.call({}).should == [status, headers, response]
+  end
+end
+describe Rack::Pygments do
+  describe "#call" do
+    let(:app) do
+      App.new(:status   => status,
+              :headers  => headers,
+              :response => response)
+    end
+    let(:status)   { 200 }
+    let(:headers)  { {'Content-Length' => 0, 'Content-Type' => 'text/html'} }
+    let(:response) { [] }
+    let(:pygments) { Rack::Pygments.new(app)}
+    context "when the response content is HTML" do
+      context "and the response status is 200" do
+        context "and there is no highlight element in the HTML" do
+          let(:response) do
+            doc = <<-DOC
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head><title>Page</title></head>
+<body><h1>Header</h1></body>
+</html>
+            DOC
+            [doc]
+          end
+          it_should_behave_like "a pass-through"
+        end
+        context "and there is a highlight element in the HTML" do
+          let(:response) do
+            doc = <<-DOC
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head><title>Page</title></head>
+<body><h1>Header</h1><highlight lang="ruby">@var='foo'</highlight></body>
+</html>
+            DOC
+            [doc]
+          end
+          it "replaces the highlight element with a div containing marked-up code" do
+            response = pygments.call({})[2]
+            document = Nokogiri::HTML(response.join)
+            document.css('highlight').should be_empty
+            document.css('div.highlight').should have(1).element
+          end
+        end
+      end
+      context "and the response status is not 200" do
+        let(:status) { 304 }
+        it_should_behave_like "a pass-through"
+      end
+    end
+    context "when the response content is not HTML" do
+      before { headers['Content-Type'] = 'text/css' }
+      it_should_behave_like "a pass-through"
+    end
+  end
+end

data/spec/spec.opts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ --colour
2	+ --format=specdoc

data/spec/spec_helper.rb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ require 'spec'
2	+ require 'rack/pygments'

metadata CHANGED Viewed

@@ -4,16 +4,17 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors:
 - Bryan Goines
+- Matt Yoho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-05-07 00:00:00 -05:00
+date: 2010-07-19 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -40,6 +41,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: rack-pygments - Rack Middleware for Pygments, the syntax highlighter
 email: bryan@ffiirree.com
 executables: []
@@ -49,13 +62,14 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
+- lib/rack/pygments/version.rb
 - lib/rack/pygments.rb
+- examples/sinatra/public/style.css
 - examples/sinatra/app.rb
 - examples/sinatra/config.ru
-- examples/sinatra/public/style.css
 - LICENSE
 - README
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/bry4n/rack-pygments
 licenses: []
@@ -85,5 +99,7 @@ rubygems_version: 1.3.6
 signing_key:
 specification_version: 1
 summary: rack-pygments
-test_files: []
+test_files:
+- spec/lib/rack/pygments_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb