lolita-file-upload 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/app/assets/javascripts/lolita/file-upload/gallery.js.coffee

@@ -5,12 +5,14 @@ class LolitaFileUploadGallery
 
   @buttonTitle = ""
   @buttonImage = ""
+  @availableFileIcons = {}
 
   GALLERY_SELECTOR = "#fixed-gallery"
   SLIDER_SELECTOR = "#fixed-gallery .slider"
   CLOSE_BUTTON_SELECTOR = "#fixed-gallery .close"
   TAPE_SELECTOR = "#fixed-gallery .slider ul"
-  IMAGE_SELECTOR = "#fixed-gallery .slider li img"
+  IMAGE_SELECTOR = "#fixed-gallery .slider li .image img"
+  FILE_ICON_SELECTOR = "#fixed-gallery .slider li .file img"
 
   @get: ->
     if not @_instance?
@@ -31,11 +33,13 @@ class LolitaFileUploadGallery
 
   add: (filePath, originalFilePath) ->
     if @_isImagePath(filePath)
-      $imageContainer = @_imageContainer(filePath, originalFilePath)
-      if @._initialized
-        @_addToDOM($imageContainer)
-      else
-        @_addToQueue($imageContainer)
+      $fileContainer = @_imageContainer(filePath, originalFilePath)
+    else
+      $fileContainer = @_fileContainer(filePath, originalFilePath)
+    if @._initialized
+      @_addToDOM($fileContainer)
+    else
+      @_addToQueue($fileContainer)
 
   _observeImageDropping: ->
     tinyMCE.onAddEditor.add( (mgr, editor) =>
@@ -50,8 +54,8 @@ class LolitaFileUploadGallery
     })
 
   _makeImagesDraggable: ->
-    $(IMAGE_SELECTOR).draggable("destroy")
-    $(IMAGE_SELECTOR).draggable({
+    $(IMAGE_SELECTOR + ',' + FILE_ICON_SELECTOR).draggable("destroy")
+    $(IMAGE_SELECTOR + ',' + FILE_ICON_SELECTOR).draggable({
       appendTo: "body"
       zIndex: 20000
       helper: "clone"
@@ -91,14 +95,39 @@ class LolitaFileUploadGallery
   _isImagePath: (filePath) ->
     filePath.match(/\.(jpg|jpeg|gif|png|ico)$/)
 
+  _getFileExtension: (filePath) ->
+    filePath.substr(filePath.lastIndexOf('.') + 1)
+
+  _getFileIcon: (filePath) ->
+    extension = @_getFileExtension(filePath)
+    if LolitaFileUploadGallery.availableFileIcons[extension]
+      LolitaFileUploadGallery.availableFileIcons[extension]
+    else
+      LolitaFileUploadGallery.availableFileIcons['unknown']
+
+  _getFileBasename: (filePath) ->
+    return filePath.replace(/\\/g,'/').replace( /.*\//, '' );
+
   _tape: ->
     $(TAPE_SELECTOR)
 
   _imageContainer: (imagePath, originalImagePath) ->
-    $("<li><a href='#'>" + @_imageTag(imagePath, originalImagePath) + "</a></li>")
+    $('<li>').html(
+      $('<a>').attr('href','#').addClass('image').html(
+        @_imageTag(imagePath, originalImagePath)
+      )
+    )
 
   _imageTag: (imagePath, originalImagePath) ->
-    "<img src='"+ imagePath + "' alt='" + imagePath + "' data-original-url='" + originalImagePath + "' />"
+    $('<img>').attr({src: imagePath, alt: imagePath}).data('original-url', originalImagePath)
+
+  _fileContainer: (filePath, originalFilePath) ->
+    $('<li>').html( 
+      $('<a>').attr('href', '#').addClass('file').html( 
+        $('<img>').attr({src: @_getFileIcon(originalFilePath), title: @_getFileBasename(originalFilePath)})
+        .data('original-url', originalFilePath)
+      )
+    )
 
   _addToDOM: ($imageContainer) ->
     @_tape().append($imageContainer)
@@ -114,16 +143,24 @@ class LolitaFileUploadGallery
       $(editor.contentDocument).ready ->
         self._editorContainer(editor).droppable({
           drop: (event, ui) =>
-            editor.selection.setContent(self._insertableImageTag(ui.draggable))
+            editor.selection.setContent(self._insertableTag(ui.draggable))
         })
     )
 
   _editorContainer: (editor) ->
     $("#" + editor.editorContainer).find(".mceIframeContainer")
 
-  _insertableImageTag: (draggableImage) ->
-    imageSrc = draggableImage.data("original-url")
-    "<img src='" + imageSrc + "' alt='" + imageSrc + "' />"
+  _insertableTag: (draggable) ->
+    filePath = draggable.data("original-url")
+    if @_isImagePath(filePath)
+      @_insertableImageTag(filePath)
+    else
+      @_insertableFileTag(filePath)
 
+  _insertableImageTag: (imagePath) ->
+    "<img src='" + imagePath + "' alt='" + imagePath + "' />"
+  
+  _insertableFileTag:  (filePath) ->
+    "<a class='file-icon' href='" + filePath + "'><img src='" + @_getFileIcon(filePath) + "' /><span>" + @_getFileBasename(filePath) + "</span></a>"
 
 window.LolitaFileUploadGallery = LolitaFileUploadGallery

data/app/models/lolita/upload/file.rb

@@ -9,7 +9,7 @@ module Lolita
       #validate :size_limit FIXME to work with more than one tab
       before_save :set_metadata
       #before_create :singularize_files
-      
+
 
       private
 

data/app/views/components/lolita/configuration/tab/files/_fixed_gallery.html.haml

@@ -4,11 +4,10 @@
       %ul
   %div.close.ui-state-default.ui-corner-all
     %span.ui-icon.ui-icon-closethick
-    
+
 :javascript
-  $(function(){
-    LolitaFileUploadGallery.buttonTitle = '#{t('lolita.tinymce.gallery')}'
-    LolitaFileUploadGallery.buttonImage = '#{asset_path('lolita/tinymce_gallery.png')}'
-    LolitaFileUploadGallery.get().init()
-  })
+  LolitaFileUploadGallery.availableFileIcons = #{Lolita::FileUpload.get_available_file_icons.to_json}
+  LolitaFileUploadGallery.buttonTitle = '#{t('lolita.tinymce.gallery')}'
+  LolitaFileUploadGallery.buttonImage = '#{asset_path('lolita/tinymce_gallery.png')}'
+  LolitaFileUploadGallery.get().init()
   

data/app/views/components/lolita/configuration/tab/files/_image.html.erb

@@ -16,9 +16,7 @@
   <p><%= File.basename(file.send(tab.uploader).url) %></p>
 </div>
 <script>
-  <% if file.send(tab.uploader).preview %>
-    LolitaFileUploadGallery.get().add('<%= file.send(tab.uploader).preview.url %>', '<%= file.send(tab.uploader).url %>')
-  <% end %>
+  LolitaFileUploadGallery.get().add('<%= file.send(tab.uploader).preview ? file.send(tab.uploader).preview.url : '' %>', '<%= file.send(tab.uploader).url %>')
   <% if tab.association_type == :many
       ids = "#{resource_name}[#{tab.association.name.to_s.singularize}_ids][]"
     else

data/app/views/components/lolita/configuration/tab/files/_row.html.erb

@@ -1,8 +1,6 @@
 <tr id="upload_<%=tab.association.name%>_row_<%=file.id%>" data-<%=tab.association.name%>-id="<%=file.id%>">
   <%= render_component *tab.build("",:cells,:file=>file) %>
   <script>
-    <% if file.send(tab.uploader).preview %>
-      LolitaFileUploadGallery.get().add('<%= file.send(tab.uploader).preview.url %>', '<%= file.send(tab.uploader).url %>)
-    <% end %>
+    LolitaFileUploadGallery.get().add('<%= file.send(tab.uploader).preview ? file.send(tab.uploader).preview.url : '' %>', '<%= file.send(tab.uploader).url %>)
   </script>
 </tr>

data/lib/lolita-file-upload.rb

@@ -9,6 +9,18 @@ I18n.load_path += Dir[File.expand_path("config/locales")+"/**/*.yml"] if defined
 
 module Lolita
   module FileUpload
+    class << self
+      def get_available_file_icons
+        @available_file_icons ||= {}.tap do |results|
+          Dir.entries(::File.dirname(__FILE__) + "/../app/assets/images/lolita/file-icons").each do |item|
+            if ::File.extname(item) == '.png'
+              results[::File.basename(item, '.png')] =
+                ActionController::Base.helpers.asset_path(::File.join('lolita/file-icons', ::File.basename(item)))
+            end
+          end
+        end
+      end
+    end
   end
   module Support
     autoload :Bytes, "support/bytes"

data/lolita-file-upload.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita-file-upload"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = "2012-10-04"
+  s.date = "2012-11-12"
   s.description = "File upload gem for Lolita with with fulll integration - models, controller, views"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -24,6 +24,39 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/assets/images/lolita/file-icons/asf.png",
+    "app/assets/images/lolita/file-icons/avi.png",
+    "app/assets/images/lolita/file-icons/bin.png",
+    "app/assets/images/lolita/file-icons/doc.png",
+    "app/assets/images/lolita/file-icons/docx.png",
+    "app/assets/images/lolita/file-icons/dvd.png",
+    "app/assets/images/lolita/file-icons/fon.png",
+    "app/assets/images/lolita/file-icons/html.png",
+    "app/assets/images/lolita/file-icons/ini.png",
+    "app/assets/images/lolita/file-icons/m4a.png",
+    "app/assets/images/lolita/file-icons/mov.png",
+    "app/assets/images/lolita/file-icons/mp2.png",
+    "app/assets/images/lolita/file-icons/mp3.png",
+    "app/assets/images/lolita/file-icons/mp4.png",
+    "app/assets/images/lolita/file-icons/mpeg.png",
+    "app/assets/images/lolita/file-icons/pdf.png",
+    "app/assets/images/lolita/file-icons/ppt.png",
+    "app/assets/images/lolita/file-icons/pptx.png",
+    "app/assets/images/lolita/file-icons/psd.png",
+    "app/assets/images/lolita/file-icons/rar.png",
+    "app/assets/images/lolita/file-icons/rtf.png",
+    "app/assets/images/lolita/file-icons/torrent.png",
+    "app/assets/images/lolita/file-icons/ttf.png",
+    "app/assets/images/lolita/file-icons/txt.png",
+    "app/assets/images/lolita/file-icons/unknown.png",
+    "app/assets/images/lolita/file-icons/wma.png",
+    "app/assets/images/lolita/file-icons/wmv.png",
+    "app/assets/images/lolita/file-icons/wri.png",
+    "app/assets/images/lolita/file-icons/xls.png",
+    "app/assets/images/lolita/file-icons/xlsx.png",
+    "app/assets/images/lolita/file-icons/xml.png",
+    "app/assets/images/lolita/file-icons/xsl.png",
+    "app/assets/images/lolita/file-icons/zip.png",
     "app/assets/images/lolita/file-upload/back.png",
     "app/assets/images/lolita/file-upload/delete.png",
     "app/assets/images/lolita/file-upload/edit.png",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
@@ -156,6 +156,39 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/assets/images/lolita/file-icons/asf.png
+- app/assets/images/lolita/file-icons/avi.png
+- app/assets/images/lolita/file-icons/bin.png
+- app/assets/images/lolita/file-icons/doc.png
+- app/assets/images/lolita/file-icons/docx.png
+- app/assets/images/lolita/file-icons/dvd.png
+- app/assets/images/lolita/file-icons/fon.png
+- app/assets/images/lolita/file-icons/html.png
+- app/assets/images/lolita/file-icons/ini.png
+- app/assets/images/lolita/file-icons/m4a.png
+- app/assets/images/lolita/file-icons/mov.png
+- app/assets/images/lolita/file-icons/mp2.png
+- app/assets/images/lolita/file-icons/mp3.png
+- app/assets/images/lolita/file-icons/mp4.png
+- app/assets/images/lolita/file-icons/mpeg.png
+- app/assets/images/lolita/file-icons/pdf.png
+- app/assets/images/lolita/file-icons/ppt.png
+- app/assets/images/lolita/file-icons/pptx.png
+- app/assets/images/lolita/file-icons/psd.png
+- app/assets/images/lolita/file-icons/rar.png
+- app/assets/images/lolita/file-icons/rtf.png
+- app/assets/images/lolita/file-icons/torrent.png
+- app/assets/images/lolita/file-icons/ttf.png
+- app/assets/images/lolita/file-icons/txt.png
+- app/assets/images/lolita/file-icons/unknown.png
+- app/assets/images/lolita/file-icons/wma.png
+- app/assets/images/lolita/file-icons/wmv.png
+- app/assets/images/lolita/file-icons/wri.png
+- app/assets/images/lolita/file-icons/xls.png
+- app/assets/images/lolita/file-icons/xlsx.png
+- app/assets/images/lolita/file-icons/xml.png
+- app/assets/images/lolita/file-icons/xsl.png
+- app/assets/images/lolita/file-icons/zip.png
 - app/assets/images/lolita/file-upload/back.png
 - app/assets/images/lolita/file-upload/delete.png
 - app/assets/images/lolita/file-upload/edit.png
@@ -273,7 +306,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 926110708312602261
+      hash: 4195418244213689896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: