global_session 1.1.0 → 2.0.0

data/lib/global_session.rb

@@ -75,15 +75,14 @@ require 'json'
 require 'openssl'
 
 #Require the core suite of GlobalSession classes and modules
-basedir = File.dirname(__FILE__)
-require File.join(basedir, 'global_session', 'configuration')
-require File.join(basedir, 'global_session', 'directory')
-require File.join(basedir, 'global_session', 'encoding')
-require File.join(basedir, 'global_session', 'session')
-require File.join(basedir, 'global_session', 'integrated_session')
+require 'global_session/configuration'
+require 'global_session/directory'
+require 'global_session/encoding'
+require 'global_session/session'
 
 #Preemptively try to activate the Rails plugin, ignoring errors
 begin
-  require File.join(basedir, 'global_session', 'rails')  
+  require 'global_session/rails'
 rescue Exception => e
+  #no-op
 end

data/rails_generators/global_session/templates/global_session.yml.erb

@@ -1,27 +1,21 @@
-# Common settings of the global session (that apply to all Rails environments)
-# are listed here. These may be overidden in the environment-specific section.
+# Common attributes.
+# May be overidden by per-environment settings; see below
 common:
   attributes:
-    # Signed attributes of the global session
-    signed:
+    signed: # integrity-protected attributes
     - user
-    # Untrusted attributes of the global session
-    insecure:
+    insecure: # Insecure (unsigned) attributes
     - account
-  #If the session cookie is ephemeral, it goes away when the user closes the browser.
-  #Otherwise it stays around
-  ephemeral: false
-  
+  ephemeral: true # Ephemeral cookies go away when the browser closes
+
 # Test/spec runs
 test:
   timeout: 15 #minutes
   renew: 5 #minutes before expiration
   cookie:
     name: global_session
-  #the name of the local authority (optional)
-  authority: test
-  #which authorities this app will trust
-  trust:
+  authority: test # the name of the local authority (optional)
+  trust: #which authorities this app will trust
   - test
 
 # Development mode

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: global_session
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-01 00:00:00 -07:00
+date: 2012-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,21 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  requirement: *id004
+  name: msgpack
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,7 +90,7 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id004
+  requirement: *id005
   name: rack-contrib
   prerelease: false
   type: :runtime
@@ -96,12 +111,14 @@ files:
 - lib/global_session/configuration.rb
 - lib/global_session/directory.rb
 - lib/global_session/encoding.rb
-- lib/global_session/integrated_session.rb
 - lib/global_session/rack.rb
 - lib/global_session/rails.rb
 - lib/global_session/rails/action_controller_class_methods.rb
 - lib/global_session/rails/action_controller_instance_methods.rb
 - lib/global_session/session.rb
+- lib/global_session/session/abstract.rb
+- lib/global_session/session/v1.rb
+- lib/global_session/session/v2.rb
 - rails/init.rb
 - rails_generators/global_session/USAGE
 - rails_generators/global_session/global_session_generator.rb

data/lib/global_session/integrated_session.rb

@@ -1,146 +0,0 @@
-# Copyright (c) 2012 RightScale Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-module GlobalSession
-  # Helper class that enables the end user to treat the global and local session as if
-  # they were the same object. This is accomplished by implementing approximately the
-  # same interface as a Hash, and dispatching to one or the other session object depending
-  # on various factors.
-  #
-  # This class isn't intended to be used directly by the end user. Instead, set integrated: true
-  # in the configuration file and the Web framework integration code will manage an integrated
-  # session object for you, as well as overriding the framework's default session accessor to
-  # return an integrated session instead.
-  #
-  # When using an integrated session, you can always get to the underlying objects by
-  # using the #local and #global readers of this class.
-  #
-  class GlobalSession::IntegratedSession
-    # Return the local-session objects, whose type may vary depending on the Web framework.
-    attr_reader :local
-
-    # Return the global-session object.
-    attr_reader :global
-    
-    # Construct a new integrated session.
-    #
-    # === Parameters
-    # local(Object):: Local session that acts like a Hash
-    # global(Session):: Session
-    def initialize(local, global)
-      @local = local
-      @global = global
-    end
-
-    # Retrieve a value from the global session if the supplied key is supported by
-    # the global session, else retrieve it from the local session.
-    #
-    # === Parameters
-    # key(String):: the key
-    #
-    # === Return
-    # value(Object):: The value associated with +key+, or nil if +key+ is not present
-    def [](key)
-      key = key.to_s
-      if @global.supports_key?(key)
-        @global[key]
-      else
-        @local[key]
-      end
-    end
-
-    # Set a value in the global session (if the supplied key is supported) or the local
-    # session otherwise.
-    #
-    # === Parameters
-    # key(String):: The key to set
-    # value(Object):: The value to set
-    #
-    # === Return
-    # value(Object):: Always returns the value that was set
-    def []=(key, value)
-      key = key.to_s
-      if @global.supports_key?(key)
-        @global[key] = value
-      else
-        @local[key] = value
-      end
-
-      return value
-    end
-
-    # Determine whether the global or local session contains a value with the specified key.
-    #
-    # === Parameters
-    # key(String):: The name of the key
-    #
-    # === Return
-    # contained(true|false):: Whether the session currently has a value for the specified key.
-    def has_key?(key)
-      key = key.to_s
-      @global.has_key?(key) || @local.has_key?(key)
-    end
-
-    alias :key? :has_key?
-    
-    # Return the keys that are currently present in either the global or local session.
-    #
-    # === Return
-    # keys(Array):: List of keys contained in the global or local session.
-    def keys
-      @global.keys + @local.keys
-    end
-
-    # Return the values that are currently present in the global or local session.
-    #
-    # === Return
-    # values(Array):: List of values contained in the global or local session.
-    def values
-      @global.values + @local.values
-    end
-
-    # Iterate over each key/value pair in both the global and local session.
-    #
-    # === Block
-    # An iterator which will be called with each key/value pair
-    #
-    # === Return
-    # Returns the value of the last expression evaluated by the block
-    def each_pair(&block)
-      @global.each_pair(&block)
-      @local.each_pair(&block)
-    end
-
-    def respond_to?(meth) # :nodoc:
-      return @global.respond_to?(meth) || @local.respond_to?(meth) || super
-    end
-    
-    def method_missing(meth, *args) # :nodoc:
-      if @global.respond_to?(meth)
-        @global.__send__(meth, *args)
-      elsif @local.respond_to?(meth)
-        @local.__send__(meth, *args)
-      else
-        super
-      end
-    end
-  end
-end