has_global_session 1.1.0 → 1.1.2

data/has_global_session.gemspec

@@ -7,13 +7,13 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'has_global_session'
-  s.version = '1.1.0'
-  s.date    = '2010-07-27'
+  s.version = '1.1.2'
+  s.date    = '2010-10-29'
 
   s.authors = ['Tony Spataro']
   s.email   = 'code@tracker.xeger.net'
   s.homepage= 'http://github.com/xeger/has_global_session'
-  
+
   s.summary = %q{Secure single-domain session sharing plugin for Rails.}
   s.description = %q{This plugin for Rails 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.}
 
@@ -21,6 +21,8 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('json', [">= 1.1.7"])
   s.add_runtime_dependency('activesupport', [">= 2.1.2"])
 
+  s.add_development_dependency('rake', ["~> 0.8.7"])
+  s.add_development_dependency('ruby-debug', ["~> 0.10.3"])
   s.add_development_dependency('rspec', [">= 1.3.0"])
   s.add_development_dependency('flexmock', [">= 0.8.6"])
   s.add_development_dependency('actionpack', [">= 2.1.2"])

data/lib/has_global_session/configuration.rb

@@ -40,7 +40,7 @@ module HasGlobalSession
   # In addition to having one section for each operating environment, the configuration
   # file can specify a 'common' section for settings that apply
   #
-  # === Lookup Mechanism  
+  # === Lookup Mechanism
   # When the code asks for +Configuration['foo']+, we first check whether the current
   # environment's config section has a value for foo. If one is found, we return that.
   #
@@ -62,9 +62,10 @@ module HasGlobalSession
     # MissingConfiguration:: if config file is missing or unreadable
     # TypeError:: if config file does not contain a YAML-serialized Hash
     def initialize(config_file, environment)
-      raise MissingConfiguration, "Missing or unreadable configuration file" unless File.readable?(config_file)
-      @config      = YAML.load(File.read(config_file))
+      @config_file = config_file
       @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
@@ -83,17 +84,30 @@ module HasGlobalSession
     end
 
     def validate # :nodoc
-      ['attributes/signed', 'integrated', 'cookie/name', 'timeout'].each do |path|
-        elements = path.split '/'
-        object = get(elements.shift, false)
-        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('')}"
-            raise MissingConfiguration, msg
-          end
+      ['attributes/signed', 'integrated', 'cookie/name',
+       'timeout'].each {|k| validate_presence_of k}
+    end
+
+    protected
+
+    # Helper method to check the presence of a key.  Used in #validate.
+    #
+    # === Parameters
+    # key(String):: key name; for nested hashes, separate keys with /
+    #
+    # === Return
+    # true always
+    def validate_presence_of(key)
+      elements = key.split '/'
+      object = get(elements.shift, false)
+      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('')}"
+          raise MissingConfiguration, msg
         end
       end
+      true
     end
 
     private
@@ -108,5 +122,5 @@ module HasGlobalSession
     rescue NoMethodError
       raise MissingConfiguration, "Configuration key '#{key}' not found"
     end
-  end  
-end
+  end
+end

data/lib/has_global_session/rails/action_controller_class_methods.rb

@@ -7,7 +7,6 @@ module HasGlobalSession
         unless @global_session_config
           config_file = File.join(RAILS_ROOT, 'config', 'global_session.yml')
           @global_session_config = HasGlobalSession::Configuration.new(config_file, RAILS_ENV)
-          @global_session_config.config_file = config_file
         end
 
         return @global_session_config

data/lib/has_global_session/rails/action_controller_instance_methods.rb

@@ -187,7 +187,7 @@ module HasGlobalSession
           klass = Directory
         end
 
-        return klass.new(File.join(RAILS_ROOT, 'config', 'authorities'))        
+        return klass.new(global_session_config, File.join(RAILS_ROOT, 'config', 'authorities'))        
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_global_session
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,9 +67,41 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +113,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: flexmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +129,11 @@ dependencies:
         - 6
         version: 0.8.6
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,7 +145,7 @@ dependencies:
         - 2
         version: 2.1.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 description: This plugin for Rails 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.
 email: code@tracker.xeger.net
 executables: []