strelka 0.6.0 → 0.7.0

data/spec/strelka/session/default_spec.rb

@@ -1,16 +1,10 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/session/default'
 
@@ -43,13 +37,13 @@ describe Strelka::Session::Default do
 		original = Strelka::Session.create( 'default', 'the_session_id' )
 		copy = original.dup
 		copy[:foom] = 1
-		original[:foom].should == {}
+		expect( original[:foom] ).to eq( {} )
 	end
 
 
 	it "can be configured to store its session ID in a different cookie" do
 		described_class.configure( :cookie_name => 'buh-mahlon' )
-		described_class.cookie_name.should == 'buh-mahlon'
+		expect( described_class.cookie_name ).to eq( 'buh-mahlon' )
 	end
 
 	it "can load sessions from and save sessions to its in-memory store" do
@@ -57,26 +51,26 @@ describe Strelka::Session::Default do
 		described_class.save_session_data( 'the_key', session_data )
 
 		loaded = described_class.load_session_data( 'the_key' )
-		loaded.should_not equal( session_data )
-		loaded.should == session_data
+		expect( loaded ).to_not equal( session_data )
+		expect( loaded ).to eq( session_data )
 	end
 
 	it "generates a session-id if one isn't available in the request" do
 		req = @request_factory.get( '/hungry/what-is-in-a-fruit-bowl?' )
-		described_class.get_session_id( req ).should =~ /^[[:xdigit:]]+$/
+		expect( described_class.get_session_id(req) ).to match( /^[[:xdigit:]]+$/ )
 	end
 
 	it "rejects invalid session-ids" do
 		session_cookie = "%s=gibberish" % [ @cookie_name ]
 		req = @request_factory.get( '/hungry/what-is-in-a-fruit-bowl?', :cookie => session_cookie )
-		described_class.get_session_id( req ).should =~ /^[[:xdigit:]]+$/
+		expect( described_class.get_session_id(req) ).to match( /^[[:xdigit:]]+$/ )
 	end
 
 	it "accepts and reuses an existing valid session-id" do
 		session_id = '3422067061a5790be374c81118d9ed3f'
 		session_cookie = "%s=%s" % [ @cookie_name, session_id ]
 		req = @request_factory.get( '/hungry/what-is-in-a-fruit-bowl?', :cookie => session_cookie )
-		described_class.get_session_id( req ).should == session_id
+		expect( described_class.get_session_id(req) ).to eq( session_id )
 	end
 
 	it "knows that a request has a session if it has a cookie with an existing session id" do
@@ -84,7 +78,7 @@ describe Strelka::Session::Default do
 		described_class.sessions[ session_id ] = {}
 		session_cookie = "%s=%s" % [ @cookie_name, session_id ]
 		req = @request_factory.get( '/hungry/what-is-in-a-fruit-bowl?', :cookie => session_cookie )
-		described_class.should have_session_for( req )
+		expect( described_class ).to have_session_for( req )
 	end
 
 	it "can save itself to the store and set the response's session ID" do
@@ -96,8 +90,8 @@ describe Strelka::Session::Default do
 
 		session.save( response )
 
-		described_class.sessions.should == { session_id => session_data }
-		response.header_data.should =~ /Set-Cookie: #{@cookie_name}=#{session_id}/i
+		expect( described_class.sessions ).to eq( { session_id => session_data } )
+		expect( response.header_data ).to match( /Set-Cookie: #{@cookie_name}=#{session_id}/i )
 	end
 
 	it "can remove itself from the store and expire the response's session ID" do
@@ -109,8 +103,8 @@ describe Strelka::Session::Default do
 
 		session.destroy( response )
 
-		described_class.sessions.should_not include({ session_id => session_data })
-		response.header_data.should =~ /Set-Cookie: #{@cookie_name}=#{session_id}/i
+		expect( described_class.sessions ).to_not include({ session_id => session_data })
+		expect( response.header_data ).to match( /Set-Cookie: #{@cookie_name}=#{session_id}/i )
 	end
 
 	describe "with no namespace set (the 'nil' namespace)" do
@@ -134,8 +128,8 @@ describe Strelka::Session::Default do
 
 			subject.namespace = nil
 
-			subject[:foo][:number].should == 18
-			subject[:bar][:number].should == 28
+			expect( subject[:foo][:number] ).to eq( 18 )
+			expect( subject[:bar][:number] ).to eq( 28 )
 		end
 
 		it "accesses namespaces via a struct-like interface" do
@@ -145,9 +139,9 @@ describe Strelka::Session::Default do
 			subject.testkey = true
 			subject.namespace = nil
 
-			subject.meat[ :testkey ].should be_true
-			subject.greet[ :testkey ].should be_true
-			subject.pork[ :testkey ].should be_nil
+			expect( subject.meat[ :testkey ] ).to be_true
+			expect( subject.greet[ :testkey ] ).to be_true
+			expect( subject.pork[ :testkey ] ).to be_nil
 		end
 	end
 
@@ -169,15 +163,15 @@ describe Strelka::Session::Default do
 			subject[:number] = 18
 			subject[:not_a_number] = 'woo'
 
-			subject[:number].should == 18
-			subject[:not_a_number].should == 'woo'
+			expect( subject[:number] ).to eq( 18 )
+			expect( subject[:not_a_number] ).to eq( 'woo' )
 		end
 
 		it "accesses values via a struct-like interface" do
 			subject.testkey = true
 
-			subject.testkey.should be_true
-			subject.i_do_not_exist.should be_nil
+			expect( subject.testkey ).to be_true
+			expect( subject.i_do_not_exist ).to be_nil
 		end
 	end
 

data/spec/strelka/session_spec.rb

@@ -1,16 +1,10 @@
 # -*- rspec -*-
 # vim: set nosta noet ts=4 sw=4:
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
-}
+require_relative '../helpers'
 
 require 'rspec'
 
-require 'spec/lib/helpers'
-
 require 'strelka'
 require 'strelka/session'
 
@@ -32,7 +26,7 @@ describe Strelka::Session do
 
 
 	it "looks for plugins under strelka/session" do
-		described_class.plugin_prefixes.should include( 'strelka/session' )
+		expect( described_class.plugin_prefixes ).to include( 'strelka/session' )
 	end
 
 
@@ -50,7 +44,7 @@ describe Strelka::Session do
 
 	it "can be asked to load an instance of itself by session ID" do
 		# By default, loading always fails
-		described_class.load( 'the_session_id' ).should be_nil()
+		expect( described_class.load( 'the_session_id' ) ).to be_nil()
 	end
 
 

data/spec/strelka/websocketserver/routing_spec.rb

@@ -0,0 +1,119 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# encoding: utf-8
+
+require_relative '../../helpers'
+
+require 'rspec'
+
+require 'strelka'
+require 'strelka/plugins'
+require 'strelka/websocketserver/routing'
+
+require 'strelka/behavior/plugin'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Strelka::WebSocketServer::Routing do
+
+	before( :all ) do
+		setup_logging()
+		@frame_factory = Mongrel2::WebSocketFrameFactory.new( route: '/chat' )
+	end
+
+	after( :all ) do
+		reset_logging()
+	end
+
+
+	it_should_behave_like( "A Strelka Plugin" )
+
+
+	describe "an including App" do
+
+		before( :each ) do
+			@app = Class.new( Strelka::WebSocketServer ) do
+				plugin :routing
+				def initialize( appid='chat-test', sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
+					super
+				end
+			end
+		end
+
+
+		it "has an Hash of raw routes" do
+			expect( @app.op_callbacks ).to be_a( Hash )
+		end
+
+		it "knows what its route methods are" do
+			expect( @app.op_callbacks ).to eq( {} )
+			@app.class_eval do
+				on_text() {}
+				on_binary() {}
+				on_ping() {}
+			end
+
+			expect( @app.op_callbacks.keys ).to eq([ :text, :binary, :ping ])
+		end
+
+		it "allows the declaration of custom opcodes" do
+			@app.opcodes( 0x3 => :nick )
+			@app.class_eval do
+				on_nick() {}
+			end
+			expect( @app.op_callbacks ).to have( 1 ).member
+			expect( @app.op_callbacks[ :nick ] ).to be_a( UnboundMethod )
+		end
+
+
+		it "dispatches TEXT frames to a text handler if one is declared" do
+			@app.class_eval do
+				on_text do |frame|
+					res = frame.response
+					res.puts( "#{frame.body.read} Yep!" )
+					return res
+				end
+			end
+
+			frame = @frame_factory.text( "/chat", "Clowns?" )
+			response = @app.new.handle_websocket( frame )
+
+			expect( response ).to be_a( Mongrel2::WebSocket::Frame )
+			expect( response.opcode ).to eq( :text )
+			response.body.rewind
+			expect( response.body.read ).to eq( "Clowns? Yep!\n" )
+		end
+
+		it "dispatches custom frame type to its handler if one is declared" do
+			@app.class_eval do
+				opcodes 0xB => :refresh
+
+				on_refresh do |frame|
+					return frame.response
+				end
+			end
+
+			frame = @frame_factory.create( '/chat', '', 0xB )
+			response = @app.new.handle_websocket( frame )
+
+			expect( response ).to be_a( Mongrel2::WebSocket::Frame )
+			expect( response.opcode ).to eq( :reserved )
+			expect( response.numeric_opcode ).to eq( 0xB )
+		end
+
+
+		it "falls back to the defaults if a handler isn't declared for a frame" do
+			frame = @frame_factory.text( '/chat', '' )
+			response = @app.new.handle_websocket( frame )
+
+			expect( response ).to be_a( Mongrel2::WebSocket::Frame )
+			expect( response.opcode ).to eq( :close )
+		end
+
+	end
+
+end
+

data/spec/strelka/websocketserver_spec.rb

@@ -0,0 +1,149 @@
+# -*- ruby -*-
+# vim: set nosta noet ts=4 sw=4:
+# encoding: utf-8
+
+require_relative '../helpers'
+
+require 'rspec'
+require 'zmq'
+require 'mongrel2'
+
+require 'strelka'
+require 'strelka/websocketserver'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Strelka::WebSocketServer do
+
+	before( :all ) do
+		setup_logging( :fatal )
+		@initial_registry = described_class.loaded_plugins.dup
+		@frame_factory = Mongrel2::WebSocketFrameFactory.new( route: '/chat' )
+		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
+		Mongrel2::Config.init_database
+
+		# Skip loading the 'strelka' gem, which probably doesn't exist in the right version
+		# in the dev environment
+		strelkaspec = make_gemspec( 'strelka', Strelka::VERSION, false )
+		loaded_specs = Gem.instance_variable_get( :@loaded_specs )
+		loaded_specs['strelka'] = strelkaspec
+
+	end
+
+	before( :each ) do
+		described_class.loaded_plugins.clear
+		@app = Class.new( described_class ) do
+			def initialize( appid=TEST_APPID, sspec=TEST_SEND_SPEC, rspec=TEST_RECV_SPEC )
+				super
+			end
+			def set_signal_handlers; end
+			def start_accepting_requests; end
+			def restore_signal_handlers; end
+		end
+	end
+
+	after( :each ) do
+		@app = nil
+	end
+
+	after( :all ) do
+		described_class.loaded_plugins = @initial_registry
+		reset_logging()
+	end
+
+
+	#
+	# Control frame defaults
+	#
+
+	it "returns a PONG for PING frames" do
+		ping = @frame_factory.ping( '/chat' )
+		res = @app.new.handle_websocket( ping )
+
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :pong )
+		expect( res.socket_id ).to eq( ping.socket_id )
+	end
+
+	it "ignores PONG frames" do
+		pong = @frame_factory.pong( '/chat' )
+		res = @app.new.handle_websocket( pong )
+
+		expect( res ).to be_nil()
+	end
+
+	it "closes the connection on CLOSE frames" do
+		app = @app.new
+		close = @frame_factory.close( '/chat' )
+
+		expect( app.conn ).to receive( :reply_close ).with( close )
+
+		res = app.handle_websocket( close )
+		expect( res ).to be_nil()
+	end
+
+	it "closes the connection with an appropriate error for reserved control opcodes" do
+		reserved = @frame_factory.create( '/chat', '', 0xB )
+		res = @app.new.handle_websocket( reserved )
+
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :close )
+		res.payload.rewind
+		expect( res.payload.read ).to match( /Unhandled data type/i )
+		expect( res.socket_id ).to eq( reserved.socket_id )
+	end
+
+	#
+	# Content frame defaults
+	#
+
+	it "replies with a close frame with a bad data type error for TEXT frames" do
+		app = @app.new
+		frame = @frame_factory.text( '/chat' )
+
+		res = app.handle_websocket( frame )
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :close )
+		res.payload.rewind
+		expect( res.payload.read ).to match( /Unhandled data type/i )
+	end
+
+	it "replies with a close frame with a bad data type error for BINARY frames" do
+		app = @app.new
+		frame = @frame_factory.binary( '/chat' )
+
+		res = app.handle_websocket( frame )
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :close )
+		res.payload.rewind
+		expect( res.payload.read ).to match( /Unhandled data type/i )
+	end
+
+	it "replies with a close frame with a bad data type error for CONTINUATION frames" do
+		app = @app.new
+		frame = @frame_factory.continuation( '/chat' )
+
+		res = app.handle_websocket( frame )
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :close )
+		res.payload.rewind
+		expect( res.payload.read ).to match( /Unhandled data type/i )
+	end
+
+	it "closes the connection with an appropriate error for reserved content opcodes" do
+		reserved = @frame_factory.create( '/chat', '', 0x3 )
+		res = @app.new.handle_websocket( reserved )
+
+		expect( res ).to be_a( Mongrel2::WebSocket::Frame )
+		expect( res.opcode ).to eq( :close )
+		res.payload.rewind
+		expect( res.payload.read ).to match( /Unhandled data type/i )
+		expect( res.socket_id ).to eq( reserved.socket_id )
+	end
+
+
+end
+

data/spec/strelka_spec.rb

@@ -1,13 +1,8 @@
 #!/usr/bin/env rspec -cfd -b
 
-BEGIN {
-	require 'pathname'
-	basedir = Pathname( __FILE__ ).dirname.parent
-	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
-}
+require_relative 'helpers'
 
 require 'rspec'
-require 'spec/lib/helpers'
 require 'strelka'
 
 describe Strelka do
@@ -23,24 +18,27 @@ describe Strelka do
 
 	describe "version methods" do
 		it "returns a version string if asked" do
-			described_class.version_string.should =~ /\w+ [\d.]+/
+			expect( described_class.version_string ).to match( /\w+ [\d.]+/ )
 		end
 
 
 		it "returns a version string with a build number if asked" do
-			described_class.version_string(true).should =~ /\w+ [\d.]+ \(build [[:xdigit:]]+\)/
+			expect( described_class.version_string(true) ).
+				to match(/\w+ [\d.]+ \(build [[:xdigit:]]+\)/)
 		end
 	end
 
 	it "provides syntactic sugar for looking up an app class by name" do
 		mox_app = nil
-		Pathname.stub( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
+		expect( Pathname ).to receive( :glob ).
+			with( 'data/*/{apps,handlers}/**/*' ).
 			and_return([ Pathname('data/mox/apps/moxthefox') ])
-		Kernel.stub( :load ).with( File.expand_path 'data/mox/apps/moxthefox' ).and_return do
-			mox_app = Class.new( Strelka::App )
-		end
 
-		described_class::App( 'moxthefox' ).should == mox_app
+		expect( Kernel ).to receive( :load ).
+			with( File.expand_path 'data/mox/apps/moxthefox' ).
+			and_return { mox_app = Class.new(Strelka::App) }
+
+		expect( described_class::App('moxthefox') ).to be( mox_app )
 	end
 
 end

data.tar.gz.sig

@@ -1,3 +1,3 @@
-�3[�p�P�
-V�i�P�ư)閔�k�}���>�]U�^3��Tb�E#�x|�#��DK��bh�����gM)ǰR�&8�c
-�J��}ǹY���X�
+���["*?(���7�P�qΤļ�L �:��6�raa��]����T�s0��8�^�������
���P��$��/[� R�! \��>�g_�u�����Y@k��G��A
+Fs;۬�q����p��j/@x_?�0�}��)ҍ�槦���c9*��5�pi��ƮjZ�j�/w��X5<G[�	F�莝���Ԑt�e�q����@�\��
+7|Mg�����n�^�l�/�!�-t�b�1|�_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -31,7 +31,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -109,14 +109,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.36'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: pluggability
   requirement: !ruby/object:Gem::Requirement
@@ -235,28 +235,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -291,14 +291,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -352,6 +352,8 @@ files:
 - examples/apps/hello-world
 - examples/apps/sessions-demo
 - examples/apps/upload-demo
+- examples/apps/ws-chat
+- examples/apps/ws-echo
 - examples/config.yml
 - examples/gen-config.rb
 - examples/static/examples.css
@@ -380,6 +382,7 @@ files:
 - lib/strelka/constants.rb
 - lib/strelka/cookie.rb
 - lib/strelka/cookieset.rb
+- lib/strelka/discovery.rb
 - lib/strelka/exceptions.rb
 - lib/strelka/httprequest.rb
 - lib/strelka/httprequest/acceptparams.rb
@@ -400,6 +403,9 @@ files:
 - lib/strelka/session/db.rb
 - lib/strelka/session/default.rb
 - lib/strelka/testing.rb
+- lib/strelka/websocketserver.rb
+- lib/strelka/websocketserver/routing.rb
+- spec/constants.rb
 - spec/data/error.tmpl
 - spec/data/forms/2_images.form
 - spec/data/forms/singleupload.form
@@ -412,8 +418,7 @@ files:
 - spec/data/forms/testform_truncated_metadata.form
 - spec/data/layout.tmpl
 - spec/data/main.tmpl
-- spec/lib/constants.rb
-- spec/lib/helpers.rb
+- spec/helpers.rb
 - spec/strelka/app/auth_spec.rb
 - spec/strelka/app/errors_spec.rb
 - spec/strelka/app/filters_spec.rb
@@ -429,6 +434,7 @@ files:
 - spec/strelka/authprovider_spec.rb
 - spec/strelka/cookie_spec.rb
 - spec/strelka/cookieset_spec.rb
+- spec/strelka/discovery_spec.rb
 - spec/strelka/exceptions_spec.rb
 - spec/strelka/httprequest/acceptparams_spec.rb
 - spec/strelka/httprequest/auth_spec.rb
@@ -448,6 +454,8 @@ files:
 - spec/strelka/session/db_spec.rb
 - spec/strelka/session/default_spec.rb
 - spec/strelka/session_spec.rb
+- spec/strelka/websocketserver/routing_spec.rb
+- spec/strelka/websocketserver_spec.rb
 - spec/strelka_spec.rb
 homepage: http://deveiate.org/projects/Strelka
 licenses:
@@ -475,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: strelka
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]