photofy 0.5.5 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efacdfd93fa55a55f88a584c9122a7d8a69795dc
-  data.tar.gz: 4dd76bf79f2a2588acf1c9c5f3e1e1f8da194365
+  metadata.gz: a52ce7b29743b3206b06d5f9e4cc7675942410a7
+  data.tar.gz: c9d927a0fe18e9cdf4a504468a76560c69a28e3c
 SHA512:
-  metadata.gz: 900cc2cdbc2e49a707a95b136279307c5eb7712d7264b47599eb749c48f0035d485ce1089d0ae4ead1d613b2633fab71478df30fffcf636195f173e8d3de8c29
-  data.tar.gz: 1f432bd79175fced2203e5c3cab410f94389b807a2a4e0d160addc28976bf6e5ee167dab827022d9bb6e81638cb966375205ab56c8f9b2b4decab0b3fff1e1a5
+  metadata.gz: 83f4520d79373a4986eedfd27ee7936d1a692a808e89d59a6d233bd7607389784fa66df1e062826a8401857b0eb6b9f3545e124536abf45a18c7502946dc405f
+  data.tar.gz: 4d42053a929877b537be04c3265847540b101e9a84a7481c71533e77257a8ae9857125ba8ca69d6ebd0a63a413cf75122c4ddf620c41577bfbe71231c026bc16

data/lib/photofy/core.rb

@@ -21,7 +21,7 @@ module Photofy
     #will give a 'stamp' attribute which on save of 'profile' photo field will scale it to 25 x 25 dimensions
     #after_photofy :profile, :portfolio, Proc.new{|img| img.scale(150, 250)}
     #will give a 'portfolio' attribute which on save of 'profile' photo field will scale it to 150 x 250 dimensions
-    def after_photofy(parent_photo_field, photo_field, proc = Proc.new { |img| puts "Rmagick image: #{img.inspect}" })
+    def after_photofy(parent_photo_field, photo_field, proc = Proc.new {|img| puts "Rmagick image: #{img.inspect}"})
       photofy(photo_field, image_processor: proc, parent_photo_field: parent_photo_field)
     end
 
@@ -97,11 +97,11 @@ module Photofy
         send('initialize_photo_buffers')
 
         if @photo_file_buffer[photo_field].nil?
-          if  s3_connected?
+          if s3_connected?
             if send("#{photo_field}_persisted?")
               _file = nil
               file = Tempfile.new('foo', :encoding => 'ascii-8bit')
-              s3_bucket.objects[send("#{photo_field}_path")].read { |chunk| file.write(chunk) }
+              s3_bucket.objects[send("#{photo_field}_path")].read {|chunk| file.write(chunk)}
               file.rewind
               _file = file.read
               file.close
@@ -148,14 +148,27 @@ module Photofy
 
           file_upload.rewind
         elsif file_upload.class == String
-          #unless self.class.photo_formats[photo_field].include?(File.extname(file_upload).downcase)
-          #  (@photo_fields_errors ||= {})[photo_field.to_sym] = options[:message]
-          #  return false
-          #else
-          #  (@photo_fields_errors ||= {}).delete(photo_field.to_sym)
-          #end
-          @photo_file_buffer[photo_field] = file_upload
-          #@photo_file_ofn[photo_field] = File.basename(file_upload.path) #As there is nothing like original_file_name for a string :)
+
+          # For handling base 64 encoded image
+          if file_upload.match(/\Adata:([-\w]+\/[-\w\+\.]+)?;base64,/)
+            file_upload_parts = file_upload.match(/\Adata:([-\w]+\/[-\w\+\.]+)?;base64,(.*)/m) || []
+            extension = MIME::Types[file_upload_parts[1]].first.preferred_extension
+
+            unless self.class.photo_formats[photo_field].include?(".#{extension}")
+              (@photo_fields_errors ||= {})[photo_field.to_sym] = options[:message]
+              return false
+            else
+              (@photo_fields_errors ||= {}).delete(photo_field.to_sym)
+            end
+
+            @photo_file_buffer[photo_field] = Base64.decode64(file_upload_parts[2])
+            @photo_file_ofn[photo_field] = "#{SecureRandom.uuid}.#{extension}"
+
+          else
+            @photo_file_buffer[photo_field] = file_upload
+
+          end
+
         end
 
         file_upload
@@ -186,7 +199,7 @@ module Photofy
               _parent_file_path = send("#{parent_photo_field}_path")
               _temp_file_path = File.join(Rails.root, File.basename(_parent_file_path))
               file = File.open(_temp_file_path, 'wb')
-              s3_bucket.objects[_parent_file_path].read { |chunk| file.write(chunk) }
+              s3_bucket.objects[_parent_file_path].read {|chunk| file.write(chunk)}
               file.close
               file = File.open(_temp_file_path)
               send("#{photo_field}=", file)
@@ -206,7 +219,7 @@ module Photofy
 
             unless proc.nil?
               file = Tempfile.new('foo', :encoding => 'ascii-8bit')
-              s3_bucket.objects[send("#{photo_field}_path")].read { |chunk| file.write(chunk) }
+              s3_bucket.objects[send("#{photo_field}_path")].read {|chunk| file.write(chunk)}
               file.rewind
 
               img = Magick::Image.read(file.path).first
@@ -217,8 +230,8 @@ module Photofy
               file.unlink # deletes the temp file
             end
           else
-            File.delete(send("#{photo_field}_path")) if  File.exist?(send("#{photo_field}_path")) #Clearing any existing file at the path
-            File.open(send("#{photo_field}_path_to_write"), "wb+") { |f| f.puts(@photo_file_buffer[photo_field]) }
+            File.delete(send("#{photo_field}_path")) if File.exist?(send("#{photo_field}_path")) #Clearing any existing file at the path
+            File.open(send("#{photo_field}_path_to_write"), "wb+") {|f| f.puts(@photo_file_buffer[photo_field])}
 
             unless proc.nil?
               FileUtils.copy(send("#{photo_field}_path_to_write"), send("#{photo_field}_path_to_write", "original_source"))
@@ -263,7 +276,7 @@ module Photofy
     def collect_photo_formats(photo_field, options)
       if options.is_a?(Hash)
         @@photo_formats ||= {}
-        @@photo_formats[photo_field] = options[:formats].is_a?(Array) ? options[:formats].collect { |x| x.starts_with?(".") ? x : ".#{x}" } : [".jpeg", ".jpg", ".gif", ".png", ".bmp"]
+        @@photo_formats[photo_field] = options[:formats].is_a?(Array) ? options[:formats].collect {|x| x.starts_with?(".") ? x : ".#{x}"} : [".jpeg", ".jpg", ".gif", ".png", ".bmp"]
       else
         raise 'InvalidArguments'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photofy
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.1
 platform: ruby
 authors:
 - Praveen Kumar Sinha
@@ -10,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A simple gem to add accessors on rails models for file upload of pictures/assets (which will be persisted on remote media's disk on object save).
       Refer documentation for more help.
+      Latest happening: Now with Base64 encoded image support.
 email: praveen.kumar.sinha@gmail.com
 executables: []
 extensions: []
@@ -45,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Photofy