rack-gist 1.0.6 → 1.0.7

data/Gemfile

@@ -1,13 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'hpricot', '>= 0.8.2'
-gem 'rest-client', '>= 1.6.0'
+gem 'nokogiri', '~> 1.4.3.1'
+gem 'rest-client', '~> 1.6.0'
 
 group :development do
-  gem 'fakeweb', '>= 1.2.8'
-  gem 'rspec', '>= 1.3.0'
-  gem 'yard', '>= 0.5.8'
-  gem 'rack', '>= 1.2.1'
-  gem 'activesupport', '>= 2.3.8'
+  gem 'fakeweb', '~> 1.2.8'
+  gem 'rspec', '~> 1.3.0'
+  gem 'yard', '~> 0.5.8'
+  gem 'rack', '~> 1.2.1'
+  gem 'activesupport', '~> 2.3.8'
   gem 'ruby-debug'
 end

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/lib/rack/gist.rb

@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 require 'rest-client'
 
 module Rack
@@ -22,34 +22,36 @@ module Rack
   private
 
     def rewrite(status, headers, body)
-      if 'text/html' == headers['Content-Type']
-        body = [body].flatten
-        body.map! do |part|
-          Hpricot(part.to_s).tap do |doc|
-            extras = false
-            doc.search('script[@src*="gist.github.com"]').each do |tag|
-              extras = true
-              tag['src'].match(%r{gist\.github\.com/(\d+)\.js(?:\?file=(.*))?}).tap do |match|
-                id, file = match[1, 2]
-                suffix, extra = file ? ["#file_#{file}", "rack-gist-file='#{file}'"] : ['', '']
-                tag.swap("<div class='rack-gist' id='rack-gist-#{id}' gist-id='#{id}' #{extra}>Can't see this Gist? <a rel='nofollow' href='http://gist.github.com/#{id}#{suffix}'>View it on Github!</a></div>")
-              end
+      if headers['Content-Type'].to_s.match('text/html')
+        b = ''
+        body.each { |part| b << part.to_s }
+        body = Nokogiri(b).tap do |doc|
+          if swap_tags(doc)
+            doc.at('head').add_child(css_html)
+            doc.at('body').tap do |node|
+              node.add_child(jquery_link) if @options[:jquery]
+              node.add_child(jquery_helper)
             end
-
-            if extras
-              doc.search('head').append(css_html)
-              doc.search('body').tap do |node|
-                node.append(jquery_link) if @options[:jquery]
-                node.append(jquery_helper)
-              end
-            end
-          end.to_s
-        end
+          end
+        end.to_s
         headers['Content-Length'] = body.map { |part| Rack::Utils.bytesize(part) }.inject(0) { |sum, size| sum + size }.to_s
       end
       [status, headers, body]
     end
 
+    def swap_tags(doc)
+      extras = false
+      doc.search('script[@src*="gist.github.com"]').each do |tag|
+        extras = true
+        tag['src'].match(%r{gist\.github\.com/(\d+)\.js(?:\?file=(.*))?}).tap do |match|
+          id, file = match[1, 2]
+          suffix, extra = file ? ["#file_#{file}", "rack-gist-file='#{file}'"] : ['', '']
+          tag.swap("<p class='rack-gist' id='rack-gist-#{id}' gist-id='#{id}' #{extra}>Can't see this Gist? <a rel='nofollow' href='http://gist.github.com/#{id}#{suffix}'>View it on Github!</a></p>")
+        end
+      end
+      extras
+    end
+
     def serve_gist(env)
       gist_id, file = path(env).match(regex)[1,2]
       cache = @options[:cache]

data/rack-gist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-gist}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-08-08}
+  s.date = %q{2010-08-24}
   s.description = %q{Load gists in the background. KTHXBYE!}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [
@@ -51,32 +51,32 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.2"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.6.0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 1.2.8"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.8"])
-      s.add_development_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_development_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.0"])
+      s.add_development_dependency(%q<fakeweb>, ["~> 1.2.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.5.8"])
+      s.add_development_dependency(%q<rack>, ["~> 1.2.1"])
+      s.add_development_dependency(%q<activesupport>, ["~> 2.3.8"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
-      s.add_dependency(%q<hpricot>, [">= 0.8.2"])
-      s.add_dependency(%q<rest-client>, [">= 1.6.0"])
-      s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<yard>, [">= 0.5.8"])
-      s.add_dependency(%q<rack>, [">= 1.2.1"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6.0"])
+      s.add_dependency(%q<fakeweb>, ["~> 1.2.8"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.5.8"])
+      s.add_dependency(%q<rack>, ["~> 1.2.1"])
+      s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
-    s.add_dependency(%q<hpricot>, [">= 0.8.2"])
-    s.add_dependency(%q<rest-client>, [">= 1.6.0"])
-    s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<yard>, [">= 0.5.8"])
-    s.add_dependency(%q<rack>, [">= 1.2.1"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.8"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6.0"])
+    s.add_dependency(%q<fakeweb>, ["~> 1.2.8"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.5.8"])
+    s.add_dependency(%q<rack>, ["~> 1.2.1"])
+    s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end

data/spec/rack-gist_spec.rb

@@ -3,8 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Rack::Gist" do
   before(:all) do
     @gist_id = 348301
-    @app = lambda do |env|
-      headers = { 'Content-Type' => 'text/html' }
+  end
+
+  def app(headers)
+    lambda do |env|
       body = File.read(File.join(File.dirname(__FILE__), "body-#{env['PATH_INFO'].gsub(/[^\w]/, '')}.html")) rescue ''
       status = 404 if body.empty?
       [status || 200, headers, body]
@@ -15,8 +17,8 @@ describe "Rack::Gist" do
     Rack::MockRequest.env_for(path)
   end
 
-  def middleware(options = {})
-    Rack::Gist.new(@app, options)
+  def middleware(options = {}, headers = { 'Content-Type' => 'text/html' })
+    Rack::Gist.new(app(headers), options)
   end
 
   it 'should pass Rack::Lint' do
@@ -30,7 +32,16 @@ describe "Rack::Gist" do
       status, headers, body = a.call(mock_env)
       status.should == 200
       headers['Content-Type'].should == 'text/html'
-      body.to_s.should have_html_tag('div').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist')
+      body.to_s.should have_html_tag('p').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist')
+    end
+  end
+
+  it 'should rewrite gist embed tags for full gists when content_type includes other things' do
+    middleware({}, { 'Content-Type' => 'text/html; charset=utf-8' }).tap do |a|
+      status, headers, body = a.call(mock_env)
+      status.should == 200
+      headers['Content-Type'].should == 'text/html; charset=utf-8'
+      body.to_s.should have_html_tag('p').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist')
     end
   end
 
@@ -39,7 +50,7 @@ describe "Rack::Gist" do
       status, headers, body = a.call(mock_env('/partial'))
       status.should == 200
       headers['Content-Type'].should == 'text/html'
-      body.to_s.should have_html_tag('div').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist', 'rack-gist-file' => 'example.pig')
+      body.to_s.should have_html_tag('p').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist', 'rack-gist-file' => 'example.pig')
     end
   end
 
@@ -102,7 +113,7 @@ describe "Rack::Gist" do
       status, headers, body = a.call(mock_env)
       status.should == 200
       headers['Content-Type'].should == 'text/html'
-      headers['Content-Length'].should == '913'
+      headers['Content-Length'].should == '996'
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-gist
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,24 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -06:00
+date: 2010-08-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  name: hpricot
+  name: nokogiri
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 113
         segments: 
-        - 0
-        - 8
-        - 2
-        version: 0.8.2
+        - 1
+        - 4
+        - 3
+        - 1
+        version: 1.4.3.1
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -41,7 +42,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -57,7 +58,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -73,7 +74,7 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -89,7 +90,7 @@ dependencies:
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 27
         segments: 
@@ -105,7 +106,7 @@ dependencies:
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 29
         segments: 
@@ -121,7 +122,7 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 19
         segments: