cgi-spa 0.5.0 → 0.6.0

data/cgi-spa.gemspec

@@ -1,25 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cgi-spa}
-  s.version = "0.5.0"
+  s.name = "cgi-spa"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Sam Ruby}]
-  s.date = %q{2011-12-24}
-  s.description = %q{    Provides a number of globals, helper methods, and monkey patches which
-    simplify the development of single page applications in the form of
-    CGI scripts.
-}
-  s.email = %q{rubys@intertwingly.net}
-  s.extra_rdoc_files = [%q{COPYING}, %q{README}, %q{lib/cgi-spa.rb}, %q{lib/cgi-spa/builder.rb}, %q{lib/cgi-spa/cgi-methods.rb}, %q{lib/cgi-spa/environment.rb}, %q{lib/cgi-spa/html-methods.rb}, %q{lib/cgi-spa/installation.rb}, %q{lib/cgi-spa/job-control.rb}, %q{lib/cgi-spa/version.rb}]
-  s.files = [%q{COPYING}, %q{Manifest}, %q{README}, %q{Rakefile}, %q{cgi-spa.gemspec}, %q{lib/cgi-spa.rb}, %q{lib/cgi-spa/builder.rb}, %q{lib/cgi-spa/cgi-methods.rb}, %q{lib/cgi-spa/environment.rb}, %q{lib/cgi-spa/html-methods.rb}, %q{lib/cgi-spa/installation.rb}, %q{lib/cgi-spa/job-control.rb}, %q{lib/cgi-spa/version.rb}]
-  s.homepage = %q{http://github.com/rubys/cgi-spa}
-  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Cgi-spa}, %q{--main}, %q{README}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{cgi-spa}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{CGI Single Page Applications}
+  s.authors = ["Sam Ruby"]
+  s.date = "2012-01-07"
+  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"]
+  s.files = ["COPYING", "Manifest", "README", "Rakefile", "cgi-spa.gemspec", "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"]
+  s.homepage = "http://github.com/rubys/cgi-spa"
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cgi-spa", "--main", "README"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "cgi-spa"
+  s.rubygems_version = "1.8.11"
+  s.summary = "CGI Single Page Applications"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

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

@@ -1,8 +1,23 @@
 # produce json
 def $cgi.json
   return unless $XHR_JSON
-  $cgi.out 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
-    JSON.pretty_generate(yield)+ "\n"
+  output = yield
+rescue Exception => exception
+  Kernel.print "Status: 500 Internal Error\r\n"
+  output = {
+    :exception => exception.inspect,
+    :backtrace => exception.backtrace
+  }
+ensure
+  if $XHR_JSON
+    Kernel.print "Status: 404 Not Found\r\n" unless output
+    $cgi.out 'type' => 'application/json', 'Cache-Control' => 'no-cache' do
+      begin
+        JSON.pretty_generate(output)+ "\n"
+      rescue
+        output.to_json + "\n"
+      end
+    end
   end
 end
 
@@ -13,9 +28,46 @@ def $cgi.json! &block
   Process.exit
 end
 
+# produce text
+def $cgi.text &block
+  return unless $TEXT
+  @output = []
+  def $cgi.puts(line='')
+    @output << line + "\n"
+  end
+  def $cgi.print(line=nil)
+    @output << line
+  end
+  self.instance_eval &block
+rescue Exception => exception
+  Kernel.print "Status: 500 Internal Error\r\n"
+  @output << "\n" unless @output.empty?
+  @output << exception.inspect + "\n"
+  exception.backtrace.each {|frame| @output << "  #{frame}\n"}
+ensure
+  class << $cgi
+    undef puts
+    undef print
+  end
+  if $TEXT
+    Kernel.print "Status: 404 Not Found\r\n" if @output.empty?
+    $cgi.out 'type' => 'text/plain', 'Cache-Control' => 'no-cache' do
+      @output.join
+    end
+    @output = nil
+  end
+end
+
+# produce text and quit
+def $cgi.text! &block
+  return unless $TEXT
+  json(&block)
+  Process.exit
+end
+
 # produce html/xhtml
 def $cgi.html
-  return if $XHR_JSON
+  return if $XHR_JSON or $TEXT
   if $XHTML
     $cgi.out 'type' => 'application/xhtml+xml', 'charset' => 'UTF-8' do
       $x.declare! :DOCTYPE, :html
@@ -35,7 +87,7 @@ end
 
 # produce html and quit
 def $cgi.html! &block
-  return if $XHR_JSON
+  return if $XHR_JSON or $TEXT
   html(&block)
   Process.exit
 end

data/lib/cgi-spa/environment.rb

@@ -3,6 +3,7 @@ $HTTP_GET  = ARGV.delete('--html')
 $HTTP_POST = ARGV.delete('--post')
 $XHR_JSON  = ARGV.delete('--json')
 $XHTML     = ARGV.delete('--xhtml')
+$TEXT      = ARGV.delete('--text')
 
 # Only prompt if explicitly asked for
 ARGV.push '' if ARGV.empty?
@@ -18,6 +19,7 @@ $HTTP_GET  ||= ($cgi.request_method == 'GET')
 $HTTP_POST ||= ($cgi.request_method == 'POST')
 $XHR_JSON  ||= ($cgi.accept.to_s =~ /json/)
 $XHTML     ||= ($cgi.accept.to_s =~ /xhtml/)
+$TEXT      ||= ($cgi.accept.to_s =~ /plain/ and $cgi.accept.to_s !~ /html/)
 
 # get arguments if CGI couldn't find any... 
 $param.merge!(CGI.parse(ARGV.join('&'))) if $param.empty?
@@ -44,7 +46,7 @@ end
 $env = {}
 def $env.method_missing(name)
   delete name.to_s if ENV[name.to_s] != self[name.to_s]
-  unless has_key?(name.to_s)
+  if ENV[name.to_s] and not has_key?(name.to_s)
     self[name.to_s]=ENV[name.to_s].dup.extend(CgiSpa::Untaint)
   end
   self[name.to_s]
@@ -53,16 +55,26 @@ end
 # quick access to request_uri
 SELF = ENV['REQUEST_URI'].to_s
 def SELF?
-  SELF + "?" # avoids spoiling the cache
+  if SELF.include? '?'
+    SELF
+  else
+    SELF + "?" # avoids spoiling the cache
+  end
 end
 
 # environment objects
-$USER = ENV['USER'] ||
+$USER = ENV['REMOTE_USER'] || ENV['USER'] ||
   if RUBY_PLATFORM =~ /darwin/
     `dscl . -search /Users UniqueID #{Process.uid}`.split.first
   else
     `getent passwd #{Process.uid}`.split(':').first
   end
 
+ENV['REMOTE_USER'] ||= $USER
+
 $HOME   = ENV['HOME'] || File.expand_path('~' + $USER)
 $SERVER = ENV['HTTP_HOST'] || `hostname`.chomp
+
+# more implied request types
+$XHR_JSON  ||= ($env.REQUEST_URI.to_s =~ /\?json$/)
+$TEXT      ||= ($env.REQUEST_URI.to_s =~ /\?text$/)

data/lib/cgi-spa/version.rb

@@ -1,7 +1,7 @@
 module CgiSpa
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     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: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sam Ruby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-24 00:00:00 Z
+date: 2012-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cgi-spa
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: CGI Single Page Applications