effective_assets 1.5.4 → 1.5.5

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/concerns/acts_as_asset_box.rb +1 -1
  3. data/lib/effective_assets.rb +1 -1
  4. data/lib/effective_assets/version.rb +1 -1
  5. metadata +2 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d455009f71691b5049c40439c515dd46d8e18ce6
4
- data.tar.gz: 7a1e35e1862b1d304626fb63638141adf498d8f1
3
+ metadata.gz: 2f86f8417655147b214fbbc1eb1749d95d4b314e
4
+ data.tar.gz: f5fec832e07bdbe3d6b803d4f23ed50754d706c3
5
5
  SHA512:
6
- metadata.gz: 2df5b4d70f0ec1afd45577ff5ea191c050901207e004bb2e717f19572b3f0154529ddbfce771269faeb3b328edff5a4011741b54572450e743c8aefe7757c098
7
- data.tar.gz: 31a0bc6bd8d19dd3d06e6d2bbd3444cdd3ea59807007c2a4a1a22df1ff9a54bdbc8eaa752eb58ac277dd44a0504e45d57423e3c2edd43c844f019de2cd4b27ec
6
+ metadata.gz: 2ad9b08f4b2b4ea8a1fde8f478fdf1604a638432bcddeee04279a17bee78ff89948a7ef8d7dc203c8027a8d4b854f43d1f4334fe065da2a1b2afb3010609fe1a
7
+ data.tar.gz: ff4002a8309d7e38a78855abfa24f9cb27b99544c2dc1836390c033c0afc79a7cf5a5e5e810a2b268f7a07f7387905031a9f496c7b3548a579f78f85ff030093
data/app/models/concerns/acts_as_asset_box.rb CHANGED
@@ -85,7 +85,7 @@ module ActsAsAssetBox
85
85
  if box == boxes
86
86
  attachments.map { |attachment| attachment.asset if attachment.box == boxes }.compact
87
87
  else
88
- attachments.to_a.find { |attachment| attachment.box == boxes }.try(:asset)
88
+ attachments.sort_by(&:position).find { |attachment| attachment.box == boxes }.try(:asset)
89
89
  end
90
90
  end
91
91
 
data/lib/effective_assets.rb CHANGED
@@ -1,9 +1,9 @@
1
- require "effective_assets/engine"
2
1
  require 'carrierwave-aws'
3
2
  require 'delayed_job_active_record'
4
3
  require 'migrant' # Required for rspec to run properly
5
4
  require 'jquery-fileupload-rails'
6
5
  require 'haml-rails'
6
+ require 'effective_assets/engine'
7
7
 
8
8
  module EffectiveAssets
9
9
  # The following are all valid config keys
data/lib/effective_assets/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveAssets
2
- VERSION = '1.5.4'.freeze
2
+ VERSION = '1.5.5'.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.5.4
4
+ version: 1.5.5
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: 2015-11-05 00:00:00.000000000 Z
11
+ date: 2015-11-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: haml
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :runtime
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: '0'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: haml-rails
99
85
  requirement: !ruby/object:Gem::Requirement