file_share 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/file_attachments_controller.rb

@@ -37,6 +37,7 @@ class FileAttachmentsController < FileShare::ApplicationController
     def new
     end
     def show
+      @file_attachment = FileAttachment.find(params[:id])
     end
     def index
       @orphans = FileAttachment.orphans

data/app/controllers/file_share/application_controller.rb

@@ -2,10 +2,11 @@ class FileShare::ApplicationController < ApplicationController
   helper_method :has_authorization?
 
   private
-    # Redefine this method to implement authorization
+  unless private_method_defined?(:has_authorization?)
     def has_authorization?(*args)
       true
     end
+  end
   protected
   public
 end

data/app/helpers/file_attachments_helper.rb

@@ -1,6 +1,7 @@
 module FileAttachmentsHelper
 
   def description_display(file_attachment)
+    return unless has_authorization?(:read, file_attachment)
     content_tag :p, {
       :id => "file_attachment_#{file_attachment.id}_description",
       :style => "max-width: 70%; float: right;",
@@ -15,8 +16,16 @@ module FileAttachmentsHelper
       :id => "file_attachment_#{file_attachment.id}_name",
       :class => 'file_attachment_name'
     } do
-      link_to(file_attachment.name, download_file_attachment_path(file_attachment.id))
+      link_to_download_file_attachment(file_attachment)
     end
   end
-
+  
+  def file_container_data(file_attachment)
+    return unless has_authorization?(:update, file_attachment)
+    content_tag :span, file_attachment.file_container, {
+      :id => "file_attachment_#{file_attachment.id}_file_container",
+      :class => "file_attachment_file_container",
+      :style => "display:none;"
+    }
+  end
 end

data/app/helpers/file_share/application_helper.rb

@@ -20,19 +20,76 @@ module FileShare
       end
     end
   
-    def link_to_file_attachments(wrapper_options={})
+    def link_to_file_attachments(wrapper_options={}, link_options={})
       link_wrapper(file_attachments_path, wrapper_options, {
         :link_text => 'List / Upload Files'
-      })
+      }.merge!(link_options))
     end
     
-    def render_file_share_main_menu
-      render :partial => 'file-share-shared/main_menu'
+    def links_to_edit_and_delete_file_attachment(file_attachment, wrapper_options={}, link_options={})
+      return unless has_authorization?(:update, file_attachment) || has_authorization?(:delete, file_attachment)
+      content_tag :p do
+        link_to_edit_file_attachment(file_attachment) + " " +
+        link_to_delete_file_attachment(file_attachment)
+      end
+    end
+    
+    def link_to_edit_file_attachment(file_attachment, wrapper_options={}, link_options={})
+      return unless has_authorization?(:update, file_attachment)
+      link_wrapper(edit_file_attachment_path(file_attachment), {
+        :no_wrapper => true
+      }.merge!(wrapper_options), {
+        :link_text => 'update',
+        :class => 'file_attachment_dynamic_form_link fake_button'
+      }.merge!(link_options))
+    end
+    
+    def link_to_delete_file_attachment(file_attachment, wrapper_options={}, link_options={})
+      return unless has_authorization?(:delete, file_attachment)
+      link_wrapper(file_attachment_path(file_attachment), {
+        :no_wrapper => true
+      }.merge!(wrapper_options), {
+        :link_text => 'delete',
+        :method => :delete,
+        :confirm => "Did you mean to Delete #{file_attachment.name}?",
+        :class => 'fake_button'
+      }.merge!(link_options))
+    end
+    
+    def link_to_download_file_attachment(file_attachment, wrapper_options={}, link_options={})
+      return unless has_authorization?(:read, file_attachment)
+      link_wrapper(download_file_attachment_path(file_attachment), {
+        :no_wrapper => true
+      }.merge!(wrapper_options), {
+        :link_text => file_attachment.name
+      }.merge!(link_options))
     end
     
-    def render_file_share_navigation
-      render :partial => 'file-share-shared/navigation'
+    def link_to_attachable(attachable, wrapper_options={}, link_options={})
+      return unless has_authorization?(:read, attachable)
+      link_wrapper(polymorphic_path(attachable), {
+        :no_wrapper => true
+      }.merge!(wrapper_options), {
+        :link_text => attachable.name
+      }.merge!(link_options))
     end
+    
+    def link_to_attachable_or_file_attachments(attachable, wrapper_options={}, link_options={})
+      unless attachable.blank?
+        return link_to_attachable(attachable), {
+          :no_wrapper => false
+        }, {
+          :link_text => '< back',
+          :class => 'fake_button'
+        }
+      else
+        return link_to_file_attachments({}, {
+          :link_text => '< back',
+          :class => 'fake_button'
+        })
+      end
+    end
+    
     def file_share_javascript_includes
       list = [
         "jquery-ui-1.7.2.custom.min.js",
@@ -55,6 +112,6 @@ module FileShare
         list.unshift("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js")
       end
       list
-    end
+    end    
   end
 end

data/app/views/file-share-shared/_main_menu.html.erb

@@ -1,3 +1,3 @@
 <ul>
-  <li><%= link_to "Files", file_attachments_path %></li>
+  <li><%= link_to_file_attachments({}, :link_text => "Files") %></li>
 </ul>

data/app/views/file_attachments/_file_attachment.html.erb

@@ -1,20 +1,7 @@
 <%= div_for(file_attachment) do %>
-  <%= content_tag :span, file_attachment.file_container, {
-    :id => "file_attachment_#{file_attachment.id}_file_container",
-    :class => "file_attachment_file_container",
-    :style => "display:none;"
-  } if has_authorization?(:update, file_attachment) %>
+  <%= file_container_data(file_attachment) %>
   <%= description_display(file_attachment) %>
   <%= name_display(file_attachment) %>
-  <%= content_tag :p, :style => "font-size: 11px;" do %>
-    <%= link_to "update", edit_file_attachment_path(file_attachment), {
-      :class => 'file_attachment_dynamic_form_link fake_button'
-    } %>
-    <%= link_to('delete', file_attachment_path(file_attachment.id), {
-          :method => :delete,
-          :confirm => "Did you mean to Delete #{file_attachment.name}?",
-          :class => 'fake_button'
-        }) if has_authorization?(:delete, file_attachment) %>
-  <% end if has_authorization?(:update, file_attachment) || has_authorization?(:delete, file_attachment) %>
+  <%= links_to_edit_and_delete_file_attachment(file_attachment) %>
 <% end %>  
 <hr />

data/app/views/file_attachments/_file_attachments.html.erb

@@ -4,18 +4,18 @@
     <h2>Orphaned Files</h2>
     <%= render :partial => 'file_attachments/file_attachment', :collection => orphans %>
   </div>
-  <div class="span-8 last">
+  <div id="files" class="span-8 last">
     <h2>Attached Files</h2>
     <% files.group_by(&:attachable).each do |attachable, attached_files| %>
     <div id="<%= "#{attachable.class}_#{attachable.id}" %>">
-    <h3><%= link_to attachable.name, polymorphic_path(attachable) %></h3>
+    <h3><%= link_to_attachable(attachable) %></h3>
     <%= render :partial => 'file_attachments/file_attachment', :collection => attached_files %>
     </div>
     <% end %>
   </div>
   <div style="clear:both;"></div>
   <% else %>
-  <div>
+  <div id="files">
     <% if files.present? || orphans.present? %>
     <%= render :partial => 'file_attachments/file_attachment', :collection => files.present? ? files : orphans %>
     <% end %>
@@ -24,6 +24,7 @@
 </div>
 
 <% if has_authorization?(:update, FileAttachment.new) %>
+<%- @file_containers = FileContainer.all unless defined?(@file_containers) %>
 <form id="file_attachment_dynamic_form" class="formtastic" method="post" action="<%= file_attachments_path %>" style="display: none; padding: 5px 0;">
   <div style="margin: 0pt; padding: 0pt; display: inline;">
     <input type="hidden" value="put" name="_method" />
@@ -42,7 +43,7 @@
   <% end %>
   <textarea id="file_attachment_description" style="height: 70px; width: 69%" name="file_attachment[description]"></textarea>
   <br />
-  <input type="submit" value="Update" /> | <a href="#" class="cancel_dynamic_form">Cancel</a>
+  <input type="submit" value="Update" /> | <a href="#" class="cancel_dynamic_form fake_button">Cancel</a>
 </form>
 
 <% content_for(:javascript) do %>

data/app/views/file_attachments/_upload_form.html.erb

@@ -1,4 +1,4 @@
-<% if defined?(container) && container %>
+<% if defined?(container) && container.present? %>
   <% new_file_attachment = FileAttachment.new(:attachable => container) %>
 <% else %>
   <% new_file_attachment = FileAttachment.new %>
@@ -11,8 +11,10 @@
   %>
 
   <% f.inputs do %>
+    <% if new_file_attachment.attachable.present? %>
     <%= f.input :attachable_id, :as => :hidden %>
     <%= f.input :attachable_type, :as => :hidden %>
+    <% end %>
     <%= f.input :name, :label => 'Name' %>
     <%= f.input :description, :label => 'Description' %>
     <%= f.input :uploaded_file, :as => :file, :label => 'Filepath' %>

data/app/views/file_attachments/edit.html.erb

@@ -1,6 +1,4 @@
-<%- back_path = @file_attachment.attachable_id.blank? ? 
-  file_attachments_path : polymorphic_path(@file_attachment.attachable_id) -%>
-<p><%= link_to '< back', back_path, :class => 'fake_button' %></p>
+<p><%= link_to_attachable_or_file_attachments(@file_attachment.attachable) %></p>
 
 <%= content_tag :div do %>
   <%= semantic_form_for @file_attachment do |form| %>

data/app/views/file_attachments/show.html.erb

@@ -0,0 +1,5 @@
+<h2><%= link_to_download_file_attachment(@file_attachment) %></h2>
+<%= link_to_attachable(@file_attachment.attachable) %>
+<%= description_display(@file_attachment) %>
+
+<%= links_to_edit_and_delete_file_attachment(file_attachment) %>

data/app/views/layouts/application.html.erb

@@ -41,7 +41,7 @@
     <div class="span-4 last">
       <div id="main_menu">
         <ul>
-          <li><%= link_to "Files", file_attachments_path %></li>
+          <li><%= link_to_file_attachments %></li>
         </ul>
       </div>
 

data/config/blueprint_settings.yml

@@ -6,4 +6,5 @@ default:
   - link-icons
   - pagination
   - tacs-base
+  - files
 

data/public/javascripts/file_share_behaviors.js

@@ -166,7 +166,7 @@ DynamicForm = $.klass({
         // get resource attr names from form input ids
         var resourceAttrContainer = resourceContainer.find('.'+this.id);
         // get resource attr vals from w/in resource container
-        this.value = resourceAttrContainer.text();
+        this.value = $.trim(resourceAttrContainer.text());
       });
       
       this.formElement.show();

data/public/stylesheets/blueprint/readme.txt

@@ -1,4 +1,4 @@
-TACS base styles
+Event styles
 
 Credits
 ----------------------------------------------------------------
@@ -9,4 +9,4 @@ Usage
 ----------------------------------------------------------------
 
 1) Add this line to your HTML:
-  <link rel="stylesheet" href="css/blueprint/plugins/tacs-base/screen.css" type="text/css" media="screen, projection">
+  <link rel="stylesheet" href="css/blueprint/plugins/events/screen.css" type="text/css" media="screen, projection">

data/public/stylesheets/blueprint/screen.css

@@ -399,4 +399,8 @@ table.tiny_table td {padding:0px 2px;margin:0px 2px;font-size:9px;}
 table.tablesorter {width:auto;}
 table.tablesorter tbody td {padding:4px 12px;}
 table.tablesorter th.header {padding-right:24px;}
-table.tablesorter thead tr th {font-size:13px;}
+table.tablesorter thead tr th {font-size:13px;}
+
+/* files */
+div.file_attachment {margin-bottom:10px;}
+p.description_file_attachment {float:right;max-width:70%;}

data/public/stylesheets/main_elements.css

@@ -23,4 +23,4 @@
 
 .pagination {
 }
-*/
+*/

data/spec/controllers/file_attachments_controller_spec.rb

@@ -167,6 +167,21 @@ describe FileAttachmentsController do
     
   end
   
+  describe ":show, :id => int" do
+    before(:each) do
+      FileAttachment.stub(:find).and_return(mock_file_attachment)
+    end
+    it "loads a @file_attachment" do
+      FileAttachment.should_receive(:find).with('1').and_return(mock_file_attachment)
+      get :show, :id => "1"
+      assigns[:file_attachment].should eql mock_file_attachment
+    end
+    it "renders the show template" do
+      get :show, :id => "1"
+      response.should render_template("file_attachments/show")
+    end
+  end
+  
   describe ":edit, :id => integer" do
     
     before(:each) do
@@ -176,7 +191,7 @@ describe FileAttachmentsController do
     it "loads a file_attachment as @file_attachment" do
       FileAttachment.should_receive(:find).with('1').and_return(mock_file_attachment)
       get :edit, :id => "1"
-      assigns[:file_attachment].should == @mock_file_attachment
+      assigns[:file_attachment].should eql @mock_file_attachment
     end
     
     it "loads potential containers as @file_containers" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file_share
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -08:00
+date: 2010-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -295,6 +295,7 @@ files:
 - app/views/file_attachments/_upload_form.html.erb
 - app/views/file_attachments/edit.html.erb
 - app/views/file_attachments/index.html.erb
+- app/views/file_attachments/show.html.erb
 - app/views/file_attachments/update.js.rjs
 - app/views/layouts/application.html.erb
 - config/application.rb