multistockphoto 0.5.0 → 0.5.1

data/History.txt

@@ -1,4 +1,7 @@
-== 0.5.0 2008-05-19???
+== 0.5.1 2008-05-29
+* 1 bug fix
+  * Fehlerbehandlung wenn Site keine Photos mehr annimmt
+== 0.5.0 2008-05-27
 * 2 major enhancements:
   * Schalter in Konfigurationsdatei :total_per_day (pro Site)
 

data/Manifest.txt

@@ -14,9 +14,11 @@ lib/multistockphoto/version.rb
 lib/multistockphoto/generic_site.rb
 lib/multistockphoto/site_fotolia.rb
 lib/multistockphoto/site_zoonar.rb
+lib/multistockphoto/mock_zoonar.rb
 lib/multistockphoto/site_photocase.rb
 lib/multistockphoto/site_aldi.rb
 lib/multistockphoto/photo.rb
+lib/multistockphoto/upload_exception.rb
 script/console
 script/destroy
 script/generate

data/bin/multistockphoto

@@ -208,13 +208,14 @@ def send_all
             end
             break if result != :duplicate && total_transfers >= Choice.choices[:total_transfers]
             break if all_sites_done(total,Choice.choices[:total_per_site])
-          rescue Net::FTPTempError
+          rescue #UploadException #Net::FTPTempError #TODO: gefaellt mir noch nicht so ganz
             errors[site_name] += 1
             if errors[site_name] >= 3
               done[site_name] = true # nichts mehr uploaden
               puts "too many errors. giving up."
             end
-            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
+#            puts "FTP-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
+            puts "Upload-Fehler beim Senden an #{site_name} aufgetreten. Ggf. Konfiguration ueberpruefen oder spaeter erneut vesuchen"
           end
         end
       }

data/lib/multistockphoto.rb

@@ -15,3 +15,6 @@ require 'multistockphoto/site_zoonar'
 require 'multistockphoto/site_aldi'
 require 'multistockphoto/site_photocase'
 
+
+require 'multistockphoto/upload_exception'
+require 'multistockphoto/mock_zoonar'

data/lib/multistockphoto/mock_zoonar.rb

@@ -0,0 +1,17 @@
+class Mock_Zoonar
+  def initialize(key,*args)
+    @key = key
+    
+    if args[0].include? :remaining
+      @remaining = args[0][:remaining]
+        end
+  end
+  
+  def transfer(photo)
+    if @remaining < 1
+      raise UploadException
+    end
+    @remaining -= 1
+    true
+  end
+end

data/lib/multistockphoto/upload_exception.rb

@@ -0,0 +1,3 @@
+class UploadException < RuntimeError
+  
+end

data/lib/multistockphoto/version.rb

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

data/test/test_multistockphoto.rb

@@ -22,6 +22,7 @@ class TestMultistockphoto < Test::Unit::TestCase
     @aldi_password        = ENV['ALDI_PASSWORD']
     @photocase_user       = ENV['PHOTOCASE_USER']
     @photocase_password   = ENV['PHOTOCASE_PASSWORD']
+    ENV['MSP_CONFIG'] = nil
   end
   
   def test_bin_help
@@ -193,32 +194,32 @@ sending foto3.jpg ... OK
     #kein ftp assert_equal @photocase_ftp_password, photocase.ftp_password
   end
   
-  def test_aldi
-    after Date.new(2008,5,30) do
-      site = Aldi.new("ALDI")
-    
-      assert_kind_of Aldi, site
-      assert_equal "ALDI", site.name
-    
-      site.user = @aldi_user
-      site.password = @aldi_password
-    
-      assert site.user
-      assert site.password
-    
-      assert_equal @aldi_user, site.user
-      assert_equal @aldi_password, site.password
-    end
-  end
-  
-  def test_aldi_transfer
-    after Date.new(2008,5,30) do
-      site = Aldi.new("ALDI")
-      photo = Photo.new("/media/LACIE/private/CF-Card/DCIM/119CANON/IMG_3267_zugeschnitten_blank_names.jpg")
-      site.transfer(photo)
-    end    
-  end
- 
+#  def test_aldi
+#    after Date.new(2008,5,30) do
+#      site = Aldi.new("ALDI")
+#    
+#      assert_kind_of Aldi, site
+#      assert_equal "ALDI", site.name
+#    
+#      site.user = @aldi_user
+#      site.password = @aldi_password
+#    
+#      assert site.user
+#      assert site.password
+#    
+#      assert_equal @aldi_user, site.user
+#      assert_equal @aldi_password, site.password
+#    end
+#  end
+#  
+#  def test_aldi_transfer
+#    after Date.new(2008,5,30) do
+#      site = Aldi.new("ALDI")
+#      photo = Photo.new("/media/LACIE/private/CF-Card/DCIM/119CANON/IMG_3267_zugeschnitten_blank_names.jpg")
+#      site.transfer(photo)
+#    end    
+#  end
+# 
   def test_grep
     file = "test/testgrep.dat"
     content = "zoonar\tIMG1.jpg\n"+
@@ -365,5 +366,216 @@ sending foto3.jpg ... OK
     assert_equal 0, photocase.sent_today
      
     
+  end
+#end
+# Code Generated by ZenTest v. 3.9.2
+#                 classname: asrt / meth =  ratio%
+#               GenericSite:    0 /    4 =   0.00%
+
+#require 'test/unit' unless defined? $ZENTEST and $ZENTEST
+
+#class Multistockphoto
+  def DONT_test_iptc_data(*args)
+    raise NotImplementedError, 'Need to write DONT_test_iptc_data'
+  end
+
+  def after(*args)
+    raise NotImplementedError, 'Need to write after'
+  end
+
+  def aldi(*args)
+    raise NotImplementedError, 'Need to write aldi'
+  end
+
+  def aldi_transfer(*args)
+    raise NotImplementedError, 'Need to write aldi_transfer'
+  end
+
+  def bin_help(*args)
+    raise NotImplementedError, 'Need to write bin_help'
+  end
+
+  def bin_version(*args)
+    raise NotImplementedError, 'Need to write bin_version'
+  end
+
+  def config_params_fotolia(*args)
+    raise NotImplementedError, 'Need to write config_params_fotolia'
+  end
+
+  def config_params_photocase(*args)
+    raise NotImplementedError, 'Need to write config_params_photocase'
+  end
+
+  def config_params_pixelio(*args)
+    raise NotImplementedError, 'Need to write config_params_pixelio'
+  end
+
+  def config_params_zoonar(*args)
+    raise NotImplementedError, 'Need to write config_params_zoonar'
+  end
+
+  def fotolia(*args)
+    raise NotImplementedError, 'Need to write fotolia'
+  end
+
+  def fotolia_transfer_1(*args)
+    raise NotImplementedError, 'Need to write fotolia_transfer_1'
+  end
+
+  def fotolia_transfer_existing_no_duplicate_picture(*args)
+    raise NotImplementedError, 'Need to write fotolia_transfer_existing_no_duplicate_picture'
+  end
+
+  def grep(*args)
+    raise NotImplementedError, 'Need to write grep'
+  end
+
+  def iptc_file_keywords(*args)
+    raise NotImplementedError, 'Need to write iptc_file_keywords'
+  end
+
+  def iptc_file_keywords_non_existing_tag_file(*args)
+    raise NotImplementedError, 'Need to write iptc_file_keywords_non_existing_tag_file'
+  end
+
+  def iptc_keywords(*args)
+    raise NotImplementedError, 'Need to write iptc_keywords'
+  end
+
+  def max_errors(*args)
+    raise NotImplementedError, 'Need to write max_errors'
+  end
+
+  def multistockphoto_group(*args)
+    raise NotImplementedError, 'Need to write multistockphoto_group'
+  end
+
+  def photo(*args)
+    raise NotImplementedError, 'Need to write photo'
+  end
+
+  def photocase_transfer_1(*args)
+    raise NotImplementedError, 'Need to write photocase_transfer_1'
+  end
+
+  def set_max_errors(*args)
+    raise NotImplementedError, 'Need to write set_max_errors'
+  end
+
+#  def setup(*args)
+#    raise NotImplementedError, 'Need to write setup'
+#  end
+
+  def site_object(*args)
+    raise NotImplementedError, 'Need to write site_object'
+  end
+
+  def string_to_keyword_array(*args)
+    raise NotImplementedError, 'Need to write string_to_keyword_array'
+  end
+
+  def total_per_day_from_config_file(*args)
+    raise NotImplementedError, 'Need to write total_per_day_from_config_file'
+  end
+
+  def transfer_all(*args)
+    raise NotImplementedError, 'Need to write transfer_all'
+  end
+#end
+
+#class TestGenericSite < Test::Unit::TestCase
+  def test_heute_schon_gesendet
+    raise NotImplementedError, 'Need to write test_heute_schon_gesendet'
+  end
+
+  def test_max_errors
+    raise NotImplementedError, 'Need to write test_max_errors'
+  end
+
+  def test_max_errors_equals
+    raise NotImplementedError, 'Need to write test_max_errors_equals'
+  end
+
+  def test_password
+    password = rand(1_000_000).to_s
+    site = Fotolia.new('fotolia')
+    site.password = password
+    assert_equal password, site.password
+    password = rand(1_000_000).to_s
+    site = Zoonar.new('zoonar')
+    site.password = password
+    assert_equal password, site.password
+        password = rand(1_000_000).to_s
+    site = Photocase.new('photocase')
+    site.password = password
+    assert_equal password, site.password
+  end
+
+  def test_password_equals
+    password = rand(1_000_000).to_s
+    site = Fotolia.new('fotolia')
+    site.password = password
+    assert_equal password, site.password
+    password = rand(1_000_000).to_s
+    site = Zoonar.new('zoonar')
+    site.password = password
+    assert_equal password, site.password
+        password = rand(1_000_000).to_s
+    site = Photocase.new('photocase')
+    site.password = password
+    assert_equal password, site.password
+  end
+
+  def test_photos_fuer_heute_uebrig_eh
+    raise NotImplementedError, 'Need to write test_photos_fuer_heute_uebrig_eh'
+  end
+
+  def test_password
+    password = rand(1_000_000).to_s
+    site = Fotolia.new('fotolia')
+    site.password = password
+    assert_equal password, site.password
+    password = rand(1_000_000).to_s
+    site = Zoonar.new('zoonar')
+    site.password = password
+    assert_equal password, site.password
+        password = rand(1_000_000).to_s
+    site = Photocase.new('photocase')
+    site.password = password
+    assert_equal password, site.password
+  end
+
+  def test_password_equals
+    password = rand(1_000_000).to_s
+    site = Fotolia.new('fotolia')
+    site.password = password
+    assert_equal password, site.password
+    password = rand(1_000_000).to_s
+    site = Zoonar.new('zoonar')
+    site.password = password
+    assert_equal password, site.password
+        password = rand(1_000_000).to_s
+    site = Photocase.new('photocase')
+    site.password = password
+    assert_equal password, site.password
+
+  end
+  
+  def test_zoonar_nur_noch_5_uploads_moeglich
+    site = Mock_Zoonar.new('zoonar',:remaining => 5)
+    photo = Photo.new("test/1234.jpg")
+      assert site.transfer(photo)
+      assert site.transfer(photo)
+      assert site.transfer(photo)
+      assert site.transfer(photo)
+      assert site.transfer(photo)
+    assert_raise (UploadException) {
+      site.transfer(photo)
+    }
+    assert_raise (UploadException) {
+      site.transfer(photo)
+    }
   end
 end
+

data/website/index.html

@@ -384,11 +384,19 @@ sie sich aktuell in der Warteschlage der zu begutachtenden Photos befinden.</p>
 
 
 	<ul>
-	<li>rubyforge: <a href="http://rubyforge.org/scm/?group_id=6180">http://rubyforge.org/scm/?group_id=6180</a></li>
+	<li>rubyforge: <span class="caps">MISSING IN ACTION</span></li>
 	</ul>
 
 
-<pre>git clone git://rubyforge.org/multistockphoto.git</pre>
+	<p><span class="caps">TODO</span> &#8211; You can not created a RubyForge project, OR have not run <code>rubyforge config</code>
+yet to refresh your local rubyforge data with this projects&#8217; id information.</p>
+
+
+	<p>When you do this, this message will magically disappear!</p>
+
+
+	<p>Or you can hack website/index.txt and make it all go away!!</p>
+
 
 	<ul>
 	<li>github: <a href="http://github.com/GITHUB_USERNAME/multistockphoto/tree/master">http://github.com/GITHUB_USERNAME/multistockphoto/tree/master</a></li>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multistockphoto
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-26 00:00:00 +02:00
+date: 2008-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -44,9 +44,11 @@ files:
 - lib/multistockphoto/generic_site.rb
 - lib/multistockphoto/site_fotolia.rb
 - lib/multistockphoto/site_zoonar.rb
+- lib/multistockphoto/mock_zoonar.rb
 - lib/multistockphoto/site_photocase.rb
 - lib/multistockphoto/site_aldi.rb
 - lib/multistockphoto/photo.rb
+- lib/multistockphoto/upload_exception.rb
 - script/console
 - script/destroy
 - script/generate