spud_core 0.8.15 → 0.8.16

data/app/assets/javascripts/spud/admin/application.js

@@ -11,7 +11,6 @@ Spud = (typeof(Spud) == 'undefined') ? {} : Spud;
 Spud.Admin = (typeof(Spud.Admin) == 'undefined') ? {} : Spud.Admin;
 
 $(document).ready(function() {
-  console.log("HELLO!");
     $('#user_table').dataTable({
       "bJQueryUI": true,
       "sPaginationType": "full_numbers"
@@ -134,15 +133,16 @@ function highdpi_init() {
       }
 
       if(hiDpiSrc) {
-        $.ajax({
-          type: 'HEAD',
-          async: true,
-          element: els[i],
-          url: hiDpiSrc,
-          success: function(message) {
-            this.element.src = this.url;
-          }
-        });
+        els[i].src = hiDpiSrc;
+        // $.ajax({
+        //   type: 'HEAD',
+        //   async: true,
+        //   element: els[i],
+        //   url: hiDpiSrc,
+        //   success: function(message) {
+        //     this.element.src = this.url;
+        //   }
+        // });
       }
 
 

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

@@ -1,5 +1,5 @@
 class Spud::Admin::DashboardController < Spud::Admin::ApplicationController
-  
+
 	def index
 		permission_set = current_user_permissions.collect{|p| p.name}
 		@unsorted_applications = Spud::Core.admin_applications.select{|app| @current_user.super_admin || permission_set.include?(app[:name])}.sort_by{|obj| obj[:order]}
@@ -19,17 +19,16 @@ class Spud::Admin::DashboardController < Spud::Admin::ApplicationController
 		end
 	end
 
-	def switch
-		if params[:multisite_select].blank?
-			# flash[:error] = "Site variable does not exist."
-			session[:admin_site] = nil
-			redirect_to request.referer and return
-		end	
-		if Spud::Core.multisite_config.select{|p| p[:site_id].to_i == params[:multisite_select].to_i}.blank? == false
-			session[:admin_site] = params[:multisite_select].to_i
-		else
-			flash[:error] = "Site does not exist."
-		end
-		redirect_to request.referer and return
-	end
-end
+  def switch
+    if !params[:multisite_select].blank?
+      if Spud::Core.multisite_config.select{|p| p[:site_id].to_i == params[:multisite_select].to_i}.blank? == false
+        session[:admin_site] = params[:multisite_select].to_i
+      else
+        flash[:error] = "Site does not exist."
+      end
+    else
+      session[:admin_site] = nil
+    end
+    redirect_to(back_or_default(!request.referer.blank? ? request.referer : spud_admin_root_path)) and return
+  end
+end

data/app/controllers/spud/application_controller.rb

@@ -61,8 +61,13 @@ class Spud::ApplicationController < ActionController::Base
     end
 
     def redirect_back_or_default(default)
-      redirect_to(session[:return_to] || default)
+      redirect_to(back_or_default(default))
+    end
+
+    def back_or_default(default)
+      result = !session[:return_to].blank? ? session[:return_to] : default
       session[:return_to] = nil
+      return result
     end
 
     def set_time_zone

data/app/helpers/spud/admin/application_helper.rb

@@ -2,7 +2,9 @@ module Spud::Admin::ApplicationHelper
 
   def hidpi_asset(path)
     begin
-      return asset_path(path.gsub(/\.png/,"@2x.png"))
+      return nil if Rails.application.assets.find_asset(path.gsub(/\.png/,"@2x.png")).nil?
+      asset_path = asset_path(path.gsub(/\.png/,"@2x.png"))
+      return asset_path
     rescue
       return nil
     end

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

@@ -5,7 +5,7 @@
 		</span>
 		<h2>
 			<%if @page_thumbnail%>
-				<span class="thumb_wrapper"><%=image_tag(@page_thumbnail,:hidpi_src => asset_path(@page_thumbnail.gsub(/\.png/,"@2x.png")))%></span>
+				<span class="thumb_wrapper"><%=image_tag(@page_thumbnail,:hidpi_src => hidpi_asset(@page_thumbnail))%></span>
 			<%end%>
 			<%=@page_name%>
 		</h2>

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "0.8.15"
+	  VERSION = "0.8.16"
 	end
 end

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

@@ -6,7 +6,7 @@ describe Spud::Admin::DashboardController do
 		  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},
+        {name: "Pages", thumbnail: "/url/to/image", url: "/url/to/app", order: 0}
       ]
 		end
   end
@@ -16,7 +16,7 @@ describe Spud::Admin::DashboardController do
     @user = FactoryGirl.create(:spud_user)
     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
@@ -27,7 +27,7 @@ describe Spud::Admin::DashboardController do
 
       assigns(:admin_applications).collect{|app| app[:name] }.should =~ @user.spud_admin_permissions.collect{|permission| permission.name }
     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))
@@ -37,7 +37,7 @@ describe Spud::Admin::DashboardController do
 
       assigns(:admin_applications).collect{|app| app[:name] }.should_not include(:settings)
     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))
@@ -53,8 +53,62 @@ describe Spud::Admin::DashboardController do
       @user.spud_user_settings.create(:key => "app_order",:value => "Pages,Settings")
       get :index
 
-      assigns(:admin_applications).collect{|app| app[:name] }.should =~ ["Pages","Settings","Blog"] 
+      assigns(:admin_applications).collect{|app| app[:name] }.should =~ ["Pages","Settings","Blog"]
+
+    end
+  end
+
+  describe :switch do
+    before(:each) do
+      @user.super_admin = true
+      @user.spud_admin_permissions.build(FactoryGirl.attributes_for(:spud_admin_permission, :name => "Blog", :access => true))
+      @user.save
+    end
+
+    context "when multisite select is not set" do
+      it "should clear the session admin site" do
+        get :switch, :multisite_select => nil
+        session[:admin_site].should be_blank
+      end
+
+      it "should redirect to the referer" do
+        get :switch, :multisite_select => nil
+        response.should be_redirect
+      end
+    end
+
+    context "when multisite select is set" do
+      context "and the selected site is configured" do
+        before(:each) do
+          Spud::Core.stubs(:multisite_config).returns([{:site_id => 1}])
+        end
+
+        it "should set the session's admin site" do
+          get :switch, :multisite_select => 1
+          session[:admin_site].should == 1
+        end
+
+        it "should redirect" do
+          get :switch, :multisite_select => 1
+          response.should be_redirect
+        end
+      end
+
+      context "and the selected site is not configured" do
+        before(:each) do
+          Spud::Core.stubs(:multisite_config).returns([{:site_id => 2}])
+        end
+
+        it "should set a flash error" do
+          get :switch, :multisite_select => 1
+          flash[:error].should_not be_blank
+        end
 
+        it "should redirect" do
+          get :switch, :multisite_select => 1
+          response.should be_redirect
+        end
+      end
     end
   end
-end
+end

data/spec/controllers/spud/user_sessions_controller_spec.rb

@@ -8,7 +8,7 @@ describe Spud::UserSessionsController do
   describe :new do
   	it "should redirect to setup url if no users exist" do
   		get :new
-		response.should redirect_to(spud_setup_url)   
+		response.should redirect_to(spud_setup_url)
   	end
 
   	it "should render login form if users do exist" do
@@ -21,16 +21,16 @@ describe Spud::UserSessionsController do
 
   describe :create do
   	it "should rerender form when login is invalid" do
-		post :create
-	  	response.should be_success
-	end
-	it "should redirect to root url if login is valid" do
-		u = FactoryGirl.create(:spud_user,:login => "testuser")
-		u.save
-		user_session = {:login => "testuser", :password => "password"}
-		post :create,:spud_user_session => user_session
-	  	response.should redirect_to(root_url)
-	end
+  		post :create
+  	  	response.should be_success
+  	end
+  	it "should redirect to root url if login is valid" do
+  		u = FactoryGirl.create(:spud_user,:login => "testuser")
+  		u.save
+  		user_session = {:login => "testuser", :password => "password"}
+  		post :create,:spud_user_session => user_session
+  	  	response.should redirect_to(root_url)
+  	end
   end
 
   describe :destroy do
@@ -48,6 +48,4 @@ describe Spud::UserSessionsController do
 	    response.should redirect_to("/")
   	end
   end
-
-
-end
+end