global_session 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf0f0c904f527bf182584e926bd80e8b98afcaa
-  data.tar.gz: eddd6c5e8c9fea9175dfeb3059737757196f5f76
+  metadata.gz: 57c8340209a64a81da8fc74cf16013d796838c71
+  data.tar.gz: 2384406755bf65f8cdc1fbdf697e3618de32c605
 SHA512:
-  metadata.gz: 83c3cfd4461a9c17a30e4881cfe9bd33e0468de8410e38cb740e8a70e415c1aa382be43adf3650d33676cf45e04ec39b4ec3d7cc581d4ee262d1dcbd86334b73
-  data.tar.gz: 8fdba2a31e228e3eac3cf1dc72e39190a3e51089882523b5b2ef1949710c2807ede4fbc4714b6a1a6bfc2f28885ed138335ebce550ef6414c1fd50372bdba5a3
+  metadata.gz: f11ff4132f86bba1adb8b6b11987cbc68c01f616c629c025d95e51cbbf1ac36c7118e583541c6a945ff7e15a16b58845fbc614f4dbb654cd62c7091e3fd24364
+  data.tar.gz: d258b70f16fbb381082cc8f2bbb11e4a2aef0ba562304b002606d22be75e70e8e6a97f736b63b0bd8777748efb3d01d8e3003721d45326dfaaddb9230fe7cebc

data/VERSION

@@ -1 +1 @@
-3.2.5
+3.2.6

data/global_session.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: global_session 3.2.5 ruby lib
+# stub: global_session 3.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "global_session"
-  s.version = "3.2.5"
+  s.version = "3.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro"]
-  s.date = "2016-04-07"
+  s.date = "2016-05-19"
   s.description = "This Rack middleware allows several web apps in an authentication domain to share session state, facilitating single sign-on in a distributed web app. It only provides session sharing and does not concern itself with authentication or replication of the user database."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [

data/lib/global_session/rails.rb

@@ -69,9 +69,15 @@ module GlobalSession
               "Specified directory class '#{dir_name}' does not inherit from GlobalSession::Directory"
       end
 
-      authorities_dir = File.join(::Rails.root, 'config', 'authorities')
-      self.directory = dir_klass.new(self.configuration, authorities_dir)
-      self.keystore = self.directory.keystore
+      if self.configuration['keystore'].blank? || self.configuration['keystore']['public'].blank?
+        # Support legacy behavior (config/authorities dir always contains pub keys)
+        authorities_dir = File.join(::Rails.root, 'config', 'authorities')
+        self.directory = dir_klass.new(self.configuration, authorities_dir)
+        self.keystore = self.directory.keystore
+      else
+        # Prefer modern behavior (configuration tells us where to find pub keys)
+        self.directory = dir_klass.new(self.configuration)
+      end
 
       # Add our middleware to the stack.
       rails_config.middleware.insert_before(ActionController::Base.session_store, ::Rack::Cookies)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_session
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json