aurora 0.1.10 → 0.2.0

data/bin/aurora

@@ -18,6 +18,7 @@ $:.unshift(File.join(File.dirname(__FILE__),'lib'))
 
 $debug = false
 $test = false
+$daemonize = false
 options = Halcyon::Server::DEFAULT_OPTIONS
 
 #--
@@ -148,7 +149,6 @@ options[:app] = ARGV.shift
 #--
 # load app
 #++
-
 begin
   # go ahead and try to require since it could be a gem
   require options[:app]
@@ -169,66 +169,47 @@ end
 # prepare server
 #++
 begin
-  server = Rack::Handler.const_get(options[:server].capitalize)
-rescue NameError
-  servers = {
-    'cgi'     => 'CGI',
-    'fastcgi' => 'FastCGI',
-    'lsws'    => 'LSWS',
-    'mongrel' => 'Mongrel',
-    'webrick' => 'WEBrick'
-  }
-  abort "Unsupported server (missing Rack Handler). Did you mean to specify #{options[:server]}?" unless servers.key? options[:server]
-  server = Rack::Handler.const_get(servers[options[:server]])
-end
-
-#--
-# daemonization
-#++
-
-if $daemonize
-  fork do
-    require 'daemons'
-    Daemonize.daemonize
-    
-    #--
-    # prepare app environment
-    #++
-    
-    case options[:environment]
-    when "development"
-      app = Rack::Builder.new {
-        use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
-        use Rack::ShowExceptions
-        use Rack::Reloader
-        use Rack::Lint
-        run app.new(options)
-      }.to_app
-    when "deployment"
-      app = Rack::Builder.new {
-        use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
-        run app.new(options)
-      }.to_app
-    else
-      app = app.new(options)
-    end
-    
-    #--
-    # start server
-    #++
-    
-    server.run app, :Port => options[:port]
+  case options[:server]
+  when 'swift-thin'
+    require 'thin'
+    server = Rack::Handler::Thin
+    server = Controllers::Controller.new({
+      :swiftiply => '',
+      :chdir => Dir.pwd,
+      :log => options[:log_file],
+      :pid => options[:pid_file],
+      :environment => 'development',
+      :timeout => 30,
+      :max_conns => 1024,
+      :max_persistent_conns => 512
+    })
+  when 'swift-mongrel'
+    require 'swiftcore/swiftiplied_mongrel'
+    require 'mongrel'
+    server = Rack::Handler::Mongrel
+  else
+    warn 'Aurora is not running behind an SSL connection-capable server. Authenticate at your own risk.'
+    servers = {
+      'cgi'     => 'CGI',
+      'fastcgi' => 'FastCGI',
+      'lsws'    => 'LSWS',
+      'mongrel' => 'Mongrel',
+      'webrick' => 'WEBrick',
+      'thin'    => 'Thin'
+    }
+    server = Rack::Handler.const_get(servers[options[:server]].to_sym)
   end
+rescue NameError
+  abort "Unsupported server (missing Rack Handler). Did you mean to specify #{options[:server]}?"
 end
 
 #--
 # prepare app environment
 #++
-
 case options[:environment]
 when "development"
   app = Rack::Builder.new {
-    use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
+    use Rack::CommonLogger, STDERR unless server.name =~ /CGI/
     use Rack::ShowExceptions
     use Rack::Reloader
     use Rack::Lint
@@ -236,7 +217,7 @@ when "development"
   }.to_app
 when "deployment"
   app = Rack::Builder.new {
-    use Rack::CommonLogger, STDERR  unless server.name =~ /CGI/
+    use Rack::CommonLogger, STDERR unless server.name =~ /CGI/
     run app.new(options)
   }.to_app
 else
@@ -246,5 +227,13 @@ end
 #--
 # start server
 #++
-
-server.run app, :Port => options[:port] unless $daemonize
+unless $daemonize
+  server.run app, :Port => options[:port].to_i
+else
+  fork do
+    require 'daemons'
+    Daemonize.daemonize
+    
+    server.run app, :Port => options[:port].to_i
+  end
+end

data/lib/aurora.rb

@@ -11,7 +11,7 @@ $:.unshift File.dirname(__FILE__)
 #++
 
 module Aurora
-  VERSION = [0,1,10]
+  VERSION = [0,2,0]
   def self.version
     VERSION.join('.')
   end

data/lib/aurora/client.rb

@@ -69,3 +69,50 @@ module Aurora
   end
   
 end
+
+require 'net/https'
+
+module Halcyon
+  class Client
+    
+    class Base
+      
+    private
+      
+      def request(req, headers={})
+        # define essential headers for Halcyon::Server's picky requirements
+        req["Content-Type"] = CONTENT_TYPE
+        req["User-Agent"] = USER_AGENT
+        
+        # apply provided headers
+        headers.each do |pair|
+          header, value = pair
+          req[header] = value
+        end
+        
+        # provide hook for modifying the headers
+        req = headers(req) if respond_to? :headers
+        
+        # prepare and send HTTP request
+        serv = Net::HTTP.new(@uri.host, @uri.port)
+        serv.use_ssl = true if @uri.scheme == 'https'
+        res = serv.start {|http|http.request(req)}
+        
+        # parse response
+        body = JSON.parse(res.body)
+        body.symbolize_keys!
+        
+        # handle non-successes
+        raise Halcyon::Client::Base::Exceptions.lookup(body[:status]).new unless res.kind_of? Net::HTTPSuccess
+        
+        # return response
+        body
+      rescue Halcyon::Exceptions::Base => e
+        # log exception if logger is in place
+        raise
+      end
+      
+    end
+    
+  end
+end

data/lib/aurora/server.rb

@@ -77,6 +77,7 @@ module Aurora
       host = "#{@config[:db][:host]}/" unless @config[:db][:host].nil?
       credentials = "#{@config[:db][:username]}:#{@config[:db][:password]}@" unless @config[:db][:username].nil?
       @db = Sequel("#{@config[:db][:adapter]}://#{credentials}#{host}#{@config[:db][:database]}")
+      @db.logger = @logger if $debug
       @logger.info 'Connected to Database.'
       
       # run migrations if version is outdated
@@ -115,7 +116,7 @@ module Aurora
           @db[:tokens] << {:username => username, :token => token, :expires_at => expiration}
           
           # create the user if not already in the DB
-          if @db[:users].filter(:username => username).empty?
+          if @db[:users].filter(:username => username).all.empty?
           	# retrieve the new user permissions
           	permissions = initialize_permissions(username)
           	
@@ -217,11 +218,11 @@ module Aurora
       # Authenticates the token.
       def auth
         # expire_tokens # TODO: investigate how much of a performance hit checking (and deleting) is
-        unless @db[:tokens].filter('token = ? AND expires_at > ?', params[:token], Time.now).empty?
+        unless @db[:tokens].filter('token = ? AND expires_at > ?', params[:token], Time.now).all.empty?
           # authenticated
           
           # update the expiration date if close to expiring
-          unless @db[:tokens].filter('token = ? AND expires_at <= ?', params[:token], generate_expiration(15)).empty?
+          unless @db[:tokens].filter('token = ? AND expires_at <= ?', params[:token], generate_expiration(15)).all.empty?
           	@db[:tokens].filter(:token => params[:token]).update(:expires_at => generate_expiration)
           end
           

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurora
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matt Todd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-19 00:00:00 -05:00
+date: 2008-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency