picnic 0.8.0 → 0.8.1

data/vendor/{camping-2.0.20090212 → zuk-camping-2.0.20090429}/lib/camping.rb

@@ -11,44 +11,42 @@ h.any?? u+"?"+U.build_query(h[0]):u end;def / p
 p[0]==?/?@root+p:p end;def URL c='/',*a;c=R(c, *a) if c.respond_to?:urls
 c=self/c;c=@request.url[/.{8,}?(?=\/)/]+c if c[0]==?/;URI c end
 end;module Base;attr_accessor:input,:cookies,:headers,:body,:status,:root
+M=proc{|_,o,n|o.merge(n,&M)}
 def render v,*a,&b;mab(/^_/!~v.to_s){send(v,*a,&b)} end
 def mab l=nil,&b;m=Mab.new({},self);s=m.capture(&b)
 s=m.capture{layout{s}} if l && m.respond_to?(:layout);s end
 def r s,b,h={};b,h=h,b if Hash===b;@status=s;
 @headers.merge!(h);@body=b;end;def redirect *a;r 302,'','Location'=>URL(*a).
-to_s;end;def r404 p=env.PATH;r 404,P%"#{p} not found"end;def r500 k,m,x
-r 500,P%"#{k}.#{m}"+"<h3>#{x.class} #{x.message}: <ul>#{x.
-backtrace.map{|b|"<li>#{b}</li>"}}</ul></h3>"end;def r501 m=@method
-r 501,P%"#{m.upcase} not implemented"end;def to_a
-@response.body=@body.respond_to?(:each)?@body:""
-@response.status=@status;@response.headers.merge!(@headers)
+to_s;end;def r404 p;P%"#{p} not found"end;def r500 k,m,e;raise e;end
+def r501 m;P%"#{m.upcase} not implemented"end;def to_a
+r=Rack::Response.new(@body,@status,@headers)
 @cookies.each{|k,v|v={:value=>v,:path=>self/"/"} if String===v
-@response.set_cookie(k,v) if @request.cookies[k]!=v}
-@response.to_a;end;def initialize(env)
-@request,@response,@env=Rack::Request.new(env),Rack::Response.new,env
-@root,@input,@cookies,@headers,@status=
-@env.SCRIPT_NAME.sub(/\/$/,''),H[@request.params],
-H[@request.cookies],@response.headers,@response.status
-@input.each{|k,v|if k[-2..-1]=="[]";@input[k[0..-3]]=
-@input.delete(k)elsif k=~/(.*)\[([^\]]+)\]$/
-(@input[$1]||=H[])[$2]=@input.delete(k)end};end;def service *a
-r=catch(:halt){send(@env.REQUEST_METHOD.downcase,*a)};@body||=r
+r.set_cookie(k,v)}
+r.to_a;end;def initialize(env,m)
+r=@request=Rack::Request.new(@env=env)
+@root,p,@cookies,@headers,@status,@method=
+(env.SCRIPT_NAME||'').sub(/\/$/,''),H[r.params],
+H[r.cookies],{},m=~/r(\d+)/?$1.to_i: 200,m
+@input=p.inject(H[]){|h,(k,v)|h.merge k.split(/[\]\[]+/).reverse.inject(v){|x,i|
+H[i=>x]},&M};end;def service *a
+r=catch(:halt){send(@method,*a)};@body||=r
 self;end;end;module Controllers;@r=[];class<<self;def r;@r end;def R *u;r=@r
 Class.new{meta_def(:urls){u};meta_def(:inherited){|x|r<<x}}end
 def D p,m;p='/'if !p||!p[0]
 r.map{|k|k.urls.map{|x|return(k.instance_method(m)rescue nil)?
 [k,m,*$~[1..-1]]:[I,'r501',m]if p=~/^#{x}\/?$/}};[I,'r404',p] end
-N=H.new{|_,x|x.downcase}.merge! "N"=>'(\d+)',"X"=>'(\w+)',"Index"=>''
+N=H.new{|_,x|x.downcase}.merge! "N"=>'(\d+)',"X"=>'([^/]+)',"Index"=>''
 def M;def M;end;constants.map{|c|k=const_get(c)
 k.send:include,C,Base,Helpers,Models;@r=[k]+r if r-[k]==r
 k.meta_def(:urls){["/#{c.scan(/.[^A-Z]*/).map(&N.method(:[]))*'/'}"]
-}if !k.respond_to?:urls}end end;class I<R()
-end; end;X=Controllers;class<<self;def goes m
-Apps<<eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING) end;def call(
-e)X.M;e=H[e.to_hash];k,m,*a=X.D e.PATH_INFO,(e.REQUEST_METHOD||'get').downcase
-e.REQUEST_METHOD=m;k.new(e).service(*a).to_a;end
-def method_missing m,c,*a;X.M;h=Hash===a[-1]?H[a.pop]:{};e=
-H[h[:env]||{}].merge!({'rack.input'=>StringIO.new,'REQUEST_METHOD'=>m.to_s})
-k=X.const_get(c).new(H[e]);k.send("input=",h[:input])if h[:input]
+}if !k.respond_to?:urls}end end;I=R()
+end;X=Controllers;class<<self;def goes m
+Apps<<eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING) end;def call e
+X.M;e=H[e];p=e.PATH_INFO=U.unescape(e.PATH_INFO)
+k,m,*a=X.D p,(e.REQUEST_METHOD||'get').downcase
+k.new(e,m).service(*a).to_a;rescue;r500(:I,k,m,$!,:env=>e).to_a;end
+def method_missing m,c,*a;X.M;h=Hash===a[-1]?a.pop: {}
+e=H[Rack::MockRequest.env_for('',h[:env]||{})]
+k=X.const_get(c).new(e,m.to_s);k.send("input=",h[:input])if h[:input]
 k.service(*a);end;end;module Views;include X,Helpers end;module Models
 autoload:Base,'camping/ar';def Y;self;end end;autoload:Mab,'camping/mab';C end

data/vendor/zuk-camping-2.0.20090429/lib/camping/reloader.rb

@@ -0,0 +1,188 @@
+module Camping
+  # == The Camping Reloader
+  #
+  # Camping apps are generally small and predictable.  Many Camping apps are
+  # contained within a single file.  Larger apps are split into a handful of
+  # other Ruby libraries within the same directory.
+  #
+  # Since Camping apps (and their dependencies) are loaded with Ruby's require
+  # method, there is a record of them in $LOADED_FEATURES.  Which leaves a
+  # perfect space for this class to manage auto-reloading an app if any of its
+  # immediate dependencies changes.
+  #
+  # == Wrapping Your Apps
+  #
+  # Since bin/camping and the Camping::Server class already use the Reloader,
+  # you probably don't need to hack it on your own.  But, if you're rolling your
+  # own situation, here's how.
+  #
+  # Rather than this:
+  #
+  #   require 'yourapp'
+  #
+  # Use this:
+  #
+  #   require 'camping/reloader'
+  #   reloader = Camping::Reloader.new('/path/to/yourapp.rb')
+  #   blog = reloader.apps[:Blog]
+  #   wiki = reloader.apps[:Wiki]
+  #
+  # The <tt>blog</tt> and <tt>wiki</tt> objects will behave exactly like your
+  # Blog and Wiki, but they will update themselves if yourapp.rb changes.
+  #
+  # You can also give Reloader more than one script.
+  class Reloader
+    attr_reader :scripts
+    
+    # This is a simple wrapper which causes the script to reload (if needed)
+    # on any method call.  Then the method call will be forwarded to the
+    # app.
+    class App # :nodoc:
+      instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+      attr_accessor :app, :script
+      
+      def initialize(script)
+        @script = script
+      end
+      
+      # Reloads if needed, before calling the method on the app.
+      def method_missing(meth, *args, &blk)
+        @script.reload!
+        @app.send(meth, *args, &blk)
+      end
+    end
+    
+    # This class is doing all the hard work; however, it only works on
+    # single files.  Reloader just wraps up support for multiple scripts
+    # and hides away some methods you normally won't need.
+    class Script # :nodoc:
+      attr_reader :apps, :file, :dir, :extras
+      
+      def initialize(file)
+        @file = File.expand_path(file)
+        @dir = File.dirname(@file)
+        @extras = File.join(@dir, File.basename(@file, ".rb"))
+        @mtime = Time.at(0)
+        @requires = []
+        @apps = {}
+      end
+      
+      # Loads the apps availble in this script.  Use <tt>apps</tt> to get
+      # the loaded apps.
+      def load_apps
+        all_requires = $LOADED_FEATURES.dup
+        all_apps = Camping::Apps.dup
+        
+        begin
+          load(@file)
+        rescue Exception => e
+          puts "!! Error loading #{@file}:"
+          puts "#{e.class}: #{e.message}"
+          puts e.backtrace
+          puts "!! Error loading #{@file}, see backtrace above"
+        end
+        
+        @requires = ($LOADED_FEATURES - all_requires).map do |req|
+          full = full_path(req)
+          full if full == @file or full.index(@extras) == 0
+        end
+        
+        @mtime = mtime
+        
+        new_apps = (Camping::Apps - all_apps)
+        old_apps = @apps.dup
+        @apps = new_apps.inject({}) do |hash, app|
+          key = app.name.to_sym
+          hash[key] = (old = old_apps[key]) || App.new(self)
+          hash[key].app = app
+          app.create if app.respond_to?(:create) && !old
+          hash
+        end
+        self
+      end
+      
+      # Removes all the apps defined in this script.
+      def remove_apps
+        @apps.each do |name, app|
+          Camping::Apps.delete(app.app)
+          Object.send :remove_const, name
+        end
+      end
+      
+      # Reloads the file if needed.  No harm is done by calling this multiple
+      # times, so feel free call just to be sure.
+      def reload!
+        return if @mtime >= mtime
+        remove_apps
+        load_apps
+      end
+      
+      # Checks if both scripts watches the same file.
+      def ==(other)
+        @file == other.file
+      end
+      
+      private
+      
+      def mtime
+        (@requires + [@file]).compact.map do |fname|
+          File.mtime(fname)
+        end.reject{|t| t > Time.now }.max
+      end
+      
+      # Figures out the full path of a required file. 
+      def full_path(req)
+        dir = $LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) }
+        if dir 
+          File.join(File.expand_path(dir), req)
+        else
+          req
+        end
+      end
+    end
+
+    # Creates the reloader, assigns a +script+ to it and initially loads the
+    # application.  Pass in the full path to the script, otherwise the script
+    # will be loaded relative to the current working directory.
+    def initialize(*scripts)
+      @scripts = []
+      update(*scripts)
+    end
+    
+    # Updates the reloader to only use the scripts provided:
+    #
+    #   reloader.update("examples/blog.rb", "examples/wiki.rb")
+    def update(*scripts)
+      old = @scripts.dup
+      clear
+      @scripts = scripts.map do |script|
+        s = Script.new(script)
+        if pos = old.index(s)
+          # We already got a script, so we use the old (which might got a mtime)
+          old[pos]
+        else
+          s.load_apps
+        end
+      end
+    end
+    
+    # Removes all the scripts from the reloader.
+    def clear
+      @scrips = []
+    end
+    
+    # Simply calls reload! on all the Script objects.
+    def reload!
+      @scripts.each { |script| script.reload! }
+    end
+    
+    # Returns a Hash of all the apps available in the scripts, where the key
+    # would be the name of the app (the one you gave to Camping.goes) and the
+    # value would be the app (wrapped inside App).
+    def apps
+      @scripts.inject({}) do |hash, script|
+        hash.merge(script.apps)
+      end
+    end
+  end
+end

data/vendor/zuk-camping-2.0.20090429/lib/camping/server.rb

@@ -0,0 +1,159 @@
+require 'irb'
+require 'rack'
+require 'camping/reloader'
+
+# TODO: I guess we should documentate this too...
+class Camping::Server
+  attr_reader :reloader
+  attr_accessor :conf
+
+  def initialize(conf, paths)
+    @conf = conf
+    @paths = paths
+    @reloader = Camping::Reloader.new
+    connect(@conf.database) if @conf.database
+  end
+  
+  def connect(db)
+    unless Camping.autoload?(:Models)
+      Camping::Models::Base.establish_connection(db)
+    end
+  end
+  
+  def find_scripts
+    scripts = @paths.map do |path|
+      case
+      when File.file?(path)
+        path
+      when File.directory?(path)
+        Dir[File.join(path, '*.rb')]
+      end
+    end.flatten.compact
+    @reloader.update(*scripts)
+  end
+  
+  def index_page(apps)
+    welcome = "You are Camping"
+    header = <<-HTML
+<html>
+  <head>
+    <title>#{welcome}</title>
+    <style type="text/css">
+      body { 
+        font-family: verdana, arial, sans-serif; 
+        padding: 10px 40px; 
+        margin: 0; 
+      }
+      h1, h2, h3, h4, h5, h6 {
+        font-family: utopia, georgia, serif;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>#{welcome}</h1>
+    HTML
+    footer = '</body></html>'
+    main = if apps.empty?
+      "<p>Good day.  I'm sorry, but I could not find any Camping apps."\
+      "You might want to take a look at the console to see if any errors"\
+      "have been raised</p>"
+    else
+      "<p>Good day.  These are the Camping apps you've mounted.</p><ul>" + 
+      apps.map do |mount, app|
+        "<li><h3 style=\"display: inline\"><a href=\"/#{mount}\">#{app}</a></h3><small> / <a href=\"/code/#{mount}\">View source</a></small></li>"
+      end.join("\n") + '</ul>'
+    end
+    
+    header + main + footer
+  end
+  
+  def app
+    reload!
+    all_apps = apps
+    rapp = case all_apps.length
+    when 0
+      proc{|env|[200,{'Content-Type'=>'text/html'},index_page([])]}
+    when 1
+      apps.values.first
+    else
+      hash = {
+        "/" => proc {|env|[200,{'Content-Type'=>'text/html'},index_page(all_apps)]}
+      }
+      all_apps.each do |mount, wrapp|
+        # We're doing @reloader.reload! ourself, so we don't need the wrapper.
+        app = wrapp.app
+        hash["/#{mount}"] = app
+        hash["/code/#{mount}"] = proc do |env|
+          [200,{'Content-Type'=>'text/plain','X-Sendfile'=>wrapp.script.file},'']
+        end
+      end
+      Rack::URLMap.new(hash)
+    end
+    rapp = Rack::ContentLength.new(rapp)
+    rapp = Rack::Lint.new(rapp)
+    rapp = XSendfile.new(rapp)
+    rapp = Rack::ShowExceptions.new(rapp)
+  end
+  
+  def apps
+    @reloader.apps.inject({}) do |h, (mount, wrapp)|
+      h[mount.to_s.downcase] = wrapp
+      h
+    end
+  end
+  
+  def call(env)
+    app.call(env)
+  end
+  
+  def start
+    handler, conf = case @conf.server
+    when "console"
+      puts "** Starting console"
+      reload!
+      this = self; eval("self", TOPLEVEL_BINDING).meta_def(:reload!) { this.reload!; nil }
+      ARGV.clear
+      IRB.start
+      exit
+    when "mongrel"
+      puts "** Starting Mongrel on #{@conf.host}:#{@conf.port}"
+      [Rack::Handler::Mongrel, {:Port => @conf.port, :Host => @conf.host}]
+    when "webrick"
+      puts "** Starting WEBrick on #{@conf.host}:#{@conf.port}"
+      [Rack::Handler::WEBrick, {:Port => @conf.port, :BindAddress => @conf.host}]
+    end
+    
+    handler.run(self, conf) 
+  end
+  
+  def reload!
+    find_scripts
+    @reloader.reload!
+  end
+
+  # A Rack middleware for reading X-Sendfile. Should only be used in
+  # development.
+  class XSendfile
+  
+    HEADERS = [
+      "X-Sendfile",
+      "X-Accel-Redirect",
+      "X-LIGHTTPD-send-file"
+    ]
+  
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      headers = Rack::Utils::HeaderHash.new(headers)
+      if header = HEADERS.detect { |header| headers.include?(header) }
+        path = headers[header]
+        body = File.read(path)
+        headers['Content-Length'] = body.length.to_s
+      end
+      [status, headers, body]
+    end
+  end    
+end

data/vendor/{camping-2.0.20090212 → zuk-camping-2.0.20090429}/lib/camping/session.rb

@@ -1,4 +1,5 @@
 # == About camping/session.rb
+# TODO: Clean everything up. Lots of just plain wrong stuff in here.
 #
 # This file contains two modules which supply basic sessioning to your Camping app.
 # Again, we're dealing with a pretty little bit of code: approx. 60 lines.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: picnic
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Matt Zukowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -04:00
+date: 2009-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,33 +84,33 @@ files:
 - setup.rb
 - test/picnic_test.rb
 - test/test_helper.rb
-- vendor/camping-2.0.20090212/CHANGELOG
-- vendor/camping-2.0.20090212/COPYING
-- vendor/camping-2.0.20090212/README
-- vendor/camping-2.0.20090212/Rakefile
-- vendor/camping-2.0.20090212/bin/camping
-- vendor/camping-2.0.20090212/doc/camping.1.gz
-- vendor/camping-2.0.20090212/examples/README
-- vendor/camping-2.0.20090212/examples/blog.rb
-- vendor/camping-2.0.20090212/examples/campsh.rb
-- vendor/camping-2.0.20090212/examples/tepee.rb
-- vendor/camping-2.0.20090212/extras/Camping.gif
-- vendor/camping-2.0.20090212/extras/flipbook_rdoc.rb
-- vendor/camping-2.0.20090212/extras/permalink.gif
-- vendor/camping-2.0.20090212/lib/camping-unabridged.rb
-- vendor/camping-2.0.20090212/lib/camping.rb
-- vendor/camping-2.0.20090212/lib/camping/ar.rb
-- vendor/camping-2.0.20090212/lib/camping/ar/session.rb
-- vendor/camping-2.0.20090212/lib/camping/mab.rb
-- vendor/camping-2.0.20090212/lib/camping/reloader.rb
-- vendor/camping-2.0.20090212/lib/camping/server.rb
-- vendor/camping-2.0.20090212/lib/camping/session.rb
-- vendor/camping-2.0.20090212/setup.rb
-- vendor/camping-2.0.20090212/test/apps/env_debug.rb
-- vendor/camping-2.0.20090212/test/apps/forms.rb
-- vendor/camping-2.0.20090212/test/apps/misc.rb
-- vendor/camping-2.0.20090212/test/apps/sessions.rb
-- vendor/camping-2.0.20090212/test/test_camping.rb
+- vendor/zuk-camping-2.0.20090429/CHANGELOG
+- vendor/zuk-camping-2.0.20090429/COPYING
+- vendor/zuk-camping-2.0.20090429/README
+- vendor/zuk-camping-2.0.20090429/Rakefile
+- vendor/zuk-camping-2.0.20090429/bin/camping
+- vendor/zuk-camping-2.0.20090429/doc/camping.1.gz
+- vendor/zuk-camping-2.0.20090429/examples/README
+- vendor/zuk-camping-2.0.20090429/examples/blog.rb
+- vendor/zuk-camping-2.0.20090429/examples/campsh.rb
+- vendor/zuk-camping-2.0.20090429/examples/tepee.rb
+- vendor/zuk-camping-2.0.20090429/extras/Camping.gif
+- vendor/zuk-camping-2.0.20090429/extras/flipbook.rb
+- vendor/zuk-camping-2.0.20090429/extras/permalink.gif
+- vendor/zuk-camping-2.0.20090429/lib/camping-unabridged.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/ar.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/ar/session.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/mab.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/reloader.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/server.rb
+- vendor/zuk-camping-2.0.20090429/lib/camping/session.rb
+- vendor/zuk-camping-2.0.20090429/setup.rb
+- vendor/zuk-camping-2.0.20090429/test/apps/env_debug.rb
+- vendor/zuk-camping-2.0.20090429/test/apps/forms.rb
+- vendor/zuk-camping-2.0.20090429/test/apps/misc.rb
+- vendor/zuk-camping-2.0.20090429/test/apps/sessions.rb
+- vendor/zuk-camping-2.0.20090429/test/test_camping.rb
 has_rdoc: true
 homepage: http://picnic.rubyforge.org
 post_install_message: