radiant-users-extension 0.0.5 → 2.1.0.beta

data/spec/datasets/devise_users_dataset.rb

@@ -0,0 +1,56 @@
+class DeviseUsersDataset < Dataset::Base
+  
+  def load
+    create_user "Existing",   :class_name => 'User'
+    create_user "Another",    :class_name => 'User'
+    create_user "Admin",      :class_name => 'Admin'
+    create_user "Designer",   :class_name => 'Designer'
+    create_user "Non_admin",  :class_name => 'Visitor'
+  end
+  
+  helpers do
+    def create_user(name, attributes={})
+      user = create_model :user, name.downcase.to_sym, user_attributes(attributes.update(:name => name))
+      if user.nil?
+        throw "Error creating user dataset for #{name}"
+      end
+    end
+    
+    def user_attributes(attributes={})
+      name = attributes[:name]
+      if name.nil?
+        throw "name attribute is required"
+      end
+      
+      attributes = { 
+        :name     => name,
+        :email    => "#{name.downcase}@example.com", 
+        :username => name.downcase,
+        :password => "password"
+      }.merge(attributes)
+      attributes[:password_confirmation] = attributes[:password]
+      attributes
+    end
+    
+    def user_params(options = {})
+      {
+        :name     => 'John Doe',
+        :username => 'jdoe',
+        :password => 'password',
+        :password_confirmation => 'password',
+        :email    => 'jdoe@gmail.com'
+      }.merge(options)
+    end
+    
+    def login_as(user)
+      login_user = user.is_a?(User) ? user : users(user)
+      flunk "Can't login as non-existing user #{user.to_s}." unless login_user
+      request.session['user_id'] = login_user.id
+      login_user
+    end
+    
+    def logout
+      request.session['user_id'] = nil
+    end
+  end
+end

data/spec/models/user_spec.rb

@@ -1,24 +1,136 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe User do
-
-  dataset :users
   
-  describe '#access attribute' do
-    it 'should be protected' do
-      @user = User.new({
-        :access => 'everything'
-      })
+  dataset :devise_users
+  
+  it { should have_default_scope(:order => 'name') }
+  
+  it { should belong_to(:created_by).class_name('User') }
+  it { should belong_to(:updated_by).class_name('User') }
+  
+  it { should validate_presence_of(:name) }
+  # it { should validate_presence_of(:class_name) } not working
+  
+  describe "#login" do
+    it 'should return username' do
+      users(:admin).login.should === users(:admin).username
+    end
+  end
+  
+  describe '#admin?' do
+    it 'should return whether the user is an admin' do
+      users(:admin).admin?.should be_true
+      users(:designer).admin?.should be_false
+    end
+  end
+  
+  describe '#designer?' do
+    it 'should return whether the user is an designer' do
+      users(:designer).designer?.should be_true
+      users(:admin).designer?.should be_false
+    end
+  end
+  
+  describe "#update" do
+    it 'should not update a users password if it is blank' do
+      @user = users(:admin)
+      @user.valid_password?('password').should be_true
+      @user.update_attributes({ :password => "", :password_confirmation => "", :username => "newmin"})
       
-      @user.access.should === ''
+      @user.valid?.should be_true
+      @user.valid_password?('password').should be_true
+      @user.username.should === 'newmin'
+    end
+  end
+  
+  describe "#login=" do
+    it "should set the username" do
+      @user = users(:admin)
+      @user.login = "new username"
+      @user.username.should == "new username"
+    end
+  end
+  
+  describe '#new_class_name' do
+    it "should set the class_name" do
+      @user = users(:admin)
+      @user.new_class_name.should == @user.class_name
+    end
+  end
+  
+  describe '#new_class_name=' do
+    before :each do
+      @user = users(:admin)
+      mock(UserActionObserver).current_user { @user}
+    end
+    it "should set the class_name" do
+      @user.new_class_name = "boggle snap"
+      @user.class_name.should == "boggle snap"
+    end
+    it "should not set the class name if they're not an admin" do
+      @user = users(:designer)
+      @user.new_class_name = "boggle snap"
+      @user.class_name.should_not == "boggle snap"
+    end
+  end
+  
+  describe "self.unprotected_attributes" do
+    it "should be an array of [:name, :email, :username, :login, :password, :password_confirmation, :locale]" do
+      # Make sure we clean up after anything set in another spec
+      User.instance_variable_set(:@unprotected_attributes, nil)
+      User.unprotected_attributes.should == [:name, :email, :username, :login, :password, :password_confirmation, :locale]
+    end
+  end
+  describe "self.unprotected_attributes=" do
+    it "should set the @@unprotected_attributes variable to the given array" do
+      User.unprotected_attributes = [:password, :email, :other]
+      User.unprotected_attributes.should == [:password, :email, :other]
     end
   end
   
-  describe '#generate_api_key' do
-    it 'should generate an api key on initialize' do
-      @user = User.new
-      @user.api_key.should_not be_nil
+  describe "self.find_for_authentication" do
+    it "should find by username" do
+      @user = User.find_for_authentication({:login => users(:admin).username})
+      @user.should === users(:admin)
     end
   end
   
+end
+
+describe User, "roles" do
+  
+  dataset :devise_users
+  
+  it "should not have a non-existent role" do
+    users(:existing).has_role?(:foo).should be_false
+  end
+  
+  it "should not have a role for which the corresponding method returns false" do
+    users(:existing).has_role?(:designer).should be_false
+    users(:existing).has_role?(:admin).should be_false
+  end
+  
+  it "should have a role for which the corresponding method returns true" do
+    users(:designer).has_role?(:designer).should be_true
+    users(:admin).has_role?(:admin).should be_true
+  end
+  
+  it "should return true for #authorized? userss" do
+    users(:existing).authorized?.should be_true
+    users(:designer).authorized?.should be_true
+    users(:admin).authorized?.should be_true
+  end
+  
+end
+
+describe User, "inheritence" do
+  
+  class Visitor < User; end
+  
+  it "should be scoped by class_name" do
+    v = Visitor.new
+    v.class_name.should == "Visitor"
+  end
+  
 end

data/spec/spec.opts

@@ -1,6 +1,5 @@
 --colour
---format
-progress
---loadby
-mtime
+--format specdoc
+--loadby mtime
 --reverse
+--backtrace

data/spec/spec_helper.rb

@@ -10,9 +10,20 @@ unless defined? RADIANT_ROOT
   end
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
+require 'remarkable_rails'
 
-Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
-
-Spec::Runner.configure do |config|
-  config.mock_with :rr
+unless defined? USERS_ROOT
+  
+  USERS_ROOT = UsersExtension.root + '/spec'
+  
+  Dataset::Resolver.default << (USERS_ROOT + "/datasets")
+  
+  if File.directory?(USERS_ROOT + "/matchers")
+    Dir[USERS_ROOT + "/matchers/**/*.rb"].each {|file| require file }
+  end
+  
+  Spec::Runner.configure do |config|
+    config.mock_with :rr
+  end
+  
 end

data/spec/tags/core_spec.rb

@@ -0,0 +1,128 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Users::Tags::Core, "collection" do
+  
+  it 'should describe these tags' do
+    Users::Tags::Core.tags.sort.should == [
+      'user',
+      'user:if_user',
+      'user:unless_user',
+      'user:if_authorized',
+      'user:unless_authorized',
+      'user:name',
+      'user:login',
+      'user:username',
+      'user:email',
+      'user:class_name'
+    ].sort
+  end
+  
+end
+
+describe Users::Tags::Core do
+
+  dataset :pages, :devise_users
+  
+  before :each do
+    @page = pages(:home)
+    stub(@page).cache? { false }
+    
+    @user = users(:admin)
+    stub(Users::Tags::Helper).current_user(anything) { @user }
+  end
+  
+  describe '<r:user />' do
+  
+    it 'should render <r:user/> if the page is not cached' do
+      tag = %{<r:user>success</r:user>}
+      exp = %{success}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+    it 'should not render <r:user/> if the page is not cached' do
+      stub(@page).cache? { true }
+      
+      tag = %{<r:user>failure</r:user>}
+      exp = %{}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+  end
+  
+  describe '<r:user:if_user />' do
+    
+    it 'should render <r:if_user/> if there is a current user' do
+      tag = %{<r:user:if_user>success</r:user:if_user>}
+      exp = %{success}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+    it 'should not render <r:if_user/> if there is not a current user' do
+      mock(Users::Tags::Helper).current_user(anything) { false }
+      
+      tag = %{<r:user:if_user>failure</r:user:if_user>}
+      exp = %{}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+  end
+  
+  describe '<r:user:unless_user />' do
+    
+    it 'should render <r:unless_user/> if there is not a current user' do
+      mock(Users::Tags::Helper).current_user(anything) { false }
+      
+      tag = %{<r:user:unless_user>success</r:user:unless_user>}
+      exp = %{success}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+    it 'should not render <r:unless_user/> if there is a current user' do
+      tag = %{<r:user:unless_user>failure</r:user:unless_user>}
+      exp = %{}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+  end
+  
+  describe '<r:user:if_authorized />' do
+    
+    it 'should render <r:if_authorized/> if the user is a moderator' do
+      tag = %{<r:user:if_authorized>success</r:user:if_authorized>}
+      exp = %{success}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+    it 'should not render <r:if_authorized/> if the user is not a moderator' do
+      @user = users(:non_admin)
+      tag = %{<r:user:if_authorized>failure</r:user:if_authorized>}
+      exp = %{}
+      
+      @page.should render(tag).as(exp)
+    end
+    
+  end
+  
+  describe '<r:user:* />' do
+    
+    [:name, :login, :username, :email, :class_name].each do |symbol|
+      
+      it "should render <r:user:#{symbol} />" do
+        tag = %{<r:user:#{symbol}/>}
+        exp = @user.send(symbol)
+        
+        @page.should render(tag).as(exp)
+      end
+      
+    end
+    
+  end
+
+end

data/users_extension.rb

@@ -1,16 +1,34 @@
+require 'radiant-users-extension/version'
+require 'devise'
+
 class UsersExtension < Radiant::Extension
-  version YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
-  description "Users allows you to create non-admin users with API access"
+  version RadiantUsersExtension::VERSION
+  description "Adds users to Radiant."
   url "http://github.com/dirkkelly/radiant-users-extension"
-
+  
+  extension_config do |config|    
+    config.gem 'devise'
+  end
+  
   def activate
-    # Tags
-    Page.send :include, Users::Tags::Core
+    Page.send                      :include, Users::Tags::Core
+    
+    SiteController.send            :include, Users::Controllers::SiteController
+    
+    ApplicationController.send     :include, Users::Controllers::ApplicationController
+    
+    Admin::ResourceController.send :include, Users::Controllers::Admin::ResourceController
+    
+    Admin::WelcomeController.send  :include, Users::Controllers::Admin::WelcomeController
+    
+    SessionsController.send        :include, Users::Controllers::Devise::SessionsController
+    PasswordsController.send       :include, Users::Controllers::Devise::PasswordsController
+    ConfirmationsController.send   :include, Users::Controllers::Devise::ConfirmationsController
+    RegistrationsController.send   :include, Users::Controllers::Devise::RegistrationsController
     
-    # Models
-    User.send :include, Users::Models::User
+    Devise::Controllers::InternalHelpers.send :include, Users::Lib::Devise::Controllers::InternalHelpers
     
-    # Controllers
-    ApplicationController.send :include, Users::Lib::LoginSystem
+    Radiant::Config['site.host'] ||= 'localhost:3000'
+    ActionMailer::Base.default_url_options = { :host => Radiant::Config['site.host'] }
   end
 end

metadata

@@ -1,27 +1,58 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-users-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 31098217
+  prerelease: 6
   segments: 
+  - 2
+  - 1
   - 0
-  - 0
-  - 5
-  version: 0.0.5
+  - beta
+  version: 2.1.0.beta
 platform: ruby
 authors: 
-- Christopher Rankin
 - Dirk Kelly
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +08:00
+date: 2011-01-18 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
-description: Users creates support for non-admin users with API access
-email: dk@squaretalent.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :runtime
+  name: radiant
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 0
+        - 9
+        version: 1.0.9
+  type: :runtime
+  name: devise
+  version_requirements: *id002
+description: Makes Radiant better by adding users!
+email: 
+- dk@dirkkelly.com
 executables: []
 
 extensions: []
@@ -29,34 +60,80 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- .gitignore
+- MIT-LICENCE
 - README.md
 - Rakefile
 - VERSION
+- app/helpers/admin/users_helper.rb
+- app/models/administrator.rb
+- app/models/designer.rb
+- app/models/user.rb
+- app/models/visitor.rb
+- app/views/admin/users/_fields.html.haml
+- app/views/admin/users/_form.html.haml
+- app/views/admin/users/remove.html.haml
+- app/views/confirmations/new.html.haml
+- app/views/devise_mailer/confirmation_instructions.html.haml
+- app/views/devise_mailer/reset_password_instructions.html.haml
+- app/views/devise_mailer/unlock_instructions.html.haml
+- app/views/mailer/confirmation_instructions.html.haml
+- app/views/mailer/reset_password_instructions.html.haml
+- app/views/mailer/unlock_instructions.html.haml
+- app/views/passwords/edit.html.haml
+- app/views/passwords/new.html.haml
+- app/views/registrations/edit.html.haml
+- app/views/registrations/new.html.haml
+- app/views/sessions/new.html.haml
+- app/views/shared/_links.html.haml
+- app/views/shared/_version.html.haml
+- app/views/unlocks/new.html.haml
+- config/initializers/devise.rb
+- config/initializers/radiant_config.rb
+- config/initializers/radiant_devise_encryptor.rb
+- config/locales/devise.en.yml
+- config/locales/en.yml
 - config/routes.rb
 - cucumber.yml
-- db/migrate/20100311014641_add_api_key_to_users.rb
-- db/migrate/20100311021835_add_access_to_user.rb
+- db/migrate/20110105024337_change_users_to_devise.rb
+- db/migrate/20110105150917_add_class_name_field.rb
+- db/migrate/20110107032850_move_permissions_to_class.rb
+- db/migrate/20110118103247_change_admin_to_administrator.rb
 - features/support/env.rb
 - features/support/paths.rb
+- lib/login_system.rb
 - lib/radiant-users-extension.rb
+- lib/radiant-users-extension/version.rb
 - lib/tasks/users_extension_tasks.rake
-- lib/users/lib/login_system.rb
+- lib/users/controllers/admin/resource_controller.rb
+- lib/users/controllers/admin/welcome_controller.rb
+- lib/users/controllers/application_controller.rb
+- lib/users/controllers/devise/confirmations_controller.rb
+- lib/users/controllers/devise/passwords_controller.rb
+- lib/users/controllers/devise/registrations_controller.rb
+- lib/users/controllers/devise/sessions_controller.rb
+- lib/users/controllers/single_form_body_styles.rb
+- lib/users/controllers/site_controller.rb
+- lib/users/lib/devise/controllers/internal_helpers.rb
 - lib/users/models/user.rb
 - lib/users/models/user/scoped.rb
 - lib/users/tags/core.rb
+- lib/users/tags/helper.rb
 - lib/users/tags/helpers.rb
 - radiant-users-extension.gemspec
+- spec/datasets/devise_users_dataset.rb
 - spec/datasets/scoped_users_dataset.rb
 - spec/models/user_spec.rb
 - spec/models/visitor_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/tags/core_spec.rb
 - users_extension.rb
 has_rdoc: true
 homepage: http://github.com/dirkkelly/radiant-users-extension
 licenses: []
 
-post_install_message: 
+post_install_message: "\n    Add this to your radiant project with:\n      config.gem 'radiant-users-extension', :version => '2.1.0.beta'\n    "
 rdoc_options: []
 
 require_paths: 
@@ -73,21 +150,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Users Extension for Radiant CMS
+summary: Users for Radiant CMS
 test_files: 
+- features/support/env.rb
+- features/support/paths.rb
+- spec/datasets/devise_users_dataset.rb
 - spec/datasets/scoped_users_dataset.rb
 - spec/models/user_spec.rb
 - spec/models/visitor_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- spec/tags/core_spec.rb