zuk-picnic 0.8.0.20090318 → 0.8.0.20090427

data/Manifest.txt

@@ -17,30 +17,29 @@ picnic.gemspec
 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/camping-2.0.20090421/CHANGELOG
+vendor/camping-2.0.20090421/COPYING
+vendor/camping-2.0.20090421/README
+vendor/camping-2.0.20090421/Rakefile
+vendor/camping-2.0.20090421/bin/camping
+vendor/camping-2.0.20090421/doc/camping.1.gz
+vendor/camping-2.0.20090421/examples/README
+vendor/camping-2.0.20090421/examples/blog.rb
+vendor/camping-2.0.20090421/examples/campsh.rb
+vendor/camping-2.0.20090421/examples/tepee.rb
+vendor/camping-2.0.20090421/extras/Camping.gif
+vendor/camping-2.0.20090421/extras/permalink.gif
+vendor/camping-2.0.20090421/lib/camping-unabridged.rb
+vendor/camping-2.0.20090421/lib/camping.rb
+vendor/camping-2.0.20090421/lib/camping/ar.rb
+vendor/camping-2.0.20090421/lib/camping/ar/session.rb
+vendor/camping-2.0.20090421/lib/camping/mab.rb
+vendor/camping-2.0.20090421/lib/camping/reloader.rb
+vendor/camping-2.0.20090421/lib/camping/server.rb
+vendor/camping-2.0.20090421/lib/camping/session.rb
+vendor/camping-2.0.20090421/setup.rb
+vendor/camping-2.0.20090421/test/apps/env_debug.rb
+vendor/camping-2.0.20090421/test/apps/forms.rb
+vendor/camping-2.0.20090421/test/apps/misc.rb
+vendor/camping-2.0.20090421/test/apps/sessions.rb
+vendor/camping-2.0.20090421/test/test_camping.rb

data/lib/picnic/cli.rb

@@ -156,6 +156,8 @@ module Picnic
         at_exit { File.delete($PID_FILE) if File.exist?($PID_FILE) }
       end
       
+      $CONF.database = :unused if $CONF.database.blank?
+      
       server = Picnic::Server::Base.new($CONF, [options[:app_file]])
       server.start
     end

data/lib/picnic/conf.rb

@@ -25,18 +25,34 @@ module Picnic
     # Read a configuration option.
     #
     # For example:
-    #   puts Conf[:server]
+    #   puts conf[:server]
     def [](key)
       @conf[key]
     end
     
-    # Another way of reading a configuration option.
+    # Set a configuration option.
+    #
+    # For example:
+    #   conf[:server] = 'mongrel'
+    def []=(key, value)
+      @conf[key] = value
+    end
+    
+    # Another way of reading or writing a configuration option.
     #
     # The following statements are equivalent:
-    #   puts Conf[:server]
-    #   puts Conf.server
+    #   puts conf[:server]
+    #   puts conf.server
+    #
+    # These are also equivalent:
+    #   conf[:server] = 'mongrel'
+    #   conf.server = 'mongrel'
     def method_missing(method, *args)
-      self[method]
+      if method.to_s =~ /(.*?)=$/
+        self[$~[1]] = args.first
+      else
+        self[method]
+      end
     end
     
     # Needs to be defined when we have a custom method_missing().

data/lib/picnic.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'activesupport'
 
 $: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + "/../vendor/camping-2.0.20090212/lib"
+$: << File.dirname(__FILE__) + "/../vendor/camping-2.0.20090421/lib"
 
 require "camping"
 

data/vendor/camping-2.0.20090421/README

@@ -0,0 +1,82 @@
+== Camping, a Microframework
+
+Camping is a web framework which consistently stays at less than 3kb of code.
+You can probably view the complete source code on a single page. But, you
+know, it's so small that, if you think about it, what can it really do?
+
+The idea here is to store a complete fledgling web application in a single
+file like many small CGIs. But to organize it as a Model-View-Controller
+application like Rails does. You can then easily move it to Rails once you've
+got it going.
+
+== A Camping Skeleton
+
+A skeletal Camping blog could look like this:
+
+  require 'camping'
+  
+  Camping.goes :Blog
+
+  module Blog::Models
+    class Post < Base; belongs_to :user; end
+    class Comment < Base; belongs_to :user; end
+    class User < Base; end
+  end
+
+  module Blog::Controllers
+    class Index < R '/'
+      def get
+        @posts = Post.find :all
+        render :index
+      end
+    end
+  end
+
+  module Blog::Views
+    def layout
+      html do
+        body do
+          self << yield
+        end
+      end
+    end
+
+    def index
+      for post in @posts
+        h1 post.title
+      end
+    end
+  end
+  
+== Installation
+
+Interested yet?  Luckily it's quite easy to install Camping. We'll be using a tool called RubyGems, so if you don't have that installed yet, go grab it! Once that's sorted out, open up a Terminal or Command Line and enter:
+
+* <tt>gem install camping</tt>
+
+Or for the bleeding edge:
+
+* <tt>gem install camping --source http://gems.judofyr.net</tt>
+
+This will download everything you need and get you all set up. If you're installing camping manually, you'll need to make sure you have 'rack' installed as well, the interface Camping uses to talk to your web server. You'll also need 'markaby' for the views, and 'activerecord' if you're going to be using databases.
+
+== Learning
+
+* Start by reading the documentation in {the Camping module}[link:classes/Camping.html]
+  - it should get you started pretty quick.
+* {The wiki}[http://wiki.github.com/why/camping] is the place for all tiny,
+  useful tricks that we've collected over the years.  Don't be afraid to
+  share your own discoveries; the more, the better!
+* Still wondering?  Subscribe to {the mailing list}[http://rubyforge.org/mailman/listinfo/camping-list].
+  This is where it's all happening!  Don't worry, though, the volume is just
+  as micro as Camping itself.  
+  
+== Authors
+
+Camping was originally started by{why the lucky stiff}[http://en.wikipedia.org/wiki/Why_the_lucky_stiff],
+but is now maintained by the _community_.  This simply means that if we like your
+patch, it will be applied.  Everything is managed through {the mailing list}[http://rubyforge.org/mailman/listinfo/camping-list],
+so just subscribe and you'll become a contributor too.  Remember: writing the
+code is just half the job, without some serious thinking from you we won't get
+any further.
+

data/vendor/{camping-2.0.20090212 → camping-2.0.20090421}/Rakefile

@@ -4,6 +4,14 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'fileutils'
+begin
+  gem 'rdoc', '~> 2.2.0'
+  require 'rdoc'
+  $:.unshift 'extras'
+rescue Gem::LoadError
+  puts "RDoc 2.2 required to build docs"
+  puts "Please run `gem install rdoc --version 2.2`"
+end
 include FileUtils
 
 NAME = "camping"
@@ -30,7 +38,7 @@ end
 Rake::RDocTask.new do |rdoc|
     rdoc.rdoc_dir = 'doc/rdoc'
     rdoc.options += RDOC_OPTS
-    rdoc.template = "extras/flipbook_rdoc.rb"
+    rdoc.template = "flipbook"
     rdoc.main = "README"
     rdoc.title = "Camping, the Documentation"
     rdoc.rdoc_files.add ['README', 'CHANGELOG', 'COPYING', 'lib/camping.rb', 'lib/camping/*.rb']
@@ -41,7 +49,6 @@ task :after_doc do
     mv "lib/camping-mural.rb", "lib/camping.rb"
     cp "extras/Camping.gif", "doc/rdoc/"
     cp "extras/permalink.gif", "doc/rdoc/"
-    sh %{scp -r doc/rdoc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/camping/}
 end
 
 spec =
@@ -61,7 +68,6 @@ spec =
 
         s.add_dependency('markaby', '>=0.5')
         s.add_dependency('rack', '>=0.3')
-        s.add_dependency('metaid')
         s.required_ruby_version = '>= 1.8.2'
 
         s.files = %w(COPYING README Rakefile) +

data/vendor/camping-2.0.20090421/bin/camping

@@ -0,0 +1,97 @@
+#!/usr/bin/env ruby
+
+trap("INT") { exit }
+require 'optparse'
+require 'ostruct'
+require 'stringio'
+require 'yaml'
+
+$:.unshift File.dirname(__FILE__) + "/../lib"
+require 'camping'
+require 'camping/server'
+
+conf = OpenStruct.new(:host => '0.0.0.0', :port => 3301)
+
+# Setup paths
+if home = ENV['HOME'] # POSIX
+  db_path = File.join(home, '.camping.db')
+  rc_path = File.join(home, '.campingrc')
+elsif home = ENV['APPDATA'] # MSWIN
+  db_path = File.join(home, 'Camping.db')
+  rc_path = File.join(home, 'Campingrc')
+end
+
+# Parse options
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: camping app1.rb, app2.rb..."
+  opts.define_head "#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  opts.separator ""
+  opts.separator "Specific options:"
+
+  opts.on("-h", "--host HOSTNAME", "Host for web server to bind to (default is all IPs)") { |conf.host| }
+  opts.on("-p", "--port NUM", "Port for web server (defaults to #{conf.port})") { |conf.port| }
+  opts.on("-d", "--database FILE", "SQLite3 database path (defaults to #{db_path ? db_path : '<none>'})") { |db_path| conf.database = {:adapter => 'sqlite3', :database => db_path} }
+  opts.on("-C", "--console", "Run in console mode with IRB") { conf.server = "console" }
+  server_list = ["mongrel", "webrick", "console"]
+  opts.on("-s", "--server NAME", server_list, "Server to force (#{server_list.join(', ')})") { |conf.server| }
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  # No argument, shows at tail.  This will print an options summary.
+  # Try it and see!
+  opts.on_tail("-?", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  # Another typical switch to print the version.
+  opts.on_tail("-v", "--version", "Show version") do
+    puts Gem.loaded_specs['camping'].version
+    exit
+  end
+end
+
+begin
+  opts.parse! ARGV
+rescue OptionParser::ParseError => ex
+  STDERR.puts "!! #{ex.message}"
+  puts "** use `#{File.basename($0)} --help` for more details..."
+  exit 1
+end
+
+if ARGV.length < 1
+  puts opts
+  exit 1
+end
+
+# Load configuration if any
+if rc_path and File.exists?(rc_path)
+  YAML.load_file(rc_path).each do |k,v|
+    conf.send("#{k}=", v) unless conf.send(k)
+  end 
+  puts "** conf file #{rc_path} loaded"
+end
+
+# Default db
+if conf.database.nil? and db_path
+  conf.database = { :adapter => 'sqlite3', :database => db_path }
+end
+
+
+# get a copy of the paths to pass to the server
+paths = ARGV.dup
+
+# Check that mongrel exists 
+if conf.server.nil? || conf.server == "mongrel"
+  begin
+    require 'mongrel'
+    conf.server = "mongrel"
+  rescue LoadError 
+    puts "!! could not load mongrel. Falling back to webrick."
+    conf.server = "webrick"
+  end
+end
+
+server = Camping::Server.new(conf, paths)
+server.start

data/vendor/camping-2.0.20090421/lib/camping/reloader.rb

@@ -0,0 +1,184 @@
+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 = File.expand_path($LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) })
+        File.join(dir, req)
+      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