ecm_pictures2_backend 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e99b6973529cd20af56583ea2cbec224c19961d
-  data.tar.gz: 2c2b6f5527d6ff8f1d96c8cb3a508d4fc85d8a2e
+  metadata.gz: 700744373fc780dd88f36e9459cda0a6bf790cf2
+  data.tar.gz: de6d2f89b0cdee79d1bbff819beb9353a505d971
 SHA512:
-  metadata.gz: ccd58650d2e0d7197dead24e435bec8eda0aabbf715d08778e87f32b8a26aa062fd21e7e49a4ac8584c66b064f4665d18b15ec8193e9aef3055c72cd15e21247
-  data.tar.gz: bbfc5db8bf3e8bed5e8082fbb2817485263cd5be95a8f299433ce67b9a5a2dc6d0ba5db77ba2027f99e08951c2ee90dc491161139158bdcbe543c14c1e1e10ba
+  metadata.gz: 0a2086394c8917c32741b252ba0c427eeee46a7f997efba62c6de7022de2b0eb9410d873f12ea0493401837729ca1de4c03d414eec122d8fe881a2a64bdbf6ed
+  data.tar.gz: ae15260cd8b9e3ba0fb0afd584270fdb4f6f8692fa88f0677b60844918b1c4aa4f11e26976717cb213a4b936fbb3bf281d2125ea0d3da1da5ecff29a8a646f98

data/app/controllers/ecm/pictures/backend/pictures_controller.rb

@@ -6,11 +6,10 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
   private
 
   def request_includes_base64_image?
-    params[:ecm_pictures_picture].key?(:image_base64) && params[:ecm_pictures_picture][:image_base64].present?
+    params[:ecm_pictures_picture].key?(:image_base64)
   end
 
-  def extract_base64
-    encoded_image = params[:ecm_pictures_picture].delete(:image_base64)
+  def extract_image_base64(encoded_image)
     decoded_image = Base64.decode64(encoded_image.gsub(/^data\:image\/\w+\;base64\,/, '')).force_encoding('UTF-8')
     content_type = encoded_image.split(';').first.split(':').last
     basename = 'image'
@@ -23,9 +22,13 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
   end
 
   def permitted_params
-    permitted_params = params
-                       .require(:ecm_pictures_picture)
-                       .permit(:picture_gallery_id, :name, :markup_language, :description, :image, :tag_list)
-    permitted_params.merge(image: extract_base64) if request_includes_base64_image?
+    processed_params = params.deep_dup
+    image_base64 = processed_params[:ecm_pictures_picture].try(:delete, :image_base64)
+    if image_base64.present?
+      image = extract_image_base64(image_base64) 
+      processed_params.merge!(image: extract_base64)
+    end
+    processed_params.require(:ecm_pictures_picture)
+                      .permit(:picture_gallery_id, :name, :markup_language, :description, :image, :tag_list)
   end
 end

data/lib/ecm/pictures/backend/version.rb

@@ -1,7 +1,7 @@
 module Ecm
   module Pictures
     module Backend
-      VERSION = '2.0.1'.freeze
+      VERSION = '2.0.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -276,4 +276,3 @@ signing_key:
 specification_version: 4
 summary: Backend Module for ECM Pictures 2
 test_files: []
-has_rdoc: