effective_assets 1.10.1 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff3438f4d766dbf9a2056efc8dda66a2e9886020
-  data.tar.gz: 20e9db275e13ee015cc259f6e8d320c39eb85c54
+SHA256:
+  metadata.gz: 91867f057c8237f0c9b602989b2c75b9805c898b799c83d4de6c96e3cbca2c60
+  data.tar.gz: 6272d43a0d8e24bd9c270a8a7f808d2804477f13057663328e3823bca416ddb0
 SHA512:
-  metadata.gz: 85b474c79b5611b8a13d11cb64437b46567b0e6fb05429c4b08625d097b302a7f9861bbcfc97b9144510ad279f8e39883abfa8caf18e5573f009c94376c23027
-  data.tar.gz: 62cbcd5938962816f1cdd6bcbba9a437a969babebef7183203e24e42b5a145d371518057b7d284a445ce1a30ef533350bfa0d5feee1adea7360f888c2c74435d
+  metadata.gz: 1243fc18c744665d68bad27d273e98a451eb78e1c212c62fd7aa2e095996ae2677e856f76614fdb3aefdf2f24419ef092291666891f52b0391a47ad8e3b8e5f5
+  data.tar.gz: 5ea43c65ffcad79c5f2a16bd7266e6529bb37f71d68d23f8a7f3332bef777c543face50148888d7b1f3740b1d8392f20f74e0907cada172772492d8315425a0d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2020 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/config/effective_assets_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../images/mime-types
+//= link_directory ../images/effective_assets

data/app/assets/javascripts/effective/snippets/{effective_asset.js.coffee.erb → effective_asset.js.coffee}

@@ -11,7 +11,7 @@ CKEDITOR.dialog.add 'effective_asset', (editor) ->
         {
           id: 'iframe-insert',
           type: 'html',
-          html: "<div><p id='iframe-insert-loading' style='text-align: center;'><br><br><br><br><br><br><img src='<%= asset_path('effective_assets/spinner.gif') %>' /><br><br>&nbsp;&nbsp;&nbsp;Loading...</p><iframe class='effective_assets_iframe' style='width: 100%; height: 100%; min-height: 500px;' src='/effective/assets?only=nonimages'></iframe></div>"
+          html: "<div><p id='iframe-insert-loading' style='text-align: center;'><br><br><br><br><br><br><br><br>&nbsp;&nbsp;&nbsp;Loading...</p><iframe class='effective_assets_iframe' style='width: 100%; height: 100%; min-height: 500px;' src='/effective/assets?only=nonimages'></iframe></div>"
           onLoad: (evt) ->
             dialog = evt.sender # This is the CKEditor.dialog
             iframe = $('#' + dialog.getContentElement('upload', 'iframe-insert').domId).children('iframe').first()

data/app/controllers/effective/assets_controller.rb

@@ -8,8 +8,7 @@ module Effective
     def index  # This is the IFRAME modal dialog that is read by CKEDITOR
       EffectiveAssets.authorized?(self, :index, Effective::Asset.new(:user_id => current_user.try(:id)))
 
-      effective_iframe_uploads = Effective::Attachment.where(box: EffectiveAssets::IFRAME_UPLOADS).pluck(:asset_id)
-      @assets = Effective::Asset.where(id: effective_iframe_uploads)
+      @assets = Effective::Asset.where(user_id: current_user.id)
 
       if params[:only] == 'images'
         @assets = @assets.images
@@ -21,9 +20,9 @@ module Effective
         @aws_acl = EffectiveAssets.aws_acl
       end
 
-      @user_uploads = IframeUploads.new(@assets)
+      @user_uploads = IframeUpload.new(@assets)
 
-      render :file => 'effective/assets/iframe'
+      render 'effective/assets/iframe'
     end
 
     def destroy

data/app/models/effective/iframe_upload.rb

@@ -0,0 +1,13 @@
+# This is a class used for the IFrame views
+
+module Effective
+  class IframeUpload < ActiveRecord::Base
+    acts_as_asset_box :uploads
+
+    def initialize(items = nil)
+      super()
+      add_to_asset_box(:uploads, items)
+    end
+
+  end
+end

data/app/models/effective/snippets/effective_asset.rb

@@ -2,10 +2,14 @@ if defined?(EffectiveRegions)
   module Effective
     module Snippets
       class EffectiveAsset < Snippet
-        attribute :asset_id, Integer
-        attribute :html_class, String
-        attribute :link_title, String
-        attribute :private_url, Boolean
+        # attr_accessor :asset_id     #, Integer
+        # attr_accessor :html_class   #, String
+        # attr_accessor :link_title   #, String
+        # attr_accessor :private_url  # , Boolean
+
+        def snippet_attributes
+          super + [:asset_id, :html_class, :link_title, :private_url]
+        end
 
         def asset
           @asset ||= (Effective::Asset.where(:id => asset_id).first if asset_id)
@@ -20,7 +24,7 @@ if defined?(EffectiveRegions)
         end
 
         def is_private?
-          private_url == true
+          [true, 'true', '1'].include?(private_url)
         end
 
         def aws_private?

data/config/effective_assets.rb

@@ -1,6 +1,7 @@
 EffectiveAssets.setup do |config|
   config.assets_table_name = :assets
   config.attachments_table_name = :attachments
+  config.iframe_uploads_table_name = :iframe_uploads
 
   config.uploader = 'AssetUploader'   # Must extend from EffectiveAssetsUploader
 

data/db/migrate/01_create_effective_assets.rb.erb

@@ -31,6 +31,10 @@ class CreateEffectiveAssets < ActiveRecord::Migration[4.2]
       t.string  :box
     end
 
+    create_table <%= @iframe_uploads_table_name %> do |t|
+      t.timestamps
+    end
+
     add_index <%= @attachments_table_name %>, :asset_id
     add_index <%= @attachments_table_name %>, [:attachable_type, :attachable_id]
     add_index <%= @attachments_table_name %>, :attachable_id

data/lib/effective_assets.rb

@@ -11,6 +11,7 @@ module EffectiveAssets
   # The following are all valid config keys
   mattr_accessor :assets_table_name
   mattr_accessor :attachments_table_name
+  mattr_accessor :iframe_uploads_table_name
 
   mattr_accessor :uploader
   mattr_accessor :async

data/lib/effective_assets/engine.rb

@@ -2,7 +2,9 @@ module EffectiveAssets
   class Engine < ::Rails::Engine
     engine_name 'effective_assets'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/**/", "#{config.root}/app/jobs/**/"]
+    config.autoload_paths += Dir["#{config.root}/lib/validators/", "#{config.root}/lib/inputs/"]
+
+    config.eager_load_paths += Dir["#{config.root}/lib/validators/", "#{config.root}/lib/inputs/"]
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_assets.active_record' do |app|
@@ -13,7 +15,7 @@ module EffectiveAssets
 
     initializer 'effective_assets.action_view' do |app|
       ActiveSupport.on_load :action_view do
-        ActionView::Helpers::FormBuilder.send(:include, Inputs::AssetBoxFormInput)
+        ActionView::Helpers::FormBuilder.send(:include, AssetBoxFormInput)
       end
     end
 
@@ -23,7 +25,10 @@ module EffectiveAssets
     end
 
     initializer "effective_assets.append_precompiled_assets" do |app|
-      Rails.application.config.assets.precompile += ['effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css', 'effective_assets/*', 'mime-types/*']
+      Rails.application.config.assets.precompile += [
+        'effective_assets_manifest.js', 'effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css',
+        'effective_assets/*', 'mime-types/*'
+      ]
     end
 
     # ActiveAdmin (optional)

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.11.4'.freeze
 end

data/lib/inputs/asset_box.rb

@@ -0,0 +1,210 @@
+class AssetBox
+  delegate :content_tag, :render, :current_user, :to => :@template
+
+  def initialize(object, object_name, template, method, opts)
+    @object = object
+    @object_name = object_name
+    @template = template
+    @options = initialize_options(method, opts)
+  end
+
+  def to_html
+    output = ''
+    output += header_html
+
+    if @options[:uploader] == :top
+      output += uploader_html
+      output += attachments_html
+      output += dialog_html if @options[:dialog]
+    else
+      output += attachments_html
+      output += dialog_html if @options[:dialog]
+      output += uploader_html if @options[:uploader]
+    end
+
+    output += footer_html
+
+    output.html_safe
+  end
+
+  private
+
+  def header_html
+    "<div id='asset-box-input-#{@options[:uid]}'
+      class='asset-box-input #{@options[:box]}'
+      data-box='#{@options[:box]}'
+      data-uploader='s3_#{@options[:uid]}'
+      data-limit='#{@options[:limit]}'
+      data-attachable-id='#{@options[:attachable_id]}'
+      data-attachable-type='#{@options[:attachable_type]}'
+      data-attachable-object-name='#{@object_name}'
+      data-attachment-style='#{@options[:attachment_style]}'
+      data-attachment-add-to='#{@options[:attachment_add_to]}'
+      data-attachment-actions='#{@options[:attachment_actions].to_json()}'
+      data-attachment-count='#{attachments.length}'
+      data-attachment-links='#{@options[:attachment_links]}'
+      data-over-limit-alerted='false'
+      data-aws-acl='#{@options[:aws_acl]}'
+    >".html_safe
+  end
+
+  def attachments_html
+    if @options[:attachment_style] == :table
+      attachments_table_html
+    elsif @options[:attachment_style] == :list
+      content_tag(:ul, build_values_html, :class => 'attachments')
+    else
+      content_tag(:div, build_values_html, :class => 'row attachments thumbnails')
+    end
+  end
+
+  def attachments_table_html
+    content_tag(:table, :class => 'table') do
+      head = attachments_table_head_html if @options[:table_filter_bar]
+      body = content_tag(:tbody, build_values_html, :class => 'attachments')
+      head ? head + body : body
+    end
+  end
+
+  def attachments_table_head_html
+    content_tag(:thead) do
+      content_tag(:tr) do
+        content_tag(:th, filter_bar_html, :colspan => 4)
+      end
+    end
+  end
+
+  def dialog_html
+    render(
+      :partial => 'asset_box_input/dialog',
+      :locals => {
+        :dialog_url => @options[:dialog_url]
+      }
+    ).html_safe
+  end
+
+  def uploader_html
+    # Check that we have permission to upload.
+    asset = Effective::Asset.new(user_id: ((current_user.try(:id) || 1) rescue 1), upload_file: 'placeholder')
+
+    unless (EffectiveAssets.authorized?(@template.controller, :create, asset) rescue false)
+      @options[:btn_title] = 'Unable to upload. (cannot :create Effective::Asset)'
+      @options[:disabled] = true
+    end
+
+    html_class = [
+      ('drop-files' if @options[:uploader_drop_files]),
+      ((@options[:uploader_html] || {})[:class])
+    ].compact.join(' ')
+
+    render(
+      :partial => 'asset_box_input/uploader',
+      :locals => {
+        :uid => @options[:uid],
+        :click_submit => @options[:click_submit],
+        :html_class => html_class,
+        :limit => @options[:limit],
+        :disabled => @options[:disabled],
+        :required => (@options[:required] == true && attachments.length == 0),
+        :file_types => @options[:file_types],
+        :progress_bar_partial => @options[:progress_bar_partial],
+        :drop_files => @options[:uploader_drop_files],
+        :drop_files_help_text => @options[:drop_files_help_text],
+        :aws_acl => @options[:aws_acl],
+        :btn_label => @options[:btn_label],
+        :btn_title => @options[:btn_title]
+      }
+    ).html_safe
+  end
+
+  def filter_bar_html
+    "<input type='text' class='form-control filter-attachments' placeholder='Filter by title'>".html_safe
+  end
+
+  def build_values_html
+    attachment_partial =
+      case @options[:attachment_style]
+      when :table
+        'attachment_as_table'
+      when :list
+        'attachment_as_list'
+      when :thumbnail
+        'attachment_as_thumbnail'
+      when nil
+        'attachment_as_thumbnail'
+      else
+        raise "unknown AssetBox attachment_style: #{@options[:attachment_style]}. Valid options are :thumbnail, :list and :table"
+      end
+
+    render(
+      :partial => "asset_box_input/#{attachment_partial}",
+      :collection => attachments.reject { |attachment| attachment.marked_for_destruction? },
+      :as => :attachment,
+      :locals => {
+        :attachment_actions => @options[:attachment_actions].map { |action| action.to_s },
+        :attachment_links => @options[:attachment_links],
+        :limit => @options[:limit],
+        :disabled => @options[:disabled],
+        :attachable_object_name => @object_name
+      }
+    )
+  end
+
+  def footer_html
+    "</div>".html_safe
+  end
+
+  def attachments
+    @object.attachments.select { |attachment| attachment.box == @options[:box] }
+  end
+
+  def initialize_options(method, opts)
+    {
+      :uploader => true, # :top, :bottom, true or false
+      :uploader_drop_files => false,
+      :drop_files_help_text => 'Drop files here',
+      :progress_bar_partial => 'asset_box_input/progress_bar_template',
+      :attachment_style => :thumbnail,  # :thumbnail, :table, or :list
+      :attachment_links => true,
+      :attachment_add_to => :bottom, # :bottom or :top (of attachments div)
+      :attachment_actions => [:remove], # or :insert, :delete, :remove
+      :table_filter_bar => false,
+      :dialog => false,
+      :dialog_url => @template.effective_assets.effective_assets_path,
+      :disabled => false,
+      :file_types => [:any],
+      :btn_label => 'Upload...',
+      :btn_title => 'Click or drag & drop to upload a file'
+    }.merge(opts).tap do |options|
+      options[:method] = method.to_s
+      options[:box] = method.to_s.pluralize
+      options[:attachable_id] ||= (@object.try(:id) rescue nil)
+      options[:attachable_type] ||= @object.class.name.titleize.gsub(" ", "_").gsub('/', '_').downcase
+
+      # The logic for the AWS ACL is such that:
+      # 1.) If the :private or :aws_acl keys are set on the asset_box input, use those values
+      # 2.) If the :private or :public keys are set on the acts_as_asset_box declaration, use those values
+      # 3.) Fall back to default EffectiveAssets.aws_acl as per config file
+
+      uploader_private = (opts[:private] == true || opts[:public] == false || opts[:aws_acl] == EffectiveAssets::AWS_PRIVATE)
+      uploader_public = (opts[:private] == false || opts[:public] == true || opts[:aws_acl] == EffectiveAssets::AWS_PUBLIC)
+      object_private = ((@object.asset_boxes[method] == :private || @object.asset_boxes[method].first[:private] == true || @object.asset_boxes[method].first[:public] == false) rescue false)
+      object_public = ((@object.asset_boxes[method] == :public || @object.asset_boxes[method].first[:public] == true || @object.asset_boxes[method].first[:private] == false) rescue false)
+
+      if uploader_private
+        options[:aws_acl] = EffectiveAssets::AWS_PRIVATE
+      elsif uploader_public
+        options[:aws_acl] = EffectiveAssets::AWS_PUBLIC
+      elsif object_private
+        options[:aws_acl] = EffectiveAssets::AWS_PRIVATE
+      elsif object_public
+        options[:aws_acl] = EffectiveAssets::AWS_PUBLIC
+      else
+        options[:aws_acl] = EffectiveAssets.aws_acl
+      end
+
+      options[:uid] = "#{options[:attachable_type]}-#{options[:attachable_id]}-#{options[:method]}-#{Time.zone.now.to_f}".parameterize
+      options[:limit] = (options[:method] == options[:box] ? (options[:limit] || 10000) : 1)
+    end
+  end
+end

data/lib/inputs/asset_box_form_input.rb

@@ -0,0 +1,5 @@
+module AssetBoxFormInput
+  def asset_box_input(method, opts = {})
+    AssetBox.new(@object, @object_name, @template, method, opts).to_html
+  end
+end

data/lib/inputs/asset_box_formtastic_input.rb

@@ -0,0 +1,7 @@
+class AssetBoxFormtasticInput < defined?(Formtastic) ? Formtastic::Inputs::FileInput : Object
+  def to_html
+    input_wrapping do
+      label_html << AssetBox.new(@object, @object_name, @template, @method, @options).to_html
+    end
+  end
+end

data/{app/models → lib}/inputs/asset_box_input.rb

@@ -4,15 +4,21 @@
 if defined?(SimpleForm)
   class AssetBoxInput < SimpleForm::Inputs::FileInput
     def input(wrapper_options = nil)
-      Inputs::AssetBox.new(object, object_name, template, attribute_name, options).to_html
+      AssetBox.new(object, object_name, template, attribute_name, options).to_html
     end
   end
 elsif defined?(Formtastic)
   class AssetBoxInput < Formtastic::Inputs::FileInput
     def to_html
       input_wrapping do
-        label_html << Inputs::AssetBox.new(@object, @object_name, @template, @method, @options).to_html
+        label_html << AssetBox.new(@object, @object_name, @template, @method, @options).to_html
       end
     end
   end
+else
+  class AssetBoxInput < Object
+    def to_html
+      'expected simpleform or formtastic'
+    end
+  end
 end

data/lib/inputs/asset_box_simple_form_input.rb

@@ -0,0 +1,5 @@
+class AssetBoxSimpleFormInput < defined?(SimpleForm) ? SimpleForm::Inputs::FileInput : Object
+  def input(wrapper_options = nil)
+    AssetBox.new(object, object_name, template, attribute_name, options).to_html
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.4
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,7 @@ files:
 - MIT-LICENSE
 - README.md
 - active_admin/effective_assets.rb
+- app/assets/config/effective_assets_manifest.js
 - app/assets/images/effective_assets/icon_close.png
 - app/assets/images/effective_assets/spinner.gif
 - app/assets/images/mime-types/excel.jpg
@@ -142,7 +143,7 @@ files:
 - app/assets/images/mime-types/video.png
 - app/assets/images/mime-types/word.jpg
 - app/assets/images/mime-types/zip.png
-- app/assets/javascripts/effective/snippets/effective_asset.js.coffee.erb
+- app/assets/javascripts/effective/snippets/effective_asset.js.coffee
 - app/assets/javascripts/effective_assets.js
 - app/assets/javascripts/effective_assets/asset_box.js.coffee
 - app/assets/javascripts/effective_assets/asset_box_dialog.js.coffee
@@ -170,15 +171,8 @@ files:
 - app/models/effective/access_denied.rb
 - app/models/effective/asset.rb
 - app/models/effective/attachment.rb
-- app/models/effective/iframe_uploads.rb
+- app/models/effective/iframe_upload.rb
 - app/models/effective/snippets/effective_asset.rb
-- app/models/inputs/asset_box.rb
-- app/models/inputs/asset_box_form_input.rb
-- app/models/inputs/asset_box_formtastic_input.rb
-- app/models/inputs/asset_box_input.rb
-- app/models/inputs/asset_box_simple_form_input.rb
-- app/models/validators/asset_box_length_validator.rb
-- app/models/validators/asset_box_presence_validator.rb
 - app/uploaders/effective_assets_uploader.rb
 - app/uploaders/test_asset_uploader.rb
 - app/views/active_admin/effective_assets/_edit.html.haml
@@ -201,12 +195,19 @@ files:
 - lib/effective_assets/version.rb
 - lib/generators/effective_assets/install_generator.rb
 - lib/generators/templates/asset_uploader.rb
+- lib/inputs/asset_box.rb
+- lib/inputs/asset_box_form_input.rb
+- lib/inputs/asset_box_formtastic_input.rb
+- lib/inputs/asset_box_input.rb
+- lib/inputs/asset_box_simple_form_input.rb
 - lib/tasks/effective_assets_tasks.rake
+- lib/validators/asset_box_length_validator.rb
+- lib/validators/asset_box_presence_validator.rb
 homepage: https://github.com/code-and-effect/effective_assets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,9 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Upload images and files directly to AWS S3 with a custom form input then
   seamlessly organize and attach them to any ActiveRecord object.

data/app/models/effective/iframe_uploads.rb

@@ -1,27 +0,0 @@
-# This is a class used for the IFrame views
-
-module Effective
-  class IframeUploads < ActiveRecord::Base
-    acts_as_asset_box :uploads
-
-    def initialize(items = nil)
-      super()
-      @column_types = {}
-
-      add_to_asset_box(:uploads, items)
-    end
-
-    def self.columns
-      @columns ||= []
-    end
-
-    def self.column_defaults
-      {}
-    end
-
-    def self.has_attribute?(*args)
-      false
-    end
-
-  end
-end

data/app/models/inputs/asset_box.rb

@@ -1,213 +0,0 @@
-module Inputs
-  class AssetBox
-    delegate :content_tag, :render, :current_user, :to => :@template
-
-    def initialize(object, object_name, template, method, opts)
-      @object = object
-      @object_name = object_name
-      @template = template
-      @options = initialize_options(method, opts)
-    end
-
-    def to_html
-      output = ''
-      output += header_html
-
-      if @options[:uploader] == :top
-        output += uploader_html
-        output += attachments_html
-        output += dialog_html if @options[:dialog]
-      else
-        output += attachments_html
-        output += dialog_html if @options[:dialog]
-        output += uploader_html if @options[:uploader]
-      end
-
-      output += footer_html
-
-      output.html_safe
-    end
-
-    private
-
-    def header_html
-      "<div id='asset-box-input-#{@options[:uid]}'
-        class='asset-box-input #{@options[:box]}'
-        data-box='#{@options[:box]}'
-        data-uploader='s3_#{@options[:uid]}'
-        data-limit='#{@options[:limit]}'
-        data-attachable-id='#{@options[:attachable_id]}'
-        data-attachable-type='#{@options[:attachable_type]}'
-        data-attachable-object-name='#{@object_name}'
-        data-attachment-style='#{@options[:attachment_style]}'
-        data-attachment-add-to='#{@options[:attachment_add_to]}'
-        data-attachment-actions='#{@options[:attachment_actions].to_json()}'
-        data-attachment-count='#{attachments.length}'
-        data-attachment-links='#{@options[:attachment_links]}'
-        data-over-limit-alerted='false'
-        data-aws-acl='#{@options[:aws_acl]}'
-      >".html_safe
-    end
-
-    def attachments_html
-      if @options[:attachment_style] == :table
-        attachments_table_html
-      elsif @options[:attachment_style] == :list
-        content_tag(:ul, build_values_html, :class => 'attachments')
-      else
-        content_tag(:div, build_values_html, :class => 'row attachments thumbnails')
-      end
-    end
-
-    def attachments_table_html
-      content_tag(:table, :class => 'table') do
-        head = attachments_table_head_html if @options[:table_filter_bar]
-        body = content_tag(:tbody, build_values_html, :class => 'attachments')
-        head ? head + body : body
-      end
-    end
-
-    def attachments_table_head_html
-      content_tag(:thead) do
-        content_tag(:tr) do
-          content_tag(:th, filter_bar_html, :colspan => 4)
-        end
-      end
-    end
-
-    def dialog_html
-      render(
-        :partial => 'asset_box_input/dialog',
-        :locals => {
-          :dialog_url => @options[:dialog_url]
-        }
-      ).html_safe
-    end
-
-    def uploader_html
-      # Check that we have permission to upload.
-      asset = Effective::Asset.new(user_id: ((current_user.try(:id) || 1) rescue 1), upload_file: 'placeholder')
-
-      unless (EffectiveAssets.authorized?(@template.controller, :create, asset) rescue false)
-        @options[:btn_title] = 'Unable to upload. (cannot :create Effective::Asset)'
-        @options[:disabled] = true
-      end
-
-      html_class = [
-        ('drop-files' if @options[:uploader_drop_files]),
-        ((@options[:uploader_html] || {})[:class])
-      ].compact.join(' ')
-
-      render(
-        :partial => 'asset_box_input/uploader',
-        :locals => {
-          :uid => @options[:uid],
-          :click_submit => @options[:click_submit],
-          :html_class => html_class,
-          :limit => @options[:limit],
-          :disabled => @options[:disabled],
-          :required => (@options[:required] == true && attachments.length == 0),
-          :file_types => @options[:file_types],
-          :progress_bar_partial => @options[:progress_bar_partial],
-          :drop_files => @options[:uploader_drop_files],
-          :drop_files_help_text => @options[:drop_files_help_text],
-          :aws_acl => @options[:aws_acl],
-          :btn_label => @options[:btn_label],
-          :btn_title => @options[:btn_title]
-        }
-      ).html_safe
-    end
-
-    def filter_bar_html
-      "<input type='text' class='form-control filter-attachments' placeholder='Filter by title'>".html_safe
-    end
-
-    def build_values_html
-      attachment_partial =
-        case @options[:attachment_style]
-        when :table
-          'attachment_as_table'
-        when :list
-          'attachment_as_list'
-        when :thumbnail
-          'attachment_as_thumbnail'
-        when nil
-          'attachment_as_thumbnail'
-        else
-          raise "unknown AssetBox attachment_style: #{@options[:attachment_style]}. Valid options are :thumbnail, :list and :table"
-        end
-
-      render(
-        :partial => "asset_box_input/#{attachment_partial}",
-        :collection => attachments.reject { |attachment| attachment.marked_for_destruction? },
-        :as => :attachment,
-        :locals => {
-          :attachment_actions => @options[:attachment_actions].map { |action| action.to_s },
-          :attachment_links => @options[:attachment_links],
-          :limit => @options[:limit],
-          :disabled => @options[:disabled],
-          :attachable_object_name => @object_name
-        }
-      )
-    end
-
-    def footer_html
-      "</div>".html_safe
-    end
-
-    def attachments
-      @object.attachments.select { |attachment| attachment.box == @options[:box] }
-    end
-
-    def initialize_options(method, opts)
-      {
-        :uploader => true, # :top, :bottom, true or false
-        :uploader_drop_files => false,
-        :drop_files_help_text => 'Drop files here',
-        :progress_bar_partial => 'asset_box_input/progress_bar_template',
-        :attachment_style => :thumbnail,  # :thumbnail, :table, or :list
-        :attachment_links => true,
-        :attachment_add_to => :bottom, # :bottom or :top (of attachments div)
-        :attachment_actions => [:remove], # or :insert, :delete, :remove
-        :table_filter_bar => false,
-        :dialog => false,
-        :dialog_url => @template.effective_assets.effective_assets_path,
-        :disabled => false,
-        :file_types => [:any],
-        :btn_label => 'Upload...',
-        :btn_title => 'Click or drag & drop to upload a file'
-      }.merge(opts).tap do |options|
-        options[:method] = method.to_s
-        options[:box] = method.to_s.pluralize
-        options[:attachable_id] ||= (@object.try(:id) rescue nil)
-        options[:attachable_type] ||= @object.class.name.titleize.gsub(" ", "_").gsub('/', '_').downcase
-
-        # The logic for the AWS ACL is such that:
-        # 1.) If the :private or :aws_acl keys are set on the asset_box input, use those values
-        # 2.) If the :private or :public keys are set on the acts_as_asset_box declaration, use those values
-        # 3.) Fall back to default EffectiveAssets.aws_acl as per config file
-
-        uploader_private = (opts[:private] == true || opts[:public] == false || opts[:aws_acl] == EffectiveAssets::AWS_PRIVATE)
-        uploader_public = (opts[:private] == false || opts[:public] == true || opts[:aws_acl] == EffectiveAssets::AWS_PUBLIC)
-        object_private = ((@object.asset_boxes[method] == :private || @object.asset_boxes[method].first[:private] == true || @object.asset_boxes[method].first[:public] == false) rescue false)
-        object_public = ((@object.asset_boxes[method] == :public || @object.asset_boxes[method].first[:public] == true || @object.asset_boxes[method].first[:private] == false) rescue false)
-
-        if uploader_private
-          options[:aws_acl] = EffectiveAssets::AWS_PRIVATE
-        elsif uploader_public
-          options[:aws_acl] = EffectiveAssets::AWS_PUBLIC
-        elsif object_private
-          options[:aws_acl] = EffectiveAssets::AWS_PRIVATE
-        elsif object_public
-          options[:aws_acl] = EffectiveAssets::AWS_PUBLIC
-        else
-          options[:aws_acl] = EffectiveAssets.aws_acl
-        end
-
-        options[:uid] = "#{options[:attachable_type]}-#{options[:attachable_id]}-#{options[:method]}-#{Time.zone.now.to_f}".parameterize
-        options[:limit] = (options[:method] == options[:box] ? (options[:limit] || 10000) : 1)
-      end
-    end
-  end
-end
-

data/app/models/inputs/asset_box_form_input.rb

@@ -1,7 +0,0 @@
-module Inputs
-  module AssetBoxFormInput
-    def asset_box_input(method, opts = {})
-      AssetBox.new(@object, @object_name, @template, method, opts).to_html
-    end
-  end
-end

data/app/models/inputs/asset_box_formtastic_input.rb

@@ -1,9 +0,0 @@
-if defined?(Formtastic)
-  class AssetBoxFormtasticInput < Formtastic::Inputs::FileInput
-    def to_html
-      input_wrapping do
-        label_html << Inputs::AssetBox.new(@object, @object_name, @template, @method, @options).to_html
-      end
-    end
-  end
-end

data/app/models/inputs/asset_box_simple_form_input.rb

@@ -1,7 +0,0 @@
-if defined?(SimpleForm)
-  class AssetBoxSimpleFormInput < SimpleForm::Inputs::FileInput
-    def input(wrapper_options = nil)
-      Inputs::AssetBox.new(object, object_name, template, attribute_name, options).to_html
-    end
-  end
-end