lalala 4.0.0.dev.153 → 4.0.0.dev.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa5db15b226839fa8cbd0960a4ccd151898a5b41
-  data.tar.gz: 733fcab27b3f62355a78a58be3ab3aac28774b77
+  metadata.gz: 425d7e8c567094ce9135f2c46126d448b9a74db0
+  data.tar.gz: 6096cbe267d51d033972447e09235dcbec617d1c
 SHA512:
-  metadata.gz: c4ba59f1f6344147e53df9d9866eb53d4629e9dadb3b82a5765d06e83d67982b2901c32de7d0450405f0ded80d94561f6e0fdfccfc022379f0f103acb9e18506
-  data.tar.gz: cdf327c8ab86ea77f180b0944a59f45421ceddbed76cf12fcdea6bb0a4e073660e92cdbd8805677cd2c703be16744c571c579c5cfae7dc7133d48eead7b9089d
+  metadata.gz: 4248271fe38157d447cc8fb7f3c0ef33d40199e55c49552342b6e563281d5d5e18aa13811f90dfe990a58d1994e3c7363d0f1fa602a6e3996d385ba66b5c45f4
+  data.tar.gz: e90574f96d008bf7cdb90ec5ec8299a993ac4777c7a5f25ee51c15ab328c5a27e1986362058d031ea7b10c7aa4e945b05759b26f252bd181d87ac7124beea41a

data/app/models/lalala/abstract_asset.rb

@@ -12,11 +12,12 @@ class Lalala::AbstractAsset < ActiveRecord::Base
   belongs_to :asset_owner, polymorphic: true
 
   def self.extension_white_list
-    list = if self.uploaders and self.uploaders[:asset]
-      self.uploaders[:asset].new.try(:extension_white_list)
+    if self.uploaders and self.uploaders[:asset]
+      list = self.uploaders[:asset].new.try(:extension_white_list)
+    else
+      list = []
     end
 
-    list = list || []
     list.map { |e| ".#{e}" }.join(",")
   end
 

data/app/models/lalala/file_asset.rb

@@ -1,3 +1,11 @@
 class Lalala::FileAsset < Lalala::AbstractAsset
   mount_uploader :asset, ::FileUploader
+
+  def asset=(value)
+    if Array === value
+      value = value.first
+    end
+
+    super(value)
+  end
 end

data/app/models/lalala/image_asset.rb

@@ -1,3 +1,11 @@
 class Lalala::ImageAsset < Lalala::AbstractAsset
   mount_uploader :asset, ::ImageUploader
+
+  def asset=(value)
+    if Array === value
+      value = value.first
+    end
+
+    super(value)
+  end
 end

data/lib/lalala/ext_rack/multiple_file_upload_support.rb

@@ -31,8 +31,6 @@ class Lalala::ExtRack::MultipleFileUploadSupport
 
       assets.each do |file|
         if file.present?
-          file[:name] = file[:name].sub(/\[\]$/, '')
-          file[:head] = file[:head].sub(file[:name] + "[]", file[:name])
           params[last_id] = { "asset" => file }.with_indifferent_access
           last_id.succ!
         end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "153"
+  BUILD   = "154"
 
   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.153
+  version: 4.0.0.dev.154
 platform: ruby
 authors:
 - Simon Menke