assetable 0.1.10 → 0.2.1

data/app/views/assetable/external_services/create.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", locals: { asset: @external_service, fieldname: @fieldname } %>');
+} else {
+  $('#<%= @uploader_id %>').find('.uploader-assets-wrapper').html('<%= j render partial: "assetable/shared/templates/asset_item", locals: { asset: @external_service, fieldname: @fieldname } %>');
+};
+
+$('.assetable-external-services').modal('hide').remove();

data/app/views/assetable/external_services/new.js.erb

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

data/app/views/assetable/shared/_asset_preview.html.haml

@@ -0,0 +1,21 @@
+.uploader-asset-details
+  = 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

data/app/views/assetable/shared/templates/_asset_item.html.haml

@@ -0,0 +1,29 @@
+- if asset.present?
+  .uploader-preview{:'data-asset-id' => asset.id}
+    .uploader-asset-details
+      = 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      
+  
+    - if local_assigns.has_key? :fieldname
+      = hidden_field_tag(fieldname, asset.id, id: nil)
+
+- else
+  .uploader-preview

data/app/views/assetable/shared/templates/_gallery_item.html.haml

@@ -0,0 +1,42 @@
+- if asset.present?
+  .uploader-preview{:'data-asset-id' => asset.id}
+    .uploader-asset-details
+      = 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      
+  
+    - if local_assigns.has_key? :fieldname
+
+      - assetable_index = local_assigns.has_key?(:index) ? index : Time.now.to_i 
+      - if local_assigns.has_key? :asset_attachment
+        - asset_attachment_id = asset_attachment.id
+        - asset_attachment_sort_order = asset_attachment.sort_order
+      - else
+        - asset_attachment_id = nil
+        - asset_attachment_sort_order = nil
+
+      / - id = asset_attachment.id.present? ? asset_attachment.id : Time.now.to_i
+      = hidden_field_tag("#{fieldname}[#{assetable_index}][id]", asset_attachment_id, id: nil)
+      = hidden_field_tag("#{fieldname}[#{assetable_index}][sort_order]", asset_attachment_sort_order, class: "assetable-gallery-item-sort-order")
+      = hidden_field_tag("#{fieldname}[#{assetable_index}][asset_id]", asset.id)
+      = hidden_field_tag("#{fieldname}[#{assetable_index}][_destroy]", "0", class: "assetable-gallery-item-remove")
+
+- else
+  .uploader-preview

data/config/initializers/uploader_input.rb

@@ -27,7 +27,7 @@ class ActionView::Helpers::FormBuilder
     end
     
     # uploaer html with preview and input
-    uploader_html = content_tag(:div, (asset_preview), class: "uploader-data-wrapper")
+    uploader_html = content_tag(:div, (asset_preview), class: "uploader-assets-wrapper")
 
     # Create and return the uploader html
     uploader_wrapper = content_tag(:div, uploader_html, class: "uploader #{'uploader-has-asset' if asset} #{options[:class]}", id: options[:id], :'data-uploader-input-name' => fieldname, :'data-uploader-directions' => get_directions(options), :'data-max-file-size' => get_max_file_size(options))

data/config/routes.rb

@@ -1,7 +1,9 @@
 Rails.application.routes.draw do
 
   namespace :assetable do
-    resources :assets
+    resources :assets do
+      post :insert, on: :collection
+    end
     resources :external_services
   end
 

data/db/migrate/20140220053656_add_sort_order_to_asset_attachments.rb

@@ -0,0 +1,15 @@
+class AddSortOrderToAssetAttachments < ActiveRecord::Migration
+  def change
+    add_column :asset_attachments, :sort_order, :integer, default: 0
+
+    AssetAttachment.reset_column_information
+
+    Gallery.all.each do |gallery|
+      if gallery.asset_attachments.present?
+        gallery.asset_attachments.each_with_index do |attachment, index|
+          attachment.update_attribute(:sort_order, index)
+        end
+      end
+    end
+  end
+end

data/lib/assetable.rb

@@ -1,18 +1,21 @@
 require "carrierwave"
 require "fog"
-require "plupload-rails"
 require "kaminari"
+require "plupload-rails"
+require "simple_form"
 
 require "haml-rails"
 require "sass-rails"
 require "jquery-rails"
 
-require "assetable/core"
 require "assetable/engine"
 require "assetable/config"
 
+require "assetable/active_record/base"
+require "assetable/inputs/uploaders"
+
 module Assetable
-  
+
   extend Config
 
 end

data/lib/assetable/{core.rb → active_record/base.rb}

@@ -1,5 +1,5 @@
 module Assetable
-  module Core
+  module Base
     extend ActiveSupport::Concern
     
     included do
@@ -38,4 +38,4 @@ module Assetable
   end
 end
 
-ActiveRecord::Base.send :include, Assetable::Core
+ActiveRecord::Base.send :include, Assetable::Base

data/lib/assetable/inputs/uploaders.rb

@@ -0,0 +1,27 @@
+module Assetable::Uploaders
+
+  # Gallery preview is a set of assets. Let's loop over the assets in the
+  # gallery and create a preview for each.
+  def gallery_preview fieldname
+    if modal_gallery = object.send("#{attribute_name}")
+      gallery = ""
+
+      # modal_gallery.assets.each do |asset|
+      modal_gallery.asset_attachments.each_with_index do |asset_attachment, index|
+        # gallery += asset_preview(asset, :gallery, fieldname) 
+        gallery += ActionController::Base.new.send(:render_to_string, partial: "assetable/shared/templates/gallery_item", locals: { asset: asset_attachment.asset, asset_attachment: asset_attachment, fieldname: fieldname, index: index })
+      end
+
+      gallery
+    end
+  end
+
+  def asset_preview asset, type=:asset, fieldname=nil
+    ActionController::Base.new.send(:render_to_string, partial: "assetable/shared/templates/#{type.downcase.to_s}_item", locals: { asset: asset, fieldname: fieldname })
+  end
+
+  def directions_html
+    ActionController::Base.new.send(:render_to_string, :partial => 'assetable/assets/directions')
+  end
+
+end

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.1.10"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.1
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -207,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -221,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -235,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -249,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -295,6 +309,7 @@ files:
 - app/assets/images/assetable/icons/icon-xml.png
 - app/assets/images/assetable/icons/icon-zip.png
 - app/assets/javascripts/assetable/asset_gallery.js.coffee
+- app/assets/javascripts/assetable/assetable.js.coffee
 - app/assets/javascripts/assetable/assetable_uploader.js.coffee
 - app/assets/javascripts/assetable/gallery.js.coffee
 - app/assets/javascripts/assetable/uploader.js.coffee
@@ -314,6 +329,9 @@ files:
 - app/assets/stylesheets/assetable/core/_variables.css.sass
 - app/controllers/assetable/assets_controller.rb
 - app/controllers/assetable/external_services_controller.rb
+- app/helpers/assetable/asset_helper.rb
+- app/inputs/gallery_input.rb
+- app/inputs/uploader_input.rb
 - app/models/asset.rb
 - app/models/asset_attachment.rb
 - app/models/document.rb
@@ -326,11 +344,21 @@ files:
 - app/uploaders/image_uploader.rb
 - app/uploaders/video_uploader.rb
 - app/views/assetable/assets/_asset.html.haml
+- app/views/assetable/assets/_directions.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/assets/_table.html.haml
+- app/views/assetable/assets/create.js.erb
+- app/views/assetable/assets/edit.js.erb
+- app/views/assetable/assets/index.js.erb
+- app/views/assetable/assets/insert.js.erb
+- app/views/assetable/assets/update.js.erb
 - app/views/assetable/external_services/_form.html.haml
-- app/views/assetable/external_services/new.html.haml
+- app/views/assetable/external_services/create.js.erb
+- app/views/assetable/external_services/new.js.erb
+- app/views/assetable/shared/_asset_preview.html.haml
+- app/views/assetable/shared/templates/_asset_item.html.haml
+- app/views/assetable/shared/templates/_gallery_item.html.haml
 - config/initializers/carrierwave.rb
 - config/initializers/gallery_input.rb
 - config/initializers/uploader_input.rb
@@ -339,9 +367,11 @@ files:
 - db/migrate/20131123172825_create_asset_attachments.rb
 - db/migrate/20131125200943_create_galleries.rb
 - db/migrate/20140121173312_add_ratio_to_assets.rb
+- db/migrate/20140220053656_add_sort_order_to_asset_attachments.rb
+- lib/assetable/active_record/base.rb
 - lib/assetable/config.rb
-- lib/assetable/core.rb
 - lib/assetable/engine.rb
+- lib/assetable/inputs/uploaders.rb
 - lib/assetable/version.rb
 - lib/assetable.rb
 - lib/tasks/assetable_tasks.rake

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

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

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

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