effective_assets 1.6.9 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd04206c6534741d975b580c7a23d971474cee16
-  data.tar.gz: 947246d4dd2da35c57ce999c542abaed303bd7e0
+  metadata.gz: 9e5b0e16ffa38f1ce220cc208ff42d4418f13d25
+  data.tar.gz: bc514be07640f7796280e5c33e7381c82bf87d99
 SHA512:
-  metadata.gz: 5322431aee4fb9b0bf81d50502917d184dcabd7e04c9e2abec3e6f25a423e3ea1ff61d35abbe376c4dccef27dc4c9d61d554c38735dee5c33709b8ace980e912
-  data.tar.gz: ad6b87af1bf6a93d20cd180a106fdb5c8e97add42f99752a613e2425a86ca0174ca214316474537d0496d9f381624380a50e264802f3f28f1eb8bd75e9355dc1
+  metadata.gz: 74576b1a834817fcbc24de46002c63dc972028e5df144b25bf54075aeac861359e16d5d9581ee76c7b367c5f2926d20fea083990aa36f67e3c94309e1b54540a
+  data.tar.gz: a0c4b89d9cf2f3d6aa0e078bf21f3ffe5e9ed1c38c5109fcfa68c1fd68ae91823f2900fa69c3f15466f521447c7dee36c4af4d0dc52e607264264b06b656796c

data/app/controllers/effective/assets_controller.rb

@@ -9,7 +9,7 @@ module Effective
       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(id: effective_iframe_uploads)
 
       if params[:only] == 'images'
         @assets = @assets.images

data/app/controllers/effective/s3_uploads_controller.rb

@@ -1,7 +1,12 @@
 module Effective
   class S3UploadsController < ApplicationController
     skip_authorization_check if defined?(CanCan)
-    skip_before_filter :verify_authenticity_token
+
+    if respond_to?(:skip_before_action)
+      skip_before_action(:verify_authenticity_token)
+    else
+      skip_before_filter(:verify_authenticity_token)
+    end
 
     # When we create an Asset, we're effectively reserving the ID
     # But the Asset itself isn't really there or uploaded yet.
@@ -16,9 +21,9 @@ module Effective
 
       begin
         @asset.save!
-        render(:text => {:id => @asset.id, :s3_key => asset_s3_key(@asset)}.to_json, :status => 200)
+        render(:body => {:id => @asset.id, :s3_key => asset_s3_key(@asset)}.to_json, :status => 200)
       rescue => e
-        render(:text => e.message, :status => 500)
+        render(:body => e.message, :status => 500)
       end
     end
 
@@ -29,7 +34,7 @@ module Effective
 
       unless params[:skip_update]  # This is useful for the acts_as_asset_box Attach action
         if update_placeholder_asset(@asset, params) == false
-          render :text => '', :status => :unprocessable_entity
+          render :body => '', :status => :unprocessable_entity
           return
         end
       end
@@ -63,7 +68,7 @@ module Effective
 
         render :partial => "asset_box_input/#{attachment_partial}", :locals => {:attachment => attachment, :attachable_object_name => attachable_object_name, :attachment_actions => attachment_actions, attachment_links: attachment_links}, :status => 200, :content_type => 'text/html'
       else
-        render :text => '', :status => 200
+        render :body => '', :status => 200
       end
     end
 

data/app/models/concerns/acts_as_asset_box.rb

@@ -34,8 +34,8 @@ module ActsAsAssetBox
   end
 
   included do
-    has_many :attachments, :as => :attachable, :class_name => "Effective::Attachment", :dependent => :delete_all
-    has_many :assets, :through => :attachments, :class_name => "Effective::Asset"
+    has_many :attachments, :as => :attachable, :class_name => 'Effective::Attachment', :dependent => :delete_all
+    has_many :assets, :through => :attachments, :class_name => 'Effective::Asset'
 
     accepts_nested_attributes_for :attachments, :reject_if => :all_blank, :allow_destroy => true
 
@@ -90,7 +90,7 @@ module ActsAsAssetBox
     if box == boxes
       attachments.map { |attachment| attachment.asset if attachment.box == boxes }.compact
     else
-      attachments.sort_by(&:position).find { |attachment| attachment.box == boxes }.try(:asset)
+      attachments.sort_by { |attachment| attachment.position }.find { |attachment| attachment.box == boxes }.try(:asset)
     end
   end
 
@@ -134,7 +134,7 @@ module ActsAsAssetBox
       attachment.asset = item
     end
 
-    attachments.to_a.sort_by!(&:position)
+    attachments.to_a.sort_by! { |attachment| attachment.position }
 
     true
   end

data/app/models/effective/iframe_uploads.rb

@@ -15,5 +15,13 @@ module Effective
       @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

@@ -0,0 +1,24 @@
+= 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)'

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.6.9'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/lib/generators/templates/effective_assets.rb

@@ -4,7 +4,7 @@ EffectiveAssets.setup do |config|
   config.assets_table_name = :assets
   config.attachments_table_name = :attachments
 
-  config.uploader = TestAssetUploader   # Must extend from EffectiveAssetsUploader
+  config.uploader = AssetUploader   # Must extend from EffectiveAssetsUploader
 
   # Authorization Method
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,7 @@ 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/routes.rb
 - db/migrate/01_create_effective_assets.rb.erb
 - lib/effective_assets.rb