oauth-plugin 0.4.0.pre3 → 0.4.0.pre4

data/CHANGELOG

@@ -1,3 +1,7 @@
+  0.4.0-pre4
+  - Fixed bug when creating a new user from a new consumer token
+  - Fix typo in consumer token [krasio]
+  - Fix issue with mongoid not supporting find_by_x style queries. [3en]
   0.4.0-pre3
   - Experimental rack filter for OAuth 1.0a:
     see lib/oauth/rack/oauth_filter.rb for details

data/generators/oauth_consumer/templates/consumer_token.rb

@@ -2,4 +2,10 @@ require 'oauth/models/consumers/token'
 class ConsumerToken < ActiveRecord::Base
   include Oauth::Models::Consumers::Token
   
+  # You can safely remove this callback if you don't allow login from any of your services
+  before_create :create_user
+  
+  # Modify this with class_name etc to match your application
+  belongs_to :user
+  
 end

data/lib/oauth-plugin/version.rb

@@ -1,5 +1,5 @@
 module Oauth
   module Plugin
-    VERSION = "0.4.0.pre3"
+    VERSION = "0.4.0.pre4"
   end
 end

data/lib/oauth/controllers/consumer_controller.rb

@@ -75,7 +75,7 @@ module Oauth
         throw RecordNotFound unless OAUTH_CREDENTIALS.include?(consumer_key)
         deny_access! unless logged_in? || OAUTH_CREDENTIALS[consumer_key][:allow_login]
         @consumer="#{consumer_key.to_s.camelcase}Token".constantize
-        @token=@consumer.find_by_user_id current_user.id if logged_in?
+        @token=@consumer.find(:first, :conditions=>{:user_id=>current_user.id.to_s}) if logged_in?
       end
       
       # Override this in you controller to deny user or redirect to login screen.

data/lib/oauth/models/consumers/token.rb

@@ -43,7 +43,7 @@ module Oauth
               user.consumer_tokens.first(:conditions=>{:type=>self.to_s,:token=>access_token.token}) ||
                 user.consumer_tokens.create!(:type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
             else
-              ConsumerToken.first( :token=>access_token.token,:type=>self.to_s) ||
+              ConsumerToken.first( :conditions =>{ :token=>access_token.token,:type=>self.to_s}) ||
                 create(:type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
             end
           end
@@ -63,7 +63,7 @@ module Oauth
           # Main client for interfacing with remote service. Override this to use
           # preexisting library eg. Twitter gem.
           def client
-            @client||=OAuth::AccessToken.new slelf.class.consumer,token,secret
+            @client||=OAuth::AccessToken.new self.class.consumer,token,secret
           end
 
           def simple_client
@@ -86,4 +86,4 @@ module Oauth
       end
     end
   end
-end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 0
-  - pre3
-  version: 0.4.0.pre3
+  - pre4
+  version: 0.4.0.pre4
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -75,7 +75,6 @@ files:
 - README.rdoc
 - Rakefile
 - UPGRADE.rdoc
-- VERSION
 - generators/oauth_consumer/USAGE
 - generators/oauth_consumer/oauth_consumer_generator.rb
 - generators/oauth_consumer/templates/consumer_token.rb

data/VERSION

@@ -1 +0,0 @@
-0.4.0.pre3