multistockphoto 0.8.1 → 0.9.0

data/lib/multistockphoto/site_zoonar.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rubygems'
 require 'mechanize'
 
@@ -59,12 +60,20 @@ class Zoonar < GenericSite
       begin
         page = agent.get 'http://www.zoonar.de'
       rescue WWW::Mechanize::ResponseCodeError
+        raise UploadException
+			rescue Iconv::InvalidEncoding
+        warn "Iconv::InvalidEncoding error in mechanize-gem"
+        warn "TODO: mechanize should fix this problem"
+        warn "skipping file"
         raise UploadException
       end
       form = page.forms[1] #TODO: besser nach Name
-      form['loginForm[Username]']  = @config[:zoonar][:user]
-      form['loginForm[Password]']  = @config[:zoonar][:password] 
-
+      begin
+        form['loginForm[Username]']  = @config[:zoonar][:user]
+        form['loginForm[Password]']  = @config[:zoonar][:password] 
+      rescue NoMethodError
+        raise "Loginformular zum Ausfuellen nicht gefunden"
+      end
       page = agent.submit form
       raise "login error" if ! page.body.include?("Hallo, #{@config[:zoonar][:user]}!")
       # old syntax of mechanize: page = agent.click page.links.text('Bilder hochladen')
@@ -161,4 +170,4 @@ Falls wir das Bild ablehnen sollten, werden Sie eine Benachrichtigung per E-Mail
   def site_can_handle_keywords?
     true
   end
-end
+end

data/lib/multistockphoto/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multistockphoto
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,93 +9,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-30 00:00:00 +01:00
+date: 2009-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
+  name: choice
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 0.1.2
     version: 
-description: Upload your photos to multiple stock phote sites
-email: 
-- thopre@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: grep
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: exifr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mini_exiftool
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: exifr
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.5
+    version: 
+description: Upload your photos to multiple stock photo sites
+email: thopre@gmail.com
 executables: 
 - multistockphoto
-- multistockphoto-gui
-- mondrian.png
-- mondrian.ico
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- website/index.txt
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
 - README.txt
-- Rakefile
-- config.yaml
-- bin/multistockphoto
-- bin/multistockphoto-gui
-- bin/mondrian.png
-- bin/mondrian.ico
-- config/hoe.rb
-- config/requirements.rb
-- lib/multistockphoto.rb
-- lib/multistockphoto/multistockphoto.rb
-- lib/multistockphoto/version.rb
-- lib/multistockphoto/sender.rb
+- History.txt
 - lib/multistockphoto/generic_site.rb
-- lib/multistockphoto/site_fotolia.rb
-- lib/multistockphoto/site_zoonar.rb
+- lib/multistockphoto/sender.rb
 - lib/multistockphoto/mock_zoonar.rb
+- lib/multistockphoto/version.rb
+- lib/multistockphoto/site_panthermedia.rb
 - lib/multistockphoto/site_photocase.rb
+- lib/multistockphoto/site_istockphoto.rb
 - lib/multistockphoto/site_dreamstime.rb
-- lib/multistockphoto/site_bigstockphoto.rb
-- lib/multistockphoto/site_panthermedia.rb
 - lib/multistockphoto/photo.rb
+- lib/multistockphoto/site_bigstockphoto.rb
 - lib/multistockphoto/upload_exception.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
-- test/test_helper.rb
-- test/test_multistockphoto.rb
-- website/index.html
-- website/index.txt
-- website/face_boy.gif
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.html.erb
+- lib/multistockphoto/multistockphoto.rb
+- lib/multistockphoto/site_aldi.rb
+- lib/multistockphoto/site_zoonar.rb
+- lib/multistockphoto/site_fotolia.rb
+- lib/multistockphoto.rb
 has_rdoc: true
 homepage: http://multistockphoto.rubyforge.org
-post_install_message: |+
-  
-  For more information on multistockphoto, see http://multistockphoto.rubyforge.org
-  
-  NOTE: Change this information in PostInstall.txt 
-  You can also delete it if you don't want it.
-  
-  
-rdoc_options: 
-- --main
-- README.txt
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -113,10 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: multistockphoto
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
-summary: Upload your photos to multiple stock phote sites
-test_files: 
-- test/test_helper.rb
-- test/test_multistockphoto.rb
+specification_version: 3
+summary: Upload your photos to multiple stock photo sites
+test_files: []
+

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008 FIXME full name
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,43 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.txt
-Rakefile
-config.yaml
-bin/multistockphoto
-bin/multistockphoto-gui
-bin/mondrian.png
-bin/mondrian.ico
-config/hoe.rb
-config/requirements.rb
-lib/multistockphoto.rb
-lib/multistockphoto/multistockphoto.rb
-lib/multistockphoto/version.rb
-lib/multistockphoto/sender.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_dreamstime.rb
-lib/multistockphoto/site_bigstockphoto.rb
-lib/multistockphoto/site_panthermedia.rb
-lib/multistockphoto/photo.rb
-lib/multistockphoto/upload_exception.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-test/test_helper.rb
-test/test_multistockphoto.rb
-website/index.html
-website/index.txt
-website/face_boy.gif
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on multistockphoto, see http://multistockphoto.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-

data/Rakefile

@@ -1,4 +0,0 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }

data/bin/multistockphoto-gui

@@ -1,187 +0,0 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
-# Freely reusable code: see SAMPLES-LICENSE.TXT for details
-begin
-  require 'rubygems' 
-rescue LoadError
-end
-#gem 'wxruby', "1.9.7"
-#require 'wx'
-gem 'wxruby', "!=1.9.8"
-require 'wx'
-
-# This sample shows a fairly minimal Wx::App using a Frame, with a
-# MenuBar and StatusBar but no controls. For the absolute minimum app,
-# see nothing.rb
-
-# A Wx::Frame is a self-contained, top-level Window that can contain
-# controls, menubars, and statusbars
-class MinimalFrame < Wx::Frame
-  Id_send_all = 2001
-  Id_list_done = 2002
-  Id_purge_done = 2003
-  Id_no_tags = 2004
-  Id_not_sent = 2005
-  Id_random = 2006
-  
-  def initialize(title)
-    # The main application frame has no parent (nil)
-    super(nil, :title => title, :size => [ 400, 300 ])
-
-    # PNG can be used on all platforms, but icon type must be specified
-    # to work on Windows. Note that OS X doesn't have "Frame" icons. 
-    icon_file = File.join( File.dirname(__FILE__), "mondrian.png")
-    self.icon = Wx::Icon.new(icon_file, Wx::BITMAP_TYPE_PNG)
-
-    menu_bar = Wx::MenuBar.new
-    # The "file" menu
-    menu_file = Wx::Menu.new
-    # Using Wx::ID_EXIT standard id means the menu item will be given
-    # the right label for the platform and language, and placed in the
-    # correct platform-specific menu - eg on OS X, in the Application's menu
-    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menu_bar.append(menu_file, "&File")
-
-    #multistockphoto - actions
-    menu_actions = Wx::Menu.new
-    menu_actions.append(Id_send_all,"Send all photos")
-    menu_actions.append(Id_list_done,"List all done photos")
-    menu_actions.append(Id_purge_done,"Purge all done photos")
-    menu_actions.append(Id_random,"Random")
-    menu_bar.append(menu_actions, "Actions")
-    
-    #multistockphoto - admin
-    menu_admin = Wx::Menu.new
-    menu_admin.append(Id_no_tags,"Photos without tags")
-    menu_admin.append(Id_not_sent,"Photos not sent")
-    menu_bar.append(menu_admin, "Administration")
-    
-    # The "help" menu
-    menu_help = Wx::Menu.new
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menu_bar.append(menu_help, "&Help")
-
-    # Assign the menubar to this frame
-    self.menu_bar = menu_bar
-
-    # Create a status bar at the bottom of the frame
-    create_status_bar(2)
-    self.status_text = "Welcome to multistockphoto!"
-
-    # Set it up to handle menu events using the relevant methods. 
-    evt_menu Wx::ID_EXIT, :on_quit
-    evt_menu Wx::ID_ABOUT, :on_about
-    evt_menu Id_send_all, :on_send_all
-    evt_menu Id_list_done, :on_list_done
-    evt_menu Id_no_tags, :on_no_tags
-    evt_menu Id_not_sent, :on_not_sent
-    evt_menu Id_random, :on_random
-  end
-
-  # End the application; it should finish automatically when the last
-  # window is closed.
-  def on_quit
-    close()
-  end
-
-  # show an 'About' dialog - WxRuby's about_box function will show a
-  # platform-native 'About' dialog, but you could also use an ordinary
-  # Wx::MessageDialog here.
-  def on_about
-    Wx::about_box(:name => self.title,
-      :version     => `multistockphoto --version`, #        Wx::WXRUBY_VERSION,
-      :description => "multistockphoto-gui application",
-      :developers  => ['Thomas Preymesser (thopre@gmail.com)'] )
-  end
-  
-  def on_send_all
-    puts 'send-all'
-    self.status_text = "uploading all photos"
-
-    #   puts `multistockphoto --send-all --verbose`
-    self.status_text = "done uploading all photos"
-  end
-  
-  def on_random
-    puts 'random'
-    self.status_text = "select a random picture"
-all = Dir.glob("upload/*.JPG")
-while true
-  r = all[rand(all.size)]
-  b = File.basename(r,".JPG")
-  p b
-  t = File.join("upload", b)+".tags"
-  p t
-  if b[0...4] == 'rot_'  
-    puts "nur rotierte Datei"
-  elsif File.exist? t
-    puts "tags-File existiert schon"
-  else
-    Thread.start do
-      `eog #{r}`
-    end
-    Thread.start do
-      `gedit #{t}` 
-    end
-    break # wir haben eine gefunden
-  end
-end
-
-#    puts `ruby  random.rb`
-    self.status_text = "done random"
-  end
-  
-  def on_list_done
-    self.status_text = "list-done"
-    result = `multistockphoto --list-done`
-    puts result
-    self.status_text = "done list-done"
-  end
-  
-  def on_no_tags
-    self.status_text = "no-tags"
-    result = `multistockphoto --no-tags`
-    puts result
-    self.status_text = "done no-tags"
-  end
-
-  
-  def on_not_sent
-    
-self.status_text = "not-sent"
-    #--
-    not_sent = {}
-    SITES.each {|site|
-      not_sent[site] = 0
-    }
-    Dir.glob(UPLOAD_DIR+'/*').each {|filename|
-      next if File.basename(filename)[0,4] == 'rot_'
-      #puts "rot_ uebersprungen"
-      if filename.upcase =~ PICTURE_FILES
-        SITES.each {|site|
-          print filename+"\t"+site+"\t" if $verbose
-          g = grep(SENDELISTE, /#{site}\t#{filename}/)
-          if g.size == 0
-            puts "not sent" if $verbose
-            not_sent[site] += 1
-          else
-            puts 'already sent' if $verbose
-          end
-        }
-      end
-    }
-    p not_sent
-    #--
-    self.status_text = "done not-sent"
-  end
-end
-
-# Wx::App is the container class for any wxruby app. To start an
-# application, either define a subclass of Wx::App, create an instance,
-# and call its main_loop method, OR, simply call the Wx::App.run class
-# method, as shown here.
-Wx::App.run do 
-  self.app_name = 'Minimal'
-  frame = MinimalFrame.new("multistockphoto")
-  frame.show
-end