exvo-auth 0.10.0 → 0.10.1

data/exvo-auth.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   
   s.add_dependency "oa-oauth",    "~> 0.0.4"
   s.add_dependency "httparty",    "~> 0.6.1"
-  s.add_dependency "activemodel", "> 3.0.0"
+  s.add_dependency "activemodel", "~> 3.0.0"
+  s.add_dependency "actionpack",  "~> 3.0.0"
 
   s.add_development_dependency "mocha",     "~> 0.9.8"
   s.add_development_dependency "test-unit", "~> 2.1.0"

data/lib/exvo-auth.rb

@@ -6,10 +6,11 @@ require 'uri'
 require 'base64'
 
 module ExvoAuth
-  autoload :Middleware, 'exvo_auth/middleware'
-  autoload :Config,     'exvo_auth/config'
-  autoload :Dejavu,     'exvo_auth/dejavu'
-  autoload :VERSION,    'exvo_auth/version'
+  autoload :Middleware,   'exvo_auth/middleware'
+  autoload :SessionStore, 'exvo_auth/session_store'
+  autoload :Config,       'exvo_auth/config'
+  autoload :Dejavu,       'exvo_auth/dejavu'
+  autoload :VERSION,      'exvo_auth/version'
   
   module Strategies
     autoload :Base,           'exvo_auth/strategies/base'

data/lib/exvo_auth/{sharing.rb → models/sharing.rb}

@@ -1,5 +1,5 @@
 # TODO: activemodel with validations
-class ExvoAuth::Sharing
+class ExvoAuth::Models::Sharing
   def self.create(attrs = {})
     new(attrs).save
   end

data/lib/exvo_auth/session_store.rb

@@ -0,0 +1,37 @@
+require "action_dispatch"
+require 'active_support/core_ext/hash/reverse_merge'
+
+# For Merb apps only. This replaces merb sessions with Rails3 sessions. We use this to share sessions between merb and rails apps.
+class ExvoAuth::SessionStore
+  def initialize(app, options = {})
+    raise "Please configure :secret_token" unless @secret_token = options[:secret_token]
+    raise "Please configure :domain"       unless @domain       = options[:domain]
+    
+    @app = ActionDispatch::Cookies.new(ActionDispatch::Session::CookieStore.new(app, :key => "_exvo_session", :domain => @domain))
+  end
+  def call(env)
+    @app.call(env.reverse_merge!(env_defaults))
+  end
+  def env_defaults
+    @env_defaults ||= { 
+      "action_dispatch.secret_token" => @secret_token
+    }
+  end
+  def self.replace_merb_sessions_with_rails_3_sessions! # this is crazy
+    [Merb::BootLoader::MixinSession, Merb::BootLoader::SetupSession, Merb::BootLoader::Cookies].each do |c| 
+      c.class_eval do
+        def self.run; end
+      end
+    end
+    Merb::Controller.class_eval do
+      def session; request.session end
+      def cookies; request.cookies end
+    end
+    Merb::Request.class_eval do
+      def session?; true end
+      def session; env["rack.session"]            ||= {} end
+      def cookies; env["action_dispatch.cookies"] ||= {} end
+    end
+  end
+end
+

data/lib/exvo_auth/version.rb

@@ -1,3 +1,3 @@
 module ExvoAuth
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo-auth
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Jacek Becela
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -67,9 +67,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +97,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: test-unit
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +113,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,7 +129,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Sign in with Exvo account
 email: 
 - jacek.becela@gmail.com
@@ -144,8 +160,9 @@ files:
 - lib/exvo_auth/dejavu.rb
 - lib/exvo_auth/middleware.rb
 - lib/exvo_auth/models/message.rb
+- lib/exvo_auth/models/sharing.rb
 - lib/exvo_auth/oauth2.rb
-- lib/exvo_auth/sharing.rb
+- lib/exvo_auth/session_store.rb
 - lib/exvo_auth/strategies/base.rb
 - lib/exvo_auth/strategies/interactive.rb
 - lib/exvo_auth/strategies/non_interactive.rb