photofy 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01170cecbe978f73d3a6b5f1c9aad979149a89f2
-  data.tar.gz: dd71457da82f23d3c9121e5ff2c60f86b716309b
+  metadata.gz: 7b77a6f420026f5be340cdae42a22fef7dacd205
+  data.tar.gz: ad949b60783be2bf604004e3da3f46d29d72a67c
 SHA512:
-  metadata.gz: 38b61e941bb7cd41fc9bd4df289c3f0d14860b33e45e8004415b8c1374f2d8b75cbceb31c7c0280681ca1df97eb92d243258f871493dfe3f46eb205be0acf31f
-  data.tar.gz: 67ac931b404622c32caf7cde528013d9165f8438b61283157a5b0e2bcb459c6095a2078a0057aa355b48fd11ca2e9c900f6b46df7445e14c287ce13db82437ca
+  metadata.gz: 6ab2fac1d174909231104eac8ef113267fcf331c9597ec92b2f93d23d20b3b11120a722e1f7b9b17a6aec9dfd93cb7ed89ddb5ed3a3c3153f7184e89a73bd33d
+  data.tar.gz: 67902b5c082d0ae0ef80b7da58cbe48acc90349671cd9120c457db4aa1ac56757185417cf75a2047b0d973717459e973d5b0c64b09a2f35cdc083891abb5affe

data/lib/photofy/core.rb

@@ -28,6 +28,7 @@ module Photofy
 
     #Example
     #photofy(:door)
+    #photofy(:door, message: "Some message to show as error when invalid file(w.r.t format) will be used in setter/assignment method")
     #photofy(:small_door, {parent_photo_field: :door})
     #photofy(:window, {image_processor: Proc.new { |img| img.scale(25, 25) }})
     #after_photofy :door, :ventilator, Proc.new { |img| img.scale(25, 25) }
@@ -48,11 +49,21 @@ module Photofy
     #image_processor: a proc for image processing like Proc.new { |img| img.scale(25, 25) }
     #parent_photo_field: a parent photo field name to be used as source
     def photofy(photo_field, options = {})
+      (options ||={})[:message] ||= "Not from valid set of allowed file types"
+
       collect_photo_formats(photo_field, options)
 
+      self.validate "validate_#{photo_field}_field"
+
       @photo_fields ||=[]
       @photo_fields << photo_field
 
+      define_method "validate_#{photo_field}_field" do
+        (@photo_fields_errors ||={}).each do |field, message|
+          errors.add(field.to_sym, message)
+        end
+      end
+
       define_method 'initialize_photo_buffers' do
         @photo_file_buffer ||= {}
         @photo_file_ofn ||= {}
@@ -117,18 +128,33 @@ module Photofy
         send('initialize_photo_buffers')
 
         if file_upload.class == ActionDispatch::Http::UploadedFile
-          return false unless self.class.photo_formats[photo_field].include?(File.extname(file_upload.original_filename).downcase)
+          unless self.class.photo_formats[photo_field].include?(File.extname(file_upload.original_filename).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.read(file_upload.path)
           @photo_file_ofn[photo_field] = File.basename(file_upload.original_filename)
 
         elsif file_upload.class == File
-          return false unless self.class.photo_formats[photo_field].include?(File.extname(file_upload.path).downcase)
+          unless self.class.photo_formats[photo_field].include?(File.extname(file_upload.path).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.read
           @photo_file_ofn[photo_field] = File.basename(file_upload.path)
 
           file_upload.rewind
         elsif file_upload.class == String
-          #return false unless self.class.photo_formats[photo_field].include?(File.extname(file_upload).downcase)
+          #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 :)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photofy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Praveen Kumar Sinha
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk