strelka 0.0.1.pre.315 → 0.0.1.pre.320

data/ChangeLog

@@ -1,8 +1,59 @@
+2012-09-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cookie.rb:
+	Remove some chatty debugging from Strelka::Cookie
+	[d85c5f7728fe] [tip]
+
+	* Rakefile, manual/layouts/default.erb, manual/lib/api-filter.rb,
+	manual/lib/editorial-filter.rb, manual/lib/examples-filter.rb,
+	manual/lib/links-filter.rb, manual/resources/css/manual.css,
+	manual/resources/fonts/GraublauWeb.otf,
+	manual/resources/fonts/GraublauWebBold.otf,
+	manual/resources/fonts/Inconsolata.otf,
+	manual/resources/images/arrow_225_small.png,
+	manual/resources/images/arrow_315_small.png,
+	manual/resources/images/arrow_skip.png, manual/resources/images/cc-
+	by.png, manual/resources/images/dialog-error.png,
+	manual/resources/images/dialog-information.png,
+	manual/resources/images/dialog-warning.png, manual/resources/images
+	/emblem-important.png, manual/resources/images/help.png,
+	manual/resources/images/information.png,
+	manual/resources/images/magnifier.png,
+	manual/resources/images/magnifier_left.png,
+	manual/resources/images/page_white_code.png,
+	manual/resources/images/page_white_copy.png,
+	manual/resources/images/printer.png, manual/resources/images
+	/project-layout.png, manual/resources/images/question.png,
+	manual/resources/images/scripts_code.png, manual/resources/images
+	/strelka-dogs/doggie6.svg, manual/resources/images/strelka-
+	dogs/doggie7.svg, manual/resources/images/wrap.png,
+	manual/resources/images/wrapping.png,
+	manual/resources/js/jquery-1.4.4.min.js,
+	manual/resources/js/manual.js, manual/resources/js/sh.js,
+	manual/resources/swf/clipboard.swf, manual/src/index.page,
+	manual/src/starting.page:
+	Removing the manual, as everything is now in the API docs
+	[c1625574779f]
+
+	* lib/strelka/cookie.rb, spec/strelka/cookie_spec.rb:
+	Add a guard against nil options hash in Strelka::Cookie#initialize
+	[cfddc50a05c8]
+
+2012-09-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/strelka/cookie.rb, spec/strelka/cookie_spec.rb:
+	Fix dotted domain and allow max_age and domain to be reset.
+	[34039ead3f43]
+
+	* lib/strelka/cookie.rb, spec/strelka/cookie_spec.rb:
+	Add Strelka::Cookie#options method.
+	[4278d5128b6a]
+
 2012-09-26  Michael Granger  <ged@FaerieMUD.org>
 
 	* Deploying.rdoc, Plugins.rdoc, README.rdoc, Rakefile:
 	A few more fixups to documentation.
-	[53fcc16af3a6] [tip]
+	[53fcc16af3a6]
 
 2012-09-26  Michael B. Hix  <mhix@laika.com>
 

data/Rakefile

@@ -35,7 +35,6 @@ hoespec = Hoe.spec 'strelka' do
 	self.dependency 'uuidtools',       '~> 2.1'
 
 	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
-	self.dependency 'hoe-manualgen',   '~> 0.3', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer
 
 	self.spec_extras[:licenses] = ["BSD"]

data/lib/strelka/authprovider.rb

@@ -74,9 +74,18 @@ class Strelka::AuthProvider
 	end
 
 
-	### If the +callback+ is set, call it with the specified +credentials+, and +request. Override this in
-	### your own AuthProvider to provide +additional_arguments+ to the +callback+, and/or to provide
-	### additional generic authorization.
+	### Callback for auth success; the auth provider should use this to add cookies, headers, or
+	### whatever to the request or response when the client becomes authenticated. This is a no-op
+	### by default.
+	def auth_succeeded( request, credentials )
+		self.log.info "Authentication for %p succeeded." % [ credentials ]
+		# No-op by default
+	end
+
+
+	### If the +callback+ is set, call it with the specified +credentials+, and +request. Override
+	### this in your own AuthProvider to provide +additional_arguments+ to the +callback+, and/or
+	### to provide additional generic authorization.
 	def authorize( credentials, request, *additional_arguments, &callback )
 		return true unless callback
 		return true if callback.call( credentials, request, *additional_arguments )

data/lib/strelka/authprovider/basic.rb

@@ -105,7 +105,7 @@ class Strelka::AuthProvider::Basic < Strelka::AuthProvider
 		self.check_password( username, password )
 
 		# Success!
-		self.log.info "Authentication for %p succeeded." % [ username ]
+		self.auth_succeeded( request, username )
 		return username
 	end
 

data/lib/strelka/cookie.rb

@@ -113,7 +113,9 @@ class Strelka::Cookie
 	### \httponly::
 	###   HttpOnly flag.
 	def initialize( name, value, options={} )
+		options ||= {}
 		self.log.debug "New cookie: %p = %p (%p)" % [ name, value, options ]
+
 		@name     = name
 		@value    = value
 
@@ -125,6 +127,7 @@ class Strelka::Cookie
 		@expires  = nil
 		@version  = 0
 
+		self.log.debug "  setting options: %p" % [ options ]
 		options.each do |meth, val|
 			self.__send__( "#{meth}=", val )
 		end
@@ -233,14 +236,24 @@ class Strelka::Cookie
 	# discard the cookie.  A value of zero means the cookie should be
 	# discarded immediately.
 	def max_age=( delta_seconds )
-		@max_age = Integer( delta_seconds )
+		if delta_seconds.nil?
+			@max_age = nil
+		else
+			@max_age = Integer( delta_seconds )
+		end
 	end
 
 
-	### Set the domain for which the cookie is valid.
+	### Set the domain for which the cookie is valid. Leading '.' characters
+	### will be stripped.
 	def domain=( newdomain )
-		newdomain = ".#{newdomain}" unless newdomain[0] == ?.
-		@domain = newdomain.dup
+		if newdomain.nil?
+			@domain = nil
+		else
+			newdomain = newdomain.dup
+			newdomain.slice!( 0 ) while newdomain.start_with?( '.' )
+			@domain = newdomain
+		end
 	end
 
 

data/spec/strelka/authprovider_spec.rb

@@ -59,6 +59,11 @@ describe Strelka::AuthProvider do
 				@provider.authenticate( req ).should == 'anonymous'
 			end
 
+			it "has a callback for adding authentication information to the request" do
+				req = @request_factory.get( '/admin/console' )
+				@provider.auth_succeeded( req, 'anonymous' ) # No-op by default
+			end
+
 		end
 
 

data/spec/strelka/cookie_spec.rb

@@ -61,6 +61,10 @@ describe Strelka::Cookie do
 		result.should == {}
 	end
 
+	it "guards against a nil options hash" do
+		Strelka::Cookie.new( :name, 'value', nil ).should be_a( Strelka::Cookie )
+	end
+
 
 	context "instance" do
 
@@ -78,13 +82,19 @@ describe Strelka::Cookie do
 		end
 
 		it "stringifies with a domain if one is set" do
+			@cookie.domain = 'example.com'
+			@cookie.to_s.should =~ /; Domain=example.com/
+		end
+
+		it "stringifies with the leading '.' in the domain" do
 			@cookie.domain = '.example.com'
-			@cookie.to_s.should =~ /; Domain=.example.com/
+			@cookie.to_s.should =~ /; Domain=example.com/
 		end
 
-		it "stringifies with a dot prepended to the domain if the set doesn't have one" do
+		it "doesn't stringify with a domain if it is reset" do
 			@cookie.domain = 'example.com'
-			@cookie.to_s.should =~ /; Domain=.example.com/i
+			@cookie.domain = nil
+			@cookie.to_s.should_not =~ /; Domain=/
 		end
 
 		it "raises an exception if the cookie value would be invalid when serialized" do
@@ -145,7 +155,7 @@ describe Strelka::Cookie do
 			@cookie.secure = true
 
 			@cookie.options.should == {
-				domain:   '.example.com',
+				domain:   'example.com',
 				path:     nil,
 				secure:   true,
 				httponly: false,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.315
+  version: 0.0.1.pre.320
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability