rails-uploader 0.0.1 → 0.0.3

data/README.rdoc

@@ -14,18 +14,25 @@ In routes:
 
 == Usage
 
-Architecture to store uploaded files:
+Architecture to store uploaded files (cancan integration):
 
   class Asset < ActiveRecord::Base
     include Uploader::Asset
     
-    def upload(params, request = nil)
-      self.user = request.env['warden'].user
-      super
+    def uploader_create(params, request = nil)
+      ability = Ability.new(request.env['warden'].user)
+      
+      if ability.can? :create, self
+        self.user = request.env['warden'].user
+        super
+      else
+        errors.add(:id, :access_denied)
+      end
     end
     
     def uploader_destroy(params, request = nil)
       ability = Ability.new(request.env['warden'].user)
+      
       if ability.can? :delete, self
         super
       else
@@ -65,11 +72,15 @@ Stylesheets:
   
 === Views
 
-  
+  <%= uploader_field_tag :article, :photo %>
 
 === Formtastic
 
   <%= f.input :picture, :as => :uploader %>
+
+=== SimpleForm
+
+  <%= f.input :picture, :as => :uploader %>
   
 
 Copyright (c) 2012 Aimbulance, released under the MIT license

data/app/assets/javascripts/uploader/application.js

@@ -5,4 +5,5 @@
 //= require uploader/jquery.iframe-transport
 //= require uploader/jquery.fileupload
 //= require uploader/jquery.fileupload-ui
+//= require uploader/init
 

data/app/assets/javascripts/uploader/init.js

@@ -0,0 +1,5 @@
+(function() {
+  $ = jQuery;
+  $('input[type="file"].uploader').trigger("init.uploader");
+}).call(this);
+

data/app/assets/stylesheets/uploader/application.css

@@ -3,4 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require uploader/jquery.fileupload-ui
+ *= require uploader/default
 */

data/app/views/uploader/default/_container.html.erb

@@ -1,25 +1,33 @@
-<%= content_tag(:div, :id => field.id, :class => "dnd-area") do %>
-  <%= hidden_field(object_name, :fileupload_guid) if object.new_record? %>
+<%= content_tag(:div, :id => field.id, :class => "uploader-dnd-area") do -%>
+  <%= hidden_field(field.object_name, :fileupload_guid) if field.object.new_record? %>
   
-	<div class="dnd-hints">
-	  <%= fields_for object do |f| %>
-	    <%= f.fields_for method_name, field.value do |m| %>
-        <%= m.file_field(:data, input_html) %>
+	<div class="uploader-dnd-hints">  
+	  <button class="uploader-button gray fileinput-button">
+      <span><%= I18n.t('uploader.button') %></span>
+      <%= fields_for field.object do |f| -%>
+	      <%= f.fields_for field.method_name, field.value do |m| -%>
+          <%= m.file_field(:data, field.input_html) %>
+	      <% end -%>
 	    <% end -%>
-	  <% end -%>
+    </button>
 	  
-		<input type="button" class="button gray" value="Выберите файл на компьютере">
-		или<span>Перетащите фотографию сюда</span>
+	  <div class="uploader-dnd-hint">
+		  <%= I18n.t('uploader.or') %><span><%= I18n.t('uploader.drop') %></span>
+	  </div>
 	</div>
 	
+	<%= render :partial => "uploader/#{field.theme}/init" %>
+	
 	<script type="text/javascript">
     $(function() {
-      $('#<%= field.id %> input[type="file"]').fileupload({
-        dataType: 'json',
-        dropZone: $("#<%= field.id %>"),
-        autoUpload: true,
-        paramName: "asset[data]",
-        formData: function(form){ return []; }
+      $('#<%= field.id %> input[type="file"]').bind("init.uploader", function(e){
+        $(this).fileupload({
+          dataType: 'json',
+          dropZone: $("#<%= field.id %>"),
+          autoUpload: true,
+          paramName: "asset[data]",
+          formData: function(form){ return []; }
+        });
       });
     });
   </script>

data/app/views/uploader/default/_init.html.erb

@@ -0,0 +1,9 @@
+<script type="text/javascript">
+  (function(d, s, id) {
+    var js, fjs = d.getElementsByTagName(s)[0];
+    if (d.getElementById(id)) return;
+    js = d.createElement(s); js.id = id;
+    js.src = "/assets/uploader/application.js";
+    fjs.parentNode.appendChild(js);
+  }(document, 'script', 'uploader-jssdk'));
+</script>

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  uploader:
+    button: "Choose file"
+    drop: "Drag&Drop photos here"
+    or: "or"

data/config/locales/ru.yml

@@ -0,0 +1,5 @@
+ru:
+  uploader:
+    button: "Выберите файл на компьютере"
+    drop: "Перетащите фотографию сюда"
+    or: "или"

data/config/locales/uk.yml

@@ -0,0 +1,5 @@
+uk:
+  uploader:
+    button: "Виберіть файл на комп'ютері"
+    drop: "Перетягніть фотографію сюди"
+    or: "або"

data/lib/uploader/engine.rb

@@ -19,6 +19,7 @@ module Uploader
     initializer "uploader.hooks" do
       require "uploader/hooks/active_record" if Object.const_defined?("ActiveRecord")
       require "uploader/hooks/formtastic"    if Object.const_defined?("Formtastic")
+      require "uploader/hooks/simple_form"   if Object.const_defined?("SimpleForm")
     end
   end
 end

data/lib/uploader/helpers/field_tag.rb

@@ -15,17 +15,17 @@ module Uploader
         options = { :object_name => object_name, :method_name => method_name }.merge(options)
         
         @template, @options = template, options.dup
+        
         @theme = (@options.delete(:theme) || "default")
         @value = @options.delete(:value) if @options.key?(:value)
-        @object = @template.instance_variable_get("@#{object_name}")
         
-        @options[:object] ||= @object
-        @options[:input_html] = input_html.merge(@options[:input_html] || {})
+        @object = @options.delete(:object) if @options.key?(:object)
+        @object ||= @template.instance_variable_get("@#{object_name}")
       end
 
       def to_s(locals = {}) #:nodoc:
         locals = { :field => self }.merge(locals)
-        @template.render :partial => "uploader/#{@theme}/container", :locals => @options.merge(locals)
+        @template.render :partial => "uploader/#{@theme}/container", :locals => locals
       end
       
       def id
@@ -61,7 +61,11 @@ module Uploader
       end
       
       def input_html
-        {:"data-url" => attachments_path, :multiple => multiple?}
+        @input_html ||= {
+          :"data-url" => attachments_path, 
+          :multiple => multiple?,
+          :class => "uploader"
+        }.merge(@options[:input_html] || {})
       end
     end
   end

data/lib/uploader/hooks/simple_form.rb

@@ -0,0 +1,7 @@
+require "simple_form"
+
+class UploaderInput < SimpleForm::Inputs::Base
+  def input
+    @builder.uploader_field(attribute_name, input_html_options)
+  end
+end

data/lib/uploader/version.rb

@@ -1,3 +1,3 @@
 module Uploader
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.3".freeze
 end

data/vendor/assets/stylesheets/uploader/default.css

@@ -1,15 +1,39 @@
-.dnd-area {
+.uploader-dnd-area {
   border: 1px dashed #CCC;
   padding: 20px;
   color: #B1B1B1;
   height: 130px;
 }
-.dnd-hints {
+.uploader-dnd-area:active {
+	border-color: #d169d9;
+}
+.uploader-dnd-area:active .uploader-dnd-hints .uploader-dnd-hint  {
+	color: #d169d9;
+}
+.uploader-dnd-hints {
   text-align: center;
   margin-top: 30px;
+  overflow: hidden;	
+}
+.uploader-dnd-hints .uploader-button {
+  margin: 0 20px 0 200px;
+  width: 222px;
+  float: left;
+}
+.uploader-dnd-hints .uploader-dnd-hint {
+  float: left;
+  line-height: 30px;
+  font-size: 12px;
+}
+.uploader-dnd-hints .uploader-dnd-hint span {
+  padding: 10px 30px;
+  background: url(/assets/uploader/ico_attach.png) no-repeat 9px center;
+}
+.uploader-dnd-hints input.uploader {
+  height: 31px;
+  line-height: 31px;
 }
-
-input.button {
+.uploader-button {
 	display: block;
 	background: #972da0;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#982da1', endColorstr='#892891'); 
@@ -30,7 +54,7 @@ input.button {
 	cursor: pointer;
 	height: 31px;
 }
-input.button:hover {
+.uploader-button:hover {
 	background: #972da0;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#90179a', endColorstr='#7d2485'); 
   background: -webkit-linear-gradient(left top, left bottom, #90179a, #7d2485); 
@@ -41,7 +65,7 @@ input.button:hover {
   -webkit-box-shadow: 0 1px 3px #aaa;
   box-shadow: 0 1px 3px #aaa;
 }
-input.button:active {
+.uploader-button:active {
   background: #8e1898;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8e1898', endColorstr='#7f2387'); 
   background: -webkit-linear-gradient(left top, left bottom, #8e1898, #7f2387); 
@@ -52,16 +76,16 @@ input.button:active {
   -webkit-box-shadow: inset 0 0 4px #5f1c65;
   box-shadow: inset 0 0 4px #5f1c65;
 }
-input.button::-moz-focus-inner {
+.uploader-button::-moz-focus-inner {
 	border: 1px dotted transparent;
 }
-input.button.gray {
+.uploader-button.gray {
 	background: #f4f4f4;
   border: solid 1px #dbdbdb;
 	color: #616161;
 	text-shadow: none;
 }
-input.button.gray:hover {
+.uploader-button.gray:hover {
   background: #f3f3f3;
   border: solid 1px #c6c6c6;
   color: #444;
@@ -69,7 +93,7 @@ input.button.gray:hover {
   -moz-box-shadow: 0 3px 3px -1px #e6e6e6;
   box-shadow: 0 3px 3px -1px #e6e6e6;
 }
-input.button.gray:active {
+.uploader-button.gray:active {
   border: 1px solid #ccc;
   -webkit-box-shadow: 0 0 3px #ccc inset !important;
   -moz-box-shadow : 0 0 3px #ccc inset !important;
@@ -78,7 +102,7 @@ input.button.gray:active {
   background-color: #e9e9e9 !important;
   color: #444;
 }
-input[disabled].button {
+input[disabled].uploader-button {
 	background: #d2aad6 !important;
   border: solid 1px #bfa4c1 !important;
 	-webkit-box-shadow: none !important;
@@ -88,7 +112,7 @@ input[disabled].button {
 	text-shadow: none;
 	cursor: default;
 }
-input[disabled].button.gray {
+input[disabled].uploader-button.gray {
   background: #f4f4f4 !important;
   border: solid 1px #dbdbdb !important;
   -webkit-box-shadow: none !important;

data/vendor/assets/stylesheets/uploader/jquery.fileupload-ui.css

@@ -14,9 +14,8 @@
   position: relative;
   overflow: hidden;
   float: left;
-  margin-right: 4px;
 }
-.fileinput-button input {
+.fileinput-button input.uploader {
   position: absolute;
   top: 0;
   right: 0;
@@ -29,32 +28,10 @@
   direction: ltr;
   cursor: pointer;
 }
-.fileupload-buttonbar .btn,
-.fileupload-buttonbar .toggle {
-  margin-bottom: 5px;
-}
-.files .progress {
-  width: 200px;
-}
-.progress-animated .bar {
-  background: url(/assets/uploader/progressbar.gif) !important;
-  filter: none;
-}
-.fileupload-loading {
-  position: absolute;
-  left: 50%;
-  width: 128px;
-  height: 128px;
-  background: url(/assets/uploader/loading.gif) center no-repeat;
-  display: none;
-}
-.fileupload-processing .fileupload-loading {
-  display: block;
-}
 
 /* Fix for IE 6: */
 *html .fileinput-button {
-  line-height: 22px;
+  line-height: 31px;
   margin: 1px -3px 0 0;
 }
 
@@ -62,23 +39,3 @@
 *+html .fileinput-button {
   margin: 1px 0 0 0;
 }
-
-@media (max-width: 480px) {
-  .files .btn span {
-    display: none;
-  }
-  .files .preview * {
-    width: 40px;
-  }
-  .files .name * {
-    width: 80px;
-    display: inline-block;
-    word-wrap: break-word;
-  }
-  .files .progress {
-    width: 20px;
-  }
-  .files .delete {
-    width: 60px;
-  }
-}