cgi-spa 0.6.0 → 0.7.0

data/cgi-spa.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cgi-spa"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]
-  s.date = "2012-01-07"
+  s.date = "2012-01-10"
   s.description = "    Provides a number of globals, helper methods, and monkey patches which\n    simplify the development of single page applications in the form of\n    CGI scripts.\n"
   s.email = "rubys@intertwingly.net"
   s.extra_rdoc_files = ["COPYING", "README", "lib/cgi-spa.rb", "lib/cgi-spa/builder.rb", "lib/cgi-spa/cgi-methods.rb", "lib/cgi-spa/environment.rb", "lib/cgi-spa/html-methods.rb", "lib/cgi-spa/installation.rb", "lib/cgi-spa/job-control.rb", "lib/cgi-spa/version.rb"]

data/lib/cgi-spa/cgi-methods.rb

@@ -11,7 +11,7 @@ rescue Exception => exception
 ensure
   if $XHR_JSON
     Kernel.print "Status: 404 Not Found\r\n" unless output
-    $cgi.out 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
+    $cgi.out? 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
       begin
         JSON.pretty_generate(output)+ "\n"
       rescue
@@ -51,7 +51,7 @@ ensure
   end
   if $TEXT
     Kernel.print "Status: 404 Not Found\r\n" if @output.empty?
-    $cgi.out 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
+    $cgi.out? 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
       @output.join
     end
     @output = nil
@@ -65,18 +65,33 @@ def $cgi.text! &block
   Process.exit
 end
 
+# Conditionally provide output, based on ETAG
+def $cgi.out?(headers, &block)
+  content = block.call
+  require 'digest/md5'
+  etag = Digest::MD5.hexdigest(content)
+
+  if ENV['HTTP_IF_NONE_MATCH'] == etag.inspect
+    print "Status: 304 Not Modified\r\n\r\n"
+  else
+    $cgi.out headers.merge('Etag' => etag.inspect) do
+      content
+    end
+  end
+end
+
 # produce html/xhtml
 def $cgi.html
   return if $XHR_JSON or $TEXT
   if $XHTML
-    $cgi.out 'type' => 'application/xhtml+xml', 'charset' => 'UTF-8' do
+    $cgi.out? 'type' => 'application/xhtml+xml', 'charset' => 'UTF-8' do
       $x.declare! :DOCTYPE, :html
       $x.html :xmlns => 'http://www.w3.org/1999/xhtml' do
         yield $x
       end
     end
   else
-    $cgi.out 'type' => 'text/html', 'charset' => 'UTF-8' do
+    $cgi.out? 'type' => 'text/html', 'charset' => 'UTF-8' do
       $x.declare! :DOCTYPE, :html
       $x.html do
         yield $x

data/lib/cgi-spa/version.rb

@@ -1,7 +1,7 @@
 module CgiSpa
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cgi-spa
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-07 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder