authorizme 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.0.6
+
+### Features & Enhancements
+
+* Synchronize without SynchronizeRequest
+
+### Bug Fixes
+
+* Fix error with stack level too deep when synchronize 2 equal users
+
+## 0.0.5
+
+### Bug Fixes
+
+* Errors on synchronize
+
 ## 0.0.4
 
 ### Features & Enhancements

data/README.md

@@ -48,6 +48,8 @@ Also you can set roles. Just add some roles in Role model and then set it to use
 
 You can sync your accounts. If user login with another provider on existing user session, then plugin will set synchronize request. You can call `has_synchronize_request?` and check if there's any new request. Then you can call 'synchronize(user)' to user model. 
 
+Also you can use synchronize without requests (synchronous synchronize). Just add get param `synchronize=true` in login url (e.c. /authorizme/login/twitter?synchronize=true).
+
 #### Custom provider callback view
 
 By default providers use callback view which require JQuery and require `eventBus` in `window` dom element:

data/app/controllers/authorizme/authorizme_controller.rb

@@ -2,12 +2,19 @@ module Authorizme
   class AuthorizmeController < ::ApplicationController
     respond_to :html, :json, :xml
     layout "authorizme/layouts/popup"
+    before_filter :check_synchronize, :only => [:auth]
 
     def index
       @user = current_user
     end
 
     protected
+
+      def check_synchronize
+        if params[:synchronize]
+          session[:synchronize] = true
+        end
+      end
       
       def logout
       	session[:user_id] = nil

data/lib/authorizme/for_controllers.rb

@@ -17,8 +17,14 @@ module Authorizme
     end
     
     def login user
-      if current_user
-        SynchronizeRequest.create!({user: current_user, requested_user: user})
+      if current_user && current_user.id != user.id
+        if session[:synchronize]
+          SynchronizeRequest.create!({user: current_user, requested_user: user, status: "accepted"})
+          current_user.synchronize user
+          session[:synchronize] = nil
+        else
+          SynchronizeRequest.create!({user: current_user, requested_user: user})
+        end
       else
     	  session[:user_id] = user.id
     	end

data/lib/authorizme/version.rb

@@ -1,3 +1,3 @@
 module Authorizme
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorizme
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &80195890 !ruby/object:Gem::Requirement
+  requirement: &80691990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80195890
+  version_requirements: *80691990
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80195680 !ruby/object:Gem::Requirement
+  requirement: &80790180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80195680
+  version_requirements: *80790180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &80195470 !ruby/object:Gem::Requirement
+  requirement: &80789800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80195470
+  version_requirements: *80789800
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &80195260 !ruby/object:Gem::Requirement
+  requirement: &80789480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80195260
+  version_requirements: *80789480
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &80195050 !ruby/object:Gem::Requirement
+  requirement: &80789020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80195050
+  version_requirements: *80789020
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &80194840 !ruby/object:Gem::Requirement
+  requirement: &80788440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80194840
+  version_requirements: *80788440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80194630 !ruby/object:Gem::Requirement
+  requirement: &80788040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80194630
+  version_requirements: *80788040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80194420 !ruby/object:Gem::Requirement
+  requirement: &80787420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80194420
+  version_requirements: *80787420
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &80194210 !ruby/object:Gem::Requirement
+  requirement: &80786710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80194210
+  version_requirements: *80786710
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &80194000 !ruby/object:Gem::Requirement
+  requirement: &80785840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80194000
+  version_requirements: *80785840
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &80193790 !ruby/object:Gem::Requirement
+  requirement: &80785380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80193790
+  version_requirements: *80785380
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &80193580 !ruby/object:Gem::Requirement
+  requirement: &80784810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80193580
+  version_requirements: *80784810
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &80193370 !ruby/object:Gem::Requirement
+  requirement: &80784220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80193370
+  version_requirements: *80784220
 - !ruby/object:Gem::Dependency
   name: fbgraph
-  requirement: &80193160 !ruby/object:Gem::Requirement
+  requirement: &80783630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80193160
+  version_requirements: *80783630
 description: Authorization that includes basic authorization and 3 social authorization
   with Latvia social network draugiem.lv, facebook.com and twitter.com.
 email:
@@ -235,12 +235,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 518828113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 518828113
 requirements: []
 rubyforge_project: authorizme
 rubygems_version: 1.8.15