assetable 0.1.10 → 0.2.1

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

@@ -1,3 +1,34 @@
+.assetable-selectable
+  ul
+    +clearfix
+    margin: 0
+    padding: 0
+
+  li
+    float: left
+    list-style: none
+    margin: 0
+    padding: 0
+
+  li.ui-selected
+    background-color: $droppable-bg
+    box-shadow: inset 0 0 0 3px $brand-primary
+    position: relative
+
+    &:after
+      background-color: $brand-primary
+      color: white
+      content: "✓"
+      font-weight: bold
+      right: 0
+      padding: 8px 12px
+      position: absolute
+      top: 0
+
+
+
+
+
 // Backdrop dimmer
 .assetable-gallery-backdrop
   background-color: rgba(0, 0, 0, .85)

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

@@ -96,7 +96,7 @@
 // Uploader Preview and actions
 // -------------------------
 
-.uploader-data-wrapper
+.uploader-assets-wrapper
   +clearfix
 
 div.uploader-preview
@@ -148,7 +148,7 @@ div.uploader-preview
   width: 100%
 
 
-.gallery-uploader .uploader-data-wrapper
+.gallery-uploader .uploader-assets-wrapper
   +clearfix
   text-align: left
 

data/app/assets/stylesheets/assetable/core/_utilities.css.sass

@@ -2,4 +2,8 @@
   float: right
 
 .pull-left
-  float: left
+  float: left
+
+.clearfix,
+.cf
+  +clearfix

data/app/controllers/assetable/assets_controller.rb

@@ -1,10 +1,18 @@
 class Assetable::AssetsController < ActionController::Base
 
-  respond_to :html, :json
+  respond_to :html, :js
 
   def index
     @assets = Asset.page(params[:page]).per(20)
-    render json: { success: true, html: render_to_string(partial: "assetable/assets/gallery", locals: {assets: @assets, fieldname: params[:fieldname]})}
+    @fieldname = params[:fieldname]
+    @uploader_id = params[:uploader_id]
+  end
+
+  # Insert assets into a gallery or uploader
+  def insert
+    @fieldname = params[:fieldname]
+    @uploader_id = params[:uploader_id]
+    @assets = Asset.find(params[:asset_ids])
   end
 
   # Create a new asset
@@ -24,23 +32,23 @@ class Assetable::AssetsController < ActionController::Base
 
     # 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]})}
+      @fieldname = params[:fieldname]
+      @uploader_id = params[:uploader_id]
+      render :create
     else
-      render json: { status: "error", errors: @asset.errors }
+      render :error
     end
   end
 
+  # Edit an asset will return the edit form
   def edit
     @asset = Asset.find(params[:id])
   end
 
+  # Update an asset
   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
+    @asset.update_attributes(permitted_params)
   end
 
   # Permitted params for the model
@@ -52,7 +60,8 @@ class Assetable::AssetsController < ActionController::Base
       :content_type,
       :width,
       :height,
-      :asset_type
+      :asset_type,
+      :ratio
     )
   end
 

data/app/controllers/assetable/external_services_controller.rb

@@ -1,6 +1,6 @@
 class Assetable::ExternalServicesController < ActionController::Base
 
-  respond_to :html, :json
+  respond_to :html, :js
 
   # def index
   #   @assets = Asset.page(params[:page]).per(20)
@@ -10,6 +10,8 @@ class Assetable::ExternalServicesController < ActionController::Base
   # New template
   def new
     @external_service = ExternalService.new
+    @fieldname = params[:fieldname]
+    @uploader_id = params[:uploader_id]
   end
 
   # Create a new external service asset
@@ -17,10 +19,11 @@ class Assetable::ExternalServicesController < ActionController::Base
     @external_service = ExternalService.new(permitted_params)
 
     if @external_service.errors.empty? and @external_service.save
-      render json: { success: true, html: render_to_string(partial: "assetable/assets/asset", locals: { asset: @external_service, fieldname: params[:fieldname]})}
+      @fieldname = params[:fieldname]
+      @uploader_id = params[:uploader_id]
+      render :create
     else
-      puts "errors:: #{@external_service.errors.full_messages}"
-      render json: { status: "error", errors: @external_service.errors.full_messages, html: render_to_string(:new) }
+      render :error
     end
   end
 
@@ -32,7 +35,8 @@ class Assetable::ExternalServicesController < ActionController::Base
       :body,
       :content_type,
       :width,
-      :height
+      :height,
+      :uploader_id
     )
   end
 

data/app/helpers/assetable/asset_helper.rb

@@ -0,0 +1,7 @@
+module Assetable::AssetHelper
+
+  def asset_preview asset
+    render partial: "assetable/shared/asset_preview", locals: { asset: asset }
+  end
+
+end

data/app/inputs/gallery_input.rb

@@ -0,0 +1,28 @@
+class GalleryInput < SimpleForm::Inputs::FileInput
+
+  include Assetable::Uploaders
+
+  def input
+    # TODO:: Find a better way to do this
+    fieldname = "#{object_name}[#{attribute_name}_attributes][asset_attachments_attributes]"
+
+    # This is the hidden input that identifies which gallery we are saving
+    # otherwise it will create a new gallery each time.
+    hidden_input = template.hidden_field_tag("#{object_name}[#{attribute_name}_attributes][id]", (object.send(attribute_name).present? ? object.send(attribute_name).id : ""))
+
+    # This is the hidden inputs for the uploader. Each asset added to the
+    # gallery will use this input name
+    gallery_hidden_input = template.hidden_field_tag(fieldname, nil, class: "assetable-uploader-input")
+
+    # Gallery preview
+    preview = gallery_preview(fieldname).html_safe rescue ""
+
+    # Uploader HTML = preview + hidden input
+    uploader_html = template.content_tag(:div, (gallery_hidden_input + preview), class: "uploader-assets-wrapper")
+
+    # Create and return the uploader html
+    uploader_wrapper = template.content_tag :div, (uploader_html + hidden_input + directions_html.html_safe), class: "gallery-uploader"
+    return uploader_wrapper
+  end
+
+end

data/app/inputs/uploader_input.rb

@@ -0,0 +1,24 @@
+class UploaderInput < SimpleForm::Inputs::FileInput
+
+  include Assetable::Uploaders
+
+  def input
+    # Create the hidden input as fields_for
+    fieldname = "#{object_name}[#{attribute_name}_association_attributes][asset_id]"
+
+    # For has_one uploaders, we'll add a nil valued hidden field so that we can
+    # remove an image (similar to how checkboxes work)
+    hidden_field = template.hidden_field_tag(fieldname, nil, class: "assetable-uploader-input")
+    
+    # Asset preview
+    preview = asset_preview(object.send("#{attribute_name}"), :asset, fieldname)
+
+    # Uploader HTML = preview + hidden input
+    uploader_html = template.content_tag(:div, (hidden_field + preview.html_safe), class: "uploader-assets-wrapper")
+
+    # Create and return the uploader html
+    uploader_wrapper = template.content_tag :div, (uploader_html + directions_html.html_safe), class: "assetable-uploader"
+    return uploader_wrapper
+  end
+
+end

data/app/models/asset_attachment.rb

@@ -1,4 +1,31 @@
 class AssetAttachment < ActiveRecord::Base
+
   belongs_to :asset
   belongs_to :assetable, polymorphic: true
+
+  before_validation :ensure_name_is_not_blank
+  before_save :set_sort_order
+
+  # Is the asset_attachment attached to a gallery?
+  def gallery?
+    assetable_type.downcase == "gallery"
+  end
+
+  def gallery
+    assetable
+  end
+
+
+  private
+
+    # Ensure the name is not blank to avoid unique indexes on the name
+    # If it's blank, let's set it to nil
+    def ensure_name_is_not_blank
+      name = nil if name.blank?
+    end
+
+    def set_sort_order
+      sort_order = assetable.asset_attachments.size if gallery? and sort_order.blank?
+    end
+
 end

data/app/models/gallery.rb

@@ -1,7 +1,9 @@
 class Gallery < ActiveRecord::Base
 
   belongs_to :galleryable, polymorphic: true
-  has_many :asset_attachments, as: :assetable, dependent: :destroy
+  has_many :asset_attachments, -> { order('sort_order asc') }, as: :assetable, dependent: :destroy
   has_many :assets, through: :asset_attachments
 
+  accepts_nested_attributes_for :asset_attachments, allow_destroy: true
+
 end

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

@@ -1,23 +1,32 @@
-.uploader-preview{:'data-asset-id' => asset.id}
-  
-  = link_to asset.filename.to_s, target: "_blank" do
-    - if asset.image?
-      = image_tag asset.filename.preview.to_s, class: "uploader-preview"
-    - elsif asset.document?
-      = image_tag "assetable/icons/icon-#{asset.extension}.png", class: "uploader-preview"
-    - elsif asset.video?
-      = image_tag "assetable/icons/icon-mp4.png", class: "uploader-preview"
-    - elsif asset.external_service?
-      - if asset.has_icon?
-        = image_tag "assetable/icons/#{asset.icon}", class: "uploader-preview"
-      - else
-        = image_tag "assetable/icons/icon-document.png", class: "uploader-preview"
+/ = asset_preview(asset)
+/ - if local_assigns.has_key? :fieldname
+/     = hidden_field_tag(fieldname, asset.id)
+
+- if asset.present?
+  .uploader-preview{:'data-asset-id' => asset.id}
+    = link_to asset.filename.to_s, target: "_blank" do
+      - if asset.image?
+        = image_tag asset.filename.preview.to_s, class: "uploader-preview"
+      - elsif asset.document?
+        = image_tag "assetable/icons/icon-#{asset.extension}.png", class: "uploader-preview"
+      - elsif asset.video?
+        = image_tag "assetable/icons/icon-mp4.png", class: "uploader-preview"
+      - elsif asset.external_service?
+        - if asset.has_icon?
+          = image_tag "assetable/icons/#{asset.icon}", class: "uploader-preview"
+        - else
+          = image_tag "assetable/icons/icon-document.png", class: "uploader-preview"
+    
+    %span.uploader-name= asset.name
+    .uploader-size-and-actions
+      %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", Rails.application.routes.url_helpers.edit_assetable_asset_path(asset.id), class: "btn-uploader btn-uploader-edit-asset", remote: true      
   
-  %span.uploader-name= asset.name
-  .uploader-size-and-actions
-    %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", edit_assetable_asset_path(asset), class: "btn-uploader btn-uploader-edit-asset"
+    - if local_assigns.has_key? :fieldname
+      = hidden_field_tag(fieldname, asset.id, id: nil)
 
-  = hidden_field_tag(fieldname, asset.id)
+- else
+  .uploader-preview

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

@@ -0,0 +1,9 @@
+.uploader-directions.drop-element
+  .uploader-directions-image
+  .uploader-directions-copy
+    = link_to "select file", "#", class: "browse-btn"
+    or
+    = link_to "add a third party service", Rails.application.routes.url_helpers.new_assetable_external_service_path, class: "btn-third-party", remote: true
+
+    / or
+    / = link_to "select from gallery", Rails.application.routes.url_helpers.assetable_assets_path(fieldname: fieldname, uploader_id: id), remote: true

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

@@ -1,14 +1,12 @@
-.assetable-assets.assetable-modal.modal.fade
+.assetable-assets.assetable-modal.modal.fade.assetable-modal-edit-asset
   .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|
+      = 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

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

@@ -0,0 +1,22 @@
+.assetable-assets.assetable-modal.modal.fade.assetable-modal-index
+  .modal-dialog
+    = form_tag insert_assetable_assets_path, remote: true do |f|
+      .modal-content
+        .modal-header
+          %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", type: "button"} ×
+          %h4.modal-title Asset Gallery
+        .modal-body.clearfix
+          
+          = hidden_field_tag :fieldname, fieldname
+          = hidden_field_tag :uploader_id, uploader_id
+          
+          .assetable-selectable
+            %ul
+              - assets.each do |asset|
+                %li
+                  = render partial: "asset", locals: {asset: asset}
+                  = check_box_tag 'asset_ids[]', asset.id, false, id: "asset_id_#{asset.id}", style: 'visibility: hidden'
+
+        .modal-footer
+          = button_tag "Cancel", class: "btn btn-default", :'data-dismiss' => "modal", type: "button"
+          = button_tag "Insert", type: :submit, class: "btn btn-primary"

data/app/views/assetable/assets/create.js.erb

@@ -0,0 +1,7 @@
+var uploader = $('#<%= @uploader_id %>');
+
+if (uploader.hasClass("gallery-uploader")) {
+  $('#<%= @uploader_id %>').find('.uploader-assets-wrapper').append('<%= j render partial: "assetable/shared/templates/gallery_item", locals: { asset: @asset, fieldname: @fieldname } %>');
+} else {
+  $('#<%= @uploader_id %>').find('.uploader-assets-wrapper').html('<%= j render partial: "assetable/shared/templates/asset_item", locals: { asset: @asset, fieldname: @fieldname } %>');
+};

data/app/views/assetable/assets/edit.js.erb

@@ -0,0 +1 @@
+$('<%= j render partial: 'form', locals: {asset: @asset} %>').modal();

data/app/views/assetable/assets/index.js.erb

@@ -0,0 +1,18 @@
+$('<%= j render partial: "table", locals: { assets: @assets, fieldname: @fieldname, uploader_id: @uploader_id } %>').modal();
+
+$( ".assetable-selectable" ).selectable({
+  filter: 'li',
+
+  selected: function(event,ui) {
+    $( ".ui-selected", this ).each(function(a,b) {
+      $('input[type="checkbox"]',b).attr('checked',true);
+    });
+  },
+
+  unselected: function(event,ui) {
+    $('input[type="checkbox"]',this).attr('checked',false);
+    $( ".ui-selected", this ).each(function(a,b) {
+      $('input[type="checkbox"]',b).attr('checked',true);
+    });
+  }
+});

data/app/views/assetable/assets/insert.js.erb

@@ -0,0 +1,9 @@
+var uploader = $('#<%= @uploader_id %>');
+
+if (uploader.hasClass("gallery-uploader")) {
+  $('#<%= @uploader_id %>').find('.uploader-assets-wrapper').append('<%= j render partial: "assetable/shared/templates/gallery_item", collection: @assets, locals: {fieldname: @fieldname} %>');
+} else {
+  $('#<%= @uploader_id %>').find('.uploader-assets-wrapper').html('<%= j render partial: "assetable/shared/templates/asset_item", locals: { asset: @assets.first, fieldname: @fieldname } %>');
+};
+
+$('.assetable-modal-index').modal('hide').remove();

data/app/views/assetable/assets/update.js.erb

@@ -0,0 +1,2 @@
+$('div.uploader-preview[data-asset-id="<%= @asset.id %>"]').find('.uploader-asset-details').replaceWith('<%= j render partial: "assetable/shared/asset_preview", locals: {asset: @asset} %>');
+$('.assetable-modal-edit-asset').modal('hide').remove();

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

@@ -1,13 +1,14 @@
 .assetable-external-services.assetable-modal.modal.fade
   .modal-dialog
     .modal-content
-      = form_for [:assetable, @external_service], remote: true do |f|
+      = 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]
+          = hidden_field_tag :fieldname, fieldname
+          = hidden_field_tag :uploader_id, uploader_id
 
           .form-group
             = f.label :name