rack-gist 1.1.9 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.2.0

data/lib/rack/gist.rb

@@ -3,14 +3,11 @@ require 'rest-client'
 
 module Rack
   class Gist
+    DefaultCacheTime = 3600
+
     def initialize(app, options = {})
       @app = app
-      @options = {
-        :jquery => true,
-        :cache_time => 3600,
-        :http_cache_time => 3600,
-        :encoding => 'utf-8'
-      }.merge(options)
+      @options = options
     end
 
     def call(env)
@@ -37,11 +34,11 @@ module Rack
         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)
+            node.add_child(jquery_link) if @options.fetch(:jquery, true)
+            node.add_child(jquery_helper) if @options.fetch(:helper, true)
           end
         end
-      end.to_html(:encoding => @options[:encoding])
+      end.to_html(:encoding => @options.fetch(:encoding, 'utf-8'))
     end
 
     def stringify_body(body)
@@ -56,8 +53,16 @@ module Rack
         extras = true
         tag['src'].match(%r{gist\.github\.com/([a-f0-9]+)\.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>")
+          url = "/gist.github.com/#{id}"
+          if file
+            url += "/#{file}"
+            suffix = "#file_#{file}"
+            extra = %Q{rack-gist-file="#{file}"}
+          else
+            suffix = nil
+            extra = nil
+          end
+          tag.swap(%Q{<p class="rack-gist" id="rack-gist-#{id}"" gist-id="#{id}" rack-gist-url="#{url}.js" #{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
@@ -65,21 +70,27 @@ module Rack
 
     def serve_gist(env)
       gist_id, file = path(env).match(regex)[1,2]
-      cache = @options[:cache]
-      gist = (cache ? cache.fetch(cache_key(gist_id, file), :expires_in => @options[:cache_time]) { get_gist(gist_id, file) } : get_gist(gist_id, file)).to_s
+      gist = fetch_gist(gist_id, file).to_s
       headers = {
         'Content-Type' => 'application/javascript',
         'Content-Length' => Rack::Utils.bytesize(gist).to_s,
         'Vary' => 'Accept-Encoding'
       }
 
-      if @options[:http_cache_time]
-        headers['Cache-Control'] = "public, must-revalidate, max-age=#{@options[:http_cache_time]}"
-      end
+      headers['Cache-Control'] = "public, must-revalidate, max-age=#{@options.fetch(:http_cache_time, DefaultCacheTime)}"
 
       [200, headers, [gist]]
     end
 
+    def fetch_gist(gist_id, file)
+      if cache = @options.fetch(:cache, false)
+        expires = @options.fetch(:cache_time, DefaultCacheTime)
+        cache.fetch(cache_key(gist_id, file), :expires_in => expires) { get_gist(gist_id, file) }
+      else
+        get_gist(gist_id, file)
+      end
+    end
+
     def get_gist(gist_id, file)
       gist = RestClient.get(gist_url(gist_id, file))
       gist = gist.split("\n").reject do |part|
@@ -115,7 +126,7 @@ module Rack
     end
 
     def jquery_link
-      "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js'></script>\n"
+      "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js'></script>\n"
     end
 
     def jquery_helper
@@ -124,13 +135,8 @@ module Rack
           //<![CDATA[
           $(document).ready(function() {
             $('.rack-gist').each(function() {
-              var url = '/gist.github.com/' + $(this).attr('gist-id');
-              var file = false;
-              if (file = $(this).attr('rack-gist-file')) {
-                url += '/' + file;
-              }
               $.ajax({
-                url: url + '.js',
+                url: $(this).attr('rack-gist-url'),
                 dataType: 'script',
                 cache: true
               });

data/rack-gist.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-gist}
-  s.version = "1.1.9"
+  s.name = "rack-gist"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
-  s.date = %q{2011-10-30}
-  s.description = %q{Load gists in the background. KTHXBYE!}
-  s.email = %q{darkhelmet@darkhelmetlive.com}
+  s.date = "2012-05-05"
+  s.description = "Load gists in the background. KTHXBYE!"
+  s.email = "darkhelmet@darkhelmetlive.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -39,10 +39,10 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/darkhelmet/rack-gist}
+  s.homepage = "http://github.com/darkhelmet/rack-gist"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Asynchronous Github Gists. All with rack.}
+  s.rubygems_version = "1.8.18"
+  s.summary = "Asynchronous Github Gists. All with rack."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/rack-gist_spec.rb

@@ -66,7 +66,7 @@ describe "Rack::Gist" do
       status, headers, body = a.call(mock_env('/partial'))
       status.should == 200
       headers['Content-Type'].should == 'text/html'
-      pbody(body).should have_html_tag('p').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist', 'rack-gist-file' => 'example.pig')
+      pbody(body).should have_html_tag('p').with('id' => "rack-gist-#{@gist_id}", 'gist-id' => @gist_id, 'class' => 'rack-gist', 'rack-gist-file' => 'example.pig', 'rack-gist-url' => '/gist.github.com/348301/example.pig.js')
     end
   end
 
@@ -115,6 +115,15 @@ describe "Rack::Gist" do
     end
   end
 
+  it "shouldn't include the jquery helper if told not to" do
+    middleware(:jquery => false, :helper => false).tap do |a|
+      status, headers, body = a.call(mock_env)
+      status.should == 200
+      headers['Content-Type'].should == 'text/html'
+      pbody(body).should_not have_html_tag('script').containing('CDATA')
+    end
+  end
+
   it "shouldn't include the jquery helper if no gist is present" do
     middleware.tap do |a|
       status, headers, body = a.call(mock_env)
@@ -129,7 +138,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 == '1144'
+      headers['Content-Length'].should == '992'
     end
   end
 
@@ -208,11 +217,11 @@ describe "Rack::Gist" do
     end
   end
 
-  it 'should be able to disable caching by setting http_cache_time to nil' do
-    middleware(:http_cache_time => nil).tap do |a|
+  it 'should be able to disable caching by setting http_cache_time to 0' do
+    middleware(:http_cache_time => 0).tap do |a|
       status, headers, body = a.call(mock_env("/gist.github.com/#{@gist_id}/example.pig.js"))
       headers['Vary'].should == 'Accept-Encoding'
-      headers['Cache-Control'].should be_nil
+      headers['Cache-Control'].should == "public, must-revalidate, max-age=0"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-gist
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 9
-  version: 1.1.9
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-30 00:00:00 -06:00
-default_executable: 
+date: 2012-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: nokogiri
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +31,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  version_requirements: *id001
-  name: nokogiri
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rest-client
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +46,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  version_requirements: *id002
-  name: rest-client
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +61,12 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  version_requirements: *id003
-  name: jeweler
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: fakeweb
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,12 +77,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
-  version_requirements: *id004
-  name: fakeweb
-  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +93,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id005
-  name: rspec
-  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: yard
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,12 +109,12 @@ dependencies:
         - 5
         - 8
         version: 0.5.8
-  version_requirements: *id006
-  name: yard
-  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rack
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +125,12 @@ dependencies:
         - 2
         - 1
         version: 1.2.1
-  version_requirements: *id007
-  name: rack
-  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: activesupport
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -140,9 +141,7 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
-  version_requirements: *id008
-  name: activesupport
-  prerelease: false
+  requirement: *id008
 description: Load gists in the background. KTHXBYE!
 email: darkhelmet@darkhelmetlive.com
 executables: []
@@ -174,7 +173,6 @@ files:
 - spec/rack-gist_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/darkhelmet/rack-gist
 licenses: []
 
@@ -204,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Asynchronous Github Gists. All with rack.