effective_assets 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7248ba8528c246a381abfed938304b69ef79493e
4
- data.tar.gz: 54044e00eea1e0504786a31c3fe5b8dd3fecbbfb
3
+ metadata.gz: e64e55facb8d3446c3b115c56b2ffbd3b4952f9b
4
+ data.tar.gz: 02708fc9a444defb57dae035f08e3a699a633315
5
5
  SHA512:
6
- metadata.gz: e9a40e99ba697fca4eeaf0d8605ffd7757fc4ff5cbe90a0d3a41cf241e97c3e282f545f32ee5d1c1ba7d8bd4c344f9021fc79e05a2d9ccdf5a9c73cd2e4702a7
7
- data.tar.gz: 5b2607301bdd09e4af4ed1d8ccee26d00bd93a099ec5222be0f5ac119adefa909865a233def075cb08d0c1a6ec31673082f8d796beb36b4685966c4729cdb6bb
6
+ metadata.gz: a15827df9b780de1d0a954dbc72b5dee2e7990df3f991262b12ee265bcc8e591ae925f40a8cf6fa12e9c00a5e1cba268b9b70454f0d29e79fdba6cbc46627203
7
+ data.tar.gz: c15c45f6bac87bfb95ae40bcf65136188f89da81ecbffcda266f98703dd1924e10ce5b25e461b015724136db6ec0b3835db1f7585a955c38eb18a80ffaf56f1b
@@ -41,9 +41,12 @@ module ActsAsAssetBox
41
41
 
42
42
  # Setup validations
43
43
  boxes = @acts_as_asset_box_opts.try(:flatten) || []
44
+
44
45
  if boxes.first.kind_of?(Hash) # We were passed some validation requirements
45
46
  boxes = boxes.first
46
47
 
48
+ self.send(:define_method, :asset_boxes) { boxes }
49
+
47
50
  boxes.each do |box, validation|
48
51
  self.send(:define_method, box) { effective_assets(box) }
49
52
 
@@ -54,6 +57,8 @@ module ActsAsAssetBox
54
57
  end
55
58
  end
56
59
  else
60
+ self.send(:define_method, :asset_boxes) { boxes }
61
+
57
62
  boxes.each do |key|
58
63
  self.send(:define_method, key) { effective_assets(key) }
59
64
  end
@@ -133,7 +133,7 @@ module Effective
133
133
 
134
134
  def public_url(version = nil)
135
135
  if data.present?
136
- url = (version.present? ? data.send(version).file.try(:url) : data.file.try(:url))
136
+ url = (version.present? ? data.send(version).file.try(:public_url) : data.file.try(:public_url))
137
137
  url || '#'
138
138
  else
139
139
  "#{Asset.s3_base_path.chomp('/')}/#{EffectiveAssets.aws_path.chomp('/')}/#{id.to_i}/#{file_name}"
@@ -13,5 +13,15 @@
13
13
  = csrf_meta_tags
14
14
 
15
15
  %body
16
- = simple_form_for @user_uploads, :url => '/' do |f|
17
- = 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')
16
+ = simple_form_for @user_uploads, url: '/' do |f|
17
+ = f.input :uploads,
18
+ as: :asset_box,
19
+ label: false,
20
+ uploader: :top,
21
+ uploader_drop_files: true,
22
+ attachment_style: :table,
23
+ table_filter_bar: true,
24
+ attachment_actions: [:insert, :delete],
25
+ attachment_add_to: :top,
26
+ file_types: (@file_types || :any),
27
+ aws_acl: (@aws_acl || 'public-read')
@@ -1,3 +1,3 @@
1
1
  module EffectiveAssets
2
- VERSION = '1.6.0'.freeze
2
+ VERSION = '1.6.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-02 00:00:00.000000000 Z
11
+ date: 2016-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails