lalala 4.0.0.dev.157 → 4.0.0.dev.160

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebcf9874e30a5ff5be77c9527fe11c85dac444ef
-  data.tar.gz: 70aa26ee89ffd6bde58cb49c267e8a242485ee3c
+  metadata.gz: 73609f4472f75f7fdf1b713692c0c68a53d2e10c
+  data.tar.gz: e26976faaa534964bb51a6425ae026c75ea2c88c
 SHA512:
-  metadata.gz: d77ddb91712874912bd41cd81b2e2b060f02f8b615191ffa72f268eb92aa3c22a9f0f1cb9e7e145bc6b4a56f2135bf55ff72de58b9ae2e8ea82a90eec5320e32
-  data.tar.gz: 25cb004cddf823b95cdb0fd3bbf39136e1e784c1555e44d3d712f30655a8c4a91d81dcf540163df9ead64f870ab9064aee7121f0f4014bbffc23d99bc6fe3469
+  metadata.gz: e4e84e8afa2ecb0dd0dd9990445b607ef4baabf3b8fa53d9065ddd08e971785cc657b12210e7bb8b839cd132941364ac7568f28d13802f1e00830c35c55a3d52
+  data.tar.gz: 51f390345d6daad5986c7f1ad0ce7c24688dccd167c43501859dda7f1b65f3de98a4ae432dd8453cf9140515dce7a24f884a1c3e9b633c7d8c3e542e07818297

data/lib/lalala/engine.rb

@@ -45,10 +45,6 @@ module Lalala
         'ActionDispatch::Flash',
         Lalala::ExtRack::PageLoader)
 
-      stack.insert_before(
-        'ActionDispatch::Head',
-        Lalala::ExtRack::MultipleFileUploadSupport)
-
     end
 
     initializer "lalala.assets", :group => :assets do |app|
@@ -104,7 +100,13 @@ module Lalala
   end
 
   ActiveSupport.on_load :action_controller do
-    ActionDispatch::Routing::Mapper.send :include, Lalala::Pages::RouteMapper
+
+    ActionDispatch::Routing::Mapper.send(
+      :include, Lalala::Pages::RouteMapper)
+
+    ActionDispatch::Request.send(
+      :include, Lalala::ExtActionDispatch::MultiFileUpload)
+
   end
 
 end

data/lib/lalala/ext_action_dispatch/multi_file_upload.rb

@@ -0,0 +1,50 @@
+module Lalala::ExtActionDispatch::MultiFileUpload
+
+private
+
+  def normalize_parameters(value)
+    value = super(value)
+
+    if Hash === value
+      value.each do |key, v|
+        value[key] = correct_assets_hash_nesting(key, v)
+      end
+    end
+
+    return value
+  end
+
+  def correct_assets_hash_nesting(key, value)
+    unless key.to_s.ends_with?("_attributes")
+      return value
+    end
+
+    unless Hash === value
+      return value
+    end
+
+    if value.size == 0
+      return value
+    end
+
+    last_id = value.keys.sort_by(&:to_i).last
+    last_id = "#{last_id}"
+    assets  = value[last_id].try(:[], "asset")
+
+    unless Array === assets
+      return value
+    end
+
+    unless assets.all?{ |i| ActionDispatch::Http::UploadedFile === i }
+      return value
+    end
+
+    assets.each do |file|
+      value[last_id] = { "asset" => file }.with_indifferent_access
+      last_id.succ!
+    end
+
+    return value
+  end
+
+end

data/lib/lalala/ext_action_dispatch.rb

@@ -0,0 +1,5 @@
+module Lalala::ExtActionDispatch
+  extend ActiveSupport::Autoload
+
+  autoload :MultiFileUpload
+end

data/lib/lalala/ext_rack.rb

@@ -4,6 +4,5 @@ module Lalala::ExtRack
   autoload :CanonicalURL
   autoload :PageLoader
   autoload :I18nNegotiator
-  autoload :MultipleFileUploadSupport
 
 end

data/lib/lalala/version.rb

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

data/lib/lalala.rb

@@ -40,9 +40,10 @@ module Lalala
   require 'formtastic/inputs/grid_input'
   require 'formtastic/inputs/single_file_input'
 
+  autoload :ExtActionDispatch
   autoload :ExtActiveRecord
-  autoload :ExtRack
   autoload :ExtI18n
+  autoload :ExtRack
   autoload :ExtWithAdvisoryLock
 
   autoload :Markdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.157
+  version: 4.0.0.dev.160
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -1371,6 +1371,8 @@ files:
 - lib/lalala/core/class_inheritable_setting.rb
 - lib/lalala/development.rb
 - lib/lalala/engine.rb
+- lib/lalala/ext_action_dispatch.rb
+- lib/lalala/ext_action_dispatch/multi_file_upload.rb
 - lib/lalala/ext_active_record.rb
 - lib/lalala/ext_active_record/assets.rb
 - lib/lalala/ext_active_record/i18n_translations_writer.rb
@@ -1384,7 +1386,6 @@ files:
 - lib/lalala/ext_rack.rb
 - lib/lalala/ext_rack/canonical_url.rb
 - lib/lalala/ext_rack/i18n_negotiator.rb
-- lib/lalala/ext_rack/multiple_file_upload_support.rb
 - lib/lalala/ext_rack/page_loader.rb
 - lib/lalala/ext_with_advisory_lock.rb
 - lib/lalala/ext_with_advisory_lock/flock.rb

data/lib/lalala/ext_rack/multiple_file_upload_support.rb

@@ -1,48 +0,0 @@
-class Lalala::ExtRack::MultipleFileUploadSupport
-
-  METHODS = /^POST|PUT|PATCH$/
-
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    if METHODS === env["REQUEST_METHOD"]
-      params = env["rack.request.form_hash"]
-      correct_assets_hash_nesting(params)
-    end
-
-    @app.call(env)
-  end
-
-  def correct_assets_hash_nesting(params, parent=nil, key=nil)
-    if key and key.to_s.ends_with?("_attributes")
-      return if params.size == 0
-
-      last_id = params.keys.sort_by(&:to_i).last
-      last_id = "#{last_id}"
-
-      return if params[last_id]["asset"].nil?
-
-      last = params.delete(last_id)
-      assets = last["asset"]
-
-      return unless Array === assets
-
-      assets.each do |file|
-        if file.present?
-          params[last_id] = { "asset" => file }.with_indifferent_access
-          last_id.succ!
-        end
-      end
-
-    else
-      case params
-      when Hash  then params.each { |k, v| correct_assets_hash_nesting(v, params, k) }
-      when Array then params.each { |v|    correct_assets_hash_nesting(v)            }
-      end
-
-    end
-  end
-
-end