effective_assets 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4704539ad2f751c0557b6484993d5a7b1eec4f395b14850fb98555d50a3487a9
-  data.tar.gz: a943ad172052ae93362088e32df9c29fb77e07850bec9314291df85f13af4a26
+  metadata.gz: 82cfdb81fc92b1b74f6c541a6c5372241e6be602dbb0a28cd9d63481e6b9a61e
+  data.tar.gz: 63c9c06bdd0995ab93ac45956a5d23260a2c702787507a666e68fb184242b6ee
 SHA512:
-  metadata.gz: 4a56ff3ae576698f4809cb3c4eefdf04b0e228eadb824fd5787d219a25c64b747fbb8181b9e4f7885897e38cfe0235fd5de7feabf6ce01e9f0cb1a3d8863f266
-  data.tar.gz: 7800e3fe6cb6915866ca2539e79b4e6108e4e76d7d01594beb3da180110b1f7db3680cfa2e3d73aa8ef5fd149925e9dc13e0cd062324477b6438e94fef235df3
+  metadata.gz: aa569d27fc080268b9faa389b9d55e1fc167726a5092dcff4ca7e38709decc675941f1e8bf34af531ceea05a6d2085f5c68098c2748d1580bb4765322312fb9f
+  data.tar.gz: 69c91034760b37ccd07043461d304f77ce1ec5d00eb524e922147c511049326baad6942fd95ab938074960c8d8c6daa3eaa92adb682e68c798cfeb84abb83acc

data/lib/effective_assets/engine.rb

@@ -2,6 +2,10 @@ module EffectiveAssets
   class Engine < ::Rails::Engine
     engine_name 'effective_assets'
 
+    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|
       ActiveSupport.on_load :active_record do
@@ -11,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
 

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.11.2'.freeze
+  VERSION = '1.11.3'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Code and Effect
@@ -173,13 +173,6 @@ files:
 - app/models/effective/attachment.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
@@ -202,7 +195,14 @@ 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

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