grandstand 0.2.4 → 0.2.6

data/lib/grandstand.rb

@@ -1,28 +1,59 @@
+# Require the Gems we need for this guy
+gem 'aws-s3'
+require 'aws/s3'
+require 'mustache'
+require 'paperclip'
+
 require 'grandstand/application'
 
 module Grandstand
-  autoload(:Controller, 'grandstand/controller')
-  autoload(:Helper, 'grandstand/helper')
-  autoload(:Session, 'grandstand/session')
-
-  def self.initialize!(config = nil)
-    if defined?(ActionController)
-      ActionController::Base.send :include, Grandstand::Controller
-      if Rails.env.development? && defined?(Less) && defined?(Less::More)
-        ActionController::Base.send :include, Grandstand::Controller::Development
-        # Tell Less to produce the smallest stylesheets it's capable of
-        Less::More.compression = true
-        Less::More.header = false
-        # Point More to our plugins' source_path and our custom admin stylesheets folder
-        Less::More.source_path = File.join('vendor', 'plugins', 'grandstand', 'app', 'stylesheets')
-        Less::More.destination_path = File.join('admin', 'stylesheets')
+  # Some basic configuration options - app name ('Grandstand'), image sizes, content areas, etc.
+  class << self
+    def routing
+      @routing ||= {:ssl => true}
+    end
+
+    def routing=(routing)
+      @routing = new_routing
+    end
+
+    def routing_options
+      routing_options = {}
+      if Grandstand.routing[:domain]
+        routing_options.merge!(:path => '', :constraints => {:domain => Grandstand.routing[:domain]})
       end
+      routing_options
     end
-    if defined?(ActionView)
-      ActionView::Base.send :include, Grandstand::Helper
+
+    def app_name
+      @app_name ||= 'Grandstand'
+    end
+
+    def image_sizes
+      @images_sizes ||= {}
     end
-    Paperclip.interpolates :padded_id do |attachment, style|
-      attachment.instance.id.to_s.rjust(6, '0')
+
+    def image_sizes=(new_image_sizes)
+      @images_sizes = new_image_sizes
+    end
+
+    def page_sections
+      @page_sections ||= %w(left main)
+    end
+
+    def page_sections=(new_page_sections)
+      @page_sections = new_page_sections
+    end
+
+    def s3
+      @s3 ||= {
+        :bucket => nil,
+        :credentials => File.join(Rails.root, 'config', 's3.yml')
+      }
+    end
+
+    def s3=(new_s3)
+      @s3 = new_s3
     end
   end
 end

data/lib/grandstand/application.rb

@@ -1,49 +1,41 @@
 require 'rails'
 require 'grandstand'
+require 'grandstand/controller'
+require 'grandstand/form_builder'
+require 'grandstand/helper'
+require 'grandstand/session'
 
 module Grandstand
   class Application < Rails::Engine
-    paths.config.routes = 'lib/routes.rb'
-    
-    initializer 'grandstand.add_session_extension', :after => :load_application_initializers do |app|
-      # puts "Adding middleware (#{app.config.session_options.inspect})"
+    initializer 'grandstand.initialize', :after => :load_application_initializers do |app|
+      # Add sessions for Flash file uploads - but this is *not* very secure!
       app.middleware.insert_before(ActionDispatch::ShowExceptions, Grandstand::Session, app.config.session_options[:key] || app.config.session_options['key'])
-      Grandstand.initialize!
-    end
-    
-    initializer 'grandstand.symlink_public_files' do |app|
-      Dir[File.join(File.dirname(__FILE__), '..', 'public', '*')].each do |gem_path|
-        user_path = File.join(app.root, 'public', File.basename(gem_path))
-        # puts "Copying #{gem_path} to #{user_path}"
-        if File.file?(gem_path) && !File.file?(user_path)
-          FileUtils.cp_r(gem_path, user_path)
-        elsif File.directory?(gem_path) && !File.directory?(user_path)
-          FileUtils.cp_r(gem_path, user_path)
-        end
-      end
-    end
 
-    class << self
-      def app_name
-        @app_name ||= 'Portfoliawesome'
-      end
+      # Extend ActionController and ActionView to have the Grandstand defaults (current_user and its friends)
+      ActionController::Base.send :include, Grandstand::Controller
 
-      def image_sizes
-        {
-          :icon => '75x75#',
-          :page => '541x' 
-        }
-      end
+      # Include Grandstand view helpers (page content and its friends)
+      ActionView::Base.send :include, Grandstand::Helper
+      ActionView::Helpers::FormBuilder.send :include, Grandstand::FormBuilder
 
-      def page_sections
-        %w(left main)
+      # Add Paperclip padded_id and dimensions interpolations
+      Paperclip.interpolates :dimensions do |attachment, style|
+        attachment.options[:styles][style].gsub(/[^\dx]/, '')
+      end
+      Paperclip.interpolates :gallery_id do |attachment, style|
+        attachment.instance.gallery_id.to_s.rjust(6, '0')
       end
+      Paperclip.interpolates :padded_id do |attachment, style|
+        attachment.instance.id.to_s.rjust(6, '0')
+      end
+    end
 
-      def s3
-        @s3 ||= {
-          :bucket => nil,
-          :credentials => File.join(Rails.root, 'config', 's3.yml')
-        }
+    if Rails.env.development?
+      # In development mode, Grandstand will serve static assets. Be sure to move them to your app's
+      # actual public directory when you're ready to deploy using rake something something
+      # TODO: Find actual rake task
+      initializer 'grandstand.development_mode', :after => :load_application_initializers do |app|
+        # app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
     end
   end

data/lib/grandstand/controller.rb

@@ -1,7 +1,5 @@
 module Grandstand
   module Controller
-    autoload(:Development, 'grandstand/controller/development')
-
     def self.included(base)
       base.helper_method :current_page, :current_user, :return_path
     end
@@ -11,14 +9,14 @@ module Grandstand
     # the current requests' URL. Very frequently nil!
     def current_page
       return @_current_page if defined? @_current_page
-      @_current_page = Page.where(:url => request.path.reverse.chomp('/').reverse).first
+      @_current_page = Grandstand::Page.where(:url => request.path.reverse.chomp('/').reverse).first
     end
     protected :current_page
 
     # Predictably, `current_user` will return the currently logged-in user.
     def current_user
       # Ask Rack for a model first - this makes it easy to add SSO middleware
-      @_user ||= request.env['user'] || User.first(:conditions => {:id => session[:user_id]}) if session[:user_id]
+      @_user ||= request.env['user'] || Grandstand::User.first(:conditions => {:id => session[:user_id]}) if session[:user_id]
     end
     protected :current_user
 
@@ -57,7 +55,7 @@ module Grandstand
         # Remember any post variables the user may have sent between logout and now.
         # session[:post_params] = params.except(:controller, :action, :id).merge({:_method => request.method}) unless request.get?
         # Send them off to the correct login path
-        redirect_to(admin_session_path) and return false
+        redirect_to(grandstand_session_path) and return false
       end
     end              
 
@@ -95,7 +93,7 @@ module Grandstand
     #   end
     # 
     # It's also a quick way to return a user to previous action post-login - see
-    # Admin::SessionController#create for more details and an example
+    # Grandstand::SessionController#create for more details and an example
     def set_return_path(path = nil)
       session[:return_path] = path || request.fullpath
     end

data/lib/grandstand/form_builder.rb

@@ -0,0 +1,19 @@
+module Grandstand
+  module FormBuilder
+    def errors_on(*fields)
+      if @object
+        errors = []
+        fields.each do |field|
+          @object.errors[field].each do |error|
+            errors.push("<li>#{error[0, 1] == error[0, 1].upcase ? error : "#{field.to_s.humanize} #{error}"}</li>")
+          end
+        end
+        unless errors.empty?
+          @template.content_tag(:ul, :class => 'errors') do
+            errors.join("\n")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grandstand/helper.rb

@@ -1,51 +1,5 @@
 module Grandstand
   module Helper
-    # Renders a <button> tag. Helpful for forms and the like.
-    # 
-    #   <%= button("Save Changes", :class => "blue") %>
-    # 
-    # ... produces
-    # 
-    #   <button class="button blue"><span class="inner"><span>Save Changes</span></span></button>
-    def button(*args)
-      options, icon = button_options(args.extract_options! || {})
-      content_tag(:button, options) { content_tag(:span, :class => icon ? "#{icon} icon" : nil) { args.shift } }
-    end
-
-    # Similar to button, but generates a link instead of a button element. Useful for providing
-    # buttons to GET actions:
-    # 
-    #   <%= button_link_to("Get Help", support_path, :icon => "help") %>
-    # 
-    # ... produces
-    # 
-    #   <a class="button blue" href="/support"><span class="inner"><span class="help icon">Get Help</span></span></button>
-    # 
-    # The extra spans are for any sliding door styling you may be interested in adding. Adding :icon to the options will
-    # give the inner-most span a class of "#{options[:icon]} icon", allowing you to add extra images inside of your button.
-    def button_link_to(*args)
-      options, icon = button_options(args.extract_options! || {})
-      link_to(content_tag(:span, :class => icon ? "#{icon} icon" : nil) { args.shift }, *args.push(options))
-    end
-
-    def button_options(options)
-      classes = %w(button)
-      if icon = options.delete(:icon)
-        classes.push('has-icon')
-      end
-      classes.push(options[:class].to_s.split(' ')) if options[:class]
-      options[:class] = classes.uniq.join(' ')
-      [options, icon]
-    end
-
-    # Returns error_message_on ONLY IF the instance has errors on that field. Just a helpful way of conditionally rendering
-    # errors.
-    def errors_on(instance, method)
-      if (instance = instance_variable_get("@#{instance}")) && !instance.errors[method].empty?
-        error_message_on(instance, method, :css_class => 'error icon')
-      end
-    end
-
     # Adds section-oriented class names if a current_page exists. Useful for styling your site to account for the presence
     # of various content sections; e.g. if a CMS user adds a page with content in the "left" column but not a page with
     # content in the "right" column, you can add:
@@ -109,7 +63,7 @@ module Grandstand
     end
 
     def page_title(separator = '|')
-      if object = @post || @_page
+      if object = @post || current_page
         "#{object.name} #{separator}"
       end
     end

data/lib/grandstand/session.rb

@@ -1,5 +1,3 @@
-require 'rack/utils'
-
 module Grandstand
   class Session
     def initialize(app, session_key = '_session_id')
@@ -8,16 +6,9 @@ module Grandstand
     end
 
     def call(env)
-      if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/ && env['PATH_INFO'] =~ /^\/admin\/galleries\/\d+\/images$/
+      if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/ && env['PATH_INFO'] =~ /^\/grandstand\/galleries\/\d+\/images$/
         params = Rack::Request.new(env).POST
-        unless params['session_key'].nil?
-          # This will strip out the session_key from the POST params - not entirely necessary,
-          # but still cleaner than the alternative
-          env['HTTP_COOKIE'] = [ @session_key, params.delete('session_key') ].join('=').freeze
-          env['rack.input'] = StringIO.new(Rack::Utils::Multipart.build_multipart(params))
-          env['rack.input'].rewind
-        end
-        puts "\n\n#{env['HTTP_COOKIE'].inspect}\n\n"
+        env['HTTP_COOKIE'] = [ @session_key, params.delete('session_key') ].join('=').freeze unless params['session_key'].nil?
       end
       @app.call(env)
     end

data/lib/grandstand/stylesheets_controller.rb

@@ -0,0 +1,14 @@
+require 'less'
+module Grandstand
+  class StylesheetsController < ApplicationController
+    def show
+      stylesheet = File.join(Grandstand::Application.root, 'app', 'stylesheets', "#{params[:name]}.less")
+      if File.file?(stylesheet)
+        engine = File.open(stylesheet) {|file| Less::Engine.new(file) }
+        render :content_type => 'text/css', :text => engine.to_css
+      else
+        grandstand_not_found
+      end
+    end
+  end
+end

data/public/{admin → grandstand}/javascripts/application.js

@@ -1,4 +1,4 @@
-$LOAD_PATH = ['/admin/javascripts'];
+$LOAD_PATH = ['/grandstand/javascripts'];
 
 $(document).ready(function() {
   $('a[data-method]').live('click', function(event) {
@@ -29,42 +29,24 @@ $(document).ready(function() {
       ul.slideDown(100);
       add = true;
     }
-    $.get('/admin/expand?add=' + (add ? 'yup' : 'nope') + '&section=' + link.attr('rel'));
+    $.get('/grandstand/expand?add=' + (add ? 'yup' : 'nope') + '&section=' + link.attr('rel'));
   });
 
-  $('#cover').click(function() {
-    $(this).fadeOut(200);
-    var pulldown = $('#pulldown');
-    if (pulldown.css('display') != 'none') {
-      pulldown.animate({top: -(pulldown.height())}, 300, function() {
-        pulldown.hide();
-      });
-    }
-  });
-
-  $('#pulldown a.cancel').live('click', function(event) {
-    event.preventDefault();
-    $('#cover').click();
+  $('form').submit(function() {
+    $(this).find('button').attr('enabled', false);
   });
 
   $('.remote').live('click', function(event) {
-    $('#cover').fadeIn(100);
     event.preventDefault();
-    $.get(this.href, function(response) {
-      var pulldown = $('#pulldown');
-      pulldown.html(response);
-      if (pulldown.css('display') == 'none') {
-        pulldown.css('top', -(pulldown.height())).show().animate({top: 0}, 300);
-      }
-    });
+    Dialog.show(this.href);
   });
 
   $('.galleries.sortable').sortable({
     handle: '.float-left',
     items: '.container',
     stop: function(event, ui) {
-      $.post('/admin/galleries/reorder', $(this).sortable('serialize'), function() {
-        Flash.show('notice', "Your changes have been saved!");
+      $.post('/grandstand/galleries/reorder', $(this).sortable('serialize'), function() {
+        Notifications.show('notice', 'Your changes have been saved!');
       });
     }
   });
@@ -74,7 +56,7 @@ $(document).ready(function() {
     items: '.container',
     stop: function(event, ui) {
       $.post(window.location.toString() + '/images/reorder', $(this).sortable('serialize'), function() {
-        Flash.show('notice', "Your changes have been saved!");
+        Notifications.show('notice', 'Your changes have been saved!');
       });
     }
   });
@@ -106,7 +88,7 @@ $(document).ready(function() {
           flashvars: {action: form.attr('action'), method: form.attr('method').toUpperCase(), data: $.param(data)},
           height: 24,
           id: 'uploads-flash',
-          src: '/admin/images/uploader.swf',
+          src: '/grandstand/images/uploader.swf',
           width: 118,
           wmode: 'transparent'
         }
@@ -116,10 +98,14 @@ $(document).ready(function() {
     }
   });
 
+  $('#cover').click(function(event) {
+    Dialog.hide();
+  });
+
   $('.tabset').tabs();
 
   $('.wysiwyg').dependency('wysiwyg', function() {
-    this.wysiwyg('post', this.attr('id') == 'post_body' ? '.post' : null);
+    this.wysiwyg('post', '.post');
   });
 
   $('.source a').live('click', function(event) {
@@ -137,9 +123,120 @@ $(document).ready(function() {
     $('#' + link.attr('rel')).show();    
   });
 
-  Flash.hideAll();
+  Notifications.hide();
+
 });
 
+var Dialog = {
+  hide: function(close) {
+    Dialog.unbind();
+    if (!close) {
+      $('#cover').fadeOut(200);
+    }
+    var dialog = $('#dialog');
+    if (dialog.css('display') != 'none') {
+      dialog.animate({top: -(dialog.height())}, 300, function() {
+        if (close) {
+          close();
+        }
+        dialog.hide().html('');
+      });
+    } else {
+      close();
+    }
+  },
+  keydown: function(event) {
+    if (event.keyCode == 27) {
+      $('#dialog a.cancel').addClass('active');
+    } else if (event.keyCode == 13) {
+      $('#dialog .default').addClass('active');
+    }
+  },
+  keyup: function(event) {
+    if (event.keyCode == 27) {
+      $('#dialog a.cancel').removeClass('active');
+      Dialog.hide();
+    } else if (event.keyCode == 13) {
+      $('#dialog .default').removeClass('active');
+      if ($(event.target).parents('form').length === 0 && !$(event.target).is('form')) {
+        Dialog.submit();
+      }
+    }
+  },
+  show: function(content, options) {
+    var cover = $('#cover');
+    cover.fadeIn(100);
+    var options = options || {};
+    var dialog = $('#dialog');
+    dialog.removeClass();
+    if (options.style) {
+      dialog.addClass(options.style);
+    }
+    var process = function(content) {
+      dialog.html(content);
+      dialog.find('a.cancel').click(function(event) {
+        event.preventDefault();
+        Dialog.hide();
+      });
+      if (options.load) {
+        options.load(dialog);
+      }
+      $(document).keydown(Dialog.keydown).keyup(Dialog.keyup);
+      if (options.submit) {
+        dialog.find('form').submit(function(event) {
+          return options.submit.call(this, event);
+        });
+      }
+      if (dialog.css('display') == 'none') {
+        dialog.css('top', -(dialog.height())).show().animate({top: 0}, 300, function() {
+          cover.removeClass('loading');
+          if (options.complete) {
+            options.complete.call(this);
+          }
+        });
+      } else {
+        cover.removeClass('loading');
+      }
+    }
+    if (typeof(content) == 'string' && content.toString().match(/^http(s)*:\/\//) || content.toString().match(/^\//)) {
+      cover.addClass('loading');
+      $.get(content, function(response) {
+        process(response);
+      });
+    } else {
+      process(content);
+    }
+  },
+  submit: function() {
+    Dialog.unbind();
+    $('#dialog form').submit();
+  },
+  unbind: function() {
+    $(document).unbind('keydown', Dialog.keydown).unbind('keyup', Dialog.keyup);
+  }
+};
+
+var Notifications = {
+  hide: function() {
+    $('.notification').each(function() {
+      var notification = $(this);
+      setTimeout(function() {
+        notification.fadeOut(200);
+      }, 2000);
+    });
+  },
+  show: function(type, message) {
+    var notification = $('.notification.' + type);
+    if (notification.length === 0) {
+      notification = $('<div class="notification ' + type + '"><div class="inner"></div></div>').hide();
+      $(document.body).prepend(notification);
+    }
+    notification.find('.inner').html(message);
+    Notifications.hide();
+    return notification.fadeIn(200);
+  }
+};
+
 var Upload = {
   // Every file is done; move on with our lives
   allComplete: function() {
@@ -147,7 +244,7 @@ var Upload = {
   },
   // Called when someone clicks a "cancel this event" button
   cancel: function(event) {
-    
+    alert('cancelling the thingy...');
   },
   // Called AFTER we've successfully cancelled, but we initiate the cancelling.
   cancelled: function() {
@@ -183,7 +280,7 @@ var Upload = {
   fileCompleted: function(event) {
     var row = Upload.rowFor(event.target.name);
     row.find('.progress-bar').addClass('complete');
-    row.find('.delete').removeClass('delete').addClass('okay');
+    row.find('.delete').removeClass('delete').removeClass('processing').addClass('okay');
   },
   fileError: function(event) {
     var row = Upload.rowFor(event.target.name)
@@ -191,8 +288,17 @@ var Upload = {
     row.find('.icon').removeClass('delete').addClass('error');
   },
   fileProgress: function(event) {
-    var progress = Upload.rowFor(event.target.name).find('.progress');
-    progress.animate({width: (event.bytesLoaded / event.bytesTotal * 100).toString() + '%'}, 50);
+    var row = Upload.rowFor(event.target.name);
+    var progress = row.find('.progress');
+    var percent = event.bytesLoaded / event.bytesTotal * 100;
+    progress.animate({width: percent.toString() + '%'}, 50);
+    if (percent == 100) {
+      var icon = row.find('.icon');
+      if (!icon.hasClass('processing')) {
+        progress.parent().addClass('complete');
+        row.find('.delete').addClass('processing');
+      }
+    }
   },
   fileStarted: function(event) {
 
@@ -208,24 +314,3 @@ var Upload = {
     Upload.list.find('tbody').find('tr:odd').addClass('odd');
   }
 };
-
-var Flash = {
-  hideAll: function() {
-    $('.flash').each(function() {
-      var flash = $(this);
-      setTimeout(function() {
-        flash.fadeOut(200);
-      }, 2000);
-    });
-  },
-  show: function(type, message) {
-    var flash = $('.flash.' + type);
-    if (flash.length === 0) {
-      flash = $('<div class="flash ' + type + '"><div class="inner"></div></div>').hide();
-      $(document.body).prepend(flash);
-    }
-    flash.find('.inner').html(message);
-    Flash.hideAll();
-    return flash.fadeIn(200);
-  }
-};