multistockphoto 0.7.1 → 0.8.0

data/lib/multistockphoto/site_dreamstime.rb

@@ -1,6 +1,4 @@
 require 'net/ftp'
-require 'grep'
-include Grep
 
 class Dreamstime < GenericSite
   
@@ -12,17 +10,21 @@ class Dreamstime < GenericSite
   FTP_HOST = 'upload.dreamstime.com'
   SITENAME = 'dreamstime'
   #      Ftp Adresse:  	upload.dreamstime.com
-#Benutzername (Benutzer ID): 	772816
-#Kennwort: 	das selbe wie Ihr Dreamstime Kontokennwort
+  #Benutzername (Benutzer ID): 	772816
+  #Kennwort: 	das selbe wie Ihr Dreamstime Kontokennwort
   
   def initialize(name)
     super
     @config = load_config
-    @user = @config[:dreamstime][:user]
-    @password = @config[:dreamstime][:password]
-    @ftp_user = @config[:dreamstime][:ftp_user]
-    @ftp_password = @config[:dreamstime][:ftp_password]
-    @total_per_day = @config[:dreamstime][:total_per_day]
+    begin
+      @user = @config[:dreamstime][:user]
+      @password = @config[:dreamstime][:password]
+      @ftp_user = @config[:dreamstime][:ftp_user]
+      @ftp_password = @config[:dreamstime][:ftp_password]
+      @total_per_day = @config[:dreamstime][:total_per_day]
+    rescue
+      puts 'cannot read configuration entries of '+SITENAME
+    end
   end
   
   def transfer(photo, dont_send=nil, dont_log=nil)
@@ -41,8 +43,7 @@ class Dreamstime < GenericSite
     end
     print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
-    if g.size > 0
+    if already_sent_site?(photo,SITENAME)
       puts "already sent"
       return :duplicate
     end
@@ -58,15 +59,15 @@ class Dreamstime < GenericSite
         ftp.login(@ftp_user,@ftp_password) 
         files=ftp.list('*')
         if photo.portrait?
-          p photo.rotated_filename
+          #p photo.rotated_filename
           res = ftp.putbinaryfile(photo.rotated_filename)
         else
           res = ftp.putbinaryfile(photo.filename)
         end
         files =ftp.list('*')
-        p files
+        #p files
         ftp.close
-      rescue Errno::EPIPE
+      rescue Errno::EPIPE,Net::FTPTempError
         raise UploadException
       end
     end
@@ -96,6 +97,24 @@ class Dreamstime < GenericSite
     false
   end
   
+  # Site akzeptiert diese Extension
+  def self.accept?(ext)
+    ext = ext.downcase
+    if ext[0,1] == '.'
+      ext = ext[1..-1]
+    end
+    case ext
+    when 'jpg','jpeg'
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Dreamstime.accept?(ext)  
+  end
+  
   private
   
   def site_can_handle_keywords?

data/lib/multistockphoto/site_fotolia.rb

@@ -1,6 +1,4 @@
 require 'net/ftp'
-require 'grep'
-include Grep
 
 class Fotolia < GenericSite
   
@@ -15,11 +13,15 @@ class Fotolia < GenericSite
   def initialize(name)
     super
     @config = load_config
-    @user = @config[:fotolia][:user]
-    @password = @config[:fotolia][:password]
-    @ftp_user = @config[:fotolia][:ftp_user]
-    @ftp_password = @config[:fotolia][:ftp_password]
-    @total_per_day = @config[:fotolia][:total_per_day]
+    begin
+      @user = @config[:fotolia][:user]
+      @password = @config[:fotolia][:password]
+      @ftp_user = @config[:fotolia][:ftp_user]
+      @ftp_password = @config[:fotolia][:ftp_password]
+      @total_per_day = @config[:fotolia][:total_per_day]
+    rescue
+      puts 'cannot read configuration entries of '+SITENAME
+    end
   end
   
   def transfer(photo, dont_send=nil, dont_log=nil)
@@ -38,8 +40,7 @@ class Fotolia < GenericSite
     end
     print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
-    if g.size > 0
+    if already_sent_site?(photo,SITENAME)
       puts "already sent"
       return :duplicate
     end
@@ -63,7 +64,7 @@ class Fotolia < GenericSite
         files =ftp.list('*')
         #p files
         ftp.close
-      rescue Errno::EPIPE
+      rescue Errno::EPIPE, Net::FTPTempError
         raise UploadException
       end
     end
@@ -93,6 +94,24 @@ class Fotolia < GenericSite
     false
   end
   
+  # Site akzeptiert diese Extension
+  def self.accept?(ext)
+    ext = ext.downcase
+    if ext[0,1] == '.'
+      ext = ext[1..-1]
+    end
+    case ext
+    when 'jpg','jpeg'  #TODO: pruefen     
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Fotolia.accept?(ext)  
+  end
+  
   private
   
   def site_can_handle_keywords?

data/lib/multistockphoto/site_photocase.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
 require 'mechanize'
-require 'grep'
-include Grep
 
 class Photocase < GenericSite
   SITENAME = 'photocase'
@@ -12,14 +10,19 @@ class Photocase < GenericSite
   
   def initialize(name)
     super
-    if ENV['MSP_CONFIG']
-      @config = YAML.load_file(ENV['MSP_CONFIG'])
-    else
-      @config = YAML.load_file("config.yaml")
+    #    if ENV['MSP_CONFIG']
+    #      @config = YAML.load_file(ENV['MSP_CONFIG'])
+    #    else
+    #      @config = YAML.load_file("config.yaml")
+    #    end
+    @config = load_config
+    begin
+      @user = @config[:photocase][:user]
+      @password = @config[:photocase][:password]
+      @total_per_day = @config[:photocase][:total_per_day]
+    rescue
+      puts 'cannot read configuration entries of '+SITENAME
     end
-    @user = @config[:photocase][:user]
-    @password = @config[:photocase][:password]
-    @total_per_day = @config[:photocase][:total_per_day]
   end
   
   def transfer(photo,dont_send=false,dont_log=false)
@@ -37,8 +40,7 @@ class Photocase < GenericSite
     end
     print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
-    if g.size > 0
+    if already_sent_site?(photo,SITENAME)
       puts 'already sent'
       return :duplicate
     end
@@ -50,6 +52,7 @@ class Photocase < GenericSite
     end
 
     if ! dont_send
+      begin
       agent = WWW::Mechanize.new
       agent.user_agent_alias = 'Linux Mozilla'
       page = agent.get 'http://www.photocase.de/en/login.asp'
@@ -97,7 +100,11 @@ class Photocase < GenericSite
           raise "too many errors"
         end
       end
-    else
+      rescue  Net::HTTPInternalServerError, WWW::Mechanize::ResponseCodeError
+#         Net::HTTPInternalServerError (WWW::Mechanize::ResponseCodeError)
+raise UploadException
+      end # rescue
+      else
       puts "OK"
     end
     #'Your photo was uploaded successfully.'
@@ -119,7 +126,7 @@ class Photocase < GenericSite
     return sent_today_site(site)
   end
   
-    # wurde dieses Photo schon gesendet?  
+  # wurde dieses Photo schon gesendet?  
   def already_sent?(photo)
     already_sent_site?(photo,SITENAME)
     #
@@ -138,6 +145,24 @@ class Photocase < GenericSite
     false
   end
   
+  # Site akzeptiert diese Extension
+  def self.accept?(ext)
+    ext = ext.downcase
+    if ext[0,1] == '.'
+      ext = ext[1..-1]
+    end
+    case ext
+    when 'jpg','jpeg' #TODO: pruefen
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Photocase.accept?(ext)  
+  end
+  
   private 
   
   def site_can_handle_keywords?

data/lib/multistockphoto/site_zoonar.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
 require 'mechanize'
-require 'grep'
-include Grep
 
 class Zoonar < GenericSite
   SITENAME = 'zoonar'
@@ -12,14 +10,19 @@ class Zoonar < GenericSite
   
   def initialize(name)
     super
-    if ENV['MSP_CONFIG']
-      @config = YAML.load_file(ENV['MSP_CONFIG'])
-    else
-      @config = YAML.load_file("config.yaml")
+    #    if ENV['MSP_CONFIG']
+    #      @config = YAML.load_file(ENV['MSP_CONFIG'])
+    #    else
+    #      @config = YAML.load_file("config.yaml")
+    #    end
+    @config = load_config
+    begin
+      @user = @config[:zoonar][:user]
+      @password = @config[:zoonar][:password]
+      @total_per_day = @config[:zoonar][:total_per_day]
+    rescue
+      puts 'cannot read configuration entries of '+SITENAME
     end
-    @user = @config[:zoonar][:user]
-    @password = @config[:zoonar][:password]
-    @total_per_day = @config[:zoonar][:total_per_day]
   end
 
   # TODO: Bild gedreht senden, falls Hochformat
@@ -37,12 +40,12 @@ class Zoonar < GenericSite
     end
     print "#{SITENAME}:#{photo.filename} ... "
     $stdout.flush
-    g = grep(SENDLIST, /#{SITENAME}\t#{photo.filename}/)
-    if g.size > 0
+
+    if already_sent_site?(photo,SITENAME)
       puts 'already sent'
       return :duplicate
     end
-        if photo.portrait? and ! Zoonar.can_handle_orientation?
+    if photo.portrait? and ! Zoonar.can_handle_orientation?
       photo.drehen
     end
 
@@ -53,11 +56,11 @@ class Zoonar < GenericSite
     unless dont_send
       agent = WWW::Mechanize.new
       agent.user_agent_alias = 'Linux Mozilla'
-     begin
-       page = agent.get 'http://www.zoonar.de'
-     rescue WWW::Mechanize::ResponseCodeError
-         raise UploadException
-     end
+      begin
+        page = agent.get 'http://www.zoonar.de'
+      rescue WWW::Mechanize::ResponseCodeError
+        raise UploadException
+      end
       form = page.forms[1] #TODO: besser nach Name
       form['loginForm[Username]']  = @config[:zoonar][:user]
       form['loginForm[Password]']  = @config[:zoonar][:password] 
@@ -129,11 +132,29 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
     already_sent_site?(photo,SITENAME)
   end
   
-    # can site handle orientation?
+  # can site handle orientation?
   def self.can_handle_orientation?
     false
   end
   
+  # Site akzeptiert diese Extension
+  def self.accept?(ext)
+    ext = ext.downcase
+    if ext[0,1] == '.'
+      ext = ext[1..-1]
+    end
+    case ext
+    when 'jpg','jpeg' # TODO: pruefen
+      return true
+    else 
+      return false
+    end
+  end
+  
+  def accept?(ext)
+    Zoonar.accept?(ext)  
+  end
+  
   private
   
   def site_can_handle_keywords?

data/lib/multistockphoto/version.rb

@@ -1,8 +1,8 @@
 module Multistockphoto #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
-    TINY  = 1
+    MINOR = 8
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/multistockphoto.rb

@@ -16,6 +16,7 @@ require 'multistockphoto/site_zoonar'
 #require 'multistockphoto/site_aldi'
 require 'multistockphoto/site_photocase'
 require 'multistockphoto/site_dreamstime'
+require 'multistockphoto/site_bigstockphoto'
 
 
 require 'multistockphoto/upload_exception'

data/test/test_multistockphoto.rb

@@ -28,6 +28,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     ENV['DREAMSTIME_PASSWORD'] = 'mageheim'
     ENV['DREAMSTIME_FTP_USER'] = 'martha12345'
     ENV['DREAMSTIME_FTP_PASSWORD'] = 'ftpgeheimmartha'
+    ENV['BIGSTOCKPHOTO_USER'] = 'dennis'
+    ENV['BIGSTOCKPHOTO_PASSWORD'] = 'dennisgeheim'
+    ENV['BIGSTOCKPHOTO_FTP_USER'] = 'dennis12345'
+    ENV['BIGSTOCKPHOTO_FTP_PASSWORD'] = 'ftpgeheimdennis'
     @fotolia_user         = ENV['FOTOLIA_USER'] 
     @fotolia_password     = ENV['FOTOLIA_PASSWORD'] 
     @fotolia_ftp_user     = ENV['FOTOLIA_FTP_USER'] 
@@ -42,6 +46,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     @dreamstime_password     = ENV['DREAMSTIME_PASSWORD'] 
     @dreamstime_ftp_user     = ENV['DREAMSTIME_FTP_USER'] 
     @dreamstime_ftp_password = ENV['DREAMSTIME_FTP_PASSWORD'] 
+    @bigstockphoto_user         = ENV['BIGSTOCKPHOTO_USER'] 
+    @bigstockphoto_password     = ENV['BIGSTOCKPHOTO_PASSWORD'] 
+    @bigstockphoto_ftp_user     = ENV['BIGSTOCKPHOTO_FTP_USER'] 
+    @bigstockphoto_ftp_password = ENV['BIGSTOCKPHOTO_FTP_PASSWORD'] 
     ENV['MSP_CONFIG'] = nil
   end
   
@@ -86,7 +94,7 @@ Options:
   end
 
   def test_bin_version
-    expected = "multistockphoto 0.6.2\n"
+    expected = "multistockphoto 0.7.1\n"
     result = `#{BIN}multistockphoto -v`
     assert_equal expected, result
     result = `#{BIN}multistockphoto --version`
@@ -196,6 +204,18 @@ Options:
     assert_equal @dreamstime_ftp_password, dreamstime.ftp_password
   end
   
+  def test_config_params_bigstockphoto
+    bigstockphoto = Bigstockphoto.new("Bigstockphoto Site")
+    assert bigstockphoto.user
+    assert bigstockphoto.password
+    assert bigstockphoto.ftp_user
+    assert bigstockphoto.ftp_password
+    assert_equal @bigstockphoto_user, bigstockphoto.user
+    assert_equal @bigstockphoto_password, bigstockphoto.password
+    assert_equal @bigstockphoto_ftp_user, bigstockphoto.ftp_user
+    assert_equal @bigstockphoto_ftp_password, bigstockphoto.ftp_password
+  end
+  
   def test_grep
     file = "test/testgrep.dat"
     content = "zoonar\tIMG1.jpg\n"+
@@ -245,34 +265,42 @@ Options:
     end # after
   end
 
-    def test_dreamstime_object
-  #    angemeldet.
-  #      Ftp Adresse:  	upload.dreamstime.com
-#Benutzername (Benutzer ID): 	772816
-#Kennwort: 	das selbe wie Ihr Dreamstime Kontokennwort
-      dreamstime = Dreamstime.new("Dreamstime Site")
-      assert_kind_of Dreamstime, dreamstime
-    end
-  
-  after Date.new(2008,6,20) do
+  def test_dreamstime_object
+    #    angemeldet.
+    dreamstime = Dreamstime.new("Dreamstime Site")
+    assert_kind_of Dreamstime, dreamstime
+  end
+
+  def test_bigstockphoto_object
+    #    http://www.bigstockphoto.com/
+    #    We accept JPG, EPS, AI, PSD, PDF and PNG file formats. 
+    #    All art or images MUST be created by you alone, no exceptions.
+    #Step ONE: Upload your model releases in Release Manager>> if needed... then FTP upload your images - no folders - separate files only. Use this FTP information to log into your BigStockPhoto FTP account:
+
+    #    host: bigstockphoto.com
+    #   username: your BSP username
+    #  password: your BSP password
+
+    #Step TWO: After upload, go to your Uploaded Images Queue to add your keywords, assign releases, titles, descriptions, categories etc. before pushing them to final BigStockPhoto Approval Queue. Also see the new FTP Status Log if needed to check upload status of images.
+    bigstockphoto = Bigstockphoto.new("Bigstockphoto Site")
+    assert_kind_of Bigstockphoto, bigstockphoto
+  end
+    
+  after Date.new(2008,6,30) do
     def test_shutterstock_object
       shutterstock = Shutterstock.new("Shutterstock Site")
       assert_kind_of Shutterstock, shutterstock
     end
     def test_istockphoto_object
-#      angemeldet, aber man muß noch vorstellungsbilder hochladen
+      #      angemeldet, aber man muß noch vorstellungsbilder hochladen
       istockphoto = Istockphoto.new("Istockphoto Site")
       assert_kind_of Istockphoto, istockphoto
     end
     def test_stockxpert_object
- #     angemeldet, aber man muss noch vorstellungsbilder hochladen
+      #     angemeldet, aber man muss noch vorstellungsbilder hochladen
       stockxpert = Stockxpert.new("Stockxpert Site")
       assert_kind_of Stockxpert, stockxpert
     end
-    def test_bigstockphoto_object
-      bigstockphoto = Bigstockphoto.new("Bigstockphoto Site")
-      assert_kind_of Bigstockphoto, bigstockphoto
-    end
     def test_Einszweidreirf_object
       einszweidreirf = Einszweidreirf.new("123rf Site")
       assert_kind_of Einszweidreirf, einszweidreirf
@@ -468,6 +496,11 @@ Options:
     site = Dreamstime.new('dreamstime')
     site.password = password
     assert_equal password, site.password
+
+    password = rand(1_000_000).to_s
+    site = Bigstockphoto.new('bigstockphoto')
+    site.password = password
+    assert_equal password, site.password
   end
 
   def test_password_equals
@@ -490,6 +523,11 @@ Options:
     site = Dreamstime.new('dreamstime')
     site.password = password
     assert_equal password, site.password
+  
+    password = rand(1_000_000).to_s
+    site = Bigstockphoto.new('dreamstime')
+    site.password = password
+    assert_equal password, site.password
   end
 
   after Date.new(2008,7,15) do
@@ -609,7 +647,8 @@ photocase:upload/3.gif ... OK
   
   def test_active_sites
     sender = Sender.new("Thomas")
-    assert_equal [:fotolia, :zoonar, :photocase, :dreamstime], sender.active_sites
+    assert_equal [:fotolia, :zoonar, :photocase, :dreamstime, :bigstockphoto], 
+      sender.active_sites
   end
   
   def test_upload_dir
@@ -667,5 +706,46 @@ photocase:upload/3.gif ... OK
     assert ! sender.sent_to?("upload/IMG_9999.JPG", :fotolia)
   end
 
+  def test_accepted_fileformats
+    #site = Bigstockphoto.new("bigstockphoto")
+    #We accept JPG, EPS, AI, PSD, PDF and PNG file formats.
+    assert Bigstockphoto.accept?("JPG")
+    assert Bigstockphoto.accept?("JPEG")
+    assert Bigstockphoto.accept?("EPS")
+    assert Bigstockphoto.accept?("AI")
+    assert Bigstockphoto.accept?("PSD")
+    assert Bigstockphoto.accept?("PDF")
+    assert Bigstockphoto.accept?("PNG")
+    assert ! Bigstockphoto.accept?("lalala")
+    
+    assert Bigstockphoto.accept?(".JPG")
+    assert Bigstockphoto.accept?(".JPEG")
+    assert Bigstockphoto.accept?(".EPS")
+    assert Bigstockphoto.accept?(".AI")
+    assert Bigstockphoto.accept?(".PSD")
+    assert Bigstockphoto.accept?(".PDF")
+    assert Bigstockphoto.accept?(".PNG")
+    assert ! Bigstockphoto.accept?(".lalala")
+    
+    assert Bigstockphoto.accept?("jpg")
+    assert Bigstockphoto.accept?("Jpeg")
+    assert Bigstockphoto.accept?("eps")
+    assert Bigstockphoto.accept?("ai")
+    assert Bigstockphoto.accept?("psd")
+    assert Bigstockphoto.accept?("pdf")
+    assert Bigstockphoto.accept?("Png")
+    assert ! Bigstockphoto.accept?("Lalala")
+    
+    
+    
+    
+  end
+  
+  def test_translated_iptc_file_keywords
+    expected = 'Berlin,gwb,flower,bee'
+    photo = Photo.new(File.join('test','IMG_3602.JPG'))
+    photo.set_keywords(:de,:en)
+    assert_equal expected, photo.file_keywords 
+  end
 end