lib/nokaya/image.rb in nokaya-0.0.7 vs lib/nokaya/image.rb in nokaya-0.0.8

@@ -1,25 +1,40 @@
 # encoding: utf-8
 module Nokaya
   class Image
+
     def self.photo_name nokaya
-      unless nokaya.options[:name]
-        Dir.home + "/Downloads/#{nokaya.type.to_s}-#{Time.now.to_i}.jpg"
+      path = self.out nokaya
+      if nokaya.options[:name]
+        "#{path}/#{nokaya.type.to_s}-#{nokaya.options[:name]}.jpg"
       else
-        Dir.home + "/Downloads/#{nokaya.type.to_s}-#{nokaya.options[:name]}.jpg"
+        "#{path}/#{nokaya.type.to_s}-#{Time.now.to_i}.jpg"
       end
     end
+
     def self.save_image path, link
       content = self.get_image link
       f = File.new(path, "wb")
         f.puts(content)
       f.close
     end
+
     def self.get_image img_link
       begin
         open(img_link).read
       rescue
         abort Status.no_can_do
       end
     end
+
+    private
+
+    def self.out nokaya
+      if nokaya.options[:output]
+        nokaya.options[:output]
+      else
+        Dir.home + "/Downloads"
+      end
+    end
+
   end
 end