sinatra 0.1.7 → 0.2.0

data/lib/sinatra/loader.rb

@@ -1,31 +0,0 @@
-require 'set'
-
-module Sinatra
-  module Loader
-    extend self
-
-    def reload!
-      silence_warnings do
-        EventManager.reset!
-        load_files loaded_files
-        load $0
-      end
-    end
-
-    def load_files(*files)
-      files = files.flatten
-      files = files.first if files.first.is_a? Set
-
-      files.each do |file| 
-        file = File.expand_path(file)
-        load file
-        loaded_files << file
-      end
-    end
-    alias_method :load_file, :load_files
-
-    def loaded_files
-      @loaded_files ||= Set.new
-    end
-  end
-end 

data/lib/sinatra/logger.rb

@@ -1,22 +0,0 @@
-module Sinatra
-  
-  class Logger
-    
-    def initialize(steam)
-      @stream = steam
-    end
-    
-    %w(info debug error warn).each do |n|
-      define_method n do |message|
-        @stream.puts message
-        @stream.flush
-      end
-    end
-    
-    def exception(e)
-      error "#{e.message}:\n\t#{e.backtrace.join("\n\t")}"
-    end
-    
-  end
-  
-end

data/lib/sinatra/options.rb

@@ -1,49 +0,0 @@
-require 'optparse'
-
-module Sinatra
-  module Options
-    extend self
-    
-    attr_with_default :port, 4567
-    attr_with_default :environment, :development
-    attr_with_default :console, nil
-    attr_with_default :use_mutex, false
-
-    alias :use_mutex? :use_mutex
-
-    def parse!(args)
-      return if @environment == :test
-      OptionParser.new do |opts|
-        opts.on '-p port', '--port port', 'Set the port (default is 4567)' do |port|
-          @port = port
-        end
-        opts.on '-e environment', 'Set the environment (default if development)' do |env|
-          @environment = env.intern
-        end
-        opts.on '-c', '--console', 'Run in console mode' do
-          @console = true
-        end
-        opts.on '-h', '--help', '-?', 'Show this message' do
-          puts opts
-          exit!
-        end
-        opts.on '-X', '--mutex', 'Use mutex lock when attending events' do
-          @use_mutex = true
-        end
-      end.parse!(ARGV)
-    end
-    
-    def log_file
-      # TODO find a better way that this
-      if File.basename($0, '.rb') == 'rake_test_loader'  # hack to satisfy rake
-        '%s.log' % environment
-      else
-        File.dirname($0) + ('/%s.log' % environment)
-      end
-    end
-    
-    def set_environment(env)
-      @environment = env
-    end
-  end
-end

data/lib/sinatra/rack_ext/request.rb

@@ -1,15 +0,0 @@
-module Rack #:nodoc:
-  
-  class Request #:nodoc:
-    
-    def request_method
-      if @env['REQUEST_METHOD'] == 'POST' && %w(PUT DELETE).include?(params['_method'])
-        params['_method'].upcase
-      else
-        @env['REQUEST_METHOD']
-      end
-    end
-    
-  end
-  
-end

data/lib/sinatra/route.rb

@@ -1,65 +0,0 @@
-module Sinatra
-
-  class Route
-
-    SYMBOL_FIND = /:[a-z_]+/.freeze
-    PARENTHETICAL_SEGMENT_STRING = "([^\/.,;?]+)".freeze
-
-    attr_reader :regex, :params
-
-    def initialize(template)
-      @template = template.to_s.strip
-      @default_params = { :format => 'html' }
-      @params = {}
-      extract_keys
-      genereate_route
-    end
-  
-    def recognize(path)
-      @params.clear
-      
-      param_values = path.match(@regex).captures.compact rescue nil
-            
-      if param_values
-        keys = @keys.size < param_values.size ? @keys.concat([:format]) : @keys
-        @params = @default_params.merge(@keys.zip(param_values).to_hash)
-        true
-      else
-        false
-      end
-    end
-
-    private
-    
-      def extract_keys
-        @keys = @template.scan(SYMBOL_FIND).map { |raw| eval(raw) }
-        @keys
-      end
-
-      def genereate_route_without_format
-        template = @template.dup
-        template.gsub!(/\.:format$/, '')
-        to_regex_route(template)
-      end
-
-      def genereate_route_with_format
-        template = @template.dup
-        if template =~ /\.:format$|\.([\w\d]+)$/
-          @default_params[:format] = $1 if $1
-        else
-          template << '.:format'
-        end
-        to_regex_route(template)
-      end
-  
-      def to_regex_route(template)
-        /^#{template.gsub(/\./, '\.').gsub(SYMBOL_FIND, PARENTHETICAL_SEGMENT_STRING)}$/
-      end
-
-      def genereate_route
-        @regex = Regexp.union(genereate_route_without_format, genereate_route_with_format)
-      end
-
-  end
-
-end

data/lib/sinatra/server.rb

@@ -1,57 +0,0 @@
-require 'fileutils'
-
-module Sinatra
-  
-  class Server
-    
-    cattr_accessor :logger
-    cattr_accessor :running
-    
-    def start
-      begin
-        tail_thread = tail(Options.log_file)
-        Rack::Handler::Mongrel.run(Sinatra::Session::Cookie.new(Dispatcher.new), :Port => Options.port) do |server|
-          puts "== Sinatra has taken the stage on port #{server.port}!"
-          trap("INT") do
-            server.stop
-            self.class.running = false
-            puts "\n== Sinatra has ended his set (crowd applauds)"
-          end
-        end
-        self.class.running = true
-      rescue Errno::EADDRINUSE => e
-        puts "== Someone is already performing on port #{Options.port}!"
-        logger.exception e
-      rescue => e
-        logger.exception e
-      ensure
-        tail_thread.kill if tail_thread
-      end
-    end
-        
-    private 
-        
-      def tail(log_file)
-        FileUtils.touch(log_file)
-        cursor = File.size(log_file)
-        last_checked = Time.now
-        tail_thread = Thread.new do
-          File.open(log_file, 'r') do |f|
-            loop do
-              f.seek cursor
-              if f.mtime > last_checked
-                last_checked = f.mtime
-                contents = f.read
-                cursor += contents.length
-                print contents
-              end
-              sleep 1
-            end
-          end
-        end
-        tail_thread
-      end
-      
-  end
-  
-end

data/lib/sinatra/sessions.rb

@@ -1,21 +0,0 @@
-module Sinatra
-  module Session
-    class Cookie
-      def self.use=(v)
-        @@use = v unless Sinatra::Server.running  # keep is thread-safe!
-      end
-      
-      def initialize(app, options = {})
-        @app = if (@@use ||= :on) == :off
-          app
-        else
-          Rack::Session::Cookie.new(app)
-        end
-      end
-      
-      def call(env)
-        @app.call(env)
-      end
-    end
-  end
-end

data/lib/sinatra/test_methods.rb

@@ -1,55 +0,0 @@
-require 'uri'
-
-module Sinatra
-
-  # These methods are for integration testing without an internet connection.  They are available in Test::Unit::TestCase and when in Irb.
-    
-  module TestMethods
-
-    # get_it, post_it, put_it, delete_it
-    # Executes the method and returns the result of the body
-    # 
-    # options:
-    # +:params+ a hash of name parameters
-    #
-    # Example:
-    #   get_it '/', :name => 'Blake' # => 'Hello Blake!'
-    #
-    %w(get post put delete).each do |verb|
-      module_eval <<-end_eval
-        def #{verb}_it(path, params = {})
-          request = Rack::MockRequest.new(Sinatra::Dispatcher.new)
-          @response = request.#{verb} path, :input => generate_input(params)
-          body
-        end
-      end_eval
-    end
-        
-    def response
-      @response || Rack::MockResponse.new(404, {}, '')
-    end
-
-    def status
-      response.status
-    end
-
-    def text
-      response.body
-    end
-    alias :xml :text
-    alias :html :text
-    alias :body :text
-
-    def headers
-      response.headers
-    end
-    
-    private
-    
-      def generate_input(params)
-        params.map { |k,v| "#{k}=#{URI.escape(v)}" }.join('&')
-      end
-
-  end
-  
-end

data/site/index.htm

@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>Sinatra : Classy web-development dressed in a DSL</title>
-	</head>
-	
-	<body>
-		<style type="text/css" media="screen">
-			body {
-				background-color: #fff;
-				color: #333;
-				font-size: 0.75em;
-			}
-			
-			#container {
-				width: 600px;
-				margin: 0 auto;
-				font-size: 1.5em;
-			}
-			
-			#container pre {
-				font-size: .8em;
-				background-color: #F5F6C9;
-				width: 100%;
-			}
-			
-			#container note {
-				font-size: .7em;
-			}
-			
-			#banner {
-				width: 600px;
-				text-align: center;
-			}
-						
-			pre {
-				padding: 10px;
-			}
-			
-			.clear {
-				clear: both;
-			}
-		</style>
-		
-		<div id="container">
-			<div id="banner">
-				<img src='logo.png' />
-				<h2><em>Classy web-development dressed in a DSL</em></h2>
-			</div>
-			<div class="clear"></div>
-			<div>
-				<div>
-					<p>
-						<strong>Install!</strong><br/>
-						<pre>gem install sinatra -y</pre>
-					</p>
-					<p>
-						<strong>Require!</strong> (any filename you wish)<br/>
-						<pre>
-# lyrics.rb
-require 'rubygems'
-require 'sinatra'</pre>
-						<note>yup.. that's it for a sec</note><br />
-					</p>
-					<p>
-						<strong>Run!</strong><br />
-						<pre>ruby lyrics.rb</pre>
-					</p>
-					<p>
-						<strong>Bask!</strong><br />
-						<pre>http://localhost:4567</pre>
-					</p>
-					<p>
-						<strong>Write!</strong>
-						<pre>
-get '/' do
-  "Now that's a fine looking dame!"
-end</pre>
-					</p>
-					<p>
-						<strong>Examples!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git?a=tree;f=examples;h=fd7513e49762738ad945adbb2e15bb31528b4207;hb=HEAD">here</a></pre>
-					</p>
-					<p>
-						<strong>Docs!</strong><br />
-						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
-					</p>
-					<p>
-						<strong>Can you <a href="http://digg.com/programming/Sinatra_Classy_web_development_dressed_in_a_DSL">digg</a> it cats?</strong><br />
-						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
-					</p>
-					<p>
-						<strong>Contribute!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git">using git</a></pre>
-					</p>
-					
-				</div>
-			</div>
-		</div>
-	</body>
-</html>

data/site/index.html

@@ -1,104 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-		<title>Sinatra : Classy web-development dressed in a DSL</title>
-	</head>
-	
-	<body>
-		<style type="text/css" media="screen">
-			body {
-				background-color: #fff;
-				color: #333;
-				font-size: 0.75em;
-			}
-			
-			#container {
-				width: 600px;
-				margin: 0 auto;
-				font-size: 1.5em;
-			}
-			
-			#container pre {
-				font-size: .8em;
-				background-color: #F5F6C9;
-				width: 100%;
-			}
-			
-			#container note {
-				font-size: .7em;
-			}
-			
-			#banner {
-				width: 600px;
-				text-align: center;
-			}
-						
-			pre {
-				padding: 10px;
-			}
-			
-			.clear {
-				clear: both;
-			}
-		</style>
-		
-		<div id="container">
-			<div id="banner">
-				<img src='logo.png' />
-				<h2><em>Classy web-development dressed in a DSL</em></h2>
-			</div>
-			<div class="clear"></div>
-			<div>
-				<div>
-					<p>
-						<strong>Install!</strong><br/>
-						<pre>gem install sinatra -y</pre>
-					</p>
-					<p>
-						<strong>Require!</strong> (any filename you wish)<br/>
-						<pre>
-# lyrics.rb
-require 'rubygems'
-require 'sinatra'</pre>
-						<note>yup.. that's it for a sec</note><br />
-					</p>
-					<p>
-						<strong>Run!</strong><br />
-						<pre>ruby lyrics.rb</pre>
-					</p>
-					<p>
-						<strong>Bask!</strong><br />
-						<pre>http://localhost:4567</pre>
-					</p>
-					<p>
-						<strong>Write!</strong>
-						<pre>
-get '/' do
-  "Now that's a fine looking dame!"
-end</pre>
-					</p>
-					<p>
-						<strong>Examples!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git?a=tree;f=examples;h=fd7513e49762738ad945adbb2e15bb31528b4207;hb=HEAD">here</a></pre>
-					</p>
-					<p>
-						<strong>Docs!</strong><br />
-						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
-					</p>
-					<p>
-						<strong>Can you <a href="http://digg.com/programming/Sinatra_Classy_web_development_dressed_in_a_DSL">digg</a> it cats?</strong><br />
-						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
-					</p>
-					<p>
-						<strong>Contribute!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git">using git</a></pre>
-					</p>
-					
-				</div>
-			</div>
-		</div>
-	</body>
-</html>