simple_auth 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16b288cc0b5f5f67f53fc86454427dfb1a392064
-  data.tar.gz: ba6f438d37ea3c8918d1aa240feeab6f6d5e4707
+  metadata.gz: a8682ca22a814e3257391a8c00f4133534f0fc10
+  data.tar.gz: 66f375cd6005a5e20236242b45c9e78746a622ac
 SHA512:
-  metadata.gz: b5ebd95ef1bb5b40032a6a19617d78a1e834e83e2ee212e46f5ae943422452b000d21df7154127fb9638647dbfd96b0fb522a3cb3cf9b6855187d9aba25a2388
-  data.tar.gz: 58c5f19ab8f6fb09f502bb9548ffcd48914c42b0ccc591105221635ef350547f6625894d254c64e7121fb79c2c61433d2a1690a4316807902f1510dd0dcd7d61
+  metadata.gz: db21173167527172fdf0ccacaaa7551a0b1341742f75e3a2358391c2d844d4da16148ee920662d330fa23e3622c19783b16cdd288cdce5305aa9068c01391262
+  data.tar.gz: 7b9bdd103c1aa3e8222b29ade7fb0348b762df8508584384a3f9a46d97f75d22fe2bd219fefcd9f2bde0a76ceb1ab0caf5bfecc5ecc2bcfa60ebe893f6760358

data/lib/simple_auth/active_record.rb

@@ -21,7 +21,7 @@ module SimpleAuth
       #     end
       #   end
       #
-      def authentication(&block)
+      def authentication(options = {}, &block)
         SimpleAuth.setup(&block) if block_given?
         SimpleAuth::Config.model ||= name.underscore.to_sym
 
@@ -29,12 +29,21 @@ module SimpleAuth
         # So, just return.
         return if respond_to?(:authenticate)
 
-        has_secure_password
+        macro = method(:has_secure_password)
+
+        if macro.arity.zero?
+          has_secure_password
+        else
+          has_secure_password(options)
+        end
 
         extend  ClassMethods
         include InstanceMethods
 
-        validates_length_of :password, minimum: 4
+        if options.fetch(:validations, true)
+          validates_length_of :password, minimum: 4,
+            if: -> { password.present? }
+        end
       end
     end
 

data/lib/simple_auth/version.rb

@@ -2,7 +2,7 @@ module SimpleAuth
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/simple_auth/active_record_spec.rb

@@ -32,31 +32,42 @@ describe SimpleAuth::ActiveRecord do
       expect(subject).not_to be_valid
     end
 
-    it "requires password" do
+    it "requires password", if: $rails_version >= "4.0" do
       expect(subject.errors[:password]).not_to be_empty
     end
 
+    it "requires password", if: $rails_version < "4.0" do
+      expect(subject.errors[:password_digest]).not_to be_empty
+    end
+
     it "requires password to be at least 4-chars long" do
       subject.password = "123"
       expect(subject).not_to be_valid
       expect(subject.errors[:password]).not_to be_empty
     end
 
-    it "requires password confirmation", if: Rails::VERSION::STRING >= "4.0" do
+    it "requires password confirmation", if: $rails_version >= "4.0" do
       user = User.create(password: "test", password_confirmation: "invalid")
       expect(user.errors[:password_confirmation]).not_to be_empty
     end
 
-    it "requires password confirmation", if: Rails::VERSION::STRING < "4.0" do
+    it "requires password confirmation", if: $rails_version < "4.0" do
       user = User.create(password: "test", password_confirmation: "invalid")
       expect(user.errors[:password]).not_to be_empty
     end
   end
 
+  context "ignoring validations" do
+    it "ignores validations", if: $rails_version >= "4.0" do
+      person = Person.new
+      expect(person).to be_valid
+    end
+  end
+
   context "existing record" do
     before do
       model.delete_all
-      model.create(
+      model.create!(
         :email => "john@doe.com",
         :login => "johndoe",
         :password => "test",
@@ -67,11 +78,16 @@ describe SimpleAuth::ActiveRecord do
 
     subject { model.first }
 
-    it "requires password" do
+    it "requires password", if: $rails_version >= "4.0" do
       user = User.create(password: nil)
       expect(user.errors[:password]).not_to be_empty
     end
 
+    it "requires password", if: $rails_version < "4.0" do
+      user = User.create(password: nil)
+      expect(user.errors[:password_digest]).not_to be_empty
+    end
+
     it "authenticates using email" do
       expect(model.authenticate("john@doe.com", "test")).to eq(subject)
     end
@@ -103,6 +119,25 @@ describe SimpleAuth::ActiveRecord do
       }.to raise_error(SimpleAuth::RecordNotFound)
     end
 
+    it "skips password length validation when no password is set" do
+      expect {
+        subject.username = "jd"
+        subject.save!
+      }.not_to raise_error
+    end
+
+    it "enforces password length when password is set" do
+      subject.password = "a"
+      subject.valid?
+      expect(subject.errors[:password]).to have(1).item
+    end
+
+    it "accepts valid password" do
+      subject.password = "test"
+      subject.valid?
+      expect(subject.errors[:password]).to be_empty
+    end
+
     it "returns user" do
       expect(model.find_by_credential(subject.email)).to eq(subject)
       expect(model.find_by_credential!(subject.email)).to eq(subject)

data/spec/simple_auth/compat_spec.rb

@@ -31,6 +31,11 @@ describe SimpleAuth, "compatibility mode" do
 
   it "assigns password_digest" do
     customer = Customer.create(password: "test")
-    expect(customer.password_digest).not_to be_empty
+    expect(customer.password_digest).to be_present
+  end
+
+  it "assigns password confirmation" do
+    customer = Customer.create(password: "test", password_confirmation: "test")
+    expect(customer.password_confirmation).to be_present
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ require "simple_auth"
 require File.dirname(__FILE__) + "/support/config/boot"
 require "rspec/rails"
 
+$rails_version = Rails::VERSION::STRING
+
 # Load database schema
 load File.dirname(__FILE__) + "/schema.rb"
 

data/spec/support/app/models/person.rb

@@ -0,0 +1,4 @@
+class Person < ActiveRecord::Base
+  self.table_name = "users"
+  authentication validations: false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_auth
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,6 +127,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/app/controllers/application_controller.rb
 - spec/support/app/models/customer.rb
+- spec/support/app/models/person.rb
 - spec/support/app/models/user.rb
 - spec/support/app/views/dashboard/index.erb
 - spec/support/app/views/session/new.erb
@@ -170,6 +171,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/app/controllers/application_controller.rb
 - spec/support/app/models/customer.rb
+- spec/support/app/models/person.rb
 - spec/support/app/models/user.rb
 - spec/support/app/views/dashboard/index.erb
 - spec/support/app/views/session/new.erb