tb_core 1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWM5YTRhNTM2YjJkYzEwMzAxMDhmN2EyOGY4ZTljY2Y0ZDE4Y2VlYw==
+    ZTFjY2Q4M2YxNThlMzRjNTVlNDRkYzYyMGM2OTY5NDI1ZGE1ZWY1Ng==
   data.tar.gz: !binary |-
-    MjBjMTgxNTVlNjhjNGUxMDAzNDcyOWZlMjQ2YjJlZTBkYmE4NDc5Mw==
+    OTlhNWEzZGU5MGExMWQ5OTM5ZmJjMTExNTE0YTk3ZWMwN2NmOWQ4Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2ZiOWUzYmRlMmRmMzJmZGZmMzk5NjFjMjlhNTIwODdjZjllMzg4YTdjZDkw
-    NGU4N2RkOTUzY2Y3NWQyZDA1ZTk4YjRiMGQ5OTMxZDVmNmNiM2UxMWZiNDdh
-    NzhiYWNiOTgyZTY4ZTFhNWU5YzkyMWY5Mjk4MDE5OWE5OGUxOWI=
+    ODYyOTM4NWQ4NTI1NzUzMjYyYzkxMzVjYTA5YzAxZjBjNDM3MzMyODVlZTg4
+    YTFhZmE0OTEyOWE0ZTI3MDEwYzYxZTE2NjZhOGIxMjg1M2JlZGY5OTQ3Mzk5
+    YzdjMzNkYzkzOGU4OTQyY2Y1MGI1ODU5M2JlZGM5NzMwMTk1MGM=
   data.tar.gz: !binary |-
-    MTJmYWYyYTZhYzdjMWI5Nzc0ZmQxZjExN2M5YTFhNWVhZDI3NTgyMGQyNDA3
-    ZThlNjQxYWE2MGI0ZTFjOTJiMjZlNjRlNmIwNDg3YTBmMjEwNjZhNTY0ZDQx
-    YTRiYTA5MzA2NWM3MTIyOWE2NjE3M2RjMDdhZDE0ZjQ1YzNkMjk=
+    ZTE0ZjY4NTBhMTFhOWFlMzBmMDU2ODAwZDUxNDRlZmM5OTgxYzE4ZjAxODI2
+    NjM4NDFiN2RlNDc4ZWMyODIyMWQ4ODY0MzlkMTA3ZGNjZDMxZDgwNWNmY2Yw
+    ZDY1NjJjOTZmZjkyMjA0NGNiZDA0NzljNzQ1YmQ0N2I1ZTg1MGU=

data/app/controllers/spud/admin/application_controller.rb

@@ -31,8 +31,8 @@ private
     if !@current_user.super_admin && current_user_permissions.count == 0
       store_location
 			flash[:error] = "User must be an administrator to view this area."
-			redirect_to root_url
-		end
+			redirect_to root_path
+    end
 		return true
 	end
 

data/app/controllers/spud/{password_resets_controller.rb → admin/password_resets_controller.rb}

@@ -1,11 +1,12 @@
-class Spud::PasswordResetsController < Spud::ApplicationController
+class Spud::Admin::PasswordResetsController < Spud::ApplicationController
+
 	before_filter :require_no_user, :only => [:new, :create]
-	before_filter :load_user_using_perishable_token, :only => [:edit, :update]
+	before_filter :load_user_using_perishable_token, :only => [:show, :update]
 
 	layout 'spud/login/application'
 
-	def new
-		render
+	def index
+
 	end
 
 	def create
@@ -14,15 +15,15 @@ class Spud::PasswordResetsController < Spud::ApplicationController
 			Spud::CoreMailer.forgot_password_notification(@user).deliver
 			flash[:notice] = "Instructions to reset your password have been emailed to you. " +
 			"Please check your email."
-			redirect_to new_spud_user_session_url
+			redirect_to spud_admin_login_path
 		else
 			flash[:notice] = "No user was found with that email address"
-			render :action => :new
+			render 'index'
 		end
 	end
 
-	def edit
-		render
+	def show
+
 	end
 
 	def update
@@ -30,13 +31,14 @@ class Spud::PasswordResetsController < Spud::ApplicationController
 		@user.password_confirmation = params[:spud_user][:password_confirmation]
 		if @user.save
 			flash[:notice] = "Password successfully updated"
-			redirect_to new_spud_user_session_url
+			redirect_to spud_admin_login_path
 		else
-			render :action => :edit
+			render 'show'
 		end
 	end
 
 private
+
 	def load_user_using_perishable_token
 		@user = SpudUser.find_using_perishable_token(params[:id])
 		unless @user
@@ -44,7 +46,7 @@ private
 			"If you are having issues try copying and pasting the URL " +
 			"from your email into your browser or restarting the " +
 			"reset password process."
-			redirect_to new_spud_user_session_url
+			redirect_to spud_admin_login_path
 		end
 	end
 end

data/app/controllers/spud/admin/settings_controller.rb

@@ -0,0 +1,27 @@
+class Spud::Admin::SettingsController < Spud::ApplicationController
+	before_filter :require_user
+	layout 'spud/admin/detail'
+
+	def edit
+		if current_user.has_admin_rights?
+			add_breadcrumb "Dashboard", :spud_admin_root_path
+		end
+		add_breadcrumb "Settings", :spud_admin_settings_path
+		@page_thumbnail = "spud/admin/users_thumb.png"
+		@page_name = "Settings"	
+	end
+
+	def update
+		add_breadcrumb "Settings", :spud_admin_settings_path
+		@page_thumbnail = "spud/admin/users_thumb.png"
+		@page_name = "Settings"	
+		if @current_user.update_attributes(params[:spud_user].slice :login,:first_name,:last_name,:email,:password,:password_confirmation,:time_zone)
+			flash[:notice] = "User settings saved successfully."
+			redirect_to spud_admin_root_path
+		else
+			flash[:error] = "There was an error while saving your settings."
+			render 'edit'
+		end
+	end
+
+end

data/app/controllers/spud/{user_sessions_controller.rb → admin/user_sessions_controller.rb}

@@ -1,13 +1,15 @@
-class Spud::UserSessionsController < Spud::ApplicationController
-  before_filter :require_no_user, :only => [:new, :create]
+class Spud::Admin::UserSessionsController < Spud::ApplicationController
+
   before_filter :require_user, :only => :destroy
   layout 'spud/login/application'
+
   def new
-    if SpudUser.all.count == 0
+    if current_user
+      redirect_to spud_admin_root_path
+    elsif SpudUser.all.count == 0
       logger.debug "NO USERS!"
       redirect_to spud_setup_url() and return
     end
-
     @user_session = SpudUserSession.new
   end
   
@@ -15,7 +17,7 @@ class Spud::UserSessionsController < Spud::ApplicationController
     @user_session = SpudUserSession.new(params[:spud_user_session])
     if @user_session.save
       flash[:notice] = "Login successful!"
-      redirect_back_or_default spud_admin_root_path
+      redirect_to spud_admin_root_path
     else
       render :action => :new
     end
@@ -27,7 +29,11 @@ class Spud::UserSessionsController < Spud::ApplicationController
     if !request.referer.blank?
       session[:return_to] = request.referer
     end
-    redirect_back_or_default new_spud_user_session_url
-    
+    redirect_back_or_default spud_admin_login_path
   end
+
+  def legacy_redirect
+    redirect_to spud_admin_login_path
+  end
+
 end

data/app/controllers/spud/application_controller.rb

@@ -1,4 +1,5 @@
 class Spud::ApplicationController < ActionController::Base
+
 	unloadable
 	protect_from_forgery
 	helper_method :current_user_session, :current_user
@@ -8,82 +9,81 @@ class Spud::ApplicationController < ActionController::Base
     before_filter :multisite_caching
   end
   include Spud::ApplicationHelper
-  before_filter :to
-
+  before_filter :set_mailer_default_url
 
-  private
+private
 
-    def to
-      ActionMailer::Base.default_url_options = {:host => request.host_with_port}
-    end
+  def set_mailer_default_url
+    ActionMailer::Base.default_url_options = {:host => request.host_with_port}
+  end
 
-    def current_user_session
-      return @current_user_session if defined?(@current_user_session)
-      @current_user_session = SpudUserSession.find
-    end
+  def current_user_session
+    return @current_user_session if defined?(@current_user_session)
+    @current_user_session = SpudUserSession.find
+  end
 
-    def current_user
-      return @current_user if defined?(@current_user)
-      @current_user = current_user_session && current_user_session.spud_user
-    end
+  def current_user
+    return @current_user if defined?(@current_user)
+    @current_user = current_user_session && current_user_session.spud_user
+  end
 
-    def current_user_permissions
-      return @current_user_permissions if defined?(@current_user_permissions)
-      @current_user_permissions = current_user.spud_admin_permissions.where(:access => true).all
-    end
+  def current_user_permissions
+    return @current_user_permissions if defined?(@current_user_permissions)
+    @current_user_permissions = current_user.spud_admin_permissions.where(:access => true).all
+  end
 
-    def require_user
-      unless current_user
-        store_location
-        flash[:notice] = "You must be logged in to access this page"
-        redirect_to new_spud_user_session_url
-        return false
-      end
-      return true
-    end
-
-    def require_no_user
-      if current_user
-        store_location
-        flash[:notice] = "You must be logged out to access this page"
-        redirect_to root_url
-        return false
-      end
+  def require_user
+    unless current_user
+      store_location
+      flash[:notice] = "You must be logged in to access this page"
+      redirect_to spud_admin_login_path
+      return false
     end
+    return true
+  end
 
-    def store_location
-      session[:return_to] = request.url
+  def require_no_user
+    if current_user
+      store_location
+      flash[:notice] = "You must be logged out to access this page"
+      redirect_to root_path
+      return false
     end
+  end
 
-    def redirect_back_or_default(default)
-      redirect_to(back_or_default(default))
-    end
+  def store_location
+    session[:return_to] = request.url
+  end
 
-    def back_or_default(default)
-      result = !session[:return_to].blank? ? session[:return_to] : default
-      session[:return_to] = nil
-      return result
-    end
+  def redirect_back_or_default(default)
+    redirect_to(back_or_default(default))
+  end
 
-    def set_time_zone
-      old_time_zone = Time.zone
-      Time.zone = current_user.time_zone if current_user and current_user.time_zone.blank? == false
-      yield
-    ensure
-      Time.zone = old_time_zone
-    end
+  def back_or_default(default)
+    result = !session[:return_to].blank? ? session[:return_to] : default
+    session[:return_to] = nil
+    return result
+  end
 
-    def multisite_caching
-      if Spud::Core.multisite_mode_enabled
-        @old_cache_directory = Rails.application.config.action_controller.page_cache_directory
-        if(@old_cache_directory.blank?)
-          @old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
-        end
-        site_config = Spud::Core.site_config_for_host request.host_with_port
+  def set_time_zone
+    old_time_zone = Time.zone
+    Time.zone = current_user.time_zone if current_user and current_user.time_zone.blank? == false
+    yield
+  ensure
+    Time.zone = old_time_zone
+  end
 
-        self.class.page_cache_directory = File.join(@old_cache_directory.to_s,site_config[:short_name].to_s.downcase)
-        logger.debug "Cache directory set to: #{Rails.application.config.action_controller.page_cache_directory}"
+  def multisite_caching
+    if Spud::Core.multisite_mode_enabled
+      @old_cache_directory = Rails.application.config.action_controller.page_cache_directory
+      if(@old_cache_directory.blank?)
+        @old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
       end
+      site_config = Spud::Core.site_config_for_host request.host_with_port
+
+      self.class.page_cache_directory = File.join(@old_cache_directory.to_s,site_config[:short_name].to_s.downcase)
+      logger.debug "Cache directory set to: #{Rails.application.config.action_controller.page_cache_directory}"
     end
+  end
 
 end

data/app/controllers/spud/setup_controller.rb

@@ -5,14 +5,14 @@ class Spud::SetupController < Spud::ApplicationController
 		@page_name = "First Time Setup"
 		if SpudUser.count != 0
 				flash[:error] = "Access Denied! This wizard may only be executed when the database is empty."
-				redirect_to new_spud_user_session_url and return
+				redirect_to spud_admin_login_path and return
 		end
 
 		if request.post?
 			@user = SpudUser.new(:login => params[:login],:email => params[:email],:password => params[:password],:password_confirmation => params[:password_confirmation])
 			@user.super_admin = true
 			if @user.save
-				redirect_back_or_default(new_spud_user_session_url) and return
+				redirect_back_or_default(spud_admin_login_path) and return
 			end
 
 			flash[:error] = "Error creating administrative account!"

data/app/mailers/spud/core_mailer.rb

@@ -3,7 +3,7 @@ class Spud::CoreMailer < ActionMailer::Base
 
   def forgot_password_notification(user)
   	@user = user
-  	@url = edit_spud_password_reset_url(:id => user.perishable_token)
+    @url = spud_admin_password_reset_url(user.perishable_token)
   	# @url = "/spud/password_resets/#{user.perishable_token}/edit"
   	  	mail(:from =>Spud::Core.from_address,:to => user.email, :subject => "Forgot Password Request from #{Spud::Core.config.site_name}")
 

data/app/views/layouts/spud/admin/application.html.erb

@@ -12,9 +12,10 @@
 	<%=link_to spud_admin_root_url do%>
     <h1><%= Spud::Core.config.site_name %> Admin</h1>
   <%end%>
-
 	<div id="user_meta">
-		<span class="greeting">Hello <%=@current_user.full_name%></span>&nbsp;|&nbsp;<%=link_to "Settings", spud_settings_path%>&nbsp;|&nbsp;<%=link_to "Logout",spud_user_session_url,:method => :delete%></a>
+		<span class="greeting">Hello <%= @current_user.full_name %></span> |
+    <%=link_to "Settings", spud_admin_settings_path%> |
+    <%=link_to "Logout",spud_admin_logout_path %>
 	</div>
   <%if Spud::Core.multisite_mode_enabled == true%>
     <div id="multisite_switcher" class="right_floated">

data/app/views/spud/{password_resets/new.html.erb → admin/password_resets/index.html.erb}

@@ -1,6 +1,6 @@
 <div class="login-form">
 	<h1>Forgot Password</h1>
-	<%= form_tag spud_password_resets_path do  %>
+	<%= form_tag spud_admin_password_resets_path do  %>
 	  	  
 	  <div class="field-group">
 		  <%= label_tag :email %>

data/app/views/spud/{password_resets/edit.html.erb → admin/password_resets/show.html.erb}

@@ -1,6 +1,6 @@
 <div class="login-form">
-	<h1>Spud CMS Admin</h1>
-	<%= form_for @user, url: spud_password_reset_path(:id => @user.perishable_token) do |f| %>
+	<h1>Password Reset</h1>
+	<%= form_for @user, url: spud_admin_password_reset_path(:id => @user.perishable_token) do |f| %>
 	  <% if flash[:notice] %>
 	  <div class="alert alert-success">
 	    <%= flash[:notice] %>
@@ -22,4 +22,4 @@
 	  </div>
 
 	<% end %>
-</div>
+</div>

data/app/views/spud/{users → admin/settings}/_form.html.erb

@@ -1,4 +1,4 @@
-<%=error_messages_for f.object%>
+<%= error_messages_for f.object %>
 <fieldset>
   <legend>User Details</legend>
 

data/app/views/spud/admin/settings/edit.html.erb

@@ -0,0 +1,8 @@
+<p>Fields marked with * are required and must be filled out.</p>
+
+<%= form_for @current_user, :url => spud_admin_settings_path, :method => :put, :html => {:class => "form-horizontal"} do |f| %>
+  <%= render :partial => "form", :locals => {:f => f} %>
+  <div class="form-actions">
+  	<%= f.submit "Save Settings", :class=>"btn btn-primary"%> or <%=link_to "cancel",request.referer,:class => "btn" %>
+  </div>
+<% end %>

data/app/views/spud/{user_sessions → admin/user_sessions}/new.html.erb

@@ -1,6 +1,6 @@
 <div class="login-form">
-	<h1>Spud CMS Admin</h1>
-	<%= form_for @user_session, url: spud_user_session_path do |f| %>
+	<h1>Login</h1>
+	<%= form_for @user_session, :url => spud_admin_login_path do |f| %>
 	  <% if flash[:notice] %>
 	  <div class="alert alert-success">
 	    <%= flash[:notice] %>
@@ -20,7 +20,7 @@
 	  	<%= f.check_box :remember_me %> <%= f.label :remember_me, class: 'inline' %>
 	  </div>
 	  <div class="field-group">
-	  	<%= f.submit "Login" %> or <%=link_to "Forgot Password?",new_spud_password_reset_url%>
+	  	<%= f.submit "Login" %> or <%=link_to "Forgot Password?", spud_admin_password_resets_path %>
 	  </div>
 
 	<% end %>

data/config/routes.rb

@@ -1,18 +1,27 @@
 Rails.application.routes.draw do
-   namespace :spud do
-	   	resource :user_session
-	   	resource :user
-	   	match 'settings' => "users#settings"
-         match 'save_key' => "users#save_setting"
-   		namespace :admin do
-   			root :to => "dashboard#index"
-   			resources :users
-            match 'switch' => "dashboard#switch"
-   		end
-         resource :sitemap,:only => [:show]
-         resources :password_resets
-	   	match 'setup' => 'setup#index'
-   end
+
+  namespace :spud, :path => '/' do
+    namespace :admin do
+
+      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'
+
+      get 'settings' => 'settings#edit', :as => 'settings'
+      put 'settings' => 'settings#update'
+
+      root :to => "dashboard#index"
+      resources :users
+      match 'switch' => "dashboard#switch"
+    end
+
+    resource :sitemap, :only => [:show]
+
+    match 'setup' => 'setup#index'
+  end
    
-end
+  get 'spud/admin' => 'spud/admin/user_sessions#legacy_redirect'
 
+end

data/lib/spud_core/configuration.rb

@@ -2,7 +2,12 @@ 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 => "/spud/admin/users",:order => 100}]
+    self.admin_applications = [{
+      :name => "Users",
+      :thumbnail => "spud/admin/users_thumb.png",
+      :url => '/admin/users',
+      :order => 100
+    }]
     self.site_name = "Company Name"
     self.site_id = 0
     self.short_name = 'default'

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "1.0"
+	  VERSION = "1.0.1"
 	end
 end

data/spec/controllers/spud/admin/application_controller_spec.rb

@@ -33,7 +33,7 @@ describe Spud::Admin::ApplicationController do
       @session.destroy
       get :index
       
-      response.should redirect_to(new_spud_user_session_url)
+      response.should redirect_to(spud_admin_login_path)
     end
     
     it "should redirect to the root for a user without administrative priviledges" do

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

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe Spud::PasswordResetsController do
+describe Spud::Admin::PasswordResetsController do
   let(:user) { FactoryGirl.build(:spud_user, :id => 1) }
 
   context :get do
-    describe :new do
+    describe :index do
       it "should return success" do
-        get :new
+        get :index
         response.should be_success
       end
     end
 
-    describe :edit do
+    describe :show do
       context "with a valid id" do
         before(:all) do
           SpudUser.stubs(:find_using_perishable_token).returns(user)
         end
 
         it "should render the edit form" do
-          get :edit, :id => 1
+          get :show, :id => 1
           response.should be_success
         end
       end
@@ -29,8 +29,8 @@ describe Spud::PasswordResetsController do
         end
 
         it "should redirect to the login form" do
-          get :edit, :id => user.id
-          response.should redirect_to(new_spud_user_session_url)
+          get :show, :id => user.id
+          response.should redirect_to(spud_admin_login_path)
         end
       end
     end
@@ -52,7 +52,7 @@ describe Spud::PasswordResetsController do
 
         it "should redirect to the login form" do
           post :create, :email => user.email
-          response.should redirect_to(new_spud_user_session_url)
+          response.should redirect_to(spud_admin_login_path)
         end
       end
 
@@ -62,7 +62,7 @@ describe Spud::PasswordResetsController do
         end
         it "should re-render the password reset form" do
           post :create, :email => "invalid@email.com"
-          response.should render_template("new")
+          response.should render_template("index")
         end
       end
     end
@@ -78,14 +78,14 @@ describe Spud::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(new_spud_user_session_url)
+          response.should redirect_to(spud_admin_login_path)
         end
       end
 
       context "with an invalid password entry" do
         it "should re-render the password form" do
           post :update, invalid_data
-          response.should render_template("edit")
+          response.should render_template("show")
         end
       end
     end

data/spec/controllers/spud/{users_controller_spec.rb → admin/settings_controller_spec.rb}

@@ -1,27 +1,24 @@
 require 'spec_helper'
 
-describe Spud::UsersController do
+describe Spud::Admin::SettingsController do
   before(:each) do
     activate_authlogic
     SpudUserSession.create(FactoryGirl.build(:spud_user))
   end
   
-  describe :settings do
+  describe :edit do
     it "should respond with success" do
-      get :settings
-      
+      get :edit
       response.should be_success
     end
     
     it "should have a page thumbnail" do
-      get :settings
-      
+      get :edit
       assigns(:page_thumbnail).should_not be_blank
     end
     
     it "should have a page name" do
-      get :settings
-      
+      get :edit
       assigns(:page_name).should_not be_blank
     end
   end
@@ -55,15 +52,4 @@ describe Spud::UsersController do
     end
   end
 
-  describe :save_setting do
-    it "should fail if no params are passed" do
-      get :save_setting
-      response.should_not be_success
-    end
-
-    it "should save key value pair when passed" do
-      get :save_setting,:key => "test",:value => "testval"
-      response.should be_success
-    end
-  end
 end