lalala 4.0.0.dev.132 → 4.0.0.dev.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc1ae17de6d849cc566a4dea2b5e7285e7c55a76
-  data.tar.gz: 483ce30c92bc399e37e9c0ae375612d4dd0a33bf
+  metadata.gz: 6329301663edfc88e1b14baea18850d1796b06ac
+  data.tar.gz: 2d6c046c1452ae601c8a0a4eb1c6f4237c53ada2
 SHA512:
-  metadata.gz: 35f72b7546f8f5655644a4eddf0733c12f650f3af66e8b08549b7b3b5b0b17c4986531bc35f7c645f6fcdb0f89d2fbe06c45b9eb96939c225c330fcf1181e7f0
-  data.tar.gz: 2414f42bbfc87cc48ba422343031b9bb726263b76d7a8d7eaf0a06d86ae578cea6d08142cc078cb97a9caa3630c168ce5475762f8b1c29b8bc6b8d4678559942
+  metadata.gz: f6e326d7b28ec3dfe25e908dd9539abe3ac2a4e85b31ad907720fd665df84bd361692168eda21c053e8d66591d9871f5f235faaede5949febd88bedc3e294463
+  data.tar.gz: b952b456028c79d336d6a0f475dbe81d97c8463025a978615b8c04bb0afd7f65499b3c3ec1ddcd5c1c39a4cfe54d1787e2e8d053bc212fbaa47a0eedded32905

data/lib/formtastic/inputs/grid_input.rb

@@ -11,10 +11,13 @@ class Formtastic::Inputs::GridInput
 
     ul = template.content_tag :ul do
       html = template.raw("")
+      asset_errors = []
 
       assets.each_with_index do |asset, idx|
         html += template.content_tag :li, class: "asset" do
           builder.fields_for(method, asset) do |f|
+            asset_errors.concat(asset.errors.to_a)
+
             lalala_thumb = f.object.asset.lalala_thumb
 
             if url = lalala_thumb.try(:url)
@@ -34,11 +37,24 @@ class Formtastic::Inputs::GridInput
                 :a, template.raw("✕"), class: "close-button"
               )
             end
+
             asset_html
           end
         end
       end
 
+      if asset_errors.present?
+        html += template.content_tag :li, class: "errors" do
+          template.content_tag :ul do
+            errors_html = template.raw("")
+            asset_errors.each do |error|
+              errors_html += template.content_tag(:li, error)
+            end
+            errors_html
+          end
+        end
+      end
+
       html += template.content_tag :li do
         builder.fields_for(method, assets.build) do |f|
           f.file_field :asset, multiple: true, accept: asset_model_class.extension_white_list

data/lib/lalala/uploaders/image.rb

@@ -1,8 +1,6 @@
 class Lalala::Uploaders::Image < Lalala::Uploaders::File
 
   include CarrierWave::MiniMagick
-  include Sprockets::Helpers::RailsHelper
-  include Sprockets::Helpers::IsolatedHelper
 
   def extension_white_list
     %w(jpg jpeg gif png)

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "132"
+  BUILD   = "133"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.132
+  version: 4.0.0.dev.133
 platform: ruby
 authors:
 - Simon Menke