tb_core 1.0.2 → 1.1.0

data/app/views/password_resets/show.html.erb

@@ -0,0 +1,26 @@
+<div class="login-form">
+	<h1>Password Reset</h1>
+	<%= form_for @user, url: password_reset_path(:id => @user.perishable_token) do |f| %>
+	  <% if @user.errors.any? %>
+    <div class="form-errors">
+      <h2>Please correct the following <%= pluralize(@user.errors.size, 'error') %>:</h2>
+      <ul>
+        <% @user.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+	  <div class="field-group">
+	  	<%= f.label :password %>
+	  	<%= f.password_field :password %>
+	  </div>
+	  <div class="field-group">
+	  	<%= f.label :password_confirmation %>
+	  	<%= f.password_field :password_confirmation %>
+	  </div>
+	  <div class="field-group">
+	  	<%= f.submit "Reset Password" %>
+	  </div>
+	<% end %>
+</div>

data/app/views/user_sessions/new.html.erb

@@ -0,0 +1,25 @@
+<h1>Login</h1>
+
+<%= form_for @user_session, :url => login_path, :html => {:class => 'spud-login-form'} do |f| %>
+  <% if @user_session.errors.any? %>
+    <div class="form-errors">
+      <h2>Please correct the following <%= pluralize(@user_session.errors.size, 'error') %>:</h2>
+      <ul>
+        <% @user_session.errors.full_messages.each do |msg| %>
+          <li><%= msg %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="form-row">
+    <%= f.label :login %>
+    <%= f.text_field :login %>
+  </div>
+  <div class="form-row">
+    <%= f.label :password %>
+    <%= f.password_field :password %>
+  </div>
+  <div class="form-row">
+    <%= f.submit "Login", :class => 'btn btn-primary' %> or <%=link_to "Forgot Password?", password_resets_path %>
+  </div>
+<% end %>

data/config/routes.rb

@@ -1,27 +1,34 @@
 Rails.application.routes.draw do
 
-  namespace :spud, :path => '/' do
-    namespace :admin do
+  namespace :admin do
 
-      get 'login' => 'user_sessions#new', :as => 'login'
-      post 'login' => 'user_sessions#create'
-      match 'logout' => 'user_sessions#destroy', :as => 'logout'
+    get 'login' => 'user_sessions#new', :as => 'login'
+    post 'login' => 'user_sessions#create'
+    match 'logout' => 'user_sessions#destroy', :as => 'logout'
 
-      resources :password_resets, :only => [:index, :create, :show, :update], :path => 'forgot'
+    resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
 
-      get 'settings' => 'settings#edit', :as => 'settings'
-      put 'settings' => 'settings#update'
+    get 'settings' => 'settings#edit', :as => 'settings'
+    put 'settings' => 'settings#update'
 
-      root :to => "dashboard#index"
-      resources :users
-      match 'switch' => "dashboard#switch"
-    end
+    root :to => "dashboard#index"
+    resources :users, :controller
+    resources :roles
 
-    resource :sitemap, :only => [:show]
+    match 'switch' => "dashboard#switch"
 
-    match 'setup' => 'setup#index'
+    get 'setup' => 'setup#new'
+    post 'setup' => 'setup#create'
   end
-   
+
+  resource :sitemap, :only => [:show]
+  
+  # Non-admin login paths 
+  get 'login' => 'user_sessions#new', :as => 'login'
+  post 'login' => 'user_sessions#create'
+  match 'logout' => 'user_sessions#destroy', :as => 'logout'
+  resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
+
   get 'spud/admin' => 'spud/admin/user_sessions#legacy_redirect'
 
 end

data/db/migrate/20130620143010_create_spud_roles.rb

@@ -0,0 +1,10 @@
+class CreateSpudRoles < ActiveRecord::Migration
+  def change
+    create_table :spud_roles do |t|
+      t.string :name
+      t.timestamps
+    end
+    add_column :spud_users, :spud_role_id, :integer
+    add_index :spud_users, :spud_role_id
+  end
+end

data/db/migrate/20130620143941_create_spud_permissions.rb

@@ -0,0 +1,10 @@
+class CreateSpudPermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_permissions do |t|
+      t.string :name, :null => false
+      t.string :tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_permissions, :tag, :unique => true
+  end
+end

data/db/migrate/20130620151132_create_spud_role_permissions.rb

@@ -0,0 +1,11 @@
+class CreateSpudRolePermissions < ActiveRecord::Migration
+  def change
+    create_table :spud_role_permissions do |t|
+      t.integer :spud_role_id, :null => false
+      t.string :spud_permission_tag, :null => false
+      t.timestamps
+    end
+    add_index :spud_role_permissions, :spud_role_id
+    add_index :spud_role_permissions, :spud_permission_tag
+  end
+end

data/db/migrate/20130620163144_drop_spud_admin_permissions.rb

@@ -0,0 +1,15 @@
+class DropSpudAdminPermissions < ActiveRecord::Migration
+  def up
+    drop_table :spud_admin_permissions
+  end
+
+  def down
+    create_table :spud_admin_permissions do |t|
+      t.integer :user_id
+      t.string :name
+      t.boolean :access
+      t.string :scope
+      t.timestamps
+    end
+  end
+end

data/db/seeds.rb

@@ -0,0 +1,3 @@
+role = SpudRole.where(:name => 'User Moderator').first || SpudRole.new(:name => 'User Moderator')
+role.permission_tags = ['users.manage', 'users.roles']
+role.save()

data/lib/spud_core/belongs_to_app.rb

@@ -1,59 +1,46 @@
 module Spud::BelongsToApp
-	extend ActiveSupport::Concern
-	included do
-		extend ClassMethods
-	end
-    # class Config
-    # 	attr_reader :page_application
-    # 	attr_reader :page_thumbnail
-    # 	def initialize(app,thumb)
-    # 		@page_application = app
-    # 		@page_thumbnail = thumb
-    # 	end
-    # end
-	module ClassMethods
-		def belongs_to_spud_app(name=nil,options={})
-			@page_title = options[:page_title]
-			Spud::Core.admin_applications.each do |app|
-					if app[:name].parameterize.underscore.to_sym == name
-						@page_application = app
-						break
-					end
-				end
-			self.class_eval do
+  extend ActiveSupport::Concern
 
-				before_filter { |controller|
-					@page_thumbnail = self.class.page_application[:thumbnail]
-          @application_name = self.class.page_application[:name]
-					@page_name = self.class.page_title
-
-					if current_user.super_admin == false
-						permission = current_user_permissions.select{|perm| perm.name == @application_name}
-						if permission.blank?
-							flash[:error] = "You do not have access to this area."
-							redirect_to spud_admin_root_url and return
-						end
-					end
-
-					if controller.action_name == 'new' || controller.action_name == 'create'
-						@page_name = "New #{@page_name.singularize}"
-					elsif controller.action_name == 'edit' || controller.action_name == 'update'
-							@page_name = "Edit #{@page_name.singularize}"
-					elsif controller.action_name == 'show'
-						@page_name = "Show #{@page_name.singularize}"
-					end
+  included do
+    extend ClassMethods
+  end
 
-				}
+  module ClassMethods
+    def belongs_to_spud_app(name=nil,options={})
+      @page_title = options[:page_title]
+      Spud::Core.admin_applications.each do |app|
+        if app[:name].parameterize.underscore.to_sym == name
+          @page_application = app
+          break
+        end
+      end
+      self.class_eval do
+        before_filter do |controller|
+          @page_thumbnail = self.class.page_application[:thumbnail]
+          @application_name = self.class.page_application[:name]
+          @page_name = self.class.page_title
 
-			end
+          if !current_user.can_view_app?(self.class.page_application)
+            raise Spud::AccessDeniedError.new("You do not have access to this area.")
+          end
 
-		end
-		def page_application
+          if controller.action_name == 'new' || controller.action_name == 'create'
+            @page_name = "New #{@page_name.singularize}"
+          elsif controller.action_name == 'edit' || controller.action_name == 'update'
+              @page_name = "Edit #{@page_name.singularize}"
+          elsif controller.action_name == 'show'
+            @page_name = "Show #{@page_name.singularize}"
+          end
+        end
+      end
+    end
+    
+    def page_application
       @page_application || self.superclass.instance_variable_get('@page_application')
     end
 
     def page_title
-    	@page_title || self.superclass.instance_variable_get('@page_title') || page_application[:name]
+      @page_title || self.superclass.instance_variable_get('@page_title') || page_application[:name]
     end
-	end
+  end
 end

data/lib/spud_core/configuration.rb

@@ -1,13 +1,8 @@
 module Spud
   module Core
     include ActiveSupport::Configurable
-    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config,:from_address,:site_id,:short_name, :javascripts,:stylesheets, :admin_javascripts, :admin_stylesheets
-    self.admin_applications = [{
-      :name => "Users",
-      :thumbnail => "spud/admin/users_thumb.png",
-      :url => '/admin/users',
-      :order => 100
-    }]
+    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config,:from_address,:site_id,:short_name, :javascripts,:stylesheets, :admin_javascripts, :admin_stylesheets, :permissions
+    self.admin_applications = []
     self.site_name = "Company Name"
     self.site_id = 0
     self.short_name = 'default'
@@ -17,9 +12,9 @@ module Spud
     self.multisite_mode_enabled = false
     self.multisite_config = []
     self.from_address = "no-reply@spudengine.com"
-
-    self.admin_javascripts = ['spud/admin/application']
-    self.admin_stylesheets = ['spud/admin/application']
+    self.permissions = []
+    self.admin_javascripts = ['admin/application']
+    self.admin_stylesheets = ['admin/application']
 
     def self.site_config_for_host(host)
       configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}

data/lib/spud_core/engine.rb

@@ -14,6 +14,7 @@ module Spud
   module Core
     class Engine < ::Rails::Engine
       require "#{root}/lib/spud_core/belongs_to_app"
+      require "#{root}/lib/spud_core/exceptions"
       require "#{root}/lib/spud_core/searchable"
       require "#{root}/lib/responds_to_parent"
 
@@ -27,7 +28,7 @@ module Spud
 
       engine_name :tb_core
 
-      initializer :assets do |config|
+      initializer 'tb_core.assets' do |config|
         Rails.application.config.assets.precompile += [
           "tiny_mce/plugins/**/*",
           "tiny_mce/themes/**/*",
@@ -38,18 +39,42 @@ module Spud
         ]
       end
 
-      initializer :controller_overrides do |config|
-     	  ActionController::Base.class_eval do
+      initializer 'tb_core.controller_overrides' do |config|
+         ActionController::Base.class_eval do
           include Spud::BelongsToApp
-     	  end
+         end
       end
 
-      initializer :model_overrides do |config|
+      initializer 'tb_core.model_overrides' do |config|
         ActiveRecord::Base.class_eval do
           include Spud::Searchable
         end
       end
 
+      initializer 'tb_core.admin', :after => :admin do |config|
+        # Translate Hash configured permissions into SpudPermission objects
+        Spud::Core.permissions.collect! do |p|
+          if p.class == Hash
+            p = SpudPermission.new(p[:tag], p[:name], p[:apps])
+          end
+          p
+        end
+        # Append Users admin module
+        Spud::Core.config.admin_applications.unshift({
+          :name => "Users",
+          :thumbnail => "admin/users_thumb.png",
+          :url => '/admin/users',
+          :order => 100
+        })
+        # Create default permissions for modules
+        Spud::Core.admin_applications.each do |admin_application|
+          admin_application[:key] ||= admin_application[:name].gsub(' ', '_').downcase.to_sym
+          tag = "admin.#{admin_application[:key]}.full_access"
+          name = "#{admin_application[:name]} admin"
+          apps = [admin_application[:key]]
+          Spud::Core.permissions.push(SpudPermission.new(tag, name, apps))
+        end
+      end
     end
   end
-end
+end

data/lib/spud_core/exceptions.rb

@@ -0,0 +1,7 @@
+class Spud::AccessDeniedError < StandardError
+
+end
+
+class Spud::NotFoundError < StandardError
+
+end

data/lib/spud_core/searchable.rb

@@ -1,11 +1,11 @@
 module Spud::Searchable
-	extend ActiveSupport::Concern
-	included do
-		extend ClassMethods
-	end
-	module ClassMethods
-		def spud_searchable
-			# puts "Place Holder For #{self.name}"
-		end
-	end
+  extend ActiveSupport::Concern
+  included do
+    extend ClassMethods
+  end
+  module ClassMethods
+    def spud_searchable
+      # puts "Place Holder For #{self.name}"
+    end
+  end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
-	module Core
-	  VERSION = "1.0.2"
-	end
+  module Core
+    VERSION = "1.1.0"
+  end
 end

data/spec/controllers/{spud/admin → admin}/application_controller_spec.rb

@@ -1,16 +1,17 @@
 require 'spec_helper'
 
-describe Spud::Admin::ApplicationController do
+describe Admin::ApplicationController do
   
   
   before :each do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)
+    @role = FactoryGirl.create(:spud_role)
     @session = SpudUserSession.create(@user)
   end
   
-  describe :require_admin_user do
-    controller(Spud::Admin::ApplicationController) do
+  describe :require_user do
+    controller(Admin::ApplicationController) do
       def index
         render :nothing => true
       end
@@ -23,7 +24,10 @@ describe Spud::Admin::ApplicationController do
     end
     
     it "should respond successfully if the current user has admin permissions" do
-      @user.spud_admin_permissions.create(:name => "pages", :access => true)
+      @role.permission_tags = ['admin.users.full_access']
+      @role.save()
+      @user.role = @role
+      @user.save()
       get :index
       
       response.should be_success
@@ -33,12 +37,12 @@ describe Spud::Admin::ApplicationController do
       @session.destroy
       get :index
       
-      response.should redirect_to(spud_admin_login_path)
+      response.should redirect_to(admin_login_path)
     end
     
     it "should redirect to the root for a user without administrative priviledges" do
       @user.super_admin = false
-      @user.spud_admin_permissions = []
+      @user.role = nil
       @user.save
       get :index
       

data/spec/controllers/{spud/admin → admin}/dashboard_controller_spec.rb

@@ -1,61 +1,51 @@
 require 'spec_helper'
 
-describe Spud::Admin::DashboardController do
+describe Admin::DashboardController do
   before(:all) do
-		Spud::Core.configure do |config|
-		  config.admin_applications = [
-        {name: "Blog", thumbnail: "/url/to/image", url: "/url/to/app", order: 0},
-        {name: "Settings", thumbnail: "/url/to/image", url: "/url/to/app", order: 0},
-        {name: "Pages", thumbnail: "/url/to/image", url: "/url/to/app", order: 0}
-      ]
-		end
+    Spud::Core.admin_applications += [{
+      :name => 'Test App',
+      :url => '/test/app',
+      :permissions => ["admin.test_app.full_access"]
+    }]
   end
 
   before(:each) do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)
+    @user.role = FactoryGirl.create(:spud_role)
+    @user.save()
     SpudUserSession.create(@user)
   end
 
   describe :index do
     it "should display applications the current user has access to given that the current user is not a super admin" do
       @user.super_admin = false
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Blog", :access => true))
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Pages", :access => true))
-      @user.save
+      @user.role.permission_tags = ['admin.users.full_access']
+      @user.role.save()
+      @user.save()
       get :index
 
-      assigns(:admin_applications).collect{|app| app[:name] }.should =~ @user.spud_admin_permissions.collect{|permission| permission.name }
+      assigns(:admin_applications).collect{|app| app[:name] }.should =~ ['Users']
     end
 
     it "should not display applications the current user does not have access to given that the current user is not a super admin" do
       @user.super_admin = false
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Blog", :access => true))
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Pages", :access => true))
-      @user.save
+      @user.role.permission_tags = ['admin.users.full_access']
+      @user.role.save()
+      @user.save()
       get :index
 
-      assigns(:admin_applications).collect{|app| app[:name] }.should_not include(:settings)
+      assigns(:admin_applications).collect{|app| app[:name] }.should_not include(:test_app)
     end
 
     it "should display all the applications despite the users permissions given the current user is a super admin" do
       @user.super_admin = true
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Blog", :access => true))
+      @user.role = nil
       @user.save
       get :index
 
       assigns(:admin_applications).collect{|app| app[:name] }.should =~ Spud::Core.admin_applications.collect{|app| app[:name] }
     end
-
-    it "should display applications in order of user preference if available" do
-      @user.super_admin = true
-      @user.save
-      @user.spud_user_settings.create(:key => "app_order",:value => "Pages,Settings")
-      get :index
-
-      assigns(:admin_applications).collect{|app| app[:name] }.should =~ ["Pages","Settings","Blog"]
-
-    end
   end
 
   describe :switch do
@@ -65,7 +55,6 @@ describe Spud::Admin::DashboardController do
         config.multisite_mode_enabled = true
       end
       @user.super_admin = true
-      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Blog", :access => true))
       @user.save
     end
 
@@ -90,7 +79,6 @@ describe Spud::Admin::DashboardController do
             config.multisite_config = [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
 
           end
-          # Spud::Core.stubs(:multisite_config).returns([{:site_id => 1}])
         end
 
         it "should set the session's admin site" do

data/spec/controllers/{spud/admin → admin}/password_reset_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Admin::PasswordResetsController do
+describe Admin::PasswordResetsController do
   let(:user) { FactoryGirl.build(:spud_user, :id => 1) }
 
   context :get do
@@ -30,7 +30,7 @@ describe Spud::Admin::PasswordResetsController do
 
         it "should redirect to the login form" do
           get :show, :id => user.id
-          response.should redirect_to(spud_admin_login_path)
+          response.should redirect_to(admin_login_path)
         end
       end
     end
@@ -46,13 +46,13 @@ describe Spud::Admin::PasswordResetsController do
         end
 
         it "should trigger the password notificiation" do
-          Spud::CoreMailer.expects(:forgot_password_notification).returns(stub(:deliver))
+          CoreMailer.expects(:forgot_password_notification).returns(stub(:deliver))
           post :create, :email => user.email
         end
 
         it "should redirect to the login form" do
           post :create, :email => user.email
-          response.should redirect_to(spud_admin_login_path)
+          response.should redirect_to(admin_login_path)
         end
       end
 
@@ -78,7 +78,7 @@ describe Spud::Admin::PasswordResetsController do
       context "with valid password entry" do
         it "should save and redirect to the login form" do
           post :update, valid_data
-          response.should redirect_to(spud_admin_login_path)
+          response.should redirect_to(admin_login_path)
         end
       end
 

data/spec/controllers/admin/settings_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Admin::SettingsController do
+  before(:each) do
+    activate_authlogic
+    user = FactoryGirl.build(:spud_user)
+    user.super_admin = true
+    SpudUserSession.create(user)
+  end
+  
+  describe :edit do
+    it "should respond with success" do
+      get :edit
+      response.should be_success
+    end
+  end
+  
+  describe :update do
+    it "should redirect to the admin root with a successful update" do
+      put :update, :spud_user => {:first_name => "Mike"}
+      response.should redirect_to(admin_root_path)
+    end
+    
+    it "should put a message in the flash notice" do
+      put :update, :spud_user => {:first_name => "Mike"}
+      flash[:notice].should_not be_blank
+    end
+  end
+
+end

data/spec/controllers/admin/setup_controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Admin::SetupController do
+  
+  describe :new do
+    it "should be successful" do
+      get :new
+      
+      response.should be_success
+    end
+
+    it "should set a flash error message when a spud user exists" do
+      SpudUser.stubs(:count).returns(1)
+      get :new
+      
+      flash[:error].should_not be_blank
+    end
+    
+    it "should redirect to the admin login form when there is already a user" do
+      SpudUser.stubs(:count).returns(1)
+      get :new
+      
+      response.should redirect_to(admin_login_path)
+    end
+  end
+
+  describe :create do
+    it "should create a new user" do
+      lambda {
+        post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
+      }.should change(SpudUser, :count).by(1)
+    end
+    
+    it "should redirect to the admin dashboard when first admin user has been created" do
+      post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
+      response.should redirect_to(admin_root_path)
+    end
+  end
+end