lolita-file-upload 0.8.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea7078dbb631b0ec2883c8b1586e311d8d8ad142
-  data.tar.gz: 07d092057a3231cdb0f56a54629c0774a77cafb4
+  metadata.gz: 2276e438635874a5b59609dca7cd7757a185f3b7
+  data.tar.gz: 9edaf5e5936f9273c0b2724084a046826dc917e0
 SHA512:
-  metadata.gz: a66d7342cc4cc543723e9556aca52ec854e3a13a8a78282aed5bab2f2593f896ebef1004082fb3230f389d00d9fcc8e745eba6b6d18ba66745a2b649ce22eeee
-  data.tar.gz: 2b2d0a3c2f58338a1888381cf1000eb19e4aa42863ec644218ad56ccf5811f68ff753942f4612f43b3e9dba637e54d97d3fd83b481b562f7998ef1ba45f11326
+  metadata.gz: 0ee8f4e1050231abeffcd3c3a4bab5c0af454eaa8496c3195481f5ed3003d5f4610ce3f128fdf68e8f1416fcdcf9b8369bb31407fbd97040d3e5bf18d2df3e9a
+  data.tar.gz: 6b9d4be98d45f0652b99a605f93f67e526aacc14d4baa6a463bae106ee75fe4bee1f23c44b86e428d4b3443cb1af88a228ab3b271df8d5738ee21d44330a1456

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lolita-file-upload (0.8.2)
+    lolita-file-upload (1.0.0)
       carrierwave (~> 0.6.0)
       lolita (~> 3.2)
       mini_magick (~> 3.6.0)
@@ -61,10 +61,10 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    lolita (3.4.0)
+    lolita (3.4.3)
       abstract (~> 1)
       actionpack (~> 3.2.0)
       activesupport (~> 3.2.0)

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

@@ -1,4 +1,4 @@
-class LolitaFileUploadGallery
+class window.LolitaFileUploadGallery
   @_instance: null
   _initialized: false
   _imageQueue: []
@@ -24,9 +24,17 @@ class LolitaFileUploadGallery
     @_createSlider()
     @_addImagesToDOM()
     @_observeCloseButton()
-    @_addButtonToTinyMCE()
     @._initialized = true
 
+  _observeImageDropping: ->
+    if typeof tinyMCE.onAddEditor == 'object' && typeof tinyMCE.onAddEditor.add == 'function'
+      tinyMCE.onAddEditor.add (e) =>
+        @_observeDropOnTinyMCEEditor(e.editor)
+    else
+      tinyMCE.on "AddEditor", (e) =>
+        @_observeDropOnTinyMCEEditor(e.editor)
+
+
   toggle: ->
     @_gallery().toggle()
     @_slider().elastislide("refresh")
@@ -41,11 +49,6 @@ class LolitaFileUploadGallery
     else
       @_addToQueue($fileContainer)
 
-  _observeImageDropping: ->
-    tinyMCE.onAddEditor.add( (mgr, editor) =>
-      @_observeDropOnTinyMCEEditor(editor)
-    )
-
   _createSlider: ->
     @_slider().elastislide({
       imageW: 100
@@ -71,7 +74,7 @@ class LolitaFileUploadGallery
   _addImagesToDOM: ->
     while image = @._imageQueue.shift()
       @_addToDOM(image)
-  
+
   _observeCloseButton: ->
     $(CLOSE_BUTTON_SELECTOR).mouseenter(->
       $(this).addClass("ui-state-hover")
@@ -81,16 +84,12 @@ class LolitaFileUploadGallery
       @_gallery().hide()
     )
 
-  _addButtonToTinyMCE: ->
-    TinyMCEConfigManager.get().config.addAfter("buttons", "gallery", "image")
-    TinyMCEConfigManager.get().config.addFunction("setup", (editor) ->
-      editor.addButton("gallery", {
-        title: LolitaFileUploadGallery.buttonTitle
-        image: LolitaFileUploadGallery.buttonImage
-        onclick: ->
-         LolitaFileUploadGallery.get().toggle()
-      })
-    )
+  _addButtonToTinyMCE: (editor) ->
+    editor.addButton "gallery",
+      title: LolitaFileUploadGallery.buttonTitle
+      image: LolitaFileUploadGallery.buttonImage
+      onclick: ->
+        LolitaFileUploadGallery.get().toggle()
 
   _gallery: ->
     $(GALLERY_SELECTOR)
@@ -99,7 +98,7 @@ class LolitaFileUploadGallery
     $(SLIDER_SELECTOR)
 
   _isImagePath: (filePath) ->
-    filePath.match(/\.(jpg|jpeg|gif|png|ico)$/)
+    filePath.match(/\.(jpg|jpeg|gif|png|ico)$/i)
 
   _getFileExtension: (filePath) ->
     filePath.substr(filePath.lastIndexOf('.') + 1)
@@ -112,7 +111,7 @@ class LolitaFileUploadGallery
       LolitaFileUploadGallery.availableFileIcons['unknown']
 
   _getFileBasename: (filePath) ->
-    filePath.replace(/\\/g, "/").replace( /.*\//, '' );
+    filePath.replace(/\\/g, "/").replace( /.*\//, '' )
 
   _tape: ->
     $(TAPE_SELECTOR)
@@ -125,13 +124,13 @@ class LolitaFileUploadGallery
     )
 
   _imageTag: (imagePath, originalImagePath) ->
-    $('<img>').attr({src: imagePath, alt: imagePath}).data('original-url', originalImagePath)
+    $('<img>').attr({src: imagePath, alt: imagePath}).attr('data-original-url', originalImagePath)
 
   _fileContainer: (filePath, originalFilePath) ->
-    $('<li>').html( 
-      $('<a>').attr('href', '#').addClass('file').html( 
+    $('<li>').html(
+      $('<a>').attr('href', '#').addClass('file').html(
         $('<img>').attr({src: @_getFileIcon(originalFilePath), title: @_getFileBasename(originalFilePath)})
-        .data('original-url', originalFilePath)
+        .attr('data-original-url', originalFilePath)
       )
     )
 
@@ -145,19 +144,17 @@ class LolitaFileUploadGallery
 
   _observeDropOnTinyMCEEditor: (newEditor) ->
     self = this
-    newEditor.onInit.add( (editor) ->
-      $(editor.contentDocument).ready ->
-        self._editorContainer(editor).droppable({
-          drop: (event, ui) =>
-            editor.selection.setContent(self._insertableTag(ui.draggable))
-        })
-    )
+    newEditor.on "LoadContent", (e) ->
+      $(e.target.getContainer()).droppable({
+        drop: (event, ui) ->
+          e.target.selection.setContent(self._insertableTag(ui.draggable))
+      })
 
   _editorContainer: (editor) ->
     $("#" + editor.editorContainer).find(".mceIframeContainer")
 
   _insertableTag: (draggable) ->
-    filePath = draggable.data("original-url")
+    filePath = draggable.attr("data-original-url")
     if @_isImagePath(filePath)
       @_insertableImageTag(filePath)
     else
@@ -165,8 +162,6 @@ class LolitaFileUploadGallery
 
   _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/assets/javascripts/tinymce/plugins/lolita_gallery/plugin.js.coffee.erb

@@ -0,0 +1,14 @@
+tinymce.PluginManager.add "lolita_gallery", (editor, url) ->
+
+  # Add a button that opens a window
+  editor.addButton "lolita_gallery",
+    text: "<%= I18n.t("lolita.upload.gallery.tinymce.button_text") %>"
+    icon: "image"
+    onclick: -> window.LolitaFileUploadGallery.get().toggle()
+
+  # Adds a menu item to the tools menu
+  editor.addMenuItem "lolita_gallery",
+    text: "<%= I18n.t("lolita.upload.gallery.tinymce.button_text") %>"
+    icon: "image"
+    context: "tools"
+    onclick: -> window.LolitaFileUploadGallery.get().toggle()

data/app/controllers/lolita/uploads_controller.rb

@@ -25,7 +25,7 @@ class Lolita::UploadsController < ApplicationController
 
   def update
     authorization_proxy.can?(:update,@file.class)
-    @file.update_attributes!(params[resource_param_name])
+    @file.update_attributes!(resource_params(@file))
     flash[:notice] = ::I18n.t("lolita.uploads_controller.update.notice")
     render_component *@tab.build("",:update,:file=>@file)
   end
@@ -67,4 +67,12 @@ class Lolita::UploadsController < ApplicationController
   def resource_param_name
     @file.class.to_s.underscore.gsub("/","_")
   end
+
+  def resource_params(resource)
+    params.require(resource_param_name).permit(*get_resource_columns(resource))
+  end
+
+  def get_resource_columns(resource)
+    resource.class.column_names.map { |name| name.to_sym }
+  end
 end

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

@@ -2,7 +2,6 @@ module Lolita
   module Upload
     class File < ActiveRecord::Base
       self.table_name = 'lolita_files'
-      attr_accessible :asset, :name, :fileable_type, :asset_extension
       mount_uploader :asset, FileUploader
       belongs_to :fileable, polymorphic: true
       before_save :set_metadata

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

@@ -16,6 +16,7 @@
   <p><%= File.basename(file.send(tab.uploader).url) %></p>
 </div>
 <script>
+  $(function(){
   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][]"
@@ -25,5 +26,5 @@
   <% if resource && resource.new_record? && resource.errors.any? %>
     $(".tabs form:first").append('<input type="hidden" class="<%=tab.association.name%>-ids" name="<%= ids %>" value="<%= file.id %>" />')
   <% end %>
-
+  });
 </script>

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

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

data/config/locales/en.yml

@@ -18,6 +18,8 @@ en:
       errors:
         "file too big": "file too big (max %{value} %{unit})"
       gallery:
+        tinymce:
+          button_text: "Gallery"
         close: "Close"
     tabs:
       titles:

data/config/locales/lv.yml

@@ -31,6 +31,11 @@ lv:
     upload:
       errors:
         "file too big": "fails par lielu (maksimums %{value} %{unit})"
+      gallery:
+        tinymce:
+          button_text: "Galerija"
+        close: "Aizvērt"
+
     tabs:
       titles:
         files: "Faili"

data/config/locales/sv_SE.yml

@@ -0,0 +1,49 @@
+sv_SE:
+  components:
+    lolita:
+      configuration:
+        tab:
+          files:
+          fixed_gallery:
+            close: Close
+        field:
+          file:
+            remove_current_upload: "Remove current file?"
+  lolita:
+    uploads_controller:
+      update:
+        notice: "File information successfuly saved"
+        error: "File information not saved"
+    upload:
+      errors:
+        "file too big": "file too big (max %{value} %{unit})"
+      gallery:
+        tinymce:
+          button_text: "Gallery"
+        close: "Close"
+    tabs:
+      titles:
+        files: "Files"
+      images:
+        edit: "Edit"
+        delete: "Delete"
+        back: "Back"
+        previous: "Previous"
+        next: "Next"
+        save: "Save"
+    support:
+      bytes:
+        byte:
+          one: byte
+          other: bytes
+        kilobyte:
+          one: kilobyte
+          other: kilobytes
+        megabyte:
+          one: megabyte
+          other: megabytes
+        gigabyte:
+          one: gigabyte
+          other: gigabytes
+    tinymce:
+      gallery: Gallery

data/lib/lolita-file-upload/rails/file_upload_routes.rb

@@ -6,7 +6,7 @@ module ActionDispatch::Routing
       # /lolita/articles/1/pictures/5
       resources mapping.plural, :module=>mapping.module, :only=>:none do
         collection do
-          match "/:association/create", :to => "#{controllers[:uploads]}#create", :as => "create_upload", :method => :post
+          match "/:association/create" => "#{controllers[:uploads]}#create", :as => "create_upload", :via => :post
         end
         resources :uploads, :controller => controllers[:uploads], :path => "/:association"
       end

data/lolita-file-upload.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "lolita-file-upload"
-  s.version     = "0.8.3"
+  s.version     = "1.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["ITHouse (Latvia)", "Arturs Meisters", "Gatis Tomsons"]
   s.description = "File upload gem for Lolita with with fulll integration - models, controller, views"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 1.0.0
 platform: ruby
 authors:
 - ITHouse (Latvia)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
@@ -114,6 +114,7 @@ files:
 - app/assets/images/lolita/tinymce_gallery.png
 - app/assets/javascripts/lolita/file-upload/application.js
 - app/assets/javascripts/lolita/file-upload/gallery.js.coffee
+- app/assets/javascripts/tinymce/plugins/lolita_gallery/plugin.js.coffee.erb
 - app/assets/stylesheets/lolita/file-upload/application.css
 - app/assets/stylesheets/lolita/file-upload/gallery.css
 - app/assets/stylesheets/lolita/file-upload/uploader.css.erb
@@ -140,6 +141,7 @@ files:
 - app/views/components/lolita/configuration/tab/files/_upload_script.html.erb
 - config/locales/en.yml
 - config/locales/lv.yml
+- config/locales/sv_SE.yml
 - lib/generators/lolita/file_upload/install_generator.rb
 - lib/generators/lolita/file_upload/templates/migration.rb
 - lib/lolita-file-upload.rb
@@ -248,4 +250,3 @@ test_files:
 - test_orm/support.rb
 - test_orm/uploaders/list_image_uploader.rb
 - test_orm/uploaders/main_image_uploader.rb
-has_rdoc: