effective_assets 1.9.14 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83b563d9bd1167133ad1f6584893f76f82f16e36
-  data.tar.gz: 5ec222a0c56d2b8a4a6f077e4d9f7877297b42e8
+SHA256:
+  metadata.gz: 4704539ad2f751c0557b6484993d5a7b1eec4f395b14850fb98555d50a3487a9
+  data.tar.gz: a943ad172052ae93362088e32df9c29fb77e07850bec9314291df85f13af4a26
 SHA512:
-  metadata.gz: 738a48fb236386ba724496fe225854df828d8bb5f4c588d84b6a0080f0efbec737701c80ee92d93304e84ea05625b26fcf4d64b32e371d026f1dfc31986638e3
-  data.tar.gz: 8143da9f67e215f5e548582a8f126218c9db2270039beea295421ef3a4e44bc36dcfb207de1380d84bd84f384c398c78975d6294f115f1d9e94e1f02c4794b40
+  metadata.gz: 4a56ff3ae576698f4809cb3c4eefdf04b0e228eadb824fd5787d219a25c64b747fbb8181b9e4f7885897e38cfe0235fd5de7feabf6ce01e9f0cb1a3d8863f266
+  data.tar.gz: 7800e3fe6cb6915866ca2539e79b4e6108e4e76d7d01594beb3da180110b1f7db3680cfa2e3d73aa8ef5fd149925e9dc13e0cd062324477b6438e94fef235df3

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,7 +20,7 @@ module Effective
         @aws_acl = EffectiveAssets.aws_acl
       end
 
-      @user_uploads = IframeUploads.new(@assets)
+      @user_uploads = IframeUpload.new(@assets)
 
       render :file => 'effective/assets/iframe'
     end

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/app/uploaders/effective_assets_uploader.rb

@@ -73,7 +73,9 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
     retval = {}
 
     self.class.versions.each do |k, v|
-      v[:uploader].processors.each do |processor|
+      processors = (v.respond_to?(:processors) ? v.processors : v[:uploader].processors)
+
+      processors.each do |processor|
         dimensions = processor[1]
 
         if processor[0].to_s.include?('resize') and dimensions.kind_of?(Array) and dimensions.length == 2

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,8 +2,6 @@ module EffectiveAssets
   class Engine < ::Rails::Engine
     engine_name 'effective_assets'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/**/", "#{config.root}/app/jobs/**/"]
-
     # 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
@@ -23,7 +21,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.9.14'.freeze
+  VERSION = '1.11.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.11.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2020-11-25 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,7 +171,7 @@ 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
@@ -193,7 +194,6 @@ files:
 - app/views/effective/assets/_video.html.erb
 - app/views/effective/assets/iframe.html.haml
 - app/views/effective/snippets/_effective_asset.html.haml
-- app/views/effective/style_guide/_effective_assets.html.haml
 - config/effective_assets.rb
 - config/routes.rb
 - db/migrate/01_create_effective_assets.rb.erb
@@ -207,7 +207,7 @@ homepage: https://github.com/code-and-effect/effective_assets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,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/views/effective/style_guide/_effective_assets.html.haml

@@ -1,24 +0,0 @@
-= simple_form_for Effective::StyleGuide.new(), :url => '/' do |f|
-  = f.input :files,
-    :as => :asset_box,
-    :hint => 'default display (same as attachment_style: :thumbnail)'
-
-  = f.input :files,
-    :as => :asset_box,
-    :attachment_style => :table,
-    :hint => 'display as table (attachment_style: :table)'
-
-  = f.input :files,
-    :as => :asset_box,
-    :attachment_style => :list,
-    :hint => 'display as list (attachment_style: :list)'
-
-  = f.input :files,
-    :as => :asset_box,
-    :dialog => true,
-    :hint => 'with attachment dialog (dialog: true)'
-
-  = f.input :files,
-    :as => :asset_box,
-    :uploader_drop_files => true,
-    :hint => 'with drop zone (uploader_drop_files: true)'