global_session 1.0.4 → 1.0.5

data/global_session.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'global_session'
-  s.version = '1.0.4'
-  s.date    = '2011-06-20'
+  s.version = '1.0.5'
+  s.date    = '2011-07-26'
 
   s.authors = ['Tony Spataro']
   s.email   = 'code@tracker.xeger.net'

data/lib/global_session/configuration.rb

@@ -52,21 +52,29 @@ module GlobalSession
   # you are integrating; see GlobalSession::Rails for more information.
   #
   class Configuration
-    # Create a new Configuration objectt
+    # Create a new Configuration object
     #
     # === Parameters
-    # config_File(String):: Absolute filesystem path to the configuration file
+    # config(String|Hash):: Absolute filesystem path to the configuration file, or Hash containing configuration
     # environment(String):: Config file section from which to read settings
     #
     # === Raise
     # MissingConfiguration:: if config file is missing or unreadable
     # TypeError:: if config file does not contain a YAML-serialized Hash
-    def initialize(config_file, environment)
-      @config_file = config_file
+    def initialize(config, environment)
+      if config.is_a?(Hash)
+        @config = config
+      elsif File.readable?(config)
+        data = YAML.load(File.read(config))
+        unless data.is_a?(Hash)
+          raise TypeError, "Configuration file #{File.basename(config)} must contain a hash as its top-level element"
+        end
+        @config = data
+      else
+        raise MissingConfiguration, "Missing or unreadable configuration file #{config}"
+      end
+
       @environment = environment
-      raise MissingConfiguration, "Missing or unreadable configuration file" unless File.readable?(@config_file)
-      @config      = YAML.load(File.read(@config_file))
-      raise TypeError, "#{config_file} must contain a Hash!" unless Hash === @config
       validate
     end
 
@@ -103,7 +111,7 @@ module GlobalSession
       elements.each do |element|
         object = object[element] if object
         if object.nil?
-          msg = "#{File.basename(@config_file)} does not specify required element #{elements.map { |x| "['#{x}']"}.join('')}"
+          msg = "Configuration does not specify required element #{elements.map { |x| "['#{x}']"}.join('')}"
           raise MissingConfiguration, msg
         end
       end

data/lib/global_session/rack.rb

@@ -166,7 +166,11 @@ module GlobalSession
       # env(Hash): Rack environment
       # e(Exception): error that happened
       def handle_error(activity, env, e)
-        env['rack.logger'].error("#{e.class} while #{activity}: #{e} #{e.backtrace}") if env['rack.logger']
+        if env['rack.logger']
+          msg = "#{e.class} while #{activity}: #{e}"
+          msg += " #{e.backtrace}" unless e.is_a?(ExpiredSession)
+          env['rack.logger'].error(msg)
+        end
 
         if e.is_a?(ClientError) || e.is_a?(SecurityError)
           env['global_session.error'] = e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: global_session
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -07:00
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency