assetable 0.1.3 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjZiYTU5Zjc1OTk0NTE2MzFhZWRlMjdlYzVmZmMyOTMzYWNmMzM1Mg==
+    MjllOWNiYzFhMzExZGIwYmQ2NGVhNjE1YWIyN2UzZThlYjZkZjE4Yg==
   data.tar.gz: !binary |-
-    ZDIxMWU0MjMyYTdhZDQ5NTM2NzJmOTViY2ViYTdmMTNhM2E5NjExOQ==
+    NWQxY2FmNGM3Mzk4MDlhYjJhMzI2M2YwMTE0NjczYzZmNWYzNWE0OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmIwNWJjOGE2ZTNmMzhlMjdhNGU5ZmE0MTIyMjM1NzIwOTI2OGQ4YzIwZDhj
-    ZmE3OTRmY2FjYmY2YjFhY2FhNjMyOGM2MzRhNzc1MWYzNzUyZGM4ZWY4YWRh
-    NmJmMTU2NTliNDMyMWViMDE3YTgwMTYxMTU1MThjZGUxNmU4ODk=
+    ZmYyNjQ0YmQ2MDUwMmNlNWFiODcxMDM3YWZkZTE4OWVjNDljMDAwNWUzZTZi
+    YjIzYjZhYzBiNmNmM2RhMDNhZjJlZDFlNTFiMGJmYzVkNTk0NWNiMzczNGI5
+    MWFlNDIwZjE4N2E1OGVlYjVjN2Y4N2U1YWM2OTM1YzhiYWQyYTk=
   data.tar.gz: !binary |-
-    OTAxYjQ3ZWUwMDA2MWE4ZmM2ZmRhZjUyOWYxNzY4NDcyZWQ5OTcyYmE3NzY2
-    YjhjNTgwMTQ2NWM4MTA2YTJkNjc0NTEwZGVkZmRkOWM0YjU3NTYwNzkxMWNk
-    MTAyNzMwZWFmNDU2MWY3MmIyZDZkOGUyNGVhN2JhYmZiNGZjYzA=
+    NDk4ZDYwNjZlMjEyOTlkMDI4MzRlZGEyYjlmNDJkYmU2OGQyYTljNjVhZTEw
+    YTY5ODYwZTczZDQ1MmVkZjQyYTdkZjA2OThjZmEzMjQ2YjRiMzUwODZmYmQ5
+    ZTdiOTdhODdkZjdkYzZhODJmZWUwNTZhOGQxOTNiNWNiY2EwODc=

data/app/assets/javascripts/assetable/assetable_uploader.js.coffee

@@ -9,6 +9,7 @@
       fieldname: null
       FileUploaded: options.onUploaded
       fileRemoved: options.fileRemoved
+      fileUpdated: options.fileUpdated
       gallery: false
       id: null
       max_file_size: "10mb"
@@ -133,6 +134,26 @@
           assetable_uploader.options.fileRemoved this, assetable_uploader
 
 
+      $(assetable_uploader).on "click", ".btn-uploader-edit-asset", (e)->
+        e.preventDefault()
+        $.ajax
+          url: $(this).attr('href')
+          data: {fieldname: assetable_uploader.options.fieldname}
+          type: 'GET'
+
+          success: (response)->
+            $response = $(response)
+            $response.modal()
+
+            $('form.form-edit-asset').on 'ajax:beforeSend', ()->
+                # console.log "form submitting..."                
+
+            $('form.form-edit-asset').on 'ajax:success', (data, status, xhr)->
+              if status.success
+                $response.modal('hide').remove()
+                assetable_uploader.options.fileUpdated status
+
+
       $(assetable_uploader).on "click", ".btn-open-asset-gallery", (e)->
         e.preventDefault()
         $(assetable_uploader).asset_gallery({fieldname: assetable_uploader.options.fieldname})
@@ -173,11 +194,11 @@
 ) jQuery
 
 
-$(document).ready ->
 
+
+bind_uploaders = ->
   # Bind the koh uploader and galleries to a page
   $(".uploader").each ->
-    
     # Check that it's not already bound
     unless $(this).hasClass("uploadable")
       $(this).addClass "uploadable"
@@ -198,7 +219,14 @@ $(document).ready ->
           return false unless $(item).hasClass("uploader-has-asset")
           $('.uploader-preview', item).html('<input type="hidden" name="' + field + '" />')
           $(item).removeClass("uploader-has-asset")
+        fileUpdated: (resp) ->
+          $this.find('div.uploader-preview[data-asset-id="' + resp.id + '"]').replaceWith(resp.html)
         # openAssetGallery: (button, item) ->
 
-          
 
+
+window.Assetable.bind_uploaders = bind_uploaders
+
+$(document).ready ->
+            
+  window.Assetable.bind_uploaders()

data/app/assets/javascripts/assetable/gallery.js.coffee

@@ -1,8 +1,6 @@
-$(document).ready ->
-
+bind_galleries = ->
   # Bind the koh uploader and galleries to a page
   $(".gallery-uploader").each ->
-    
     # Check that it's not already bound
     unless $(this).hasClass("uploadable")
       $(this).addClass "uploadable"
@@ -18,11 +16,11 @@ $(document).ready ->
         fieldname: field
         authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
         onUploaded: (resp) ->
-          $this.find('.uploadar-data-wrapper').append(resp.html)
+          $this.find('.uploader-data-wrapper').append(resp.html)
         fileRemoved: (button, item) ->
           $(button).closest('.uploader-preview').remove()
-
-
+        fileUpdated: (resp) ->
+          $this.find('div.uploader-preview[data-asset-id="' + resp.id + '"]').replaceWith(resp.html)
 
         # Make the gallery sortable
         $(this).sortable
@@ -31,3 +29,10 @@ $(document).ready ->
           tolerance: 'pointer'
           placeholder: 'uploader-sortable-placeholder'
 
+
+window.Assetable.bind_galleries = bind_galleries
+
+$(document).ready ->
+
+  window.Assetable.bind_galleries()
+

data/app/assets/javascripts/assetable/uploader.js.coffee

@@ -1,3 +1,5 @@
+#= require_self
+
 #= require moxie
 #= require plupload.dev
 #= require plupload.settings
@@ -8,3 +10,5 @@
 #= require assetable/assetable_uploader
 #= require assetable/gallery
 #= require assetable/asset_gallery
+
+window.Assetable = {}

data/app/assets/stylesheets/assetable/components/_uploader.css.sass

@@ -148,7 +148,7 @@ div.uploader-preview
   width: 100%
 
 
-.gallery-uploader .uploadar-data-wrapper
+.gallery-uploader .uploader-data-wrapper
   +clearfix
   text-align: left
 

data/app/controllers/assetable/assets_controller.rb

@@ -13,9 +13,6 @@ class Assetable::AssetsController < ActionController::Base
     content_type = params[:file].content_type
     asset_params = {name: params[:file].original_filename, filename: params[:file]}
 
-    puts "params:: #{params.inspect}"
-    puts "content_type:: #{content_type}"
-
     # Create the appropriate model
     if content_type.split("/").first == "image"
       @asset = Image.new(asset_params)
@@ -25,8 +22,6 @@ class Assetable::AssetsController < ActionController::Base
       @asset = Document.new(asset_params)
     end
 
-    puts "@asset:: #{@asset.inspect}"
-
     # Return
     if @asset.errors.empty? and @asset.save
       render json: { success: true, html: render_to_string(partial: "assetable/assets/asset", locals: { asset: @asset, fieldname: params[:fieldname]})}
@@ -35,4 +30,30 @@ class Assetable::AssetsController < ActionController::Base
     end
   end
 
+  def edit
+    @asset = Asset.find(params[:id])
+  end
+
+  def update
+    @asset = Asset.find(params[:id])
+    if @asset and @asset.errors.empty? and @asset.update_attributes(permitted_params)
+      render json: { success: true, id: @asset.id, html: render_to_string(partial: "assetable/assets/asset", locals: { asset: @asset, fieldname: params[:fieldname]})}
+    else
+      render json: { status: "error", errors: @external_service.errors.full_messages, html: render_to_string(:edit) }
+    end
+  end
+
+  # Permitted params for the model
+  def permitted_params
+    params.require(params[:asset_type].underscore.to_sym).permit(
+      :name,
+      :filename,
+      :body,
+      :content_type,
+      :width,
+      :height,
+      :asset_type
+    )
+  end
+
 end

data/app/models/asset.rb

@@ -62,7 +62,7 @@ class Asset < ActiveRecord::Base
       self.content_type = self.filename.file.content_type
       self.file_size = self.filename.file.size
       self.width, self.height = `identify -format "%wx%h" #{self.filename.file.path}`.split(/x/) unless self.document?
-      self.checksum = Digest::MD5.file(self.filename.file.path).to_s
+      # self.checksum = Digest::MD5.file(self.filename.to_s).to_s
     end
   end
 

data/app/uploaders/asset_uploader.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+class AssetUploader < CarrierWave::Uploader::Base
+
+  # Choose what kind of storage to use for this uploader:
+  storage Assetable.storage
+
+  # Set the MD5 hash
+  process :set_md5
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    if model.present?
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    else
+      "uploads/#{mounted_as}"
+    end
+  end
+    
+  # Set an MD5 hash of the image
+  def set_md5
+    if model.present?
+      model.checksum = Digest::MD5.file(current_path).to_s
+    end 
+  end
+
+end

data/app/uploaders/document_uploader.rb

@@ -1,19 +1,6 @@
 # encoding: utf-8
 
-class DocumentUploader < CarrierWave::Uploader::Base
-
-  # Choose what kind of storage to use for this uploader:
-  storage Assetable.storage
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    if model.present?
-      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-    else
-      "uploads/#{mounted_as}"
-    end
-  end
+class DocumentUploader < AssetUploader
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
   # def default_url

data/app/uploaders/image_uploader.rb

@@ -1,27 +1,14 @@
 # encoding: utf-8
 
-class ImageUploader < CarrierWave::Uploader::Base
+class ImageUploader < AssetUploader
 
   include CarrierWave::MimeTypes
   # Include RMagick or MiniMagick support:
   include CarrierWave::RMagick
 
-  # Choose what kind of storage to use for this uploader:
-  storage Assetable.storage
-
   # More reliable content types
   process :set_content_type
 
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    if model.present?
-      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-    else
-      "uploads/#{mounted_as}"
-    end
-  end
-
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list

data/app/uploaders/video_uploader.rb

@@ -1,16 +1,4 @@
 class VideoUploader < CarrierWave::Uploader::Base
-
-  storage Assetable.storage
-  
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    if model.present?
-      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-    else
-      "uploads/#{mounted_as}"
-    end
-  end
   
   # Create an MP4 version
   # version :mp4 do

data/app/views/assetable/assets/_asset.html.haml

@@ -1,4 +1,4 @@
-.uploader-preview
+.uploader-preview{:'data-asset-id' => asset.id}
   
   = link_to asset.filename.to_s, target: "_blank" do
     - if asset.image?
@@ -18,6 +18,6 @@
     %span.uploader-size= number_to_human_size(asset.file_size)
     .uploader-actions
       = link_to "delete", "#", class: "btn-uploader btn-uploader-remove-asset"
-      = link_to "edit", "#", class: "btn-uploader btn-uploader-edit-asset"
+      = link_to "edit", edit_assetable_asset_path(asset), class: "btn-uploader btn-uploader-edit-asset"
 
   = hidden_field_tag(fieldname, asset.id)

data/app/views/assetable/assets/_form.html.haml

@@ -0,0 +1,32 @@
+.assetable-assets.assetable-modal.modal.fade
+  .modal-dialog
+    .modal-content
+      = form_for [:assetable, @asset], url: assetable_asset_path(@asset, asset_type: @asset.type), remote: true, html: {class: "form-edit-asset"} do |f|
+        .modal-header
+          %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", type: "button"} ×
+          %h4.modal-title Asset
+        .modal-body
+          
+          = hidden_field_tag :fieldname, params[:fieldname]
+          
+          .form-group
+            = f.label :name
+            = f.text_field :name, class: "form-control input-fluid", required: true
+          - unless f.object.filename.present?
+            .form-group
+              = f.label :filename
+              = f.text_field :filename, class: "form-control input-fluid"
+          .form-group
+            = f.label :body
+            = f.text_area :body, class: "form-control input-fluid"
+          .form-group.row
+            .col-xs-6
+              = f.label :width
+              = f.number_field :width, class: "form-control input-fluid"
+            .col-xs-6
+              = f.label :height
+              = f.number_field :height, class: "form-control input-fluid"
+
+        .modal-footer
+          = button_tag "Cancel", class: "btn btn-default", :'data-dismiss' => "modal", type: "button"
+          = f.submit "Save Asset", class: "btn btn-primary"

data/app/views/assetable/assets/edit.html.haml

@@ -0,0 +1 @@
+= render 'form'

data/app/views/assetable/external_services/_form.html.haml

@@ -0,0 +1,34 @@
+.assetable-external-services.assetable-modal.modal.fade
+  .modal-dialog
+    .modal-content
+      = form_for [:assetable, @external_service], remote: true do |f|
+        .modal-header
+          %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", type: "button"} ×
+          %h4.modal-title Third Party Service
+        .modal-body
+          
+          = hidden_field_tag :fieldname, params[:fieldname]
+
+          .form-group
+            = f.label :name
+            = f.text_field :name, class: "form-control input-fluid", required: true
+          .form-group
+            = f.label :content_type
+            = f.select :content_type, ExternalService.possible_content_types
+          .form-group
+            = f.label :filename
+            = f.text_field :filename, class: "form-control input-fluid"
+          .form-group
+            = f.label :body
+            = f.text_area :body, class: "form-control input-fluid", required: true
+          .form-group.row
+            .col-xs-6
+              = f.label :width
+              = f.number_field :width, class: "form-control input-fluid"
+            .col-xs-6
+              = f.label :height
+              = f.number_field :height, class: "form-control input-fluid"
+
+        .modal-footer
+          = button_tag "Cancel", class: "btn btn-default", :'data-dismiss' => "modal", type: "button"
+          = f.submit "Add Third Party Service", class: "btn btn-primary"

data/app/views/assetable/external_services/new.html.haml

@@ -1,34 +1 @@
-.assetable-external-services.assetable-modal.modal.fade
-  .modal-dialog
-    .modal-content
-      = form_for [:assetable, @external_service], remote: true do |f|
-        .modal-header
-          %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", type: "button"} ×
-          %h4.modal-title Third Party Service
-        .modal-body
-          
-          = hidden_field_tag :fieldname, params[:fieldname]
-
-          .form-group
-            = f.label :name
-            = f.text_field :name, class: "form-control input-fluid", required: true
-          .form-group
-            = f.label :content_type
-            = f.select :content_type, ExternalService.possible_content_types
-          .form-group
-            = f.label :filename
-            = f.text_field :filename, class: "form-control input-fluid"
-          .form-group
-            = f.label :body
-            = f.text_area :body, class: "form-control input-fluid", required: true
-          .form-group.row
-            .col-xs-6
-              = f.label :width
-              = f.number_field :width, class: "form-control input-fluid"
-            .col-xs-6
-              = f.label :height
-              = f.number_field :height, class: "form-control input-fluid"
-
-        .modal-footer
-          = button_tag "Cancel", class: "btn btn-default", :'data-dismiss' => "modal", type: "button"
-          = f.submit "Add Third Party Service", class: "btn btn-primary"
+= render 'form'

data/config/initializers/gallery_input.rb

@@ -27,7 +27,7 @@ class ActionView::Helpers::FormBuilder
     end
 
     # Uploader HTML with the asset previews and actions
-    uploader_html = content_tag(:div, (asset_preview.html_safe), class: "uploadar-data-wrapper")
+    uploader_html = content_tag(:div, (asset_preview.html_safe), class: "uploader-data-wrapper")
 
     # Wrap the previews and uploader in a div
     uploader_wrapper = content_tag(:div, uploader_html, class: "gallery-uploader", id: options[:id], :'data-uploader-input-name' => fieldname)

data/config/initializers/uploader_input.rb

@@ -38,9 +38,9 @@ class ActionView::Helpers::FormBuilder
     image_tag = asset_preview_image(asset)
     asset_name = content_tag(:span, asset.name.to_s, class: "uploader-name")
     asset_size = content_tag(:span, number_to_human_size(asset.file_size.to_s), class: "uploader-size")
-    asset_size_and_actions = content_tag(:div, (asset_size + asset_actions), class: "uploader-size-and-actions")
+    asset_size_and_actions = content_tag(:div, (asset_size + asset_actions(asset)), class: "uploader-size-and-actions")
     field = hidden_field_tag(fieldname, (asset.id))
-    return content_tag(:div, (image_tag + asset_name + asset_size_and_actions + field), class: "uploader-preview")
+    return content_tag(:div, (image_tag + asset_name + asset_size_and_actions + field), class: "uploader-preview", :'data-asset-id' => asset.id)
   end
 
   # Asset preview image or fallback to a content type image
@@ -63,9 +63,9 @@ class ActionView::Helpers::FormBuilder
   end
 
   # Asset actions, i.e.e remove and edit buttons
-  def asset_actions
+  def asset_actions asset
     remove_btn = link_to "delete", "#", class: "btn-uploader btn-uploader-remove-asset"
-    edit_btn = link_to "edit", "#", class: "btn-uploader btn-uploader-edit-asset"
+    edit_btn = link_to "edit", Rails.application.routes.url_helpers.edit_assetable_asset_path(asset), class: "btn-uploader btn-uploader-edit-asset", :'data-asset-id' => asset.id
     content_tag(:div, (remove_btn + edit_btn), class: "uploader-actions")
   end
 

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.1.3"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -306,11 +306,15 @@ files:
 - app/models/gallery.rb
 - app/models/image.rb
 - app/models/video.rb
+- app/uploaders/asset_uploader.rb
 - app/uploaders/document_uploader.rb
 - app/uploaders/image_uploader.rb
 - app/uploaders/video_uploader.rb
 - app/views/assetable/assets/_asset.html.haml
+- app/views/assetable/assets/_form.html.haml
 - app/views/assetable/assets/_gallery.html.haml
+- app/views/assetable/assets/edit.html.haml
+- app/views/assetable/external_services/_form.html.haml
 - app/views/assetable/external_services/new.html.haml
 - config/initializers/carrierwave.rb
 - config/initializers/gallery_input.rb