spud_core 0.8.13 → 0.8.15

data/README.markdown

@@ -0,0 +1,62 @@
+[![Build Status](https://secure.travis-ci.org/davydotcom/spud_core_admin.png)](http://travis-ci.org/davydotcom/spud_core_admin)
+
+Spud Core Admin
+===============
+
+Spud Admin is a dependency package that adds a nice looking administrative panel to any project you add it to with built in authlogic authentication ready to go out of the box. It supports easy engine integration and there are several planned future engines that we plan on designing for the spud suite. The first of which is Spud CMS which can be found at http://github.com/davydotcom/spud_cms
+
+Installation/Usage
+------------------
+
+1. In your Gemfile add the following
+
+		gem 'spud_core'
+
+2. Run bundle install
+3. Copy in database migrations to your new rails project
+
+		bundle exec rake spud_core:install:migrations
+		rake db:migrate
+
+4. run a rails server instance and point your browser to /spud/admin
+
+
+Adding Your Own Engines
+-----------------------
+
+Creating a rails engine that ties into spud admin is fairly straight forward
+In your new engine add spud_admin as a dependency and create an initializer inside your engine class as such:
+
+		initializer :admin do
+			Spud::Core.configure do |config|
+			config.admin_applications += [{:name => "Pages",:thumbnail => "spud/admin/pages_thumb.png",:url => "/spud/admin/pages",:order => 0}]
+
+			end
+		end
+
+You can use the layouts provided with spud admin by using 'spud/admin/application' or 'spud/admin/detail' layouts
+
+When creating controllers for the admin panel create them in the Spud::Admin Namespace and have them extend Spud::Admin::ApplicationController for automatic user authentication restrictions.
+
+Testing
+-----------------
+
+Spud uses RSpec for testing. Get the tests running with a few short commands:
+
+1. Create and migrate the databases:
+   
+		rake db:create
+		rake db:migrate
+
+2. Load the schema in to the test database:
+
+		rake app:db:test:prepare
+
+3. Run the tests with RSpec
+
+		rspec spec
+
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.
+
+
+

data/Rakefile

@@ -20,21 +20,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-# Rake::TestTask.new(:test) do |t|
-#   t.libs << 'lib'
-#   t.libs << 'test'
-#   t.pattern = 'test/**/*_test.rb'
-#   t.verbose = false
-# end
-
-
-task :default => [:spec]
+require 'rake'

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

@@ -11,10 +11,10 @@ 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",
-
+      "bJQueryUI": true,
+      "sPaginationType": "full_numbers"
     });
 
     $('a.ajax').live('click', function() {
@@ -35,7 +35,7 @@ $(document).ready(function() {
     $('a.close_dialog').live('click', function() {
     	$('#dialog').dialog('close');
     })
-    
+
     $('a[data-method="delete"]').live('ajax:success',
       function(data, textStatus, jqXHR){
         $(this).closest('tr').fadeOut();
@@ -44,18 +44,17 @@ $(document).ready(function() {
       $('form[data-remote="true"]').live('ajax:success',
       function(data, textStatus, jqXHR){
         $(this).closest('#dialog').dialog('close');
-        console.log(data)
       });
       $('a.button').button();
 
 
-      $('input[type=submit].btn').click(function() {$(this).button('loading')});
+      $('input[type=submit].btn').click(function() {$(this).button('loading');});
 
     $('#multisite_switcher select').change(function() {
       $(this).parent().submit();
       // alert('test');
     });
-	  initFormTabs();
+    initFormTabs();
     highdpi_init();
 } );
 
@@ -75,14 +74,14 @@ function initFormTabs(){
    var tabNames = [];
    $('.formtabs .formtab').each(function(tabind) {
        this.id = 'tab-' + tabind;
-       tabNames.push($('.tab_name',this).first().val())
+       tabNames.push($('.tab_name',this).first().val());
    });
    var tabButtons = $('.formtabs .formtab_buttons').first();
    for(var x=0;x<tabNames.length;x++)
    {
-       tabButtons.append($('<li><a href="#tab-' + x + '">' + tabNames[x] + '</a></li>'))
+       tabButtons.append($('<li><a href="#tab-' + x + '">' + tabNames[x] + '</a></li>'));
    }
-       
+
    $('.formtabs').tabs();
 }
 
@@ -102,7 +101,7 @@ function initTinyMCE(selector) {
       convert_urls : false,
       height:"400"
     });
-    
+
 
 }
 
@@ -110,16 +109,46 @@ function initDatePicker(selector){
   selector = (typeof(selector) == 'undefined') ? '.spud_form_date_picker' : selector;
   $(selector).datepicker({
     dateFormat: 'yy-mm-dd'
-  }); 
+  });
 }
 
 function highdpi_init() {
-  if(jQuery('.replace-2x').css('font-size') == "1px") {
-    var els = jQuery(".replace-2x").get();
+  if(window.devicePixelRatio > 1)
+  {
+
+    var els = jQuery("img").get();
     for(var i = 0; i < els.length; i++) {
-      var src = els[i].src
-      src = src.replace(".png", "@2x.png");
-      els[i].src = src;
+      var hiDpiSrc = $(els[i]).attr('hidpi_src');
+      var src = els[i].src;
+
+      if(hiDpiSrc)
+      {
+        src = hiDpiSrc;
+      }
+      else
+      {
+        var path_segments = src.split('.');
+        var path_without_extension = path_segments.slice(0, (path_segments.length - 1)).join(".");
+        var extension = path_segments[path_segments.length - 1];
+        src = path_without_extension + "@2x." + extension;
+      }
+
+      if(hiDpiSrc) {
+        $.ajax({
+          type: 'HEAD',
+          async: true,
+          element: els[i],
+          url: hiDpiSrc,
+          success: function(message) {
+            this.element.src = this.url;
+          }
+        });
+      }
+
+
+
     }
   }
-}
+
+
+}

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

@@ -8,9 +8,7 @@ class Spud::Admin::ApplicationController < Spud::ApplicationController
 
 	private
 	def require_admin_user
-		puts "Checking for Admin"
 		return false if !require_user
-		puts "user found, verifying permissions"
 		if !@current_user.super_admin && current_user_permissions.count == 0
 			flash[:error] = "User must be an administrator to view this area."
 			redirect_to root_url() and return false

data/app/controllers/spud/application_controller.rb

@@ -1,16 +1,27 @@
 class Spud::ApplicationController < ActionController::Base
 	unloadable
 	protect_from_forgery
-	helper_method :current_user_session, :current_user
+	helper_method :current_user_session, :current_user, :current_site_name
 	around_filter :set_time_zone
   around_filter :multisite_caching
   before_filter :to
-  
+
+
+  def current_site_name
+    # puts "request.host_with_port = #{request.host_with_port}"
+    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
+    config = Spud::Core.site_config_for_host(request.host_with_port)
+    return Spud::Core.site_name if config.blank?
+
+    return config[:site_name]
+  end
 
   private
+
     def to
       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
@@ -20,10 +31,12 @@ class Spud::ApplicationController < ActionController::Base
       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 require_user
       unless current_user
         store_location
@@ -42,11 +55,11 @@ class Spud::ApplicationController < ActionController::Base
         return false
       end
     end
-    
+
     def store_location
       session[:return_to] = request.url
     end
-    
+
     def redirect_back_or_default(default)
       redirect_to(session[:return_to] || default)
       session[:return_to] = nil
@@ -73,11 +86,11 @@ class Spud::ApplicationController < ActionController::Base
           Rails.application.config.action_controller.page_cache_directory = File.join(old_cache_directory.to_s,"main")
         end
       end
-      
+
       yield
 
     ensure
       Rails.application.config.action_controller.page_cache_directory = old_cache_directory
 
     end
-end
+end

data/app/controllers/spud/password_resets_controller.rb

@@ -1,50 +1,50 @@
 class Spud::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 => [:edit, :update]
 
 	layout 'spud/login/application'
 
-	def new  
-		render  
-	end  
-  
-	def create  
-		@user = SpudUser.find_by_email(params[:email])  
-		if @user  
+	def new
+		render
+	end
+
+	def create
+		@user = SpudUser.find_by_email(params[:email])
+		if @user
 			Spud::CoreMailer.forgot_password_notification(@user).deliver
-			flash[:notice] = "Instructions to reset your password have been emailed to you. " +  
-			"Please check your email."  
+			flash[:notice] = "Instructions to reset your password have been emailed to you. " +
+			"Please check your email."
 			redirect_to new_spud_user_session_url
-		else  
-			flash[:notice] = "No user was found with that email address"  
-			render :action => :new  
-		end  
-	end 
+		else
+			flash[:notice] = "No user was found with that email address"
+			render :action => :new
+		end
+	end
 
-	def edit  
-		render  
-	end  
-	  
-	def update  
-		@user.password = params[:spud_user][:password]  
-		@user.password_confirmation = params[:spud_user][:password_confirmation]  
-		if @user.save  
-			flash[:notice] = "Password successfully updated"  
+	def edit
+		render
+	end
+
+	def update
+		@user.password = params[:spud_user][:password]
+		@user.password_confirmation = params[:spud_user][:password_confirmation]
+		if @user.save
+			flash[:notice] = "Password successfully updated"
 			redirect_to new_spud_user_session_url
-		else  
+		else
 			render :action => :edit
-		end  
-	end  
-  
-private  
-	def load_user_using_perishable_token  
-		@user = SpudUser.find_using_perishable_token(params[:id])  
-		unless @user  
-			flash[:notice] = "We're sorry, but we could not locate your account. " +  
-			"If you are having issues try copying and pasting the URL " +  
-			"from your email into your browser or restarting the " +  
-			"reset password process."  
+		end
+	end
+
+private
+	def load_user_using_perishable_token
+		@user = SpudUser.find_using_perishable_token(params[:id])
+		unless @user
+			flash[:notice] = "We're sorry, but we could not locate your account. " +
+			"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
-		end 
+		end
 	end
 end

data/app/controllers/spud/setup_controller.rb

@@ -1,13 +1,10 @@
 class Spud::SetupController < Spud::ApplicationController
 	layout 'spud/setup'
 	def index
-		logger.debug("---Spud setup form running!")
 		@page_thumbnail = "spud/admin/users_thumb.png"
 		@page_name = "First Time Setup"
-		if SpudUser.all.count != 0
-				flash[:error] = "Access Denied! This wizard may only be executed when the database is empty."
-				logger.debug "We have a user count: " + SpudUser.all.count.to_s
-				
+		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
 		end
 
@@ -15,7 +12,6 @@ class Spud::SetupController < Spud::ApplicationController
 			@user = SpudUser.new(:login => params[:login],:email => params[:email],:password => params[:password],:password_confirmation => params[:password_confirmation])
 			@user.super_admin = true
 			if @user.save
-				logger.debug "REDIRECTING!"
 				session[:return_to] = spud_admin_root_url
 				redirect_to new_spud_user_session_url and return
 			end

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

@@ -1,40 +1,39 @@
 module Spud::Admin::ApplicationHelper
+
+  def hidpi_asset(path)
+    begin
+      return asset_path(path.gsub(/\.png/,"@2x.png"))
+    rescue
+      return nil
+    end
+  end
   def timestamp(timedate=nil)
     return "Never" if timedate.blank?
     return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
   end
 
   def current_admin_site_name
-    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled || session[:admin_site].blank?
-
-    config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
-    return Spud::Core.site_name if config.blank?
-
-    return config[0][:site_name]
-
+    site_name = Spud::Core.site_name
+    if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
+      config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
+      site_name = config[0][:site_name] if !config.blank?
+    end
+    return site_name
   end
 
-  def current_site_name
-    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
-    config = Spud::Core.site_config_for_host(request.host_with_port)
-    return Spud::Core.site_name if config.blank?
-
-    return config[:site_name]
-  end
   def header_style
-    if !Spud::Core.multisite_mode_enabled
-      return ''
+    style_str = ''
+    if Spud::Core.multisite_mode_enabled
+      config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
+      style_str = config[0][:header_style] if !config.blank? && config[0].has_key?(:header_style)
     end
-    config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
-    return '' if config.blank?
-
-    return config[0][:header_style]
+    return style_str
   end
 
   def link_to_remove_fields(name, f)
     f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)",:class => "btn btn-danger")
   end
-  
+
   def link_to_add_fields(name, f, association)
     new_object = f.object.class.reflect_on_association(association).klass.new
     fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
@@ -55,6 +54,6 @@ module Spud::Admin::ApplicationHelper
       content +="</ul></div>"
     end
     return content.html_safe
-  
+
   end
-end
+end