lalala 4.0.0.dev.160 → 4.0.0.dev.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73609f4472f75f7fdf1b713692c0c68a53d2e10c
-  data.tar.gz: e26976faaa534964bb51a6425ae026c75ea2c88c
+  metadata.gz: 6496dddb416bf30955bfda92c6b846b259141c15
+  data.tar.gz: a4e3ee6537a65917e5348c4f591b5cc26de16006
 SHA512:
-  metadata.gz: e4e84e8afa2ecb0dd0dd9990445b607ef4baabf3b8fa53d9065ddd08e971785cc657b12210e7bb8b839cd132941364ac7568f28d13802f1e00830c35c55a3d52
-  data.tar.gz: 51f390345d6daad5986c7f1ad0ce7c24688dccd167c43501859dda7f1b65f3de98a4ae432dd8453cf9140515dce7a24f884a1c3e9b633c7d8c3e542e07818297
+  metadata.gz: f2e010c20df7eccad07a8e03ba9eeee5ba440ec66c5382b86cddd3512b64eb7699f00be11c2e39f0f674e5ebb59aa370c200d3b3dbf8b93095bf6db64b383b90
+  data.tar.gz: b920dd7d2f5a69c6d3829b2650ddc79e74eebfc83cd44029a1c3e0500696a4e2dcfe7507dcc09ecab41bb5aaf1559138613ae4bfc8091bbeafcf47a8133d95c6

data/app/models/lalala/file_asset.rb

@@ -1,11 +1,3 @@
 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,11 +1,3 @@
 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_action_dispatch/multi_file_upload.rb

@@ -29,6 +29,11 @@ private
 
     last_id = value.keys.sort_by(&:to_i).last
     last_id = "#{last_id}"
+
+    unless /^\d+$/ === last_id
+      return value
+    end
+
     assets  = value[last_id].try(:[], "asset")
 
     unless Array === assets

data/lib/lalala/markdown/html_renderer.rb

@@ -17,12 +17,12 @@ class Lalala::Markdown::HtmlRenderer < Redcarpet::Render::HTML
       return enhanced_autolink($1, link, link_type)
     end
 
-    if @options[:safe_links_only] and !safe_link(link) and type != :email
+    if @options[:safe_links_only] and !safe_link(link) and link_type != :email
       return ""
     end
 
     url = link
-    url = "mailto:"+url if type == :email
+    url = "mailto:"+url if link_type == :email
 
     helpers.link_to(link, url, @options[:link_attributes])
   end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "160"
+  BUILD   = "161"
 
   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.160
+  version: 4.0.0.dev.161
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave