sinatra 0.1.0 → 0.1.5

data/CHANGELOG

@@ -1 +1,2 @@
+v0.1.5 Mutex and before-filters
 v0.1.0 Released!

data/RakeFile

@@ -1,6 +1,5 @@
 require 'rake/testtask'
 require 'ftools'
-require 'hoe'
 
 Version = '0.1.0'
 
@@ -20,7 +19,7 @@ begin
     p.email = "blake.mizerany@gmail.com"
     p.test_pattern = 'test/**/*_test.rb'
     p.include_rakefile = true
-    p.rdoc_pattern = ['README', 'LICENSE'] << Dir.glob('lib/**/*.rb') << Dir.glob('vendor/**/*.rb')
+    p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
   end
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake/testtask'
 require 'ftools'
-require 'hoe'
 
 Version = '0.1.0'
 
@@ -20,7 +19,7 @@ begin
     p.email = "blake.mizerany@gmail.com"
     p.test_pattern = 'test/**/*_test.rb'
     p.include_rakefile = true
-    p.rdoc_pattern = ['README', 'LICENSE'] << Dir.glob('lib/**/*.rb') << Dir.glob('vendor/**/*.rb')
+    p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
   end
 

data/lib/sinatra/dsl.rb

@@ -54,11 +54,34 @@ module Sinatra
       Sinatra::Event.new(:delete, path, &block)
     end
 
+    # Run given block after each Event's execution
+    # Usage:
+    #   before_attend do
+    #     logger.debug "After event attend!"
+    #   end
+    # or
+    #   before_attend :authorize # authorize is a helper method defined using helpers
+    #
+    # Stop execution using - throw :halt
+    #   before_attend do
+    #     throw :halt, 401 unless has_access?
+    #   end
+    # Throw a Symbol to execute a helper method
+    # Throw a String to render it as the content
+    # Throw a Fixnum to set the status
+    #
+    def before_attend(filter_name = nil, &block)
+      Sinatra::Event.before_attend(filter_name, &block)
+    end
+
     # Run given block after each Event's execution
     # Example:
     #   after_attend do
     #     logger.debug "After event attend!"
     #   end
+    # or 
+    #   after_attend :clean_up  # clean_up is a helper method defined using helpers
+    #
     def after_attend(filter_name = nil, &block)
       Sinatra::Event.after_attend(filter_name, &block)
     end

data/lib/sinatra/event.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module Sinatra
   
   module EventManager # :nodoc:
@@ -43,13 +45,30 @@ module Sinatra
 
     cattr_accessor :logger
     cattr_accessor :after_filters
+    cattr_accessor :before_filters
+    
+    @@mutex = Mutex.new
     
+    self.before_filters = []
     self.after_filters = []
     
-    def self.after_attend(filter)
-      after_filters << filter
+    def self.before_attend(method_name = nil, &block)
+      setup_filter(:before_filters, method_name, &block)
+    end
+
+    def self.after_attend(method_name = nil, &block)
+      setup_filter(:after_filters, method_name, &block)
     end
     
+    def self.setup_filter(filter_set_name, method_name, &block)
+      raise "Must specify method or block" if method_name.nil? and !block_given?
+      send(filter_set_name) << if block_given?
+        block
+      else
+        method_name
+      end
+    end
+      
     after_attend :log_event
     
     attr_reader :path, :verb
@@ -65,13 +84,27 @@ module Sinatra
     def attend(request)
       request.params.merge!(@route.params)
       context = EventContext.new(request)
-      begin
-        result = context.instance_eval(&@block) if @block
-        context.body context.body || result || ''
-      rescue => e
-        context.error e
+      run_safely do
+        caught = catch(:halt) do
+          call_filters(before_filters, context)
+        end
+        body = case caught
+          when :filter_chain_completed
+            begin
+              context.instance_eval(&@block) if @block
+            rescue => e
+              context.error e
+            end
+          when Symbol
+            context.send(caught)
+          when String
+            caught
+          when Fixnum
+            context.status caught
+        end
+        context.body context.body || body || ''
+        call_filters(after_filters, context)
       end
-      run_through_after_filters(context)
       context
     end
     alias :call :attend
@@ -82,8 +115,28 @@ module Sinatra
 
     private
     
-      def run_through_after_filters(context)
-        after_filters.each { |filter| context.send(filter) }
+      def run_safely
+        if Options.use_mutex?
+          @@mutex.synchronize do
+            yield
+          end
+        else
+          yield
+        end
+      end
+      
+      # Adapted from Merb
+      # calls a filter chain according to rules.
+      def call_filters(filter_set, context)
+        filter_set.each do |filter|
+          case filter
+            when Symbol, String
+             context.send(filter)
+            when Proc
+             context.instance_eval(&filter)
+          end
+        end
+        :filter_chain_completed
       end
       
   end

data/lib/sinatra/irb.rb

@@ -28,6 +28,7 @@ module Sinatra
             f.puts
             f.puts body
           end
+          nil
         end
         alias :mate :show!
         

data/lib/sinatra/options.rb

@@ -7,6 +7,9 @@ module Sinatra
     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
@@ -24,6 +27,9 @@ module Sinatra
           puts opts
           exit!
         end
+        opts.on '-X', '--mutex', 'Use mutex lock when attending events' do
+          @use_mutex = true
+        end
       end.parse!(ARGV)
     end
     

data/lib/sinatra/server.rb

@@ -19,6 +19,9 @@ module Sinatra
           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

data/sinatra.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Sinatra-0.1.0
+# Gem::Specification for Sinatra-0.1.5
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra}
-  s.version = "0.1.0"
-  s.date = %q{2007-10-04}
+  s.version = "0.1.5"
+  s.date = %q{2007-10-07}
   s.summary = %q{Sinatra is a classy web-framework dressed in a DSL}
   s.email = %q{blake.mizerany@gmail.com}
   s.homepage = %q{http://sinatra.rubyforge.org/}
@@ -24,7 +24,6 @@ end
 # 
 # require 'rake/testtask'
 # require 'ftools'
-# require 'hoe'
 # 
 # Version = '0.1.0'
 # 
@@ -44,7 +43,7 @@ end
 #     p.email = "blake.mizerany@gmail.com"
 #     p.test_pattern = 'test/**/*_test.rb'
 #     p.include_rakefile = true
-#     p.rdoc_pattern = ['README', 'LICENSE'] << Dir.glob('lib/**/*.rb') << Dir.glob('vendor/**/*.rb')
+#     p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
 #     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/sinatra/"
 #   end
 # 

data/site/index.htm

@@ -85,13 +85,17 @@ end</pre>
 						<pre><a href="http://repo.or.cz/w/sinatra.git?a=tree;f=examples;h=fd7513e49762738ad945adbb2e15bb31528b4207;hb=HEAD">here</a></pre>
 					</p>
 					<p>
-						<strong>Contribute!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git">using git</a></pre>
+						<strong>Docs!</strong><br />
+						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
 					</p>
 					<p>
-						<strong>Docs!</strong><br />
+						<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>

data/site/index.html

@@ -85,13 +85,17 @@ end</pre>
 						<pre><a href="http://repo.or.cz/w/sinatra.git?a=tree;f=examples;h=fd7513e49762738ad945adbb2e15bb31528b4207;hb=HEAD">here</a></pre>
 					</p>
 					<p>
-						<strong>Contribute!</strong><br />
-						<pre><a href="http://repo.or.cz/w/sinatra.git">using git</a></pre>
+						<strong>Docs!</strong><br />
+						<pre><a	href="http://sinatra.rubyforge.org/doc/">here</a></pre>
 					</p>
 					<p>
-						<strong>Docs!</strong><br />
+						<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>

data/test/sinatra/event_test.rb

@@ -33,5 +33,14 @@ describe "Event" do
     Sinatra::EventManager.expects(:not_found)
     Sinatra::EventManager.determine_event(:get, '/asdfsasd')
   end
+
+  it "should not execute event if halted" do
+    Sinatra::Event.before_filters << lambda { throw :halt, 'whoa!' }
+    event = Sinatra::Event.new(:get, '/') do
+      foo
+    end
+    event.expects(:foo).never
+    get_it('/').should.equal 'whoa!'
+  end
     
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.0
 specification_version: 1
 name: sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-10-04 00:00:00 -07:00
+  version: 0.1.5
+date: 2007-10-07 00:00:00 -07:00
 summary: Sinatra is a classy web-framework dressed in a DSL
 require_paths: 
 - lib