imagevenue 0.0.2 → 0.0.3

data/bin/image_venue

@@ -2,110 +2,7 @@
 
 $LOAD_PATH.push(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
-require 'getoptlong'
-#require 'rubygems'
 require 'image_venue'
+require 'image_venue/cli'
 
-
-options = GetoptLong.new(
-  ['-c', '--cookie', GetoptLong::OPTIONAL_ARGUMENT],
-  ['-p', '--password', GetoptLong::REQUIRED_ARGUMENT],
-  ['-u', '--username', GetoptLong::REQUIRED_ARGUMENT]
-)
-options_hash = {}
-options.each do |option, argument|
-  options_hash[option] = argument
-end
-command = ARGV.shift
-cookie = nil
-
-if command == 'list'
-  ImageVenue.authenticate(options_hash['-u'], options_hash['-p'], cookie)
-  if ImageVenue.authenticate.login
-    ImageVenue.directory.list.each do |directory|
-      puts directory
-    end
-    exit(0)
-  else
-    exit(-10)
-  end
-
-elsif command == 'files'
-  directory = ARGV.shift
-  unless directory.nil? or directory.empty?
-    ImageVenue.authenticate(options_hash['-u'], options_hash['-p'], cookie)
-    if ImageVenue.authenticate.login
-      ImageVenue.directory.files(directory).each do |file|
-        puts file.basename
-      end
-      exit(0)
-    else
-      exit(-10)
-    end
-  else
-    exit(-20)
-  end
-
-elsif command == 'create'
-  directory = ARGV.shift
-  unless directory.nil? or directory.empty?
-    ImageVenue.authenticate(options_hash['-u'], options_hash['-p'], cookie)
-    if ImageVenue.authenticate.login
-      if ImageVenue.directory.create(directory)
-        exit(0)
-      else
-        exit(-30)
-      end
-    else
-      exit(-10)
-    end
-  else
-    exit(-20)
-  end
-
-elsif command == 'upload'
-  directory = ARGV.shift
-  files = ARGV.clone
-  unless directory.nil? or directory.empty? or files.nil? or files.empty?
-    ImageVenue.authenticate(options_hash['-u'], options_hash['-p'], cookie)
-    if ImageVenue.authenticate.login
-      if ImageVenue.directory.select_or_create(directory)
-        upload = ImageVenue::Upload.new
-        files.each do |file|
-          upload_file = ImageVenue::UploadFile.from_local_path(file)
-          upload.add(upload_file)
-        end
-        upload.debug = true
-        upload.process
-        exit(0)
-      else
-        exit(-30)
-      end
-    else
-      exit(-10)
-    end
-  else
-    exit(-20)
-  end
-
-elsif command == 'delete'
-  directory = ARGV.shift
-  unless directory.nil? or directory.empty?
-    ImageVenue.authenticate(options_hash['-u'], options_hash['-p'], cookie)
-    if ImageVenue.authenticate.login
-      if ImageVenue.directory.delete(directory)
-        exit(0)
-      else
-        exit(-30)
-      end
-    else
-      exit(-10)
-    end
-  else
-    exit(-20)
-  end
-
-else
-  puts "USAGE: #{$0} -u <USERNAME> -p <PASSWORD> <COMMAND> [<ARGUMENT>]"
-  exit(-1)
-end
+ImageVenue::Cli.main

data/lib/image_venue.rb

@@ -7,47 +7,51 @@ require 'uri' unless defined?(URI)
 require 'rubygems' unless defined?(Gem)
 require 'hpricot' unless defined?(Hpricot)
 
+Kernel_File = File
 module Kernel
-  class File < File
+  class File < Kernel_File
   end
 end
 
 module ImageVenue
-  def self.base_url
-    @base_url ||= 'http://users.imagevenue.com'
-  end
-
-  def self.base_uri
-    @base_uri ||= URI.parse(self.base_url)
-  end
-
-  def self.version
-    @version ||= [0, 0, 2]
-  end
-
-  def self.debug
-    @debug
-  end
-
-  def self.debug=(debug)
-    @debug = debug
-  end
-
-  def self.authenticate(username=nil, password=nil, cookie=nil)
-    @authenticate ||= ImageVenue::Authenticate.new(username, password, cookie)
-  end
-
-  def self.directory
-    @directory ||= ImageVenue::Directory.new
-  end
-
-  def self.upload
-    @upload ||= ImageVenue::Upload.new
+  class << self
+    attr_accessor :debug
+
+    def debug?
+      (self.debug) ? true : false
+    end
+
+    def puts_debug(*args)
+      if self.debug?
+        puts(*args)
+        return true
+      else
+        return false
+      end
+    end
+
+    def base_url
+      @base_url ||= 'http://users.imagevenue.com'
+    end
+
+    def base_uri
+      @base_uri ||= URI.parse(self.base_url)
+    end
+
+    def version
+      @version ||= [0, 1, 0]
+    end
+
+    def login(username, password, &block)
+      connection = ImageVenue::Connection.new(username, password)
+      if connection.login
+        block.call(connection) if block_given?
+      end
+      return connection
+    end
   end
 end
 
-require 'image_venue/authenticate'
+require 'image_venue/connection'
 require 'image_venue/directory'
-require 'image_venue/file'
-require 'image_venue/upload'
-require 'image_venue/upload_file'
+require 'image_venue/file'

data/lib/image_venue/cli.rb

@@ -0,0 +1,125 @@
+require 'getoptlong'
+
+module ImageVenue
+  class Cli
+    class << self
+      def main
+        cli = self.new
+        cli.main
+      end
+    end
+
+    attr_accessor :options
+    attr_accessor :options_hash
+    attr_accessor :command
+    attr_accessor :arguments
+
+    def initialize
+      self.options = GetoptLong.new(
+        ['-d', '--debug', GetoptLong::NO_ARGUMENT],
+        ['-p', '--password', GetoptLong::REQUIRED_ARGUMENT],
+        ['-u', '--username', GetoptLong::REQUIRED_ARGUMENT]
+      )
+      self.options_hash = {}
+      self.options.each do |option, argument|
+        self.options_hash[option] = argument
+      end
+      self.command = ARGV.shift
+      self.arguments = ARGV.clone
+      return nil
+    end
+
+    def main
+      ImageVenue.debug = self.options_hash.has_key?('-d')
+
+      if self.command.nil? or self.command.empty?
+        puts "USAGE: #{$0} -u <USERNAME> -p <PASSWORD> <COMMAND> [<ARGUMENT>]"
+        return false
+      else
+        command_block = nil
+        self.command = self.command.to_sym
+
+        if self.command == :list
+          command_block = lambda do |connection|
+            connection.directories.each do |directory|
+              puts directory.name
+            end
+          end
+
+        elsif self.command == :files
+          directory_name = self.arguments.shift
+          unless directory_name.nil? or directory_name.empty?
+            command_block = lambda do |connection|
+              directory = connection.directories.find {|dir| dir.name == directory_name}
+              if directory
+                directory.files.each do |file|
+                  puts file.real_name
+                end
+              else
+                puts "NOT_FOUND_ERROR"
+              end
+            end
+          end
+
+        elsif self.command == :create
+          directory_name = self.arguments.shift
+          unless directory_name.nil? or directory_name.empty?
+            command_block = lambda do |connection|
+              directory = ImageVenue::Directory.new(connection, directory_name)
+              if directory.save
+                puts "OK"
+              else
+                puts "ERROR"
+              end
+            end
+          end
+
+        elsif self.command == :upload
+          directory_name = self.arguments.shift
+          filepathes = self.arguments
+          unless directory_name.nil? or directory_name.empty? or filepathes.nil? or filepathes.empty?
+            command_block = lambda do |connection|
+              directory = connection.directories.find {|dir| dir.name == directory_name}
+              if directory
+                directory.select
+                filepathes.each do |filepath|
+                  file = ImageVenue::File.new(directory, filepath)
+                  if file.save
+                    puts "OK #{filepath}"
+                  else
+                    puts "ERROR #{filepath}"
+                  end
+                end
+              else
+              end
+            end
+          end
+
+        elsif self.command == :delete
+          directory_name = self.arguments.shift
+          unless directory_name.nil? or directory_name.empty?
+            command_block = lambda do |connection|
+              directory = connection.directories.find {|dir| dir.name == directory_name}
+              if directory
+                if directory.destroy
+                  puts "OK"
+                else
+                  puts "ERROR"
+                end
+              else
+                puts "NOT_FOUND_ERROR"
+              end
+            end
+          end
+        end
+
+        if command_block
+          ImageVenue.login(options_hash['-u'], options_hash['-p']) do |connection|
+            command_block.call(connection)
+            connection.logout
+          end
+        end
+      end
+    end
+  end
+end

data/lib/image_venue/{authenticate.rb → connection.rb}

@@ -1,5 +1,5 @@
 module ImageVenue
-  class Authenticate
+  class Connection
     class << self
       def login_uri
         @login_uri ||= URI.parse(ImageVenue.base_url + '/process_logon.php')
@@ -32,13 +32,29 @@ module ImageVenue
       def cookie_timestamp_key
         @cookie_timestamp_key ||= 'tsctr'
       end
+
+      def cookie_directory_key
+        @cookie_directory_key ||= 'cur_upload_dir'
+      end
+
+      def cookie_view_directory
+        @cookie_view_directory ||= 'view_dir'
+      end
+
+      def login_params(connection)
+        {
+          self.login_action_key => connection.action,
+          self.login_username_key => connection.username,
+          self.login_password_key => connection.password
+        }
+      end
     end
 
     attr_accessor :action
-    attr_accessor :username
-    attr_accessor :password
     attr_accessor :cookie
     attr_accessor :debug
+    attr_accessor :password
+    attr_accessor :username
 
     def initialize(username, password, cookie=nil)
       self.action = '1'
@@ -49,7 +65,7 @@ module ImageVenue
     end
 
     def debug?
-      (ImageVenue.debug or self.debug) ? true : false
+      (ImageVenue.debug or self.debug)
     end
 
     def puts_debug(*args)
@@ -62,8 +78,8 @@ module ImageVenue
     end
 
     def login
-      puts_debug "Trying to login ..."
-      response = Net::HTTP.post_form(self.class.login_uri, self.login_params)
+      self.puts_debug "Trying to login ..."
+      response = Net::HTTP.post_form(self.class.login_uri, self.class.login_params(self))
       unless response.header['Set-Cookie'].nil? or response.header['Set-Cookie'].empty?
         self.cookie = {}
         self.cookie[self.class.cookie_user_key] = $1 if response.header['Set-Cookie'] =~ /#{Regexp.escape(self.class.cookie_user_key)}=(.+?)[,;]/
@@ -71,10 +87,10 @@ module ImageVenue
         response_timestamp = Net::HTTP.get_response(ImageVenue.base_uri)
         unless response_timestamp.header['Set-Cookie'].nil? or response_timestamp.header['Set-Cookie'].empty?
           self.cookie[self.class.cookie_timestamp_key] = $1 if response_timestamp.header['Set-Cookie'] =~ /#{Regexp.escape(self.class.cookie_timestamp_key)}=(.+?)[,;]/
-          puts_debug "Login successfull!"
+          self.puts_debug "Login successfull!"
           return true
         else
-          puts_debug "Login failed!"
+          self.puts_debug "Login failed!"
           return false
         end
       else
@@ -83,14 +99,6 @@ module ImageVenue
       end
     end
 
-    def login_params
-      {
-        self.class.login_action_key => self.action,
-        self.class.login_username_key => self.username,
-        self.class.login_password_key => self.password
-      }
-    end
-
     def logged_in?
       unless self.cookie.nil?
         return true
@@ -100,19 +108,59 @@ module ImageVenue
     end
 
     def logout
-      puts_debug "Trying to logout ..."
+      self.puts_debug "Trying to logout ..."
       response = Net::HTTP.get_response(self.class.logout_uri)
       if response.is_a?(Net::HTTPSuccess) or response.is_a?(Net::HTTPFound)
         self.cookie = nil
-        puts_debug "Logout successfull! Resetting cookie."
+        self.puts_debug "Logout successfull! Resetting cookie."
         return true
       else
         self.cookie = nil
-        puts_debug "Logout failed! But resetting cookie anyway."
+        self.puts_debug "Logout failed! But resetting cookie anyway."
         return false
       end
     end
 
+    def selected_directory
+      if self.cookie.is_a?(Hash)
+        return self.cookie[self.class.cookie_directory_key]
+      else
+        return nil
+      end
+    end
+
+    def selected_directory=(directory)
+      if self.cookie.is_a?(Hash)
+        if directory.nil?
+          return self.cookie.delete(self.class.cookie_directory_key)
+        else
+          return self.cookie[self.class.cookie_directory_key] = directory
+        end
+      else
+        return nil
+      end
+    end
+
+    def view_directory
+      if self.cookie.is_a?(Hash)
+        return self.cookie[self.class.cookie_view_directory]
+      else
+        return nil
+      end
+    end
+
+    def view_directory(directory)
+      if self.cookie.is_a?(Hash)
+        if directory.nil?
+          return self.cookie.delete(self.class.cookie_view_directory)
+        else
+          return self.cookie[self.class.cookie_view_directory] = directory
+        end
+      else
+        return nil
+      end
+    end
+
     def cookie_as_string
       unless self.cookie.nil?
         cookie_str = self.cookie.map {|key, value| [key, value].join('=')}.join('; ')
@@ -121,5 +169,19 @@ module ImageVenue
         return nil
       end
     end
+
+    def directories(reload=false)
+      if reload or @directories.nil?
+        @directories = ImageVenue::Directory.list(self)
+      else
+        self.puts_debug "Directories from cache!"
+      end
+      return @directories
+    end
+
+    def clear_cache
+      @directories = nil
+      self.puts_debug "Connection's cache cleared."
+    end
   end
 end