effective_assets 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7248ba8528c246a381abfed938304b69ef79493e
-  data.tar.gz: 54044e00eea1e0504786a31c3fe5b8dd3fecbbfb
+  metadata.gz: e64e55facb8d3446c3b115c56b2ffbd3b4952f9b
+  data.tar.gz: 02708fc9a444defb57dae035f08e3a699a633315
 SHA512:
-  metadata.gz: e9a40e99ba697fca4eeaf0d8605ffd7757fc4ff5cbe90a0d3a41cf241e97c3e282f545f32ee5d1c1ba7d8bd4c344f9021fc79e05a2d9ccdf5a9c73cd2e4702a7
-  data.tar.gz: 5b2607301bdd09e4af4ed1d8ccee26d00bd93a099ec5222be0f5ac119adefa909865a233def075cb08d0c1a6ec31673082f8d796beb36b4685966c4729cdb6bb
+  metadata.gz: a15827df9b780de1d0a954dbc72b5dee2e7990df3f991262b12ee265bcc8e591ae925f40a8cf6fa12e9c00a5e1cba268b9b70454f0d29e79fdba6cbc46627203
+  data.tar.gz: c15c45f6bac87bfb95ae40bcf65136188f89da81ecbffcda266f98703dd1924e10ce5b25e461b015724136db6ec0b3835db1f7585a955c38eb18a80ffaf56f1b

data/app/models/concerns/acts_as_asset_box.rb

@@ -41,9 +41,12 @@ module ActsAsAssetBox
 
     # Setup validations
     boxes = @acts_as_asset_box_opts.try(:flatten) || []
+
     if boxes.first.kind_of?(Hash) # We were passed some validation requirements
       boxes = boxes.first
 
+      self.send(:define_method, :asset_boxes) { boxes }
+
       boxes.each do |box, validation|
         self.send(:define_method, box) { effective_assets(box) }
 
@@ -54,6 +57,8 @@ module ActsAsAssetBox
         end
       end
     else
+      self.send(:define_method, :asset_boxes) { boxes }
+
       boxes.each do |key|
         self.send(:define_method, key) { effective_assets(key) }
       end

data/app/models/effective/asset.rb

@@ -133,7 +133,7 @@ module Effective
 
     def public_url(version = nil)
       if data.present?
-        url = (version.present? ? data.send(version).file.try(:url) : data.file.try(:url))
+        url = (version.present? ? data.send(version).file.try(:public_url) : data.file.try(:public_url))
         url || '#'
       else
        "#{Asset.s3_base_path.chomp('/')}/#{EffectiveAssets.aws_path.chomp('/')}/#{id.to_i}/#{file_name}"

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

@@ -13,5 +13,15 @@
     = csrf_meta_tags
 
   %body
-    = simple_form_for @user_uploads, :url => '/' do |f|
-      = f.input :uploads, :as => :asset_box, :label => false, :uploader => :top, :uploader_drop_files => true, :attachment_style => :table, :table_filter_bar => true, :attachment_actions => [:insert, :delete], :attachment_add_to => :top, :file_types => (@file_types || :any), :aws_acl => (@aws_acl || 'public-read')
+    = simple_form_for @user_uploads, url: '/' do |f|
+      = f.input :uploads,
+        as: :asset_box,
+        label: false,
+        uploader: :top,
+        uploader_drop_files: true,
+        attachment_style: :table,
+        table_filter_bar: true,
+        attachment_actions: [:insert, :delete],
+        attachment_add_to: :top,
+        file_types: (@file_types || :any),
+        aws_acl: (@aws_acl || 'public-read')

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails