wheels 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/app/controllers/pages_controller.rb

@@ -1,11 +1,28 @@
 class PagesController < InheritedResources::Base
+  respond_to :js, :html
+  ajax_loading
+  belongs_to :parent, :optional=>true, :collection_name => :children,
+             :parent_class=>Page, :param=>:page_id, :instance_name=>:parent_page
+  before_filter :set_collection_name
+
+  def set_collection_name
+    if params[:page_id]
+      self.resources_configuration[:self][:collection_name] = :children
+    end
+  end
+
+
+  before_filter :authenticate_user!, :except=>[:index, :show]
+  before_filter :maybe_authenticate, :only=>[:index, :show]
   before_filter :resource, :only=>[:update, :show, :destroy, :edit]
-  authorize_resource
+
   has_scope :tagged_with, :as => :tag
   has_scope :accessible_by, :type=>:boolean, :default=>true do |c,s|
     s.accessible_by(c.current_ability)
   end
 
+  authorize_resource
+
   def resource
     page_id = params[:id]
     if page_id.is_numeric?
@@ -13,6 +30,54 @@ class PagesController < InheritedResources::Base
     else
       @page ||= Page.where(["lower(pages.title) = ?", page_id.downcase.gsub(/[_]/, ' ')]).first
     end
+    @attachments ||= @page.attachments
+    @page
+  end
+
+  def maybe_authenticate
+    authenticate_user! if params[:a]
+  end
+
+  def show
+    show! do |format|
+      set_children
+    end
+  end
+
+  def edit
+    edit! do |format|
+      set_children
+      @attachment = Attachment.new(:page=>@page)
+    end
+  end
+
+  def create
+    create! { (@parent_page ? page_child_path(@parent_page, @page) : @page) }
+  end
+
+  def new
+    new! do |format|
+      set_children
+    end
+  end
+
+  def update
+    update! do |format|
+      if params[:child_id]
+        @parent_page = @page
+        @page = Page.find(params[:child_id])
+        @page.parent = @parent_page
+        @page.save
+      end
+    end
+  end
+
+  def set_children
+    if @parent_page
+      @children = @parent_page.children
+    else
+      @children = @page.children
+    end
   end
 end
 

data/app/helpers/application_helper.rb

@@ -0,0 +1,13 @@
+module ApplicationHelper
+  def menu_item(name, href)
+    content_tag(:li, content_tag(:a, content_tag(:span, name), :href=>href))
+  end
+  def include_ckeditor
+    content_for :head do
+      javascript_include_tag('/ckeditor/ckeditor.js',
+        '/ckeditor/adapters/jquery.js',
+        "galleries/configure_ckeditor.js")
+    end
+  end
+end
+

data/app/helpers/pages_helper.rb

@@ -1,11 +1,13 @@
 module PagesHelper
-  def include_ckeditor
-    content_for :head do
-      javascript_include_tag('/ckeditor/ckeditor.js',
-        '/ckeditor/adapters/jquery.js',
-        "galleries/configure_ckeditor.js")
-    end
+  def form_url
+    @parent_page ? page_children_path(@parent_page) : page_path(@page)
+  end
+  def form_object
+    @parent_page ? [@parent_page, @page] : @page
   end
 
+  def to_html_options(pages)
+    pages.map{|p| [p.title, p.id]}
+  end
 end
 

data/app/models/access_control_entry.rb

@@ -50,8 +50,13 @@ class AccessControlEntry < ActiveRecord::Base
 
   def configure(ability)
     raise "I only like Ability" unless ability.class==Ability
-    ability.send method_name, verb.to_sym, resource, options
-    puts "ability.send #{method_name}, #{verb.to_sym.inspect}, #{resource.inspect}, #{options.inspect}"
+    if self.can
+      puts "can #{verb.to_sym.inspect}, #{resource.inspect}, #{options.inspect}"
+      ability.can verb.to_sym, resource, options
+    else
+      puts "cannot #{verb.to_sym.inspect}, #{resource.inspect}, #{options.inspect}"
+      ability.cannot verb.to_sym, resource, options
+    end
   end
 
   def self.can(verb, resource, options={})

data/app/models/page.rb

@@ -1,5 +1,10 @@
 class Page < ActiveRecord::Base
-  has_many :images
+  has_many :attachments
+  validates_presence_of :title
+  belongs_to :parent, :class_name=>'Page', :foreign_key=>'parent_id'
+  has_many :children, :class_name=>'Page', :foreign_key=>'parent_id'
   acts_as_taggable
+
+  scope :orphans, where(:parent_id=>nil)
 end
 

data/app/views/loadbehind/_destroy.js.haml

@@ -0,0 +1,3 @@
+- if resource.errors.any?
+  = growl('Error', raw(render_js('errors')), :error)
+

data/app/views/loadbehind/_edit.js.haml

@@ -0,0 +1,4 @@
+setUpDocument($('##{container}'));
+- if resource.errors.any?
+  = growl('Error', raw(render_js('loadbehind/errors')), :error)
+

data/app/views/loadbehind/_errors.html.haml

@@ -0,0 +1,5 @@
+.errorTitle= "#{resource.errors.count, 'error')} prohibited this <%= singular_name %> from being saved:"
+%ul
+- resource.errors.full_messages.each do |msg|
+  %li= msg
+

data/app/views/loadbehind/_growl_template.html.haml

@@ -0,0 +1,65 @@
+:css
+  .growl_box {
+    width: 225px;
+    border: 0px;
+    cellpadding: 0px;
+    cellspacing: 0px;
+  }
+  .growl_top {
+    background-image: url(/images/growl/growl_top.png);
+    width: 225px;
+    height: 49px;
+    background-repeat: no-repeat;
+    color: #fff;
+  }
+  .growl_top_img {
+    max-width: 25px;
+    max-height: 25px;
+    text-align: center;
+    margin-left: 19px;
+    margin-top: 19px;
+  }
+  .growl_title {
+    font-size: 18px;
+    margin: 0pt;
+    margin-left: 5px;
+    margin-bottom: 10px;
+    display: inline;
+  }
+  td.growl_content {
+    background-image: url(/images/growl/growl_repeat.png);
+    width: 225px;
+    background-repeat: repeat-y;
+    color: #ddd;
+  }
+
+  p.growl_content {
+    margin: 20px;
+  }
+  .growl_bottom {
+    background-image: url(/images/growl/growl_bottom.png);
+    background-repeat: no-repeat;
+    width: 225px;
+    height: 27px;
+    vertical-align: top;
+    horizontal-align: right;
+  }
+  a.growl_close {
+    margin-right: 25px;
+    font-size: 10px;
+    color: #fff;
+    text-align: right;
+  }
+
+%table.growl_box
+  %tr
+    %td.growl_top
+      %img.growl_top_img{:src=>"%image%"}
+      %h1.growl_title %title%
+  %tr
+    %td.growl_content
+      %p.growl_content %message%
+  %tr
+    %td.growl_bottom
+      a.growl_close{:href=>"#", :onclick=>"return false;" :rel=>"close"} Close
+

data/app/views/loadbehind/_show_box.html.haml

@@ -0,0 +1,9 @@
+#showBox.showBox
+  %table
+    %tr.row1
+      %td.col1.toggle.showHide_hidden{"data-box-id" => "showBox"}
+      %td.col2 Point Prescriptions
+    %tr.row2.displayArea.showHide_hidden
+      %td.col1
+      %td.col2.contentPane
+

data/app/views/loadbehind/_view.js.haml

@@ -0,0 +1,5 @@
+setUpDocument($('##{container}'));
+- unless flash[:notice].empty?
+  = growl("Success", flash[:notice])
+  - flash.discard
+

data/app/views/loadbehind/growl.js.haml

@@ -0,0 +1,4 @@
+$.growl.settings.dockCss.width = '225px';
+$.growl.settings.noticeTemplate = raw render_js('growl_template')
+$.growl.settings.noticeCss = {position: 'relative'};
+

data/app/views/loadbehind/index.js.haml

@@ -0,0 +1,4 @@
+$.growl.settings.dockCss.width = '225px';
+$.growl.settings.noticeTemplate = #{raw render_js('growl_template')}
+$.growl.settings.noticeCss = {position: 'relative'};
+

data/app/views/pages/_child_pages_links.html.haml

@@ -0,0 +1,5 @@
+= content_for :sidebar do
+  %ul#child_pages
+    - @children.each do |page|
+      %li= link_to page.title, page_child_path(page.parent_id, page.id)
+

data/app/views/pages/_form.html.haml

@@ -1,13 +1,13 @@
 - include_ckeditor
 
-= form_for @page do |f|
+= render :partial => "child_pages_links"
+= form_for form_object, :url=>form_url do |f|
   -if @page.errors.any?
     #errorExplanation
       %h2= "#{pluralize(@page.errors.count, "error")} prohibited this page from being saved:"
       %ul
         - @page.errors.full_messages.each do |msg|
           %li= msg
-
   .field
     = f.label :title
     = f.text_field :title

data/app/views/pages/_show_attachment.html.haml

@@ -0,0 +1,6 @@
+%li
+  %ul
+    %li= link_to attachment.file.original_filename, attachment.file.url
+    %li Size: #{number_to_human_size attachment.file.size}
+    %li Modified: #{attachment.updated_at.try(:strftime, "%D %R")}
+

data/app/views/pages/_show_small.html.haml

@@ -0,0 +1,2 @@
+%li= link_to @page.title, page_child_path(@page.parent_id, @page.id)
+

data/app/views/pages/create.js.haml

@@ -0,0 +1,2 @@
+$('##child_pages').append(#{raw render_js('show_small')});
+

data/app/views/pages/edit.html.haml

@@ -2,6 +2,18 @@
 
 = render 'form'
 
+= content_for :sidebar do
+  %ul#attachments_list
+    %li.sidebar_title Files
+    - @page.attachments.each do |attachment|
+      = render :partial => "attachments/show", :locals=>{:a=>(@attachment=attachment)}
+  = render :partial=>'attachments/form'
+
+  = form_for form_object, :url=>form_url, :remote=>true do |f|
+    = select_tag :child_id, options_for_select(to_html_options(Page.orphans))
+    = f.submit "Add Child"
+  = link_to "New Child Page", new_page_path(:page_id=>@page.id), :confirm=>"Adding a child page will leave this page without saving.  Only continue if you have no unsaved changes."
 = link_to 'Show', @page
 \|
 = link_to 'Back', pages_path
+

data/app/views/pages/index.html.haml

@@ -12,5 +12,6 @@
 - @pages.each do |page|
   %h1= link_to page.title, page
   = link_to "Edit", edit_page_path(page) if can? :edit, page
-  .page_content!= page.body[0..5000]
+  .page_content!= page.body
+  %hr/
 

data/app/views/pages/show.html.haml

@@ -1,8 +1,23 @@
 %h1= resource.title
 .page_content!= resource.body
 
-- if can? :edit, @page
-  = link_to 'Edit', edit_page_path(@page)
+= render :partial => "child_pages_links"
+
 - if can? :manage, @page
-  = link_to 'Edit Access', access_control_entries_path(:resource_class=>"Page", :resource_id=>@page.id)
+  = content_for :sidebar do
+    %ul
+      %li.sidebar_title Manage This Page
+      %li= link_to 'Edit', edit_page_path(@page)
+      %li= link_to 'Edit Access', access_control_entries_path(:resource_class=>"Page", :resource_id=>@page.id)
+
+- if @parent_page
+  = content_for :links do
+    %li= link_to "< #{@parent_page.title}", @parent_page
+
+- unless @page.attachments.empty?
+  = content_for :sidebar do
+    %ul#attachments_list
+      %li.sidebar_title Files
+      - @page.attachments.each do |attachment|
+        = render :partial => "attachments/show", :locals=>{:a=>(@attachment=attachment)}
 

data/app/views/pages/update.js.haml

@@ -0,0 +1,3 @@
+$('#child_pages').append(#{raw render_js('show_small')});
+alert('#{raw params.inspect}');
+

data/lib/wheels/flash_session_cookie_middleware.rb

@@ -0,0 +1,21 @@
+require 'rack/utils'
+
+class FlashSessionCookieMiddleware
+  def initialize(app, session_key = '_session_id')
+    @app = app
+    @session_key = session_key
+  end
+
+  def call(env)
+    if env['HTTP_USER_AGENT'] =~ /^(Adobe|Shockwave) Flash/
+      req = Rack::Request.new(env)
+      env['HTTP_COOKIE'] = [ @session_key,
+                             ::Rack::Utils.escape(req.params[@session_key]) ].
+                           join('=').freeze unless req.params[@session_key].nil?
+      env['HTTP_ACCEPT'] = "#{req.params['_http_accept']}".
+                           freeze unless req.params['_http_accept'].nil?
+    end
+    @app.call(env)
+  end
+end
+

data/lib/wheels/routes.rb

@@ -22,10 +22,9 @@ module ActionDispatch::Routing
         end
       end
 
-      resources :pages, :only => [:index, :show]
-      resources :product_revisions
-      scope "/publish" do
-        resources :pages
+      resources :pages do
+        resources :attachments
+        resources :children, :controller=>"pages", :as => "children"
       end
 
       scope "/admin" do

data/lib/wheels.rb

@@ -2,4 +2,5 @@ require 'wheels/wheels_engine.rb'
 require 'wheels/routes.rb'
 require 'wheels/action_controller_extensions.rb'
 require 'wheels/action_view_helper_extensions.rb'
+require 'wheels/flash_session_cookie_middleware.rb'
 

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-08-17}
+  s.date = %q{2010-08-18}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "app/controllers/profiles_controller.rb",
      "app/controllers/users_controller.rb",
      "app/helpers/access_control_entries_helper.rb",
+     "app/helpers/application_helper.rb",
      "app/helpers/blogs_helper.rb",
      "app/helpers/discussions_helper.rb",
      "app/helpers/forums_helper.rb",
@@ -102,11 +103,24 @@ Gem::Specification.new do |s|
      "app/views/images/update.js.haml",
      "app/views/layouts/application.html.haml",
      "app/views/layouts/image_dialog.html.haml",
+     "app/views/loadbehind/_destroy.js.haml",
+     "app/views/loadbehind/_edit.js.haml",
+     "app/views/loadbehind/_errors.html.haml",
+     "app/views/loadbehind/_growl_template.html.haml",
+     "app/views/loadbehind/_show_box.html.haml",
+     "app/views/loadbehind/_view.js.haml",
+     "app/views/loadbehind/growl.js.haml",
+     "app/views/loadbehind/index.js.haml",
+     "app/views/pages/_child_pages_links.html.haml",
      "app/views/pages/_form.html.haml",
+     "app/views/pages/_show_attachment.html.haml",
+     "app/views/pages/_show_small.html.haml",
+     "app/views/pages/create.js.haml",
      "app/views/pages/edit.html.haml",
      "app/views/pages/index.html.haml",
      "app/views/pages/new.html.haml",
      "app/views/pages/show.html.haml",
+     "app/views/pages/update.js.haml",
      "app/views/profiles/_form.html.haml",
      "app/views/profiles/edit.html.haml",
      "app/views/profiles/index.html.haml",
@@ -173,6 +187,7 @@ Gem::Specification.new do |s|
      "lib/wheels/action_view_helper_extensions.rb",
      "lib/wheels/active_record_extensions.rb",
      "lib/wheels/active_record_user_extensions.rb",
+     "lib/wheels/flash_session_cookie_middleware.rb",
      "lib/wheels/routes.rb",
      "lib/wheels/user.rb",
      "lib/wheels/wheels_engine.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 0
-  - 22
-  version: 0.0.22
+  - 23
+  version: 0.0.23
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -07:00
+date: 2010-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - app/controllers/profiles_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/access_control_entries_helper.rb
+- app/helpers/application_helper.rb
 - app/helpers/blogs_helper.rb
 - app/helpers/discussions_helper.rb
 - app/helpers/forums_helper.rb
@@ -127,11 +128,24 @@ files:
 - app/views/images/update.js.haml
 - app/views/layouts/application.html.haml
 - app/views/layouts/image_dialog.html.haml
+- app/views/loadbehind/_destroy.js.haml
+- app/views/loadbehind/_edit.js.haml
+- app/views/loadbehind/_errors.html.haml
+- app/views/loadbehind/_growl_template.html.haml
+- app/views/loadbehind/_show_box.html.haml
+- app/views/loadbehind/_view.js.haml
+- app/views/loadbehind/growl.js.haml
+- app/views/loadbehind/index.js.haml
+- app/views/pages/_child_pages_links.html.haml
 - app/views/pages/_form.html.haml
+- app/views/pages/_show_attachment.html.haml
+- app/views/pages/_show_small.html.haml
+- app/views/pages/create.js.haml
 - app/views/pages/edit.html.haml
 - app/views/pages/index.html.haml
 - app/views/pages/new.html.haml
 - app/views/pages/show.html.haml
+- app/views/pages/update.js.haml
 - app/views/profiles/_form.html.haml
 - app/views/profiles/edit.html.haml
 - app/views/profiles/index.html.haml
@@ -198,6 +212,7 @@ files:
 - lib/wheels/action_view_helper_extensions.rb
 - lib/wheels/active_record_extensions.rb
 - lib/wheels/active_record_user_extensions.rb
+- lib/wheels/flash_session_cookie_middleware.rb
 - lib/wheels/routes.rb
 - lib/wheels/user.rb
 - lib/wheels/wheels_engine.rb