test/rails_app/app/data_mapper/shim.rb in dm-devise-1.2.0.beta vs test/rails_app/app/data_mapper/shim.rb in dm-devise-1.2.0.rc

- old
+ new

@@ -3,18 +3,14 @@ def self.included(klass) klass.extend(ModelMethods) end module ModelMethods - # Override version in SharedUser which uses #find_by_email. - def find_for_facebook_oauth(access_token, signed_in_resource=nil) - data = ActiveSupport::JSON.decode(access_token.get('/me')) - user = signed_in_resource || User.first(:email => data["email"]) || User.new - user.update_with_facebook_oauth(access_token, data) - user.save - user + # For benefit of Users::OmniauthCallbacksController + def find_by_email(email) + first(:email => email) end - + def create!(*args) create(*args) end def destroy_all