file_share 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/file_attachments_controller.rb

@@ -29,9 +29,6 @@ class FileAttachmentsController < FileShare::ApplicationController
       #end
       #session[:return_to] = nil
     end
-    def load_containers
-      @file_containers = FileContainer.all
-    end
   protected
   public
     def new
@@ -42,7 +39,6 @@ class FileAttachmentsController < FileShare::ApplicationController
     def index
       @orphans = FileAttachment.orphans
       @files   = FileAttachment.attached
-      load_containers
     end
   
     def download
@@ -88,7 +84,6 @@ class FileAttachmentsController < FileShare::ApplicationController
     
     def edit
       @file_attachment = FileAttachment.find(params[:id])
-      load_containers
     end
     
     def update

data/app/helpers/file_share/application_helper.rb

@@ -89,25 +89,27 @@ module FileShare
         })
       end
     end
-    
+    def file_share_asset_prefix
+      'file_share/'
+    end
     def file_share_javascript_includes
       list = [
-        "jquery-ui-1.7.2.custom.min.js",
-        "jquery.tablesorter.min.js",
-        "jquery.string.1.0-min.js",
-        "jquery.clonePosition.js",
-        "lowpro.jquery.js",
-        "jquery.qtip-1.0.0-rc3.js",
-        "rails",
-        "file_share_behaviors",
-        "file_share",
+        "#{file_share_asset_prefix}jquery-ui-1.7.2.custom.min.js",
+        "#{file_share_asset_prefix}jquery.tablesorter.min.js",
+        "#{file_share_asset_prefix}jquery.string.1.0-min.js",
+        "#{file_share_asset_prefix}jquery.clonePosition.js",
+        "#{file_share_asset_prefix}lowpro.jquery.js",
+        "#{file_share_asset_prefix}jquery.qtip-1.0.0-rc3.js",
+        "#{file_share_asset_prefix}rails",
+        "#{file_share_asset_prefix}file_share_behaviors",
+        "#{file_share_asset_prefix}file_share",
         "http://www.google.com/jsapi",
-        "plupload/gears_init",
-        "plupload/plupload.full.min.js",
-        "plupload/jquery.plupload.queue.min.js"
+        "#{file_share_asset_prefix}plupload/gears_init",
+        "#{file_share_asset_prefix}plupload/plupload.full.min.js",
+        "#{file_share_asset_prefix}plupload/jquery.plupload.queue.min.js"
       ]
       unless Rails.env == 'production'
-        list.unshift("jquery")
+        list.unshift("#{file_share_asset_prefix}jquery")
       else
         list.unshift("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js")
       end

data/app/models/file_container.rb

@@ -4,17 +4,17 @@ module FileContainer
   @@types ||= []
 
   def self.included(base)
+    return if @@types.include?(base)
+    
     @@types << base
   
     base.instance_eval do
       include Associations
     end
   end
-  
+
   def self.all
-    types.collect do |type|
-      type.all
-    end.flatten! || []
+    @all ||= types.map{|t| t.where(1)} # lazy load :all of each type
   end
 
   module Associations

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

@@ -24,14 +24,12 @@
 </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" />
     <input type="hidden" value="<%= form_authenticity_token %>" name="authenticity_token" />
   </div>
   <input type="text" id="file_attachment_name" name="file_attachment[name]" />
-  <% unless @file_containers.empty? %>
   <select id="file_attachment_file_container" name="file_attachment[file_container]">
     <%= render({
       :partial => 'file_attachments/file_container_select',
@@ -40,7 +38,6 @@
       }
     }) %>
   </select>
-  <% 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 fake_button">Cancel</a>

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

@@ -1,5 +1,5 @@
   <option value=""></option>
-  <% @file_containers.group_by(&:class).each do |klass, file_containers| %>
+  <% FileContainer.all.flatten.group_by(&:class).each do |klass, file_containers| %>
     <optgroup label="<%= klass.to_s.pluralize %>">
       <%= render({
         :partial => 'file_attachments/file_container_option',

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

@@ -117,7 +117,12 @@
     <%= link_to_if params[:std] == '1', "Several at once", url_for(:controller => controller_name, :action => action_name, :std => 0), :class => 'fake_button' %>
   </p>
 
-  <% if @file_containers.present? %>
+  <% if instance_variable_defined?("@#{controller_name.singularize}") %>
+  <% instance = instance_variable_get("@#{controller_name.singularize}") %>
+  <%= hidden_field_tag 'file_attachment[file_container]', "#{instance.class}_#{instance.id}", {
+    :id => 'file_container_select'
+  } %>
+  <% elsif !FileContainer.types.empty? %>
   <p>
     <select id="file_container_select" name="file_attachment[file_container]">
       <%= render({
@@ -128,15 +133,6 @@
       }) %>
     </select>
   </p>
-  <% elsif instance_variable_defined?("@#{controller_name.singularize}") %>
-  <% instance = instance_variable_get("@#{controller_name.singularize}") %>
-  <%= hidden_field_tag 'file_attachment[file_container]', "#{instance.class}_#{instance.id}", {
-    :id => 'file_container_select'
-  } %>
-  <% else %>
-  <%= hidden_field_tag 'file_attachment[file_container]', nil, {
-    :id => 'file_container_select'
-  } %>
   <% end %>
 
   <% if params[:std] && params[:std] == '1' %>

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

@@ -4,17 +4,18 @@
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <!-- <link rel="icon" type="image/png" href="/images/favorite.png"/> -->
   <title>FileShare</title>
-  <%= stylesheet_link_tag "blueprint/screen", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "plupload/screen", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "blueprint/print", :media => "print" %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}blueprint/screen", :media => "screen, projection" %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}plupload/screen", :media => "screen, projection" %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}blueprint/print", :media => "print" %>
   <!--[if lt IE 8]>
-    <%= stylesheet_link_tag "blueprint/ie", :media => "screen, projection" %>
+    <%= stylesheet_link_tag "#{file_share_asset_prefix}blueprint/ie", :media => "screen, projection" %>
   <![endif]-->
-  <%= stylesheet_link_tag "tablesorter/blue/style", :media => "screen" %>
-  <%= stylesheet_link_tag "smoothness/jquery-ui-1.7.2.custom.css" %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}tablesorter/blue/style", :media => "screen" %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}smoothness/jquery-ui-1.7.2.custom.css" %>
   
-  <%= stylesheet_link_tag 'error_messages', 'formtastic', 'formtastic_changes',
-                          'main_elements', 'text_and_colors' %>
+  <%= stylesheet_link_tag "#{file_share_asset_prefix}error_messages",
+    "#{file_share_asset_prefix}formtastic", "#{file_share_asset_prefix}formtastic_changes",
+    "#{file_share_asset_prefix}main_elements", "#{file_share_asset_prefix}text_and_colors" %>
 
   <%= javascript_include_tag file_share_javascript_includes %>
   

data/config/blueprint_settings.yml

@@ -1,5 +1,5 @@
 default:
-  path: public/stylesheets/blueprint
+  path: public/stylesheets/file_share/blueprint
   plugins:
   - buttons
   - fancy-type

data/spec/controllers/file_attachments_controller_spec.rb

@@ -194,13 +194,6 @@ describe FileAttachmentsController do
       assigns[:file_attachment].should eql @mock_file_attachment
     end
     
-    it "loads potential containers as @file_containers" do
-      FileContainer.stub(:types).and_return([mock_container.class])
-      mock_container.class.should_receive(:all).and_return([mock_container])
-      get :edit, :id => "1"
-      assigns[:file_containers].should eql [mock_container]
-    end
-    
   end
   
   describe ":update, :id => integer, :file_attachment => {}" do
@@ -305,12 +298,6 @@ describe FileAttachmentsController do
       get :index
       assigns[:files].should eql [mock_file_attachment]
     end
-    it "loads potential containers as @file_containers" do
-      FileContainer.stub(:types).and_return([mock_container.class])
-      mock_container.class.should_receive(:all).and_return([mock_container])
-      get :index
-      assigns[:file_containers].should eql [mock_container]
-    end
     it "renders the index template" do
       get :index
       response.should render_template("file_attachments/index")

data/spec/models/file_container_spec.rb

@@ -20,4 +20,9 @@ describe FileContainer do
     MockContainer.should_receive(:has_many)
     MockContainer.send :include, FileContainer
   end
+  it "lazy loads :all of each type" do
+    MockContainer.should_receive(:where).with(1)
+    MockContainer.send :include, FileContainer
+    FileContainer.all
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file_share
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -08:00
+date: 2010-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -329,104 +329,103 @@ files:
 - public/422.html
 - public/500.html
 - public/favicon.ico
-- public/images/rails.png
-- public/javascripts/file_share.js
-- public/javascripts/file_share_behaviors.js
-- public/javascripts/idselector.js
-- public/javascripts/jquery-1.3.2.min.js
-- public/javascripts/jquery-ui-1.7.2.custom.min.js
-- public/javascripts/jquery.clonePosition.js
-- public/javascripts/jquery.js
-- public/javascripts/jquery.qtip-1.0.0-rc3.js
-- public/javascripts/jquery.qtip-1.0.0-rc3.min.js
-- public/javascripts/jquery.string.1.0-min.js
-- public/javascripts/jquery.tablesorter.min.js
-- public/javascripts/lowpro.jquery.js
-- public/javascripts/plupload/gears_init.js
-- public/javascripts/plupload/jquery.plupload.queue.min.js
-- public/javascripts/plupload/plupload.browserplus.min.js
-- public/javascripts/plupload/plupload.flash.min.js
-- public/javascripts/plupload/plupload.flash.swf
-- public/javascripts/plupload/plupload.full.min.js
-- public/javascripts/plupload/plupload.gears.min.js
-- public/javascripts/plupload/plupload.html4.min.js
-- public/javascripts/plupload/plupload.html5.min.js
-- public/javascripts/plupload/plupload.min.js
-- public/javascripts/plupload/plupload.silverlight.min.js
-- public/javascripts/plupload/plupload.silverlight.xap
-- public/javascripts/rails.js
+- public/javascripts/file_share/file_share.js
+- public/javascripts/file_share/file_share_behaviors.js
+- public/javascripts/file_share/idselector.js
+- public/javascripts/file_share/jquery-1.3.2.min.js
+- public/javascripts/file_share/jquery-ui-1.7.2.custom.min.js
+- public/javascripts/file_share/jquery.clonePosition.js
+- public/javascripts/file_share/jquery.js
+- public/javascripts/file_share/jquery.qtip-1.0.0-rc3.js
+- public/javascripts/file_share/jquery.qtip-1.0.0-rc3.min.js
+- public/javascripts/file_share/jquery.string.1.0-min.js
+- public/javascripts/file_share/jquery.tablesorter.min.js
+- public/javascripts/file_share/lowpro.jquery.js
+- public/javascripts/file_share/plupload/gears_init.js
+- public/javascripts/file_share/plupload/jquery.plupload.queue.min.js
+- public/javascripts/file_share/plupload/plupload.browserplus.min.js
+- public/javascripts/file_share/plupload/plupload.flash.min.js
+- public/javascripts/file_share/plupload/plupload.flash.swf
+- public/javascripts/file_share/plupload/plupload.full.min.js
+- public/javascripts/file_share/plupload/plupload.gears.min.js
+- public/javascripts/file_share/plupload/plupload.html4.min.js
+- public/javascripts/file_share/plupload/plupload.html5.min.js
+- public/javascripts/file_share/plupload/plupload.min.js
+- public/javascripts/file_share/plupload/plupload.silverlight.min.js
+- public/javascripts/file_share/plupload/plupload.silverlight.xap
+- public/javascripts/file_share/rails.js
 - public/robots.txt
-- public/stylesheets/blueprint/grid.css
-- public/stylesheets/blueprint/icons/cross.png
-- public/stylesheets/blueprint/icons/doc.png
-- public/stylesheets/blueprint/icons/email.png
-- public/stylesheets/blueprint/icons/external.png
-- public/stylesheets/blueprint/icons/feed.png
-- public/stylesheets/blueprint/icons/im.png
-- public/stylesheets/blueprint/icons/key.png
-- public/stylesheets/blueprint/icons/pdf.png
-- public/stylesheets/blueprint/icons/tick.png
-- public/stylesheets/blueprint/icons/visited.png
-- public/stylesheets/blueprint/icons/xls.png
-- public/stylesheets/blueprint/ie.css
-- public/stylesheets/blueprint/oldgrid.css
-- public/stylesheets/blueprint/plugins/buttons/icons/cross.png
-- public/stylesheets/blueprint/plugins/buttons/icons/key.png
-- public/stylesheets/blueprint/plugins/buttons/icons/tick.png
-- public/stylesheets/blueprint/plugins/buttons/readme.txt
-- public/stylesheets/blueprint/plugins/buttons/screen.css
-- public/stylesheets/blueprint/plugins/fancy-type/readme.txt
-- public/stylesheets/blueprint/plugins/fancy-type/screen.css
-- public/stylesheets/blueprint/plugins/link-icons/icons/doc.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/email.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/external.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/feed.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/im.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/visited.png
-- public/stylesheets/blueprint/plugins/link-icons/icons/xls.png
-- public/stylesheets/blueprint/plugins/link-icons/readme.txt
-- public/stylesheets/blueprint/plugins/link-icons/screen.css
-- public/stylesheets/blueprint/plugins/rtl/readme.txt
-- public/stylesheets/blueprint/plugins/rtl/screen.css
-- public/stylesheets/blueprint/plugins/silksprite/sprite.css
-- public/stylesheets/blueprint/plugins/silksprite/sprites.png
-- public/stylesheets/blueprint/print.css
-- public/stylesheets/blueprint/readme.txt
-- public/stylesheets/blueprint/screen.css
-- public/stylesheets/error_messages.css
-- public/stylesheets/formtastic.css
-- public/stylesheets/formtastic_changes.css
-- public/stylesheets/main_elements.css
-- public/stylesheets/plupload/backgrounds.gif
-- public/stylesheets/plupload/buttons-disabled.png
-- public/stylesheets/plupload/buttons.png
-- public/stylesheets/plupload/delete.gif
-- public/stylesheets/plupload/done.gif
-- public/stylesheets/plupload/error.gif
-- public/stylesheets/plupload/screen.css
-- public/stylesheets/plupload/transp50.png
-- public/stylesheets/reset.css
-- public/stylesheets/scaffold.css
-- public/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- public/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- public/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- public/stylesheets/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- public/stylesheets/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- public/stylesheets/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- public/stylesheets/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- public/stylesheets/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- public/stylesheets/smoothness/images/ui-icons_222222_256x240.png
-- public/stylesheets/smoothness/images/ui-icons_2e83ff_256x240.png
-- public/stylesheets/smoothness/images/ui-icons_454545_256x240.png
-- public/stylesheets/smoothness/images/ui-icons_888888_256x240.png
-- public/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
-- public/stylesheets/smoothness/jquery-ui-1.7.2.custom.css
-- public/stylesheets/tablesorter/blue/asc.gif
-- public/stylesheets/tablesorter/blue/bg.gif
-- public/stylesheets/tablesorter/blue/desc.gif
-- public/stylesheets/tablesorter/blue/style.css
-- public/stylesheets/text_and_colors.css
+- public/stylesheets/file_share/blueprint/grid.css
+- public/stylesheets/file_share/blueprint/icons/cross.png
+- public/stylesheets/file_share/blueprint/icons/doc.png
+- public/stylesheets/file_share/blueprint/icons/email.png
+- public/stylesheets/file_share/blueprint/icons/external.png
+- public/stylesheets/file_share/blueprint/icons/feed.png
+- public/stylesheets/file_share/blueprint/icons/im.png
+- public/stylesheets/file_share/blueprint/icons/key.png
+- public/stylesheets/file_share/blueprint/icons/pdf.png
+- public/stylesheets/file_share/blueprint/icons/tick.png
+- public/stylesheets/file_share/blueprint/icons/visited.png
+- public/stylesheets/file_share/blueprint/icons/xls.png
+- public/stylesheets/file_share/blueprint/ie.css
+- public/stylesheets/file_share/blueprint/oldgrid.css
+- public/stylesheets/file_share/blueprint/plugins/buttons/icons/cross.png
+- public/stylesheets/file_share/blueprint/plugins/buttons/icons/key.png
+- public/stylesheets/file_share/blueprint/plugins/buttons/icons/tick.png
+- public/stylesheets/file_share/blueprint/plugins/buttons/readme.txt
+- public/stylesheets/file_share/blueprint/plugins/buttons/screen.css
+- public/stylesheets/file_share/blueprint/plugins/fancy-type/readme.txt
+- public/stylesheets/file_share/blueprint/plugins/fancy-type/screen.css
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/doc.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/email.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/external.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/feed.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/im.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/pdf.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/visited.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/icons/xls.png
+- public/stylesheets/file_share/blueprint/plugins/link-icons/readme.txt
+- public/stylesheets/file_share/blueprint/plugins/link-icons/screen.css
+- public/stylesheets/file_share/blueprint/plugins/rtl/readme.txt
+- public/stylesheets/file_share/blueprint/plugins/rtl/screen.css
+- public/stylesheets/file_share/blueprint/plugins/silksprite/sprite.css
+- public/stylesheets/file_share/blueprint/plugins/silksprite/sprites.png
+- public/stylesheets/file_share/blueprint/print.css
+- public/stylesheets/file_share/blueprint/readme.txt
+- public/stylesheets/file_share/blueprint/screen.css
+- public/stylesheets/file_share/error_messages.css
+- public/stylesheets/file_share/formtastic.css
+- public/stylesheets/file_share/formtastic_changes.css
+- public/stylesheets/file_share/main_elements.css
+- public/stylesheets/file_share/plupload/backgrounds.gif
+- public/stylesheets/file_share/plupload/buttons-disabled.png
+- public/stylesheets/file_share/plupload/buttons.png
+- public/stylesheets/file_share/plupload/delete.gif
+- public/stylesheets/file_share/plupload/done.gif
+- public/stylesheets/file_share/plupload/error.gif
+- public/stylesheets/file_share/plupload/screen.css
+- public/stylesheets/file_share/plupload/transp50.png
+- public/stylesheets/file_share/reset.css
+- public/stylesheets/file_share/scaffold.css
+- public/stylesheets/file_share/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- public/stylesheets/file_share/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/stylesheets/file_share/smoothness/images/ui-icons_222222_256x240.png
+- public/stylesheets/file_share/smoothness/images/ui-icons_2e83ff_256x240.png
+- public/stylesheets/file_share/smoothness/images/ui-icons_454545_256x240.png
+- public/stylesheets/file_share/smoothness/images/ui-icons_888888_256x240.png
+- public/stylesheets/file_share/smoothness/images/ui-icons_cd0a0a_256x240.png
+- public/stylesheets/file_share/smoothness/jquery-ui-1.7.2.custom.css
+- public/stylesheets/file_share/tablesorter/blue/asc.gif
+- public/stylesheets/file_share/tablesorter/blue/bg.gif
+- public/stylesheets/file_share/tablesorter/blue/desc.gif
+- public/stylesheets/file_share/tablesorter/blue/style.css
+- public/stylesheets/file_share/text_and_colors.css
 - spec/controllers/file_attachments_controller_spec.rb
 - spec/fixtures/file_share_file_attachments.yml
 - spec/fixtures/somefile.txt