effective_assets 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bacc3e0d5f658838bebe3ac64e6914078952cea
-  data.tar.gz: 614b38bdf3162f44dd810256ab7cc092bb11b3b9
+  metadata.gz: 47cf237da48597a134011c3256f2631b731b2d6b
+  data.tar.gz: b4a479a03cff5dfda60b5a5566f3674bbd494361
 SHA512:
-  metadata.gz: 88cd095f1bd880b215c82d32f898b5e02e07f23efdccf43d1b2494d8ee1adeb03d057ec59d0c105b54379a2acfa17a8fc467c298aa0a524cda633e94cff56173
-  data.tar.gz: 54b14269944ca4446002934cd239eb127ca6e2c0ea9a3e3adb1c5144cdfcf93944798beef96b91afa27c04f697542e8f5425af9f3d8fa9c32b648001ec54ec2a
+  metadata.gz: 95bcb6b27a4e4623f05d0b4d40a6bc676ca6a5067da6bef4a24ea5b686b84db5b4a10fc93bb2e19c8aab08d7d90ab1bfca8a609e3b120dd8a8497d8ec9a8a364
+  data.tar.gz: ab67f6beab1aa7a87d375f66ace82566dd6e0dca4004e143e0ba27c1060bbf43861b2770aa9d1756ef380ea73302656ebf6efaff7f1e5be0e2c7f79c818bc769

data/app/controllers/effective/assets_controller.rb

@@ -4,22 +4,22 @@ module Effective
   class AssetsController < ApplicationController
     layout false
 
-    def index  # This is the Modal dialog that is read by CKEDITOR
+    # iframe
+    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)))
 
-      @assets =  Effective::Asset.where(:user_id => current_user.try(:id))
-      @aws_acl = EffectiveAssets.aws_acl.presence || 'public-read'
+      effective_iframe_uploads = Effective::Attachment.where(box: EffectiveAssets::IFRAME_UPLOADS).pluck(:asset_id)
+      @assets =  Effective::Asset.where(id: effective_iframe_uploads)
 
       if params[:only] == 'images'
         @assets = @assets.images
         @file_types = [:jpg, :gif, :png, :bmp, :ico]
-        @aws_acl = 'public-read' # The CKEditor Insert Image functionality needs a public-read image here
       elsif params[:only] == 'nonimages'
         @assets = @assets.nonimages
         @file_types = [:pdf, :zip, :doc, :docx, :xls, :xlsx, :txt, :csv, :avi, :m4v, :m2v, :mov, :mp3, :mp4, :eml]
       end
 
-      @user_uploads = UserUploads.new(@assets)
+      @user_uploads = IframeUploads.new(@assets)
 
       render :file => 'effective/assets/iframe'
     end

data/app/controllers/effective/s3_uploads_controller.rb

@@ -34,6 +34,11 @@ module Effective
         end
       end
 
+      # Kind of a hacky way of saving IFRAME uploads without joining them to anything
+      if params[:attachable_object_name] == EffectiveAssets::IFRAME_UPLOADS
+        Effective::Attachment.new(asset: @asset, box: EffectiveAssets::IFRAME_UPLOADS, position: 0).save!
+      end
+
       # If the attachment information is present, then our input needs some attachment HTML
       if params.key?(:attachable_object_name)
         attachment = Effective::Attachment.new
@@ -44,7 +49,7 @@ module Effective
         attachment.position = 0
         attachable_object_name = params[:attachable_object_name].to_s
         attachment_actions = params[:attachment_actions]
-        attachment_links = ![false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF'].include?(params[:attachment_links])
+        attachment_links = !['0', 'f', 'false', 'off'].include?(params[:attachment_links].to_s.downcase)
 
         attachment_partial =
         case params[:attachment_style].to_s

data/app/helpers/effective_assets_helper.rb

@@ -13,24 +13,27 @@ module EffectiveAssetsHelper
       opts = {}
     end
 
+    public_url = options.delete(:public) || options.delete(:public_url)
+
     opts = opts.merge({:alt => asset.title || asset.file_name}).merge(options)
 
-    content_tag(:img, nil, opts.merge(:src => _effective_asset_image_url(asset, version))).gsub('"', "'").html_safe
+    content_tag(:img, nil, opts.merge(:src => _effective_asset_image_url(asset, version, public_url))).gsub('"', "'").html_safe
   end
 
   def effective_asset_link_to(asset, version = nil, options = {})
     options_title = options.delete(:title)
+    public_url = options.delete(:public) || options.delete(:public_url)
     link_title = options_title || asset.title || asset.file_name || "Asset ##{asset.id}"
 
     if asset.image?
-      link_to(link_title, _effective_asset_image_url(asset, version), options).gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
+      link_to(link_title, _effective_asset_image_url(asset, version, public_url), options)
     else
-      link_to(link_title, asset.url, options).gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
-    end
+      link_to(link_title, (public_url ? asset.public_url : asset.url), options)
+    end.gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
   end
 
   def effective_asset_video_tag(asset)
-    render(:partial => 'assets/video', :locals => { :asset => asset }).gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
+    render(:partial => 'effective/assets/video', :locals => { :asset => asset }).gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
   end
 
   def effective_asset_title(asset)
@@ -41,15 +44,15 @@ module EffectiveAssetsHelper
     ].compact.join("\n")
   end
 
-  def _effective_asset_image_url(asset, version = nil)
+  def _effective_asset_image_url(asset, version = nil, public_url = nil)
     # asset_url and image_url will work in Rails4
 
     return image_path('mime-types/file.png') if !asset.content_type.present? or asset.content_type == 'unknown'
 
     if asset.icon?
-      asset.url
+      (public_url ? asset.public_url : asset.url)
     elsif asset.image?
-      asset.url(version)
+      (public_url ? asset.public_url(version) : asset.url(version))
     elsif asset.audio?
       image_path('mime-types/mp3.png')
     elsif asset.video?

data/app/models/effective/asset.rb

@@ -19,26 +19,32 @@ module Effective
 
     has_many :attachments, :dependent => :delete_all
 
-    structure do
-      title           :string
-      extra           :text
+    # structure do
+    #   title           :string
+    #   extra           :text
 
-      content_type    :string, :validates => [:presence]
-      upload_file     :string, :validates => [:presence]    # The full url of the file, as originally uploaded
+    #   content_type    :string
+    #   upload_file     :string    # The full url of the file, as originally uploaded
 
-      processed       :boolean, :default => false
-      aws_acl         :string, :default => 'public-read', :validates => [:presence, :inclusion => {:in => ['public-read', 'authenticated-read']}]
+    #   processed       :boolean, :default => false
+    #   aws_acl         :string, :default => 'public-read'
 
-      data            :string
+    #   data            :string
 
-      data_size       :integer
-      height          :integer, :validates => [:numericality => { :allow_nil => true }]
-      width           :integer, :validates => [:numericality => { :allow_nil => true }]
+    #   data_size       :integer
+    #   height          :integer
+    #   width           :integer
 
-      versions_info   :text   # We store a hash of {:thumb => 34567, :medium => 3343434} data sizes
+    #   versions_info   :text   # We store a hash of {:thumb => 34567, :medium => 3343434} data sizes
 
-      timestamps
-    end
+    #   timestamps
+    # end
+
+    validates :content_type, presence: true
+    validates :upload_file, presence: true
+    validates :aws_acl, presence: true, inclusion: { in: [EffectiveAssets::AWS_PUBLIC, EffectiveAssets::AWS_PRIVATE] }
+    validates :height, numericality: { allow_nil: true }
+    validates :width, numericality: { allow_nil: true }
 
     serialize :versions_info, Hash
     serialize :extra, Hash
@@ -128,7 +134,7 @@ module Effective
     end
 
     def url(version = nil, expire_in = nil)
-      aws_acl == 'authenticated-read' ? authenticated_url(version, expire_in) : public_url(version)
+      aws_acl == EffectiveAssets::AWS_PRIVATE ? authenticated_url(version, expire_in) : public_url(version)
     end
 
     def public_url(version = nil)

data/app/models/effective/attachment.rb

@@ -7,14 +7,16 @@ module Effective
     belongs_to :asset
     belongs_to :attachable, :polymorphic => true
 
-    structure do
-      position        :integer, :validates => [:presence, :numericality]
-      box             :string, :default => 'assets', :validates => [:presence]  # This is essentially a category
-    end
+    # structure do
+    #   position        :integer
+    #   box             :string, :default => 'assets'  # This is essentially a category
+    # end
 
     default_scope -> { includes(:asset).order("\"#{EffectiveAssets.attachments_table_name.to_s}\".\"position\" ASC, \"#{EffectiveAssets.attachments_table_name.to_s}\".\"asset_id\" ASC") }
 
-    validates_presence_of :asset_id
+    validates :asset_id, presence: true
+    validates :position, presence: true, numericality: true
+    validates :box, presence: true
 
   end
 end

data/app/models/effective/delayed_job.rb

@@ -1,4 +1,3 @@
-#require 'uri'
 # Call with DelayedJob.new.process_asset_images(...)
 # Run jobs locally with "rake jobs:work"
 

data/app/models/effective/{user_uploads.rb → iframe_uploads.rb}

@@ -1,7 +1,7 @@
 # This is a class used for the IFrame views
 
 module Effective
-  class UserUploads < ActiveRecord::Base
+  class IframeUploads < ActiveRecord::Base
     acts_as_asset_box :uploads
 
     def initialize(items = nil)

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

@@ -16,7 +16,7 @@ if defined?(EffectiveRegions)
         end
 
         def is_private?
-          private_url == true || (asset.try(:aws_acl) == 'authenticated-read')
+          private_url == true || (asset.try(:aws_acl) == EffectiveAssets::AWS_PRIVATE)
         end
 
       end

data/app/models/inputs/asset_box.rb

@@ -70,11 +70,7 @@ module Inputs
     def attachments_table_head_html
       content_tag(:thead) do
         content_tag(:tr) do
-          [
-            content_tag(:th, ''),
-            content_tag(:th, ''),
-            content_tag(:th, filter_bar_html, :colspan => 2)
-          ].join().html_safe
+          content_tag(:th, filter_bar_html, :colspan => 4)
         end
       end
     end
@@ -106,16 +102,11 @@ module Inputs
     end
 
     def filter_bar_html
-      "<input type='text' class='form-control filter-attachments' placeholder='Search Title'>".html_safe
+      "<input type='text' class='form-control filter-attachments' placeholder='Filter by title'>".html_safe
     end
 
     def build_values_html
-      count = 0
-
-      attachments.map do |attachment|
-        count += 1 unless attachment.marked_for_destruction?
-
-        attachment_partial =
+      attachment_partial =
         case @options[:attachment_style]
         when :table
           'attachment_as_table'
@@ -129,18 +120,18 @@ module Inputs
           raise "unknown AssetBox attachment_style: #{@options[:attachment_style]}. Valid options are :thumbnail, :list and :table"
         end
 
-        render(
-          :partial => "asset_box_input/#{attachment_partial}",
-          :locals => {
-            :attachment => attachment,
-            :attachment_actions => @options[:attachment_actions].map(&:to_s),
-            :attachment_links => @options[:attachment_links],
-            :hidden => (count > @options[:limit]),
-            :disabled => @options[:disabled],
-            :attachable_object_name => @object_name,
-          }
-        )
-      end.join.html_safe
+      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

data/app/uploaders/effective_assets_uploader.rb

@@ -12,7 +12,7 @@ class EffectiveAssetsUploader < CarrierWave::Uploader::Base
   end
 
   def aws_public
-    model.aws_acl == 'public-read' rescue true
+    model.aws_acl == EffectiveAssets::AWS_PUBLIC rescue true
   end
 
   def aws_authenticated_url_expiration

data/app/views/asset_box_input/_attachment_as_list.html.haml

@@ -1,10 +1,12 @@
 - uid = (attachment.persisted? ? attachment.id : Time.now.to_f.to_s.split('.')[1] + Random.rand(10000).to_s)
-- hidden ||= false
+- limit ||= 99999999
+- attachment_counter ||= 0
+- hidden ||= (attachment_counter >= limit)
 
 %li.attachment
   .attachment-title.caption
     - if attachment_links
-      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+      = link_to attachment.asset.title, attachment.asset.public_url, :target => '_blank'
     - else
       = attachment.asset.title
 

data/app/views/asset_box_input/_attachment_as_table.html.haml

@@ -1,12 +1,14 @@
 - uid = (attachment.persisted? ? attachment.id : Time.now.to_f.to_s.split('.')[1] + Random.rand(10000).to_s)
-- hidden ||= false
+- limit ||= 99999999
+- attachment_counter ||= 0
+- hidden ||= (attachment_counter >= limit)
 
 %tr.attachment{:style => "#{(attachment.marked_for_destruction? || hidden) ? 'display: none;' : ''}"}
   %td.attachment-image
     = effective_asset_image_tag(attachment.asset)
   %td.attachment-title{:title => effective_asset_title(attachment.asset)}
     - if attachment_links
-      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+      = link_to attachment.asset.title, attachment.asset.public_url, :target => '_blank'
     - else
       = attachment.asset.title
   %td.attachment-size
@@ -15,11 +17,11 @@
     - if attachment_actions.include?('insert') || attachment_actions.include?('attach')
       - asset = attachment.asset
       - if asset.image? || asset.icon?
-        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_image_tag(asset)} Attach
+        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_image_tag(asset, nil, public: true)} Attach
       - elsif asset.video?
-        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_video_tag(asset)} Attach
+        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_video_tag(asset, nil, public: true)} Attach
       - else
-        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_link_to(asset)} Attach
+        %a.btn.btn-primary.attachment-insert{:href => '#', 'data-asset-id' => asset.id, 'data-asset' => effective_asset_link_to(asset, nil, public: true)} Attach
 
     - if attachment_actions.include?('remove')
       %a.attachment-remove{:href => '#', :title => 'Remove'}

data/app/views/asset_box_input/_attachment_as_thumbnail.html.haml

@@ -1,5 +1,7 @@
 - uid = (attachment.persisted? ? attachment.id : Time.now.to_f.to_s.split('.')[1] + Random.rand(10000).to_s)
-- hidden ||= false
+- limit ||= 99999999
+- attachment_counter ||= 0
+- hidden ||= (attachment_counter >= limit)
 
 .col-sm-3.attachment
   .thumbnail{:style => "#{(attachment.marked_for_destruction? || hidden) ? 'display: none;' : ''}", :title => effective_asset_title(attachment.asset)}
@@ -7,7 +9,7 @@
 
     .attachment-title.caption
       - if attachment_links
-        = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+        = link_to attachment.asset.title, attachment.asset.public_url, :target => '_blank'
       - else
         = attachment.asset.title
 

data/app/views/effective/assets/iframe.html.haml

@@ -24,4 +24,4 @@
         attachment_actions: [:insert, :delete],
         attachment_add_to: :top,
         file_types: (@file_types || :any),
-        aws_acl: (@aws_acl || 'public-read')
+        aws_acl: EffectiveAssets::AWS_PUBLIC

data/app/views/effective/snippets/_effective_asset.html.haml

@@ -1,5 +1,5 @@
 - asset = effective_asset.asset
-- asset.aws_acl = 'authenticated-read' if effective_asset.is_private?
+- asset.aws_acl = EffectiveAssets::AWS_PRIVATE if effective_asset.is_private?
 
 - if asset.nil?
   %img{:src => '#'}

data/lib/effective_assets.rb

@@ -1,12 +1,15 @@
 require 'carrierwave-aws'
 require 'delayed_job_active_record'
-require 'migrant'     # Required for rspec to run properly
 require 'jquery-fileupload-rails'
 require 'haml-rails'
 require 'effective_assets/engine'
 require 'effective_assets/version'
 
 module EffectiveAssets
+  AWS_PUBLIC = 'public-read'
+  AWS_PRIVATE = 'authenticated-read'
+  IFRAME_UPLOADS = 'effective_iframe_uploads'
+
   # The following are all valid config keys
   mattr_accessor :assets_table_name
   mattr_accessor :attachments_table_name
@@ -49,7 +52,7 @@ module EffectiveAssets
       CarrierWave.configure do |config|
         config.storage        = :aws
         config.aws_bucket     = EffectiveAssets.aws_bucket
-        config.aws_acl        = EffectiveAssets.aws_acl.presence || 'public-read'
+        config.aws_acl        = EffectiveAssets.aws_acl.presence || EffectiveAssets::AWS_PUBLIC
         config.cache_dir      = "#{Rails.root}/tmp/uploads" # For heroku
 
         config.aws_credentials = {

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.6.2'.freeze
+  VERSION = '1.6.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: migrant
-  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: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -197,8 +183,8 @@ files:
 - app/models/effective/asset.rb
 - app/models/effective/attachment.rb
 - app/models/effective/delayed_job.rb
+- app/models/effective/iframe_uploads.rb
 - app/models/effective/snippets/effective_asset.rb
-- app/models/effective/user_uploads.rb
 - app/models/inputs/asset_box.rb
 - app/models/inputs/asset_box_form_input.rb
 - app/models/inputs/asset_box_formtastic_input.rb
@@ -217,7 +203,7 @@ files:
 - app/views/asset_box_input/_dialog.html.haml
 - app/views/asset_box_input/_progress_bar_template.html.haml
 - app/views/asset_box_input/_uploader.html.haml
-- app/views/assets/_video.html.erb
+- app/views/effective/assets/_video.html.erb
 - app/views/effective/assets/iframe.html.haml
 - app/views/effective/snippets/_effective_asset.html.haml
 - config/routes.rb