effective_assets 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d455009f71691b5049c40439c515dd46d8e18ce6
-  data.tar.gz: 7a1e35e1862b1d304626fb63638141adf498d8f1
+  metadata.gz: 2f86f8417655147b214fbbc1eb1749d95d4b314e
+  data.tar.gz: f5fec832e07bdbe3d6b803d4f23ed50754d706c3
 SHA512:
-  metadata.gz: 2df5b4d70f0ec1afd45577ff5ea191c050901207e004bb2e717f19572b3f0154529ddbfce771269faeb3b328edff5a4011741b54572450e743c8aefe7757c098
-  data.tar.gz: 31a0bc6bd8d19dd3d06e6d2bbd3444cdd3ea59807007c2a4a1a22df1ff9a54bdbc8eaa752eb58ac277dd44a0504e45d57423e3c2edd43c844f019de2cd4b27ec
+  metadata.gz: 2ad9b08f4b2b4ea8a1fde8f478fdf1604a638432bcddeee04279a17bee78ff89948a7ef8d7dc203c8027a8d4b854f43d1f4334fe065da2a1b2afb3010609fe1a
+  data.tar.gz: ff4002a8309d7e38a78855abfa24f9cb27b99544c2dc1836390c033c0afc79a7cf5a5e5e810a2b268f7a07f7387905031a9f496c7b3548a579f78f85ff030093

data/app/models/concerns/acts_as_asset_box.rb

@@ -85,7 +85,7 @@ module ActsAsAssetBox
     if box == boxes
       attachments.map { |attachment| attachment.asset if attachment.box == boxes }.compact
     else
-      attachments.to_a.find { |attachment| attachment.box == boxes }.try(:asset)
+      attachments.sort_by(&:position).find { |attachment| attachment.box == boxes }.try(:asset)
     end
   end
 

data/lib/effective_assets.rb

@@ -1,9 +1,9 @@
-require "effective_assets/engine"
 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'
 
 module EffectiveAssets
   # The following are all valid config keys

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.5.4'.freeze
+  VERSION = '1.5.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  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: haml-rails
   requirement: !ruby/object:Gem::Requirement