ramaze 0.3.9 → 0.3.9.1

data/lib/ramaze/adapter.rb

@@ -32,10 +32,10 @@ module Ramaze
         start_adapter
 
         Timeout.timeout(3) do
-          sleep 0.01 until Global.adapters.any?
+          sleep 0.01 until Global.server
         end
 
-        Global.adapters.each{|a| a.join} unless Global.run_loose
+        Global.server.join unless Global.run_loose
 
       rescue SystemExit
         Ramaze.shutdown
@@ -44,25 +44,24 @@ module Ramaze
         Ramaze.shutdown
       end
 
-      # Takes Global.adapter and starts if test_connections is positive that
-      # connections can be made to the specified host and ports.
+      # Takes Global.adapter and starts if test_connections is positive that a
+      # connection can be made to the specified host and port.
       # If you set Global.adapter to false it won't start any but deploy a
       # dummy which is useful for testing purposes where you just send fake
       # requests to Dispatcher.
 
       def start_adapter
         if adapter = Global.adapter
-          host, ports = Global.host, Global.ports
+          host, port = Global.host, Global.port
 
           if Global.test_connections
-            Log.info("Adapter: #{adapter}, testing connection to #{host}:#{ports}")
-            test_connections(host, ports)
-            Log.info("and we're running: #{host}:#{ports}")
+            test_connection(host, port)
+            Log.info("Ramaze is ready to run on: #{host}:#{port}")
           end
 
-          adapter.start(host, ports)
+          adapter.start(host, port)
         else # run dummy
-          Global.adapters.add Thread.new{ sleep }
+          Global.server = Thread.new{ sleep }
           Log.warn("Seems like Global.adapter is turned off", "Continue without adapter.")
         end
       rescue LoadError => ex
@@ -73,34 +72,20 @@ module Ramaze
       # them to finish, then goes on to kill them and exit still.
 
       def shutdown
-        Timeout.timeout(1) do
-          Global.adapters.each do |adapter|
-            a = adapter[:adapter]
-            a.shutdown if a.respond_to?(:shutdown)
-          end
+        Timeout.timeout(3) do
+          a = Global.server[:adapter]
+          a.shutdown if a.respond_to?(:shutdown)
         end
       rescue Timeout::Error
-        Global.adapters.each{|a| a.kill! }
+        Global.server.kill!
         # Hard exit! because it won't be able to kill Webrick otherwise
         exit!
       end
 
-      # check the given host and ports via test_connection.
-      # Shuts down if no connection is possible.
-
-      def test_connections host, ports
-        ports.each do |port|
-          unless test_connection(host, port)
-            Log.error("Cannot open connection on #{host}:#{port}")
-            Ramaze.shutdown
-          end
-        end
-      end
-
       # Opens a TCPServer temporarily and returns true if a connection is
       # possible and false if none can be made
 
-      def test_connection host, port
+      def test_connection(host, port)
         Timeout.timeout(1) do
           testsock = TCPServer.new(host, port)
           testsock.close
@@ -108,7 +93,8 @@ module Ramaze
         end
       rescue => ex
         Log.error(ex)
-        false
+        Log.error("Cannot open connection on #{host}:#{port}")
+        Ramaze.shutdown
       end
     end
   end

data/lib/ramaze/adapter/base.rb

@@ -14,11 +14,9 @@ module Ramaze
         # Afterwards adds a trap for the value of Global.shutdown_trap which
         # calls Ramaze.shutdown when triggered (usually by SIGINT).
 
-        def start host, ports
-          ports.each do |port|
-            Global.adapters.add(run_server(host, port))
-            trap(Global.shutdown_trap){ Ramaze.shutdown }
-          end
+        def start host, port
+          Global.server = run_server(host, port)
+          trap(Global.shutdown_trap){ Ramaze.shutdown }
         end
 
         # Does nothing
@@ -49,7 +47,11 @@ module Ramaze
         # Then goes on and calls Dispatcher::handle with request and response.
 
         def respond env
-          Current.call env
+          if Global.server == Thread.current
+            Thread.new{ Current.call(env) }.value
+          else
+            Current.call(env)
+          end
         end
       end
     end

data/lib/ramaze/adapter/ebb.rb

@@ -1,8 +1,6 @@
 require 'ebb'
 
 module Ramaze
-  Global.test_connections = true
-
   module Adapter
     class Ebb < Base
       class << self

data/lib/ramaze/adapter/mongrel.rb

@@ -5,8 +5,6 @@ require 'mongrel'
 require 'rack/handler/mongrel'
 
 module Ramaze
-  Global.test_connections = true
-
   module Adapter
 
     # Our Mongrel adapter acts as wrapper for the Rack::Handler::Mongrel.

data/lib/ramaze/adapter/scgi.rb

@@ -4,8 +4,6 @@
 require 'rack/handler/scgi'
 
 module Ramaze
-  Global.test_connections = true
-
   module Adapter
     # Our Scgi adapter acts as wrapper for the Rack::Handler::SCGI.
     class Scgi < Base

data/lib/ramaze/adapter/thin.rb

@@ -2,8 +2,6 @@ require 'thin'
 require 'rack/handler/thin'
 
 module Ramaze
-  Global.test_connections = true
-
   module Adapter
     class Thin < Base
       class << self

data/lib/ramaze/adapter/webrick.rb

@@ -5,8 +5,6 @@ require 'webrick'
 require 'rack/handler/webrick'
 
 module Ramaze
-  Global.test_connections = true
-
   module Adapter
     # Our WEBrick adapter acts as wrapper for the Rack::Handler::WEBrick.
     class WEBrick < Base

data/lib/ramaze/contrib/facebook/facebook.rb

@@ -53,7 +53,7 @@ module Facebook
 
       begin
         ret = post(data)
-      rescue Errno::ECONNRESET
+      rescue Errno::ECONNRESET, Errno::EPIPE
         @server = connect
         retry
       end while ret.empty? and @server = connect

data/lib/ramaze/controller/resolve.rb

@@ -161,9 +161,11 @@ module Ramaze
           ancestor <= Ramaze::Controller
         } + Helper::LOOKUP.to_a
 
-        meths = ancs.map{|a|
-          a.instance_methods(false).map{|iv| iv.to_s }
-        }.flatten.uniq
+        ancs.reverse.inject [] do |meths, anc|
+          meths +
+            anc.public_instance_methods(false).map{|im| im.to_s } -
+            anc.private_instance_methods(false).map{|im| im.to_s }
+        end
       end
 
       # Generate all possible permutations for given path.

data/lib/ramaze/dispatcher.rb

@@ -46,7 +46,7 @@ module Ramaze
         Dispatcher::Error.process(error, meta)
       end
 
-      # protcets against recursive dispatch and reassigns the path_info in the
+      # protects against recursive dispatch and reassigns the path_info in the
       # request, the rest of the request is kept intact.
       def dispatch_to(path)
         if request.path_info == path

data/lib/ramaze/dispatcher/action.rb

@@ -29,7 +29,8 @@ module Ramaze
             body = Controller.handle(path)
             response = Response.current.build(body)
           }
-          FILTER.inject(response){|r,f| f.call(r) }
+          FILTER.each{|f| f.call(response)}
+          response
         rescue Ramaze::Error => ex
           ex
         end

data/lib/ramaze/global.rb

@@ -8,9 +8,6 @@ module Ramaze
     o "Set the adapter Ramaze will run on.",
       :adapter => :webrick, :cli => [:webrick, :mongrel, :thin]
 
-    o "All running threads of Adapter will be collected here.",
-      :adapters => Set.new
-
     o "Set the size of Backtrace shown.",
       :backtrace_size => 10, :cli => 10
 
@@ -85,6 +82,9 @@ module Ramaze
     o "Don't wait until all adapter-threads are finished or killed.",
       :run_loose => false, :cli => false
 
+    o "The running server will be put here from Adapter.",
+      :server => nil
+
     o "Turn on session for all requests.",
       :sessions => true, :cli => true
 
@@ -97,9 +97,6 @@ module Ramaze
     o "Interval in seconds of the background SourceReload",
       :sourcereload => 3, :cli => 3
 
-    o "How many adapters Ramaze should spawn.",
-      :spawn => 1, :cli => 1, :short => :s
-
     o "Test before start if adapters will be able to connect",
       :test_connections => true, :cli => true
 

data/lib/ramaze/global/globalstruct.rb

@@ -89,11 +89,6 @@ module Ramaze
       cache = Ramaze.const_get(class_name)
     end
 
-    # a range built from port and the number of spawns.
-    def ports
-      (port.to_i..(port.to_i + (spawn.to_i - 1)))
-    end
-
     # reassigns the interval in the instance of SourceReload that is running or
     # just waiting.
     def sourcereload=(interval)

data/lib/ramaze/helper/partial.rb

@@ -51,13 +51,24 @@ module Ramaze
       options = { :controller => current.controller,
                   :instance => current.instance.dup }
 
-      roots = [options[:controller].template_paths].flatten
-
-      if (files = Dir["{#{roots.join(',')}}"/"{#{file},#{file}.*}"]).any?
-        options[:template] = files.first.squeeze '/'
+      file = file.to_s
+
+      if Pathname(file).absolute?
+        file = file.squeeze '/'
+        unless File.exist?(file)
+          Log.warn "render_template: #{file} does not exist."
+          return ''
+        end
+        options[:template] = file
       else
-        Log.warn "render_template: #{file} does not exist in the following directories: #{roots.join(',')}."
-        return ''
+        roots = [options[:controller].template_paths].flatten
+
+        if (files = Dir["{#{roots.join(',')}}"/"{#{file},#{file}.*}"]).any?
+          options[:template] = files.first.squeeze '/'
+        else
+          Log.warn "render_template: #{file} does not exist in the following directories: #{roots.join(',')}."
+          return ''
+        end
       end
 
       binding = options[:instance].scope

data/lib/ramaze/spec/helper/browser.rb

@@ -4,12 +4,11 @@
 class Browser
   attr_reader :cookie, :http
 
-  def initialize(url = '/', base = '/', &block)
+  def initialize(base = '/', &block)
     @base     = base
     @history  = []
-    @http     = SimpleHttp.new(url2uri(url))
-
-    get url
+    @uri      = URI("http://localhost:#{Ramaze::Global.port}")
+    @http     = SimpleHttp.new(@uri)
 
     story(&block) if block_given?
   end
@@ -18,28 +17,28 @@ class Browser
     instance_eval(&block) if block_given?
   end
 
-  def get url = '/', hash = {}
-    request(:get, url, hash)
+  def get path = '/', hash = {}
+    request(:get, path, hash)
   end
 
-  def post url = '/', hash = {}
-    request(:post, url, hash)
+  def post path = '/', hash = {}
+    request(:post, path, hash)
   end
 
-  def erequest method, url, hash = {}
-    response = request(method, url, hash)
+  def erequest method, path, hash = {}
+    response = request(method, path, hash)
     eval(response)
   rescue Object => ex
     p :response => response
     ex.message
   end
 
-  def epost url = '/', hash = {}
-    erequest(:post, url, hash)
+  def epost path = '/', hash = {}
+    erequest(:post, path, hash)
   end
 
-  def eget url = '/', hash = {}
-    erequest(:get, url, hash)
+  def eget path = '/', hash = {}
+    erequest(:get, path, hash)
   end
 
   def hget(*args)
@@ -66,8 +65,8 @@ class Browser
     end
   end
 
-  def request method, url, hash = {}
-    @http.uri = url2uri(url)
+  def request method, path, hash = {}
+    @http.uri = @uri + "/#{@base}/#{path}".squeeze('/')
     @http.request_headers['referer'] = @history.last.path rescue '/'
 
     if method == :get and not hash.empty?
@@ -86,13 +85,4 @@ class Browser
     @cookie = @http.response_headers['set-cookie']
     @http.request_headers['cookie'] = @cookie
   end
-
-  def url2uri url
-    uri = URI.parse(url)
-    uri.scheme = 'http'
-    uri.host = 'localhost'
-    uri.port = Ramaze::Global.port
-    uri.path = "/#{@base}/#{url}".squeeze('/')
-    uri
-  end
 end

data/lib/ramaze/version.rb

@@ -5,7 +5,7 @@ module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 9
+    TINY  = 9.1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/examples/simple_auth.rb

@@ -0,0 +1,32 @@
+require 'spec/helper'
+require 'examples/simple_auth'
+
+describe "SimpleAuth" do
+  behaves_like 'browser'
+  ramaze(:adapter => :webrick)
+
+  it 'should show start page' do
+    Browser.new do
+      http.basic_authentication "username", "password"
+      get('/').should == "Secret Info"
+    end
+
+    Browser.new do
+      http.basic_authentication "admin", "secret"
+      get('/').should == "Secret Info"
+    end
+  end
+
+  it 'should not show start page' do
+    Browser.new do
+      lambda{ get('/') }.should.raise
+    end
+
+    Browser.new do
+      lambda do
+        http.basic_authentication "hello", "world"
+        lambda{ get('/') }.should.raise
+      end
+    end
+  end
+end

data/spec/ramaze/helper/auth.rb

@@ -54,7 +54,7 @@ describe "StackHelper" do
   ].each do |controller|
 
     it controller.to_s do
-      Browser.new('/', Ramaze::Global.mapping.invert[controller]) do
+      Browser.new(Ramaze::Global.mapping.invert[controller]) do
         get('/secured').should == ''
         post('/login', 'username' => 'manveru', 'password' => 'password')
         get('/secured').should == 'Secret content'

data/spec/ramaze/helper/flash.rb

@@ -73,7 +73,7 @@ describe Ramaze::Helper::Flash do
   ramaze :adapter => :webrick
 
   should "set and forget flash twice" do
-    Browser.new('/') do
+    Browser.new do
       get('/first_here')
       get('/then_here').should == 'hey'
       2.times{ get('/then_here').should.be.empty }

data/spec/ramaze/helper/stack.rb

@@ -56,6 +56,7 @@ describe "StackHelper" do
 
   it "indirect login" do
     Browser.new do
+      get('/')
       get('/foo').should == 'logged in'
       get('/secure').should == 'secret content'
       eget('/').should == {:logged_in => true}
@@ -64,6 +65,7 @@ describe "StackHelper" do
 
   it "indirect login with params" do
     Browser.new do
+      get('/')
       eget('/bar', 'x' => 'y').should == {'x' => 'y'}
       eget('/').should == {:logged_in => true}
     end

data/spec/ramaze/helper/user.rb

@@ -36,7 +36,7 @@ describe Ramaze::Helper::User do
   ramaze :adapter => :webrick
 
   should 'login' do
-    Browser.new '/status' do
+    Browser.new do
       get('/status').should == 'false'
       get('/login', 'name' => 'arthur', 'password' => '42')
       get('/status').should == 'true'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ramaze
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.3.9.1
 platform: ruby
 authors: 
 - manveru
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-16 00:00:00 -07:00
+date: 2008-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -301,6 +301,7 @@ files:
 - spec/examples/hello.rb
 - spec/examples/linking.rb
 - spec/examples/simple.rb
+- spec/examples/simple_auth.rb
 - spec/examples/templates
 - spec/examples/templates/template_amrita2.rb
 - spec/examples/templates/template_erubis.rb