nozzle 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993361ba7ee445ab9365bafa57fb7f98279f6b7d
-  data.tar.gz: 6670e1748250e84d46d9706036c5a27c30f7b687
+  metadata.gz: 6acf45517971815d7ea04dab2de08a5aa4b4db51
+  data.tar.gz: fd100f0680bf760bb5b9cd4c29604449d73ea87d
 SHA512:
-  metadata.gz: a7d10a4beb91d405c3dc12a4d2d86f2acfaf55b0e829ccb9992bcc8f7e059a07d4a2df88ccf876a3bcea2c8686454188f8e131d9140eb005626ebcb71d27ef59
-  data.tar.gz: a363de139f5989f3be6366eb0e3a3d2c63590dcf32329fb735a72db9680cdd3d8838608227c539cf8e6e925c7e63b79eb3e2168c7bf54ff05082b39406396f28
+  metadata.gz: 1cd93c3d5b4d613e7992b8836c9376885e8b19a8d31ca18e2c615427a12ae26aa4e35f5ccc92ee39e978393feb792f37dec8bc3140aa5616e347bba73e4acd02
+  data.tar.gz: 080f3642843fe3bc88ae95b8346087052860075cdbba1e4128b4a95a87830bb11aa274b2a3706d24c9a640811daf50e6f416d037dea30a3abb639c58b4f5f62a

data/lib/nozzle/adapter/base.rb

@@ -163,12 +163,12 @@ module Nozzle
         @original_path = path
         return nil  unless value
 
-        new_path = expand_argument value
+        new_path, filename_candidate = expand_argument(value)
         raise Errno::ENOENT, "'#{new_path}'"  unless File.exists?(new_path)
 
         @tempfile_path = File.expand_path(new_path)
         detect_properties
-        @filename
+        @filename = prepare_filename(filename_candidate)
       end
 
       # Stores temporary filename by the constructed path. Deletes old file.
@@ -205,6 +205,12 @@ module Nozzle
 
     private
 
+      # Returns a filename prepared for saving. Should be overridden.
+      #   instance.avatar.new_filename('image.jpg') # => '0006-avatary-image.jpg'
+      def prepare_filename(candidate=filename)
+        candidate
+      end
+
       # Tries to detect content_type and size of the file.
       # Note: this method calls `file` system command to detect file content type.
       def detect_properties
@@ -230,12 +236,11 @@ module Nozzle
         when File, Tempfile
           value.path
         when Hash
-          expand_argument( value[:tempfile] || value['tempfile'] )
+          expand_argument( value[:tempfile] || value['tempfile'] ).first
         else
           raise ArgumentError, "#{@model}##{@column}= argument must be kind of String, File, Tempfile or Hash[:tempfile => 'path']"
         end
-        @filename = value.kind_of?(Hash) && ( value[:filename] || value['filename'] ) || File.basename(tempfile_path)
-        tempfile_path
+        [tempfile_path, value.kind_of?(Hash) && ( value[:filename] || value['filename'] ) || File.basename(tempfile_path)]
       end
 
       # Deletes the specified file and all empty folders recursively stopping at

data/lib/nozzle/version.rb

@@ -1,3 +1,3 @@
 module Nozzle
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nozzle
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Igor Bochkariov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler