sq_auth 0.0.25 → 0.0.26

data/examples/client.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require 'sq_auth'
+require 'pry'
 enable :sessions
 set :port, 7842
 

data/lib/sq_auth/sq_auth_access.rb

@@ -92,6 +92,10 @@ module SqAuth
       @session_provider.create_session_for_current_user sqauthsession
     end
 
+    def save_username_for_current_user username
+      @session_provider.username = username
+    end
+
     def current_user_ip= ip
       if @gateway_ip
         @session_provider.user.user_ip = @gateway_ip
@@ -100,6 +104,10 @@ module SqAuth
       end
     end
 
+    def current_user_name= name
+      @session_provider.user.user_name = name
+    end
+
     def login_to
       uri = @session_provider.auth_server_uri
       uri.path = "#@login_path"

data/lib/sq_auth/sq_auth_client.rb

@@ -41,6 +41,10 @@ module SqAuth
       @user
     end
 
+    def username=(username)
+      @username = username
+    end
+
     def current_user
       @user.current_user
     end

data/lib/sq_auth/sq_auth_integration/sq_auth_rack.rb

@@ -6,10 +6,19 @@ module SqAuth
       end
       def self.alter_environment options={}
         if defined?(Rails)
-          Rails.application.class.instance_eval do
-            # cookie in rails enabled by default
-            # config.middleware.use Rack::Session::Cookie, :expire_after => 2592000
-            config.middleware.use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
+          # Rails::Engine?
+          if (Rails.application.nil?)
+            options[:engine].instance_eval do
+              initializer "Rails::Engine.add_sq_auth" do |app|
+                app.middleware.use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
+              end
+            end
+          else
+            Rails.application.class.instance_eval do
+              # cookie in rails enabled by default
+              # config.middleware.use Rack::Session::Cookie, :expire_after => 2592000
+              config.middleware.use SqAuth::SqAuthIntegration::SqAuthRack::Middleware
+            end
           end
         elsif defined?(Sinatra)
           if options[:klass].respond_to?(:use)
@@ -22,6 +31,7 @@ module SqAuth
         end
       end
 
+
       class Middleware
         attr_accessor :app, :env
         def call(env)
@@ -44,9 +54,11 @@ module SqAuth
         def redirect_to_callback env, form_hash
           env["rack.session"][:sqauthsession] = form_hash["sqauthsession"] if env["rack.session"]
           env["rack.session"][:current_user] = form_hash["current_user"] if env["rack.session"]
+          SqAuth.access.current_user_name = form_hash["current_user"]
           SqAuth.access.save_session_for_current_user form_hash["sqauthsession"]
+          SqAuth.access.save_username_for_current_user form_hash["current_user"]
 
-          [302, {'Location' => form_hash["callback"]}, ['Authenticated']]
+          [302, {'Content-Type'=>'text/plain', 'Location' => form_hash["callback"]}, ['Authenticated']]
         end
 
         def callback_uri env

data/lib/sq_auth/version.rb

@@ -1,3 +1,3 @@
 module SqAuth
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sq_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70316757184520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70316757184520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70316757183580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70316757183580
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70316757181920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70316757181920
 description: SQ sevices authentication gem
 email:
 - leonidkrn@gmail.com
@@ -119,8 +104,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sq_auth
-rubygems_version: 1.8.18
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: SQ sevices authentication gem
-test_files: []
+test_files:
+- spec/lib/sq_auth/sq_auth_client_spec.rb
+- spec/lib/sq_auth/sq_auth_request_spec.rb
+- spec/lib/sq_auth/sq_auth_server_interface/basic_server_spec.rb
+- spec/lib/sq_auth/sq_auth_sessions_spec.rb
+- spec/lib/sq_auth/sq_auth_user/basic_user_spec.rb
+- spec/lib/sq_auth_spec.rb
+- spec/spec_helper.rb