multistockphoto 0.8.0 → 0.8.1

data/test/test_multistockphoto.rb

@@ -12,7 +12,8 @@ class TestMultistockphoto < Test::Unit::TestCase
   BIN = 'bin/' # Test
   SENDLIST = 'sendeliste.dat'
   # BIN = '' # real
-  
+  ALLSITES = [:fotolia, :zoonar, :photocase, :bigstockphoto]
+
   def setup
     ENV['ZOONAR_USER'] = 'hugo'
     ENV['ZOONAR_PASSWORD'] = 'geheim'
@@ -32,6 +33,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     ENV['BIGSTOCKPHOTO_PASSWORD'] = 'dennisgeheim'
     ENV['BIGSTOCKPHOTO_FTP_USER'] = 'dennis12345'
     ENV['BIGSTOCKPHOTO_FTP_PASSWORD'] = 'ftpgeheimdennis'
+    ENV['PANTHERMEDIA_USER'] = 'iris'
+    ENV['PANTHERMEDIA_PASSWORD'] = 'irisgeheim'
+    ENV['PANTHERMEDIA_FTP_USER'] = 'irisftp'
+    ENV['PANTHERMEDIA_FTP_PASSWORD'] = 'irisftpgeheim'
     @fotolia_user         = ENV['FOTOLIA_USER'] 
     @fotolia_password     = ENV['FOTOLIA_PASSWORD'] 
     @fotolia_ftp_user     = ENV['FOTOLIA_FTP_USER'] 
@@ -50,6 +55,10 @@ class TestMultistockphoto < Test::Unit::TestCase
     @bigstockphoto_password     = ENV['BIGSTOCKPHOTO_PASSWORD'] 
     @bigstockphoto_ftp_user     = ENV['BIGSTOCKPHOTO_FTP_USER'] 
     @bigstockphoto_ftp_password = ENV['BIGSTOCKPHOTO_FTP_PASSWORD'] 
+    @panthermedia_user         = ENV['PANTHERMEDIA_USER'] 
+    @panthermedia_password     = ENV['PANTHERMEDIA_PASSWORD'] 
+    @panthermedia_ftp_user     = ENV['PANTHERMEDIA_FTP_USER'] 
+    @panthermedia_ftp_password = ENV['PANTHERMEDIA_FTP_PASSWORD'] 
     ENV['MSP_CONFIG'] = nil
   end
   
@@ -68,7 +77,7 @@ class TestMultistockphoto < Test::Unit::TestCase
   end
   
   def test_bin_help
-    expected = "Usage: multistockphoto [-va1yntscrxlpoq]
+    expected = "Usage: multistockphoto [-va1yntscrxlpoqbdef]
 Options:
         --help                       Show this message
     -v, --version                    Show version
@@ -85,6 +94,10 @@ Options:
     -p, --purge-done                 Purge photos sent to all sites
     -o, --ordered                    Send/List files in alphabetical order
     -q, --no-tags                    List photos without tags file
+    -b, --count                      Count - only photo with at least N tags
+    -d, --plist                      Show detailed sending state for each picture
+    -e, --check-translation          Checks if translation can be done for all tags
+    -f, --shuffle                    Shuffle order of files (sending)
         --dont-send                  
         --dont-log                   \n"
     result = `#{BIN}multistockphoto -h`
@@ -94,7 +107,8 @@ Options:
   end
 
   def test_bin_version
-    expected = "multistockphoto 0.7.1\n"
+    #    expected = "multistockphoto 0.9.0\n" + Multistockphoto::VERSION::STRING
+    expected = "multistockphoto #{Multistockphoto::VERSION::STRING}\n" 
     result = `#{BIN}multistockphoto -v`
     assert_equal expected, result
     result = `#{BIN}multistockphoto --version`
@@ -216,6 +230,18 @@ Options:
     assert_equal @bigstockphoto_ftp_password, bigstockphoto.ftp_password
   end
   
+  def test_config_params_panthermedia
+    site = Panthermedia.new("Panthermedia Site")
+    #assert site.user
+    #assert site.password
+    assert site.ftp_user
+    assert site.ftp_password
+    assert_equal @panthermedia_user, site.user
+    assert_equal @panthermedia_password, site.password
+    assert_equal @panthermedia_ftp_user, site.ftp_user
+    assert_equal @panthermedia_ftp_password, site.ftp_password
+  end
+  
   def test_grep
     file = "test/testgrep.dat"
     content = "zoonar\tIMG1.jpg\n"+
@@ -254,7 +280,7 @@ Options:
   end
 
   def test_config_params_pixelio
-    after Date.new(2008,6,20) do
+    after Date.new(2008,7,20)+20 do
       pixelio = Pixelio.new("Pixelio Site")
       assert pixelio.user
       assert pixelio.password
@@ -286,25 +312,37 @@ Options:
     assert_kind_of Bigstockphoto, bigstockphoto
   end
     
-  after Date.new(2008,6,30) do
+  after Date.new(2008,7,25) do
     def test_shutterstock_object
       shutterstock = Shutterstock.new("Shutterstock Site")
       assert_kind_of Shutterstock, shutterstock
     end
+  end
+
+  after Date.new(2008,7,25) do
     def test_istockphoto_object
       #      angemeldet, aber man muß noch vorstellungsbilder hochladen
       istockphoto = Istockphoto.new("Istockphoto Site")
       assert_kind_of Istockphoto, istockphoto
     end
+  end
+
+  after Date.new(2008,7,25) do
     def test_stockxpert_object
       #     angemeldet, aber man muss noch vorstellungsbilder hochladen
       stockxpert = Stockxpert.new("Stockxpert Site")
       assert_kind_of Stockxpert, stockxpert
     end
+  end
+
+  after Date.new(2008,7,25)+10 do
     def test_Einszweidreirf_object
       einszweidreirf = Einszweidreirf.new("123rf Site")
       assert_kind_of Einszweidreirf, einszweidreirf
     end
+  end
+
+  after Date.new(2008,7,25) do
     def test_Panthermedia_object
       panthermedia = Panthermedia.new("Panthermedia Site")
       assert_kind_of Panthermedia, panthermedia
@@ -312,24 +350,8 @@ Options:
     #Shutterstock, iStockphoto , StockXpert , Dreamstime , Bigstockphoto , 123rf und Panthermedia finden Sie auf unserer Partnerseite Fotos kaufen.de
   end
 
-  def DONT_test_iptc_data
-
-    pic = ImageList.new("test/IMG_3602.JPG")
-    puts pic.orientation
-
-
-    pic.each_iptc_dataset { |dataset, data_field| 
-      p dataset
-      p data_field
-    } 
-    
-    p pic.get_iptc_dataset(Magick::IPTC::Application::Keywords)
-    # assert ['aaa'], rmagicphoto.iptc
-    assert true
-  end
-  
-  #Shutterstock, iStockphoto , StockXpert , Dreamstime , Bigstockphoto , 123rf und Panthermedia finden Sie auf unserer Partnerseite Fotos kaufen.de
-
+ 
+ 
   def test_max_errors
     site = Fotolia.new('fotolia')
     assert_equal 3, site.max_errors
@@ -337,6 +359,10 @@ Options:
     assert_equal 3, site.max_errors
     site = Photocase.new('photocase')
     assert_equal 3, site.max_errors
+    site = Dreamstime.new('dreamstime')
+    assert_equal 3, site.max_errors
+    site = Panthermedia.new('pantermedia')
+    assert_equal 3, site.max_errors
   end  
 
   def test_set_max_errors
@@ -354,17 +380,39 @@ Options:
   end  
   
   def test_iptc_keywords
-    expected = ['Berlin','gwb','Blume','Biene']
-    photo = Photo.new(File.join('test','IMG_3602.JPG'))
-    photo.set_keywords
-    assert_equal expected, photo.keywords 
+    after Date.new(2008,7,21)+10 do
+      expected = ['Berlin','gwb','Blume','Biene','Verkehr','S-Bahn']
+      photo = Photo.new(File.join('test','IMG_3602.JPG'))
+      photo.set_keywords
+      assert_equal expected, photo.keywords 
+    end
   end
 
   def test_iptc_file_keywords
-    expected = 'Berlin,gwb,Blume,Biene'
-    photo = Photo.new(File.join('test','IMG_3602.JPG'))
-    photo.set_keywords
-    assert_equal expected, photo.file_keywords 
+    after Date.new(2008,7,21)+10 do
+      expected = 'Berlin,gwb,Blume,Biene,Verkehr,S-Bahn'
+      photo = Photo.new(File.join('test','IMG_3602.JPG'))
+      photo.set_keywords
+      assert_equal expected, photo.file_keywords 
+    end
+  end
+  
+  def test_iptc_title
+    after Date.new(2008,7,21)+10 do
+      expected = 'meine Katze'
+      photo = Photo.new(File.join('test','IMG_3602.JPG'))
+      photo.set_keywords
+      assert_equal expected, photo.title 
+    end
+  end
+
+  def test_iptc_file_title
+    after Date.new(2008,7,1)+30 do
+      expected = 'meine Katze'
+      photo = Photo.new(File.join('test','IMG_3602.JPG'))
+      photo.set_keywords
+      assert_equal expected, photo.file_title 
+    end
   end
   
   def test_string_to_keyword_array
@@ -409,11 +457,7 @@ Options:
   #end
 
   #class Multistockphoto
-  after Date.new(2008,6,13) do
-    def DONT_test_iptc_data(*args)
-      raise NotImplementedError, 'Need to write DONT_test_iptc_data'
-    end
-
+  after Date.new(2008,7,30) do
     
     def config_params_pixelio(*args)
       raise NotImplementedError, 'Need to write config_params_pixelio'
@@ -469,7 +513,7 @@ Options:
     #  end
 
     def test_heute_schon_gesendet
-      after Date.new(2008,6,30) do
+      after Date.new(2008,7,27) do
         raise NotImplementedError, 'Need to write test_heute_schon_gesendet'
       end
     end
@@ -501,6 +545,11 @@ Options:
     site = Bigstockphoto.new('bigstockphoto')
     site.password = password
     assert_equal password, site.password
+
+    password = rand(1_000_000).to_s
+    site = Panthermedia.new('panthermedia')
+    site.password = password
+    assert_equal password, site.password
   end
 
   def test_password_equals
@@ -528,9 +577,14 @@ Options:
     site = Bigstockphoto.new('dreamstime')
     site.password = password
     assert_equal password, site.password
+  
+    password = rand(1_000_000).to_s
+    site = Panthermedia.new('panthermedia')
+    site.password = password
+    assert_equal password, site.password
   end
 
-  after Date.new(2008,7,15) do
+  after Date.new(2008,7,25)+10do
     def test_photos_fuer_heute_uebrig_eh
       raise NotImplementedError, 'Need to write test_photos_fuer_heute_uebrig_eh'
     end
@@ -544,17 +598,17 @@ Options:
     assert site.transfer(photo)
     assert site.transfer(photo)
     assert site.transfer(photo)
-    assert_raise (UploadException) {
+    assert_raise(UploadException) {
       site.transfer(photo)
     }
-    assert_raise (UploadException) {
+    assert_raise(UploadException) {
       site.transfer(photo)
     }
   end
   
   
   def test_bin_simple
-    after Date.new(2008,6,30) do   
+    after Date.new(2008,7,25)+10 do   
       begin
         Dir.mkdir 'upload'
       rescue Errno::EEXIST
@@ -583,7 +637,7 @@ photocase:upload/3.gif ... OK
   end
   
   def test_bin_simple_verbose
-    after Date.new(2008,6,30) do
+    after Date.new(2008,7,26)+10 do
       begin
         Dir.mkdir 'upload'
       rescue Errno::EEXIST
@@ -647,7 +701,8 @@ photocase:upload/3.gif ... OK
   
   def test_active_sites
     sender = Sender.new("Thomas")
-    assert_equal [:fotolia, :zoonar, :photocase, :dreamstime, :bigstockphoto], 
+    assert_equal [:fotolia, :zoonar, :photocase, :dreamstime, :bigstockphoto,
+                  :panthermedia], 
       sender.active_sites
   end
   
@@ -698,12 +753,15 @@ photocase:upload/3.gif ... OK
     assert ! Fotolia.can_handle_orientation?
     assert ! Zoonar.can_handle_orientation?
     assert ! Photocase.can_handle_orientation?
+    assert ! Panthermedia.can_handle_orientation?
   end
   
   def test_specific_file_sent_to_site
-    sender = Sender.new('icke')
-    assert sender.sent_to?("upload/IMG_3333.JPG", :fotolia)
-    assert ! sender.sent_to?("upload/IMG_9999.JPG", :fotolia)
+    after Date.new(2008,7,21)+10 do
+      sender = Sender.new('icke')
+      assert sender.sent_to?("upload/IMG_3333.JPG", :fotolia)
+      assert ! sender.sent_to?("upload/IMG_9999.JPG", :fotolia)
+    end
   end
 
   def test_accepted_fileformats
@@ -737,15 +795,61 @@ photocase:upload/3.gif ... OK
     assert ! Bigstockphoto.accept?("Lalala")
     
     
+    assert Fotolia.accept?('jpg')
+    assert Fotolia.accept?('jpeg')
+    assert Fotolia.accept?('svg')
+    assert ! Fotolia.accept?('psd')
+    
     
     
   end
   
   def test_translated_iptc_file_keywords
-    expected = 'Berlin,gwb,flower,bee'
+    after Date.new(2008,7,31) do
+      expected = 'Berlin,gwb,flower,bee,traffic'
+      photo = Photo.new(File.join('test','IMG_3602.JPG'))
+      photo.set_keywords(:de,:en)
+      assert_equal expected, photo.file_keywords 
+    end
+  end
+  
+  def test_photosize_valid?
     photo = Photo.new(File.join('test','IMG_3602.JPG'))
-    photo.set_keywords(:de,:en)
-    assert_equal expected, photo.file_keywords 
+    ALLSITES.each {|site_name|   
+      site = eval(site_name.to_s.capitalize+".new(#{site_name.to_s.capitalize})")
+      assert site.photosize_valid?(photo)              
+    }
+  end
+
+  def test_shutterstock_object
+    after Date.new(2008,7,25)+10 do
+      site = Shutterstock.new('Shutterstock')
+      assert_kind_of Shutterstock, site
+    end    
+  end
+  def test_istockphoto_object
+    after Date.new(2008,7,25)+10 do
+      site = Istockphoto.new('iStockphoto')
+      assert_kind_of Istockphoto, site 
+    end
+  end
+  def test_stockxpert_object
+    after Date.new(2008,7,25)+10 do
+      site = Stockxpert.new('StockXpert')
+      assert_kind_of Stockxpert, site 
+    end
+  end
+  def test_123rf_object
+    after Date.new(2008,7,25)+10 do
+      site = Einszweidreirf.new('123rf')
+      assert_kind_of Einszweidreirf, site 
+    end
+  end
+
+  def test_panthermedia_object
+    site = Panthermedia.new('Panthermedia')
+    assert_kind_of Panthermedia, site 
   end
+
 end