rack-gist 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/rack/gist.rb

@@ -5,14 +5,13 @@ module Rack
   class Gist
     def initialize(app, options = {})
       @app = app
-      @gist_path =
       @options = {
         :jquery => true
       }.merge(options)
     end
 
     def call(env)
-      if path(env).match(%r{^/gist\.github\.com})
+      if path(env).match(regex)
         serve_gist(env)
       else
         status, headers, body = @app.call(env)
@@ -30,7 +29,7 @@ module Rack
             extras = false
             doc.search('script[@src*="gist.github.com"]').each do |tag|
               extras = true
-              tag['src'].match(regex).tap do |match|
+              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>")
@@ -52,7 +51,7 @@ module Rack
     end
 
     def serve_gist(env)
-      gist_id, file = path(env).match(%r{gist\.github\.com/(\d+)(?:/(.*))?\.js})[1,2]
+      gist_id, file = path(env).match(regex)[1,2]
       cache = @options[:cache]
       gist = (cache ? cache.fetch(cache_key(gist_id, file), :expires_in => 3600) { get_gist(gist_id, file) } : get_gist(gist_id, file)).to_s
       [
@@ -92,7 +91,7 @@ module Rack
     end
 
     def regex
-      @regex ||= %r{gist\.github\.com/(\d+)\.js(?:\?file=(.*))?}
+      @regex ||= %r{gist\.github\.com/(\d+)(?:/(.*))?\.js}
     end
 
     def css_html

data/rack-gist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-gist}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-08-08}
   s.description = %q{Load gists in the background. KTHXBYE!}
   s.email = %q{darkhelmet@darkhelmetlive.com}
   s.extra_rdoc_files = [

data/spec/rack-gist_spec.rb

@@ -5,8 +5,9 @@ describe "Rack::Gist" do
     @gist_id = 348301
     @app = lambda do |env|
       headers = { 'Content-Type' => 'text/html' }
-      body =  File.read(File.join(File.dirname(__FILE__), "body-#{env['PATH_INFO'].gsub(/[^\w]/, '')}.html"))
-      [200, headers, body]
+      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]
     end
   end
 
@@ -139,4 +140,11 @@ describe "Rack::Gist" do
       body.should == body2
     end
   end
+
+  it 'should not explode if not given a gist' do
+    middleware.tap do |a|
+      status, headers, body = a.call(mock_env('/gist.github.com'))
+      status.should == 404
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-gist
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -06:00
+date: 2010-08-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency