refinerycms-authentication 0.9.9.18 → 0.9.9.19

data/refinerycms-authentication.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-authentication}
-  s.version           = %q{0.9.9.18}
+  s.version           = %q{0.9.9.19}
   s.summary           = %q{Authentication engine for Refinery CMS}
   s.description       = %q{The default authentication engine for Refinery CMS}
-  s.date              = %q{2011-04-16}
+  s.date              = %q{2011-04-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.18'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.19'
   s.add_dependency 'devise',           '~> 1.2.0'
 
   s.files             = [

data/spec/models/user_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 Dir[File.expand_path('../../../features/support/factories.rb', __FILE__)].each {|f| require f}
 
 describe User do
+
+  let(:user) { Factory(:user) }
+  let(:refinery_user) { Factory(:refinery_user) }
+
   context "Roles" do
     context "add_role" do
       it "raises Exception when Role object is passed" do
-        user = Factory(:user)
         lambda{ user.add_role(Role.new)}.should raise_exception
       end
 
       it "adds a Role to the User when role not yet assigned to User" do
-        user = Factory(:user)
         lambda {
           user.add_role(:new_role)
         }.should change(user.roles, :count).by(1)
@@ -19,34 +21,30 @@ describe User do
       end
 
       it "does not add a Role to the User when this Role is already assigned to User" do
-        user = Factory(:refinery_user)
         lambda {
-          user.add_role(:refinery)
-        }.should_not change(user.roles, :count).by(1)
-        user.roles.collect(&:title).should include("Refinery")
+          refinery_user.add_role(:refinery)
+        }.should_not change(refinery_user.roles, :count).by(1)
+        refinery_user.roles.collect(&:title).should include("Refinery")
       end
     end
 
     context "has_role" do
       it "raises Exception when Role object is passed" do
-        user = Factory(:user)
         lambda{ user.has_role?(Role.new)}.should raise_exception
       end
 
       it "returns the true if user has Role" do
-        user = Factory(:refinery_user)
-        user.has_role?(:refinery).should be_true
+        refinery_user.has_role?(:refinery).should be_true
       end
 
       it "returns false if user hasn't the Role" do
-        user = Factory(:refinery_user)
-        user.has_role?(:refinery_fail).should be_false
+        refinery_user.has_role?(:refinery_fail).should be_false
       end
     end
 
     describe "role association" do
       it "have a roles attribute" do
-        Factory(:user).should respond_to(:roles)
+        user.should respond_to(:roles)
       end
     end
   end
@@ -54,8 +52,8 @@ describe User do
   context "validations" do
     # email and password validations are done by including devises validatable
     # module so those validations are not tested here
-    before(:each) do
-      @attr = {
+    let(:attr) do
+      {
         :username => "RefineryCMS",
         :email => "refinery@cms.com",
         :password => "123456",
@@ -63,61 +61,60 @@ describe User do
       }
     end
 
+
     it "requires username" do
-      User.new(@attr.merge(:username => "")).should_not be_valid
+      User.new(attr.merge(:username => "")).should_not be_valid
     end
 
     it "rejects duplicate usernames" do
-      User.create!(@attr)
-      User.new(@attr.merge(:email => "another@email.com")).should_not be_valid
+      User.create!(attr)
+      User.new(attr.merge(:email => "another@email.com")).should_not be_valid
     end
   end
 
   describe ".find_for_database_authentication" do
     it "finds user either by username or email" do
-      user = Factory(:user)
       User.find_for_database_authentication(:login => user.username).should == user
       User.find_for_database_authentication(:login => user.email).should == user
     end
   end
 
   describe "#can_delete?" do
-    before(:each) do
-      @user = Factory(:refinery_user)
-      @user_not_persisted = Factory.build(:refinery_user)
-      @super_user = Factory(:refinery_user)
-      @super_user.add_role(:superuser)
+    let(:user_not_persisted) { Factory.build(:refinery_user) }
+    let(:super_user) do
+      super_user = Factory(:refinery_user)
+      super_user.add_role(:superuser)
+      super_user
     end
 
     context "won't allow to delete" do
       it "not persisted user record" do
-        @user.can_delete?(@user_not_persisted).should be_false
+        refinery_user.can_delete?(user_not_persisted).should be_false
       end
 
       it "user with superuser role" do
-        @user.can_delete?(@super_user).should be_false
+        refinery_user.can_delete?(super_user).should be_false
       end
 
       it "if user count with refinery role <= 1" do
-        Role[:refinery].users.delete(@user)
-        @super_user.can_delete?(@user).should be_false
+        Role[:refinery].users.delete(refinery_user)
+        super_user.can_delete?(refinery_user).should be_false
       end
 
       it "user himself" do
-        @user.can_delete?(@user).should be_false
+        refinery_user.can_delete?(refinery_user).should be_false
       end
     end
 
     context "allow to delete" do
       it "if all conditions return true" do
-        @super_user.can_delete?(@user).should be_true
+        super_user.can_delete?(refinery_user).should be_true
       end
     end
   end
 
   describe "#plugins=" do
     it "assigns plugins to user" do
-      user = Factory(:user)
       plugin_list = ["refinery_one", "refinery_two", "refinery_three"]
       user.plugins = plugin_list
       user.plugins.collect { |p| p.name }.should == plugin_list
@@ -126,7 +123,6 @@ describe User do
 
   describe "#authorized_plugins" do
     it "returns array of user and always allowd plugins" do
-      user = Factory(:user)
       ["refinery_one", "refinery_two", "refinery_three"].each_with_index do |name, index|
         user.plugins.create!(:name => name, :position => index)
       end
@@ -135,25 +131,23 @@ describe User do
   end
 
   describe "plugins association" do
-    before(:each) do
-      @user = Factory(:user)
-      @plugin_list = ["refinery_one", "refinery_two", "refinery_three"]
-      @user.plugins = @plugin_list
-    end
+    let(:plugin_list) { ["refinery_one", "refinery_two", "refinery_three"] }
+    before { user.plugins = plugin_list }
 
     it "have a plugins attribute" do
-      @user.should respond_to(:plugins)
+      user.should respond_to(:plugins)
     end
 
     it "returns plugins in ASC order" do
-      @user.plugins[0].name.should == @plugin_list[0]
-      @user.plugins[1].name.should == @plugin_list[1]
-      @user.plugins[2].name.should == @plugin_list[2]
+      user.plugins[0].name.should == plugin_list[0]
+      user.plugins[1].name.should == plugin_list[1]
+      user.plugins[2].name.should == plugin_list[2]
     end
 
     it "deletes associated plugins" do
-      @user.destroy
-      UserPlugin.find_by_user_id(@user.id).should be_nil
+      user.destroy
+      UserPlugin.find_by_user_id(user.id).should be_nil
     end
   end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-authentication
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.18
+  version: 0.9.9.19
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 Z
+date: 2011-04-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.18
+        version: 0.9.9.19
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency