wheels 0.0.25 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/app/controllers/attachments_controller.rb

@@ -0,0 +1,16 @@
+class AttachmentsController < InheritedResources::Base
+  respond_to :html, :js
+  belongs_to :page
+  before_filter :authenticate_user!
+  ajax_loading
+
+  def index
+    index! do |format|
+      @attachment = @page.attachments.build
+    end
+  end
+  def create
+    create! {collection_url}
+  end
+end
+

data/app/controllers/pages_controller.rb

@@ -11,18 +11,16 @@ class PagesController < InheritedResources::Base
     end
   end
 
-
-  before_filter :authenticate_user!, :except=>[:index, :show]
-  before_filter :maybe_authenticate, :only=>[:index, :show]
+  before_filter :authenticate_user!, :except=>[:show]
+  before_filter :maybe_authenticate, :only=>[: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?
@@ -35,7 +33,9 @@ class PagesController < InheritedResources::Base
   end
 
   def maybe_authenticate
-    authenticate_user! if params[:a]
+    unless user_signed_in?
+      authenticate_user! unless current_ability.can? :read, resource
+    end
   end
 
   def show

data/app/models/attachment.rb

@@ -0,0 +1,10 @@
+class Attachment < ActiveRecord::Base
+  validates_presence_of :file, :page_id
+  belongs_to :page
+
+  has_attached_file :file,
+      :storage => :s3,
+      :s3_credentials => "#{Rails.root}/config/amazon_s3.yml",
+      :path => "/attachments/:filename"
+end
+

data/app/models/user.rb

@@ -4,6 +4,11 @@ class User < ActiveRecord::Base
   has_many :blogs, :dependent => :destroy
   has_one :profile, :dependent => :destroy
   has_many :galleries, :dependent => :destroy
+  has_many :access_control_entries, :dependent=>:destroy
+
+  def self.nobody
+    User.new(:role=>"Nobody")
+  end
 
   def create_profile
     Profile.create(:user=>self) unless self.profile
@@ -36,12 +41,7 @@ class User < ActiveRecord::Base
     self.confirmed_at = DateTime::now
     save
   end
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :lockable, :timeoutable
 
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :confirmable, :lockable, :timeoutable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation
 end
 

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

@@ -0,0 +1,35 @@
+-if resource.errors.any?
+  #errorExplanation
+    %h2= "#{pluralize(resource.errors.count, "error")} prohibited this image from being saved:"
+    %ul
+      - resource.errors.full_messages.each do |msg|
+        %li= msg
+
+= form_for [@page, @attachment], :html=>{:multipart=>true} do |f|
+  = f.file_field :file, :id=>"file_input"
+  = f.submit "Upload File", :id=>"upload_button"
+
+= content_for :head do
+  = javascript_include_tag *%w(swfobject jquery.uploadify)
+:javascript
+  $(function() {
+    $('#upload_button').hide();
+    $('#file_input').uploadify ({
+      script          : '#{page_attachments_path(@page, :container=>'attachments_list')}',
+      uploader        : '/uploadify.swf',
+      fileDataName    : 'attachment[file]',
+      multi           : true,
+      auto            : true,
+      buttonText      : 'New File',
+      cancelImg       : '/images/uploadify/cancel.png',
+      onComplete      : function(a, b, c, response){ eval(response); },
+      scriptData      : {
+        '_http_accept': 'application/javascript',
+        '_method': 'post',
+        '#{session_key_name}' : encodeURIComponent('#{u cookies[session_key_name]}'),
+        'authenticity_token': encodeURIComponent('#{raw form_authenticity_token}'),
+        'session_encoded': '#{make_session_string}',
+      }
+    });
+  });
+

data/app/views/attachments/_index.html.haml

@@ -0,0 +1,9 @@
+
+%ul#attachments_list
+  - @attachments.each do |attachment|
+    %li{:id=>attachment.element_id}
+      .file_link= link_to attachment.file.original_filename, attachment.file.url
+      .file_size= number_to_human_size attachment.file.size
+
+= render :partial=>'form'
+

data/app/views/attachments/_show.html.haml

@@ -0,0 +1,6 @@
+%li
+  %ul{:id=>@attachment.element_id}
+    %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/attachments/create.js.haml

@@ -0,0 +1,3 @@
+$('#attachments_list').append(#{raw render_js('show')});
+= render :partial => "loadbehind/view"
+

data/app/views/attachments/destroy.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').remove;
+= render :partial => "loadbehind/destroy"
+

data/app/views/attachments/edit.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('form')});
+= render :partial => "loadbehind/edit"
+

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

@@ -0,0 +1,2 @@
+= render :partial => "index"
+

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

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('index')});
+= render :partial => "loadbehind/view"
+

data/app/views/attachments/new.html.haml

@@ -0,0 +1,3 @@
+
+= render :partial => "form"
+

data/app/views/attachments/new.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('form')});
+= render :partial => "loadbehind/edit"
+

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

@@ -0,0 +1,2 @@
+= render :partial => "show"
+

data/app/views/attachments/show.js.haml

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('show')});
+= render :partial => "loadbehind/view"
+

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

@@ -0,0 +1,3 @@
+$('##{container}').#{ajax_function}(#{raw render_js('show')});
+= render :partial => "loadbehind/view"
+

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

@@ -0,0 +1,20 @@
+
+
+= content_for :sidebar do
+  %ul
+    %li.sidebar_title Control Panel
+    %li
+      Upload a file to this page.
+      = render :partial=>'attachments/form'
+    %li
+      Set an existing page as a child of current one
+      = 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"
+    %li
+      Set permissions >>
+      = link_to 'Edit Access', access_control_entries_path(:resource_class=>"Page", :resource_id=>@page.id), |
+      :confirm => "Are you sure?  Any unsaved changes on this page should be saved before leaving."
+    %li= link_to 'New Page as child', new_page_child_path(@page), |
+      :confirm => "Are you sure?  Any unsaved changes on this page should be saved before leaving."
+

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

@@ -1,20 +1,16 @@
 %h1 Editing page
 
-
 = render 'form'
 
+= link_to 'Show', @page
+\|
+= link_to 'Back', pages_path
+
 = 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 'Show', @page
-\|
-= link_to 'Back', pages_path
+= render :partial => "control_panel"
 

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-08-19}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/controllers/access_control_entries_controller.rb",
+     "app/controllers/attachments_controller.rb",
      "app/controllers/blogs_controller.rb",
      "app/controllers/discussions_controller.rb",
      "app/controllers/forum_messages_controller.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "app/helpers/pages_helper.rb",
      "app/models/ability.rb",
      "app/models/access_control_entry.rb",
+     "app/models/attachment.rb",
      "app/models/blog.rb",
      "app/models/discussion.rb",
      "app/models/forum.rb",
@@ -64,6 +66,19 @@ Gem::Specification.new do |s|
      "app/views/access_control_entries/show.html.haml",
      "app/views/access_control_entries/show.js.haml",
      "app/views/access_control_entries/update.js.haml",
+     "app/views/attachments/_form.html.haml",
+     "app/views/attachments/_index.html.haml",
+     "app/views/attachments/_show.html.haml",
+     "app/views/attachments/create.js.haml",
+     "app/views/attachments/destroy.js.haml",
+     "app/views/attachments/edit.js.haml",
+     "app/views/attachments/index.html.haml",
+     "app/views/attachments/index.js.haml",
+     "app/views/attachments/new.html.haml",
+     "app/views/attachments/new.js.haml",
+     "app/views/attachments/show.html.haml",
+     "app/views/attachments/show.js.haml",
+     "app/views/attachments/update.js.haml",
      "app/views/blogs/_form.html.haml",
      "app/views/blogs/edit.html.haml",
      "app/views/blogs/index.html.haml",
@@ -112,6 +127,7 @@ Gem::Specification.new do |s|
      "app/views/loadbehind/growl.js.haml",
      "app/views/loadbehind/index.js.haml",
      "app/views/pages/_child_pages_links.html.haml",
+     "app/views/pages/_control_panel.html.haml",
      "app/views/pages/_form.html.haml",
      "app/views/pages/_form_fields.html.haml",
      "app/views/pages/_show_attachment.html.haml",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -07:00
+date: 2010-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/access_control_entries_controller.rb
+- app/controllers/attachments_controller.rb
 - app/controllers/blogs_controller.rb
 - app/controllers/discussions_controller.rb
 - app/controllers/forum_messages_controller.rb
@@ -63,6 +64,7 @@ files:
 - app/helpers/pages_helper.rb
 - app/models/ability.rb
 - app/models/access_control_entry.rb
+- app/models/attachment.rb
 - app/models/blog.rb
 - app/models/discussion.rb
 - app/models/forum.rb
@@ -89,6 +91,19 @@ files:
 - app/views/access_control_entries/show.html.haml
 - app/views/access_control_entries/show.js.haml
 - app/views/access_control_entries/update.js.haml
+- app/views/attachments/_form.html.haml
+- app/views/attachments/_index.html.haml
+- app/views/attachments/_show.html.haml
+- app/views/attachments/create.js.haml
+- app/views/attachments/destroy.js.haml
+- app/views/attachments/edit.js.haml
+- app/views/attachments/index.html.haml
+- app/views/attachments/index.js.haml
+- app/views/attachments/new.html.haml
+- app/views/attachments/new.js.haml
+- app/views/attachments/show.html.haml
+- app/views/attachments/show.js.haml
+- app/views/attachments/update.js.haml
 - app/views/blogs/_form.html.haml
 - app/views/blogs/edit.html.haml
 - app/views/blogs/index.html.haml
@@ -137,6 +152,7 @@ files:
 - app/views/loadbehind/growl.js.haml
 - app/views/loadbehind/index.js.haml
 - app/views/pages/_child_pages_links.html.haml
+- app/views/pages/_control_panel.html.haml
 - app/views/pages/_form.html.haml
 - app/views/pages/_form_fields.html.haml
 - app/views/pages/_show_attachment.html.haml