bcms_pubcookie 0.3.0 → 0.3.1

data/bcms_pubcookie.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "bcms_pubcookie"
-  s.version     = "0.3.0"
+  s.version     = "0.3.1"
   s.authors     = ["James Hughes"]
   s.email       = ["james@virtualjames.com"]
   s.homepage    = "http://github.com/jamezilla/bcms_pubcookie"
@@ -11,9 +11,17 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "bcms_pubcookie"
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files =  Dir[".gitignore"]
+  s.files += Dir["*"]
+  s.files -= Dir["lib"]
+  s.files -= Dir["pkg"]
+  s.files += Dir["lib/**/*.rb"]
+  s.files += Dir["lib/**/.gitkeep"]
+  s.files -= Dir["lib/tasks/build_gem.rake"]
+  s.files.reject! { |file| file[-1] == "~" || file[-1] == "#" }
+
+  # s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:

data/lib/pubcookie/authentication/controller.rb

@@ -47,7 +47,6 @@ module Pubcookie
         # Attempts to set the current user based on the
         # HTTP_AUTHORIZATION variable set by pubcookie.
         def login_from_pubcookie
-          # logger.debug '--- Attempting to login using pubcookie'
           if login_id = parse_http_authorization
             begin
               return User.find_by_login(login_id)
@@ -67,7 +66,7 @@ module Pubcookie
         # login information encoded in Base64.
         def parse_http_authorization
           if !request.env['HTTP_AUTHORIZATION'].nil?
-            return request.env['HTTP_AUTHORIZATION'].split(' ')[1].unpack("m").to_s.split(':')[0]
+            return request.env['HTTP_AUTHORIZATION'].split(' ')[1].unpack("m")[0].split(':')[0]
           else
             return nil
           end

data/lib/pubcookie/controller_helper.rb

@@ -7,19 +7,23 @@ module Pubcookie
     # a :login_required filter, you want "location" to be
     # request.url, thus it's parameterized
     def handle_pubcookie_ondemand(location = request.env["HTTP_REFERER"])
-      # logger.debug "Handling login with pubcookie."
       response.headers["Cache-control"] = "no-store, no-cache, must-revalidate"
       response.headers["Expires"] = "Sat, 1 Jan 2000 01:01:01 GMT"
       response.headers["Set-Cookie"] = "OnDemandKey=ondemand; path=/"
+
+      # make sure we redirect back to something sensible
       back = location || my_root_url || request.host
+
+      # logger.debug "--- Handling login with pubcookie"
       # logger.debug "--- OnDemand redirect: " + back
       # logger.debug "---          location: " + location
       # logger.debug "---           referer: " + request.env["HTTP_REFERER"].to_s
       # logger.debug "---       my_root_url: " + my_root_url.to_s
       # logger.debug "---              host: " + request.host.to_s
+
       redirect_to ensure_ssl(back)
     end
-    
+
     private
 
     def ensure_ssl(url_or_path)
@@ -36,5 +40,5 @@ module Pubcookie
       return defined?(root_url) ? root_url : nil
     end
 
-  end  
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcms_pubcookie
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152578640 !ruby/object:Gem::Requirement
+  requirement: &2157613760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152578640
+  version_requirements: *2157613760
 - !ruby/object:Gem::Dependency
   name: browsercms
-  requirement: &2152578160 !ruby/object:Gem::Requirement
+  requirement: &2157613280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2152578160
+  version_requirements: *2157613280
 description: 
 email:
 - james@virtualjames.com
@@ -41,13 +41,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- bcms_pubcookie.gemspec
 - COPYRIGHT
-- GPL
 - Gemfile
+- GPL
 - LGPL
-- README.markdown
 - Rakefile
-- bcms_pubcookie.gemspec
+- README.markdown
 - lib/bcms_pubcookie.rb
 - lib/pubcookie/authentication/controller.rb
 - lib/pubcookie/controller_helper.rb
@@ -55,7 +55,6 @@ files:
 - lib/pubcookie/sessions_controller.rb
 - lib/pubcookie/user_extensions.rb
 - lib/tasks/.gitkeep
-- lib/tasks/build_gem.rake
 homepage: http://github.com/jamezilla/bcms_pubcookie
 licenses: []
 post_install_message: 

data/lib/tasks/build_gem.rake

@@ -1,5 +0,0 @@
-# Add any tasks from your Rake file here (if you were using, say, Jeweler to build gems)
-
-# Otherwise, this enabled Bundler to build your gem
-require 'bundler'
-Bundler::GemHelper.install_tasks