radiant-users-extension 0.0.5 → 2.1.0.beta

data/lib/radiant-users-extension.rb

@@ -1 +1,2 @@
-# Nothing to see here
+module RadiantUsersExtension
+end

data/lib/radiant-users-extension/version.rb

@@ -0,0 +1,3 @@
+module RadiantUsersExtension
+  VERSION = '2.1.0.beta'
+end

data/lib/tasks/users_extension_tasks.rake

@@ -3,14 +3,15 @@ namespace :radiant do
     namespace :users do
       
       desc "Runs the migration of the Users extension"
-      task :migrate => [ :environment, 'radiant:extensions:forms:migrate' ] do
+      task :migrate => :environment do
         require 'radiant/extension_migrator'
         if ENV["VERSION"]
           UsersExtension.migrator.migrate(ENV["VERSION"].to_i)
+          Rake::Task['db:schema:dump'].invoke
         else
           UsersExtension.migrator.migrate
+          Rake::Task['db:schema:dump'].invoke
         end
-        Rake::Task['db:schema:dump'].invoke
       end
       
       desc "Copies public assets of the Users to the instance public/ directory."

data/lib/users/controllers/admin/resource_controller.rb

@@ -0,0 +1,15 @@
+module Users
+  module Controllers
+    module Admin
+      module ResourceController
+      
+        def self.included(base)
+          base.class_eval do
+            before_filter :authenticate_user
+          end
+        end
+      
+      end
+    end
+  end
+end

data/lib/users/controllers/admin/welcome_controller.rb

@@ -0,0 +1,19 @@
+module Users
+  module Controllers
+    module Admin
+      module WelcomeController
+        
+        def self.included(base)
+          base.class_eval do
+            
+            def index
+              redirect_to default_admin_path
+            end
+            
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/users/controllers/application_controller.rb

@@ -0,0 +1,25 @@
+module Users
+  module Controllers
+    module ApplicationController
+      
+      def self.included(base)
+        base.class_eval do
+          
+          private
+          
+          def default_admin_path
+            default_user_path || root_path
+          end
+          
+          def default_user_path
+            return false unless user_signed_in?
+            return '/admin/pages' if user_has_access_to_action?(:index)
+            Radiant::Config["defaults.path.#{current_user.class_name.downcase}"]
+          end
+          
+        end
+      end
+      
+    end
+  end
+end

data/lib/users/controllers/devise/confirmations_controller.rb

@@ -0,0 +1,17 @@
+module Users
+  module Controllers
+    module Devise
+      module ConfirmationsController
+      
+        def self.included(base)
+          include Users::Controllers::SingleFormBodyStyles
+          
+          base.class_eval do
+            skip_before_filter :authenticate_user, :only => [ :new, :create, :show ]
+          end
+        end
+      
+      end
+    end
+  end
+end

data/lib/users/controllers/devise/passwords_controller.rb

@@ -0,0 +1,17 @@
+module Users
+  module Controllers
+    module Devise
+      module PasswordsController
+      
+        def self.included(base)
+          include Users::Controllers::SingleFormBodyStyles
+          
+          base.class_eval do
+            skip_before_filter :authenticate_user, :only => [ :new, :create, :edit, :update ]
+          end
+        end
+      
+      end
+    end
+  end
+end

data/lib/users/controllers/devise/registrations_controller.rb

@@ -0,0 +1,17 @@
+module Users
+  module Controllers
+    module Devise
+      module RegistrationsController
+      
+        def self.included(base)
+          include Users::Controllers::SingleFormBodyStyles
+          
+          base.class_eval do
+            skip_before_filter :authenticate_user, :only => [ :new, :create ]
+          end
+        end
+      
+      end
+    end
+  end
+end

data/lib/users/controllers/devise/sessions_controller.rb

@@ -0,0 +1,17 @@
+module Users
+  module Controllers
+    module Devise
+      module SessionsController
+      
+        def self.included(base)
+          include Users::Controllers::SingleFormBodyStyles
+          
+          base.class_eval do
+            skip_before_filter :authenticate_user, :only => [ :new, :create, :destroy ]
+          end
+        end
+      
+      end
+    end
+  end
+end

data/lib/users/controllers/single_form_body_styles.rb

@@ -0,0 +1,27 @@
+module Users
+  module Controllers
+    module SingleFormBodyStyles
+      
+      def self.included(base)
+        base.class_eval do
+          
+          def set_standard_body_style
+            @body_classes ||= []
+            @body_classes.concat(%w(single_form))
+          end
+          
+          def after_sign_out_path_for(resource)
+            new_user_session_path
+          end
+          
+          def after_sign_in_path_for(resource)
+            # TODO class based redirect
+            default_admin_path
+          end
+          
+        end
+      end
+      
+    end
+  end
+end

data/lib/users/controllers/site_controller.rb

@@ -0,0 +1,13 @@
+module Users
+  module Controllers
+    module SiteController
+      
+      def self.included(base)
+        base.class_eval do
+          skip_before_filter :authenticate_user
+        end
+      end
+      
+    end
+  end
+end

data/lib/users/lib/devise/controllers/internal_helpers.rb

@@ -0,0 +1,31 @@
+module Users
+  module Lib
+    module Devise
+      module Controllers
+        module InternalHelpers
+          
+          def self.included(base)
+            
+            base.class_eval do
+              
+              def set_flash_message(key, kind, now=false)
+                type = [:invalid, :alert, :unauthenticated].include?(kind) ? :error : kind
+                type = [:error].include?(type) ? type : :notice
+                
+                flash[type] = I18n.t(:"#{kind}", 
+                  :scope => [:devise, controller_name.to_sym], :default => kind)
+              end
+              
+              def after_sign_in_path_for(resource)
+                default_admin_path
+              end
+              
+            end
+          end
+          
+        end
+      end
+    end
+  end
+end
+

data/lib/users/tags/core.rb

@@ -2,42 +2,40 @@ module Users
   module Tags
     module Core
       include Radiant::Taggable
-          
+      
       tag 'user' do |tag|
         return if tag.locals.page.cache?
         
-        tag.locals.user = Helpers.current_user(tag)
+        tag.locals.user = Helper.current_user(tag)
         
         tag.expand
       end
       
+      desc %{ will expand if the user is logged in }
       tag 'user:if_user' do |tag|
         tag.expand if tag.locals.user.present?
       end
       
+      desc %{ will expand if the user is not logged in}
       tag 'user:unless_user' do |tag|
         tag.expand unless tag.locals.user.present?
       end
       
+      desc %{ will expand if the user can access radiant }
       tag 'user:if_authorized' do |tag|
-        tag.expand unless tag.locals.user.access.present?
+        tag.expand if tag.locals.user.authorized?
       end
       
+      desc %{ will expand if the user can not access radiant }
       tag 'user:unless_authorized' do |tag|
-        tag.expand if tag.locals.user.access.present?
-      end
-      
-      tag 'user:if_admin' do |tag|
-        tag.expand if tag.locals.user.admin
+        tag.expand unless tag.locals.user.authorized?
       end
       
-      tag 'user:unless_admin' do |tag|
-        tag.expand unless tag.locals.user.admin
-      end
-      
-      [:name, :first_name, :last_name, :login, :email, :access].each do |symbol|
+      [:name, :login, :username, :email, :class_name].each do |symbol|
         desc %{ outputs the #{symbol} of the current user }
         tag "user:#{symbol}" do |tag|
+          return unless tag.locals.user.present?
+          
           tag.locals.user.send(symbol)
         end
       end

data/lib/users/tags/helper.rb

@@ -0,0 +1,13 @@
+module Users
+  module Tags
+    class Helper
+      class << self
+        
+        def current_user(tag)
+          UserActionObserver.current_user
+        end
+        
+      end
+    end
+  end
+end

data/lib/users/tags/helpers.rb

@@ -2,15 +2,9 @@ module Users
   module Tags
     class Helpers
       class << self
-        include ActionView::Helpers::NumberHelper
         
         def current_user(tag)
-          begin
-            user_id = tag.locals.page.request.session['user_id']
-            User.find(user_id)
-          rescue
-            return false
-          end
+          User.find_by_id(tag.locals.page.request.session['user_id'])
         end
         
       end

data/radiant-users-extension.gemspec

@@ -5,60 +5,120 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-users-extension}
-  s.version = "0.0.5"
+  s.version = "2.1.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christopher Rankin", "Dirk Kelly"]
-  s.date = %q{2010-12-14}
-  s.description = %q{Users creates support for non-admin users with API access}
-  s.email = %q{dk@squaretalent.com}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Dirk Kelly"]
+  s.date = %q{2011-01-18}
+  s.description = %q{Makes Radiant better by adding users!}
+  s.email = ["dk@dirkkelly.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.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"
   ]
   s.homepage = %q{http://github.com/dirkkelly/radiant-users-extension}
+  s.post_install_message = %q{
+    Add this to your radiant project with:
+      config.gem 'radiant-users-extension', :version => '2.1.0.beta'
+    }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Users Extension for Radiant CMS}
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Users for Radiant CMS}
   s.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_helper.rb"
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/tags/core_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<radiant>, ["~> 0.9"])
+      s.add_runtime_dependency(%q<devise>, ["~> 1.0.9"])
     else
+      s.add_dependency(%q<radiant>, ["~> 0.9"])
+      s.add_dependency(%q<devise>, ["~> 1.0.9"])
     end
   else
+    s.add_dependency(%q<radiant>, ["~> 0.9"])
+    s.add_dependency(%q<devise>, ["~> 1.0.9"])
   end
 end