sorcery 0.5.0 → 0.5.1

data/README.rdoc

@@ -29,7 +29,7 @@ Example Rails 3 app using sorcery: https://github.com/NoamB/sorcery-example-app
 
 Example Sinatra app using sorcery: https://github.com/NoamB/sorcery-example-app-sinatra
 
-Documentation: http://rubydoc.info/gems/sorcery/0.5.0/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.5.1/frames
 
 Check out the tutorials in the github wiki!
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/sorcery/model.rb

@@ -32,7 +32,7 @@ module Sorcery
 
             self.class_eval do
               field sorcery_config.username_attribute_name, type: String
-              field sorcery_config.password_attribute_name, type: String
+              #field sorcery_config.password_attribute_name, type: String
               field sorcery_config.email_attribute_name, type: String unless sorcery_config.username_attribute_name == sorcery_config.email_attribute_name
               field sorcery_config.crypted_password_attribute_name, type: String
               field sorcery_config.salt_attribute_name, type: String
@@ -122,7 +122,7 @@ module Sorcery
       # encrypts password with salt and saves it.
       def encrypt_password
         config = sorcery_config
-        new_salt = self.send(:"#{config.salt_attribute_name}=", generate_random_token) if !config.salt_attribute_name.nil?
+        self.send(:"#{config.salt_attribute_name}=", new_salt = generate_random_token) if !config.salt_attribute_name.nil?
         self.send(:"#{config.crypted_password_attribute_name}=", self.class.encrypt(self.send(config.password_attribute_name),new_salt))
       end
 

data/lib/sorcery/model/adapters/mongoid.rb

@@ -15,11 +15,12 @@ module Sorcery
 
         module ClassMethods
           def find_by_credentials(credentials)
-            where(@sorcery_config.username_attribute_name => credentials[0]).first
+            where(sorcery_config.username_attribute_name => credentials[0]).first
           end
 
           def find_by_provider_and_uid(provider, uid)
-            where(:provider => provider, :uid => uid).first
+            user_klass = ::Sorcery::Controller::Config.user_class
+            where(user_klass.sorcery_config.provider_attribute_name => provider, user_klass.sorcery_config.provider_uid_attribute_name => uid).first
           end
 
           def find_by_id(id)
@@ -27,15 +28,15 @@ module Sorcery
           end
 
           def find_by_activation_token(token)
-            where(:activation_token => token).first
+            where(sorcery_config.activation_token_attribute_name => token).first
           end
 
           def find_by_remember_me_token(token)
-            where(:remember_me_token => token).first
+            where(sorcery_config.remember_me_token_attribute_name => token).first
           end
 
           def find_by_username(username)
-            where(:username => username).first
+            where(sorcery_config.username_attribute_name => username).first
           end
 
           def transaction(&blk)
@@ -46,6 +47,10 @@ module Sorcery
             where(token_attr_name => token).first
           end
 
+          def find_by_email(email)
+            where(sorcery_config.email_attribute_name => email).first
+          end
+
           def get_current_users
             config = sorcery_config
             where(config.last_activity_at_attribute_name.ne => nil) \

data/lib/sorcery/model/submodules/reset_password.rb

@@ -32,11 +32,12 @@ module Sorcery
 
             reset!
           end
-          
+
+          base.extend(ClassMethods)
+
           base.sorcery_config.after_config << :validate_mailer_defined
           base.sorcery_config.after_config << :define_reset_password_mongoid_fields if defined?(Mongoid) and base.ancestors.include?(Mongoid::Document)
 
-          base.extend(ClassMethods)
           base.send(:include, TemporaryToken)
           base.send(:include, InstanceMethods)
 
@@ -84,7 +85,8 @@ module Sorcery
           # Clears token and tries to update the new password for the user.
           def change_password!(new_password)
             clear_reset_password_token
-            update_attributes(sorcery_config.password_attribute_name => new_password)
+            self.send(:"#{sorcery_config.password_attribute_name}=", new_password)
+            save
           end
 
           protected

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-05-11}
   s.description = %q{Provides common authentication needs such as signing in/out, activating by email and resetting password.}
   s.email = %q{nbenari@gmail.com}
   s.extra_rdoc_files = [

data/spec/Gemfile.lock

@@ -3,12 +3,10 @@ PATH
   specs:
     sorcery (0.5.0)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -54,7 +52,6 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
-    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)

data/spec/rails3/Gemfile.lock

@@ -4,12 +4,10 @@ PATH
     oauth (0.4.4)
     sorcery (0.5.0)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -55,7 +53,6 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
-    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)

data/spec/rails3/spec/user_reset_password_spec.rb

@@ -142,7 +142,7 @@ describe "User with reset_password submodule" do
       ActionMailer::Base.deliveries.size.should == old_size + 1
     end
 
-    it "when reset_password! is called, should delete reset_password_token" do
+    it "when change_password! is called, should delete reset_password_token" do
       create_new_user
       @user.deliver_reset_password_instructions!
       @user.reset_password_token.should_not be_nil

data/spec/rails3_mongoid/Gemfile.lock

@@ -4,12 +4,10 @@ PATH
     oauth (0.4.4)
     sorcery (0.5.0)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -57,7 +55,6 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
-    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)

data/spec/rails3_mongoid/spec/user_reset_password_spec.rb

@@ -20,7 +20,7 @@ describe "User with reset_password submodule" do
       
       specify { @user.should respond_to(:deliver_reset_password_instructions!) }
       
-      specify { @user.should respond_to(:reset_password!) }
+      specify { @user.should respond_to(:change_password!) }
 
       it "should respond to .load_from_reset_password_token" do
         User.should respond_to(:load_from_reset_password_token)
@@ -135,7 +135,7 @@ describe "User with reset_password submodule" do
       ActionMailer::Base.deliveries.size.should == old_size + 1
     end
 
-    it "when reset_password! is called, should delete reset_password_token" do
+    it "when change_password! is called, should delete reset_password_token" do
       create_new_user
       @user.deliver_reset_password_instructions!
       @user.reset_password_token.should_not be_nil
@@ -164,11 +164,19 @@ describe "User with reset_password submodule" do
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 2
     end
-    
+
+    it "should encrypt properly on reset" do
+      create_new_user
+      @user.deliver_reset_password_instructions!
+      @user.change_password!("blagu")
+      Sorcery::CryptoProviders::BCrypt.matches?(@user.crypted_password,"blagu",@user.salt).should be_true
+    end
+
     it "if mailer is nil on activation, throw exception!" do
       expect{sorcery_reload!([:reset_password])}.to raise_error(ArgumentError)
     end
-    
+
+
   end
   
 end

data/spec/sinatra/Gemfile

@@ -2,9 +2,12 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'activerecord', '>= 3.0.3'
+gem 'actionmailer', '>= 3.0.3'
 gem "sorcery", '>= 0.1.0', :path => '../../'
 
 group :development, :test do
+  gem "rake"
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency

data/spec/sinatra/Gemfile.lock

@@ -3,43 +3,38 @@ PATH
   specs:
     sorcery (0.5.0)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+    activesupport (3.0.5)
     addressable (2.2.5)
     archive-tar-minitar (0.5.2)
     arel (2.0.7)
@@ -54,7 +49,6 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
-    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.15)
@@ -75,19 +69,6 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -114,7 +95,6 @@ GEM
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     sqlite3-ruby (1.3.2)
-    thor (0.14.6)
     tilt (1.2.2)
     timecop (0.3.5)
     treetop (1.4.9)
@@ -125,6 +105,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionmailer (>= 3.0.3)
+  activerecord (>= 3.0.3)
+  rake
   rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +03:00
+date: 2011-05-11 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency