strelka 0.0.1.pre.244 → 0.0.1.pre.252

data/spec/strelka/app/sessions_spec.rb

@@ -39,12 +39,7 @@ describe Strelka::App::Sessions do
 	describe "session-class loading" do
 		before( :all ) do
 			# First, hook the anonymous class up to the 'testing' name using the PluginFactory API
-			@test_session_class = Class.new( Strelka::Session ) do
-				class << self; attr_accessor :options; end
-				def self::configure( options )
-					@options = options
-				end
-			end
+			@test_session_class = Class.new( Strelka::Session )
 			Strelka::Session.derivatives[ 'testing' ] = @test_session_class
 		end
 
@@ -53,8 +48,8 @@ describe Strelka::App::Sessions do
 		end
 
 		it "has a default associated session class" do
-			Strelka::App::Sessions.session_class.should be_a( Class )
-			Strelka::App::Sessions.session_class.should < Strelka::Session
+			Strelka::App::Sessions.configure
+			Strelka::App::Sessions.session_class.should be( Strelka::Session::Default )
 		end
 
 		it "is can be configured to use a different session class" do
@@ -62,28 +57,14 @@ describe Strelka::App::Sessions do
 			Strelka::App::Sessions.session_class.should == @test_session_class
 		end
 
-		it "configures the configured session class with default options" do
-			Strelka::App::Sessions.configure( :session_class => 'testing' )
-			Strelka::App::Sessions.session_class.options.should == Strelka::App::Sessions::DEFAULT_OPTIONS
-		end
-
-		it "merges any config options for the configured session class" do
-			options = { 'cookie_name' => 'patience' }
-			Strelka::App::Sessions.configure( :session_class => 'testing', :options => options )
-			Strelka::App::Sessions.session_class.options.
-				should == Strelka::App::Sessions::DEFAULT_OPTIONS.merge( options )
-		end
-
-		it "uses the default session class if the config doesn't have a session section" do
-			Strelka::App::Sessions.configure
-			Strelka::App::Sessions.session_class.should be( Strelka::Session::Default )
-		end
-
 	end
 
 	describe "an including App" do
 
+
 		before( :each ) do
+			Strelka::App::Sessions.configure
+
 			@app = Class.new( Strelka::App ) do
 				self.log.info "Anonymous App class: %p" % [ self ]
 				self.log.info "ID constant is: %p" % [ const_defined?(:ID) ? const_get(:ID) : "(not defined)" ]
@@ -152,7 +133,7 @@ describe Strelka::App::Sessions do
 		it "saves the session automatically" do
 			req = @request_factory.get( '/foom' )
 			res = @app.new.handle( req )
-			res.cookies.should include( Strelka::Session::Default.cookie_options[:name] )
+			res.cookies.should include( Strelka::Session::Default.cookie_name )
 		end
 
 	end

data/spec/strelka/app_spec.rb

@@ -103,7 +103,7 @@ describe Strelka::App do
 		rabbit_path  = specs[:rabbit_new].full_gem_path
 		giraffe_path = specs[:giraffe].full_gem_path
 
-		Dir.should_receive( :glob ).with( Pathname('data/strelka/{apps,handlers}/**/*') ).
+		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
 			and_return( [] )
 		Dir.should_receive( :glob ).with( "#{giraffe_path}/data/giraffe/{apps,handlers}/**/*" ).
 			and_return([ "#{giraffe_path}/data/giraffe/apps/app" ])
@@ -128,7 +128,7 @@ describe Strelka::App do
 		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
 		Gem::Specification.should_receive( :each ).and_yield( gemspec ).at_least( :once )
 
-		Dir.should_receive( :glob ).with( Pathname('data/strelka/{apps,handlers}/**/*') ).
+		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
 			and_return( [] )
 		Dir.should_receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
 			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])
@@ -150,7 +150,7 @@ describe Strelka::App do
 		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
 		Gem::Specification.should_receive( :each ).and_yield( gemspec ).at_least( :once )
 
-		Dir.should_receive( :glob ).with( Pathname('data/strelka/{apps,handlers}/**/*') ).
+		Dir.should_receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
 			and_return( [] )
 		Dir.should_receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
 			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])

data/spec/strelka/authprovider/basic_spec.rb

@@ -31,8 +31,8 @@ describe Strelka::AuthProvider::Basic do
 		@app = stub( "Strelka::App", :conn => stub("Connection", :app_id => 'test-app') )
 		@provider = Strelka::AuthProvider.create( :basic, @app )
 		@config = {
-			'realm' => 'Pern',
-			'users' => {
+			:realm => 'Pern',
+			:users => {
 				"lessa" => "8wiomemUvH/+CX8UJv3Yhu+X26k=",
 				"f'lar" => "NSeXAe7J5TTtJUE9epdaE6ojSYk=",
 			}
@@ -70,8 +70,8 @@ describe Strelka::AuthProvider::Basic do
 
 	it "can be configured via the Configurability API" do
 		described_class.configure( @config )
-		described_class.realm.should == @config['realm']
-		described_class.users.should == @config['users']
+		described_class.realm.should == @config[:realm]
+		described_class.users.should == @config[:users]
 	end
 
 

data/spec/strelka/httprequest/session_spec.rb

@@ -96,7 +96,7 @@ describe Strelka::HTTPRequest::Session, "-extended request" do
 	context "with a session ID" do
 
 		before( :each ) do
-			cookie_name = Strelka::Session::Default.cookie_options[ :name ]
+			cookie_name = Strelka::Session::Default.cookie_name
 			@sess_id = Strelka::Session::Default.get_session_id
 			@req.header.cookie = "#{cookie_name}=#{@sess_id}"
 		end

data/spec/strelka/httpresponse/session_spec.rb

@@ -110,7 +110,7 @@ describe Strelka::HTTPResponse::Session, "-extended response" do
 	context "for a request with a session ID" do
 
 		before( :each ) do
-			@cookie_name = Strelka::Session::Default.cookie_options[ :name ]
+			@cookie_name = Strelka::Session::Default.cookie_name
 			@sess_id = Strelka::Session::Default.get_session_id
 			@req.header.cookie = "#{@cookie_name}=#{@sess_id}"
 		end

data/spec/strelka/session/db_spec.rb

@@ -34,13 +34,17 @@ describe Strelka::Session::Db do
 	end
 
 	before( :each ) do
-		@cookie_name = described_class.cookie_options[:name]
+		Strelka.log.debug "BEFORE each"
+		@cookie_name = described_class.cookie_name
 		described_class.configure
+		Strelka.log.debug "/BEFORE each"
 	end
 
 	after( :each ) do
+		Strelka.log.debug "AFTER each"
 		described_class.db.drop_table( :sessions ) if
 			described_class.db.table_exists?( :sessions )
+		Strelka.log.debug "/AFTER each"
 	end
 
 	after( :all ) do
@@ -61,6 +65,7 @@ describe Strelka::Session::Db do
 
 
 	it "can load an existing session from the sessions table" do
+		Strelka.log.debug "described_class dataset: %p" % [ described_class.dataset ]
 		described_class.dataset.insert(
 			:session_id => @session_id,
 			:session    => @session_data.to_yaml )

data/spec/strelka/session/default_spec.rb

@@ -28,7 +28,7 @@ describe Strelka::Session::Default do
 
 	before( :each ) do
 		described_class.configure
-		@cookie_name = described_class.cookie_options[:name]
+		@cookie_name = described_class.cookie_name
 	end
 
 	after( :each ) do
@@ -48,8 +48,8 @@ describe Strelka::Session::Default do
 
 
 	it "can be configured to store its session ID in a different cookie" do
-		described_class.configure( :cookie => {:name => 'buh-mahlon'} )
-		described_class.cookie_options[:name].should == 'buh-mahlon'
+		described_class.configure( :cookie_name => 'buh-mahlon' )
+		described_class.cookie_name.should == 'buh-mahlon'
 	end
 
 	it "can load sessions from and save sessions to its in-memory store" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.244
+  version: 0.0.1.pre.252
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -189,7 +189,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -364,11 +364,12 @@ files:
 - contrib/hoetemplate/data/project/templates/top.tmpl.erb
 - contrib/hoetemplate/lib/file_name.rb.erb
 - contrib/hoetemplate/spec/file_name_spec.rb.erb
-- data/strelka/apps/hello-world
+- examples/.env
+- examples/Procfile
 - examples/apps/auth-demo
 - examples/apps/auth-demo2
+- examples/apps/hello-world
 - examples/apps/sessions-demo
-- examples/apps/ws-echo
 - examples/config.yml
 - examples/gen-config.rb
 - examples/static/examples.css
@@ -403,7 +404,6 @@ files:
 - lib/strelka/httpresponse.rb
 - lib/strelka/httpresponse/negotiation.rb
 - lib/strelka/httpresponse/session.rb
-- lib/strelka/logging.rb
 - lib/strelka/mixins.rb
 - lib/strelka/paramvalidator.rb
 - lib/strelka/plugins.rb
@@ -442,7 +442,6 @@ files:
 - spec/strelka/httpresponse/negotiation_spec.rb
 - spec/strelka/httpresponse/session_spec.rb
 - spec/strelka/httpresponse_spec.rb
-- spec/strelka/logging_spec.rb
 - spec/strelka/mixins_spec.rb
 - spec/strelka/paramvalidator_spec.rb
 - spec/strelka/plugins_spec.rb

metadata.gz.sig

@@ -1,2 +1,2 @@
-��I�7RƆP�bi(�61�PG��d�D}g��D��(E&�R[�*a!�G�븧��2y�3�.����������
6�w����^P���A����[�[����w.'�S�I�d�V[�d�F�.$��'	C̵�#`"�d����
-bV"aSP��$͹�?��gk|�~�9ǣ9_�A"�>DT�!/�*޻'P���thS��Q(;��
+�/��J`���=`���)��-��m��uR��T�2Z�\�"�"�-�FM
+��+�� �S��m�𵨋�;v������x���υ"#x�GI���)

data/examples/apps/ws-echo

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set nosta noet ts=4 sw=4:
-#encoding: utf-8
-
-require 'strelka'
-
-# A demo of the WebSocketServer -- this does the same thing as the Mongrel2
-# echo server, but uses the Strelka WebSocket class.
-class WebSocketEchoServer < Strelka::WebSocketServer
-
-	# Use the heartbeat plugin
-	plugins :heartbeat
-
-
-	
-
-end

data/lib/strelka/logging.rb

@@ -1,301 +0,0 @@
-# -*- ruby -*-
-# vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
-
-require 'logger'
-require 'date'
-
-require 'strelka' unless defined?( Strelka )
-require 'strelka/mixins'
-
-
-# A mixin that provides a top-level logging subsystem based on Logger.
-module Strelka::Logging
-
-	### Logging
-	# Log levels
-	LOG_LEVELS = {
-		'debug' => Logger::DEBUG,
-		'info'  => Logger::INFO,
-		'warn'  => Logger::WARN,
-		'error' => Logger::ERROR,
-		'fatal' => Logger::FATAL,
-	}.freeze
-	LOG_LEVEL_NAMES = LOG_LEVELS.invert.freeze
-
-
-	### Inclusion hook
-	def self::extended( mod )
-		super
-
-		class << mod
-			# the log formatter that will be used when the logging subsystem is reset
-			attr_accessor :default_log_formatter
-
-			# the logger that will be used when the logging subsystem is reset
-			attr_accessor :default_logger
-
-			# the logger that's currently in effect
-			attr_accessor :logger
-			alias_method :log, :logger
-			alias_method :log=, :logger=
-		end
-
-		mod.default_logger = mod.logger = Logger.new( $stderr )
-		mod.default_logger.level = case
-			when $DEBUG then Logger::DEBUG
-			when $VERBOSE then Logger::INFO
-			else Logger::WARN end
-		mod.default_log_formatter = Strelka::Logging::Formatter.new( mod.default_logger )
-	end
-
-
-	### Reset the global logger object to the default
-	def reset_logger
-		self.logger = self.default_logger
-		self.logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-		self.logger.formatter = self.default_log_formatter
-	end
-
-
-	### Returns +true+ if the global logger has not been set to something other than
-	### the default one.
-	def using_default_logger?
-		return self.logger == self.default_logger
-	end
-
-
-	# A alternate formatter for Logger instances.
-	class Formatter < Logger::Formatter
-
-		# The format to output unless debugging is turned on
-		DEFAULT_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"
-
-		# The format to output if debugging is turned on
-		DEFAULT_DEBUG_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, format=DEFAULT_FORMAT, debug=DEFAULT_DEBUG_FORMAT ) # :notnew:
-			@logger       = logger
-			@format       = format
-			@debug_format = debug
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The logging format string
-		attr_accessor :format
-
-		# The logging format string that's used when outputting in debug mode
-		attr_accessor :debug_format
-
-
-		### Log using either the DEBUG_FORMAT if the associated logger is at ::DEBUG level or
-		### using FORMAT if it's anything less verbose.
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			if @logger.level == Logger::DEBUG
-				return self.debug_format % args
-			else
-				return self.format % args
-			end
-		end
-	end # class Formatter
-
-
-	# A ANSI-colorized formatter for Logger instances.
-	class ColorFormatter < Logger::Formatter
-
-		# Set some ANSI escape code constants (Shamelessly stolen from Perl's
-		# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
-		ANSI_ATTRIBUTES = {
-			'clear'      => 0,
-			'reset'      => 0,
-			'bold'       => 1,
-			'dark'       => 2,
-			'underline'  => 4,
-			'underscore' => 4,
-			'blink'      => 5,
-			'reverse'    => 7,
-			'concealed'  => 8,
-
-			'black'      => 30,   'on_black'   => 40,
-			'red'        => 31,   'on_red'     => 41,
-			'green'      => 32,   'on_green'   => 42,
-			'yellow'     => 33,   'on_yellow'  => 43,
-			'blue'       => 34,   'on_blue'    => 44,
-			'magenta'    => 35,   'on_magenta' => 45,
-			'cyan'       => 36,   'on_cyan'    => 46,
-			'white'      => 37,   'on_white'   => 47
-		}
-
-
-		### Create a string that contains the ANSI codes specified and return it
-		def self::ansi_code( *attributes )
-			attributes.flatten!
-			attributes.collect! {|at| at.to_s }
-			return '' unless /(?:vt10[03]|xterm(?:-color)?|linux|screen)/i =~ ENV['TERM']
-			attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
-
-			if attributes.empty?
-				return ''
-			else
-				return "\e[%sm" % attributes
-			end
-		end
-
-
-		### Colorize the given +string+ with the specified +attributes+ and
-		### return it, handling line-endings, color reset, etc.
-		def self::colorize( *args )
-			string = ''
-
-			if block_given?
-				string = yield
-			else
-				string = args.shift
-			end
-
-			ending = string[/(\s)$/] || ''
-			string = string.rstrip
-
-			return self.ansi_code( args.flatten ) + string + self.ansi_code( 'reset' ) + ending
-		end
-
-
-		# Color settings
-		LEVEL_FORMATS = {
-			:debug => colorize( :bold, :black ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"},
-			:info  => colorize( :normal ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:warn  => colorize( :bold, :yellow ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:error => colorize( :red ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:fatal => colorize( :bold, :red ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-		}
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, settings={} ) # :notnew:
-			settings = LEVEL_FORMATS.merge( settings )
-
-			@logger   = logger
-			@settings = settings
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The formats, by level
-		attr_accessor :settings
-
-
-		### Log using the format associated with the severity
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			return self.settings[ severity.downcase.to_sym ] % args
-		end
-
-	end # class Formatter
-
-
-	# An alternate formatter for Logger instances that outputs +div+ HTML
-	# fragments.
-	class HtmlFormatter < Logger::Formatter
-
-		# The default HTML fragment that'll be used as the template for each log message.
-		HTML_LOG_FORMAT = %q{
-		<div class="log-message %5$s">
-			<span class="log-time">%1$s.%2$06d</span>
-			[
-				<span class="log-pid">%3$d</span>
-				/
-				<span class="log-tid">%4$s</span>
-			]
-			<span class="log-level">%5$s</span>
-			:
-			<span class="log-name">%6$s</span>
-			<span class="log-message-text">%7$s</span>
-		</div>
-		}
-
-		### Override the logging formats with ones that generate HTML fragments
-		def initialize( logger, format=HTML_LOG_FORMAT ) # :notnew:
-			@logger = logger
-			@format = format
-			super()
-		end
-
-
-		######
-		public
-		######
-
-		# The HTML fragment that will be used as a format() string for the log
-		attr_accessor :format
-
-
-		### Return a log message composed out of the arguments formatted using the
-		### formatter's format string
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity.downcase,                                                     # %5$s
-				progname,                                                     # %6$s
-				escape_html( msg ).gsub(/\n/, '<br />')                       # %7$s
-			]
-
-			return self.format % args
-		end
-
-
-		#######
-		private
-		#######
-
-		### Escape any HTML special characters in +string+.
-		def escape_html( string )
-			return string.
-				gsub( '&', '&amp;' ).
-				gsub( '<', '&lt;'  ).
-				gsub( '>', '&gt;'  )
-		end
-
-	end # class HtmlFormatter
-
-
-end # module Strelka
-