imagevenue 0.0.2 → 0.0.3

data/lib/image_venue/net_http_post_extensions.rb

@@ -102,19 +102,12 @@ module ImageVenue
           if name.to_s =~ /\[\]$/
             files.each do |file|
               body.write "\r\n--#{boundary1}\r\n"
-              body.write "content-disposition: form-data; name=\"#{name}\""
+              body.write "content-disposition: form-data; name=\"#{name}\"; filename=\"#{file.base_name}\"\r\n"
               # single-file multipart is different
-              if file.filename
-                # right in content-dispo line
-                body.write "; filename=\"#{file.filename}\"\r\n"
-              else
-                body.write "\r\n"
-              end
-
               body.write "Content-Type: #{file.content_type}\r\n"
               body.write "Content-Transfer-Encoding: binary\r\n"
               body.write "\r\n"
-              FileUtils.copy_stream(file, body)
+              FileUtils.copy_stream(Kernel::File.open(file.name, 'rb'), body)
             end
           else
             body.write "\r\n--#{boundary1}\r\n"
@@ -126,18 +119,12 @@ module ImageVenue
 
             files.each do |file|
               body.write "\r\n--#{boundary2}\r\n"
-
               body.write "Content-disposition: attachment"
-              if file.filename
-                body.write "; filename=\"#{file.filename}\"\r\n"
-              else
-                body.write "\r\n"
-              end
-
-              body.write "Content-Type: #{file.mimetype}\r\n"
+              body.write "; filename=\"#{file.base_name}\"\r\n"
+              body.write "Content-Type: #{file.content_type}\r\n"
               body.write "Content-Transfer-Encoding: binary\r\n"
               body.write "\r\n"
-              FileUtils.copy_stream(file, body)
+              FileUtils.copy_stream(Kernel::File.open(file.name, 'rb'), body)
             end
             body.write "\r\n--#{boundary2}--\r\n"
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: imagevenue
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Nowak
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 +01:00
+date: 2009-10-27 00:00:00 +01:00
 default_executable: image_venue
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,13 +32,12 @@ extra_rdoc_files: []
 
 files: 
 - bin/image_venue
-- lib/image_venue/authenticate.rb
+- lib/image_venue/cli.rb
+- lib/image_venue/connection.rb
 - lib/image_venue/directory.rb
 - lib/image_venue/file.rb
 - lib/image_venue/net_http_get_extensions.rb
 - lib/image_venue/net_http_post_extensions.rb
-- lib/image_venue/upload.rb
-- lib/image_venue/upload_file.rb
 - lib/image_venue.rb
 has_rdoc: false
 homepage: http://imagevenue.rubyforge.org/

data/lib/image_venue/upload.rb

@@ -1,137 +0,0 @@
-module ImageVenue
-  class Upload
-    class << self
-      def upload_uri
-        @upload_uri ||= URI.parse(ImageVenue.base_url + '/upload.php')
-      end
-
-      def upload_action_key
-        @upload_action_key ||= 'action'
-      end
-
-      def upload_user_key
-        @upload_user_key ||= 'user_id'
-      end
-
-      def upload_file_key
-        @upload_file_key ||= 'userfile[]'
-      end
-
-      def upload_directory_key
-        @upload_directory_key ||= 'upload_dir'
-      end
-
-      def upload_content_key
-        @upload_content_key ||= 'imgcontent'
-      end
-
-      def upload_content_safe
-        @upload_content_safe ||= 'safe'
-      end
-      alias :upload_content_family :upload_content_safe
-
-      def upload_content_notsafe
-        @upload_content_notsafe ||= 'notsafe'
-      end
-      alias :upload_content_adult :upload_content_notsafe
-
-      def upload_resize_key
-        @upload_resize_key ||= 'img_resize'
-      end
-
-      def upload_maximum_files
-        @upload_maximum_files ||= 10
-      end
-
-      def upload_maximum_size
-        @upload_maximum_size ||= 3 * 1024 * 1024 # 3 MByte
-      end
-
-      def upload_image_types
-        @upload_image_types ||= ['jpeg', 'jpg']
-      end
-    end
-
-    attr_accessor :files
-    attr_accessor :debug
-
-    def initialize
-      self.files = []
-      return nil
-    end
-
-    def debug?
-      (ImageVenue.debug or self.debug) ? true : false
-    end
-
-    def puts_debug(*args)
-      if self.debug?
-        puts(*args)
-        return true
-      else
-        return false
-      end
-    end
-
-    def add(upload_file)
-      if upload_file.is_a?(ImageVenue::UploadFile)
-        self.files.push(upload_file)
-        return true
-      else
-        return false
-      end
-    end
-
-    def upload
-      files = []
-      self.files.each do |file|
-        puts_debug "Trying to upload file `#{file.filename}` to directory `#{file.directory}` ..."
-        request = Net::HTTP::Post.new(self.class.upload_uri.path)
-        request.set_multipart_data(self.upload_file_params(file), self.upload_form_params(file.directory))
-        request.header['cookie'] = [ImageVenue.authenticate.cookie_as_string]
-        response = Net::HTTP.start(self.class.upload_uri.host, self.class.upload_uri.port) do |http|
-          http.request(request)
-        end
-        if response.is_a?(Net::HTTPSuccess)
-          file = ImageVenue::File.parse_upload(response.body)
-          puts_debug "File successfully uploaded!"
-        else
-          file = false
-          puts_debug "File upload failed!"
-        end
-        files.push(file)
-      end
-      return files
-    end
-    alias :process :upload
-
-    def upload_file_params(file_or_files=nil)
-      {
-        self.class.upload_file_key => file_or_files
-      }
-    end
-
-    def upload_form_params(directory=nil, content_safe=false, resize=nil)
-      unless directory.nil?
-        ImageVenue.directory.select_or_create(directory)
-      end
-      params = {
-        self.class.upload_action_key => '1',
-        self.class.upload_directory_key => ImageVenue.directory.selected,
-        self.class.upload_user_key => ImageVenue.authenticate.cookie[ImageVenue::Authenticate.cookie_user_key],
-        self.class.upload_content_key => (content_safe) ? self.class.upload_content_safe : self.class.upload_content_notsafe,
-        self.class.upload_resize_key => resize || ''
-      }
-      return params
-    end
-
-    def status
-      return nil
-    end
-
-    def reset
-      self.files = []
-      return self
-    end
-  end
-end

data/lib/image_venue/upload_file.rb

@@ -1,84 +0,0 @@
-module ImageVenue
-  class UploadFile
-    class << self
-      def content_types
-        @content_types ||= ['jpeg', 'jpg']
-      end
-
-      def from_local_path(path)
-        file = Kernel::File.open(path, 'rb')
-        content_type = `file --mime --brief #{file.path}`.strip
-        filename = Kernel::File.basename(file.path)
-        data = file.read
-        new = self.new(content_type, filename, data)
-        return new
-      end
-      alias :from_path :from_local_path
-
-      def from_files(files, directory)
-        news = []
-        files.each do |file|
-          new = self.new(file.content_type, file.original_filename, file, directory)
-          news.push(new)
-        end
-        return news
-      end
-
-      def upload_file_test
-        @upload_file_test ||= self.from_local_path(Kernel::File.join(Kernel::File.dirname(__FILE__), 'test.jpg'))
-      end
-    end
-
-    attr_accessor :content_type
-    attr_accessor :filename
-    attr_accessor :data
-    attr_accessor :directory
-    attr_accessor :debug
-
-    def initialize(content_type, filename, data, directory=nil)
-      self.content_type = content_type
-      self.filename = filename
-      self.data = data
-      self.directory = directory
-      return nil
-    end
-
-    def debug?
-      (ImageVenue.debug or self.debug) ? true : false
-    end
-
-    def puts_debug(*args)
-      if self.debug?
-        puts(*args)
-        return true
-      else
-        return false
-      end
-    end
-
-    def data_io
-      @data_io ||= StringIO.new(self.data) if self.data.is_a?(String)
-      @data_io ||= self.data
-      return @data_io
-    end
-
-    def read(bytes=nil)
-      self.data_io.read(bytes)
-    end
-
-    def rewind
-      self.data_io.rewind
-    end
-
-    def size
-      if self.data.is_a?(String)
-        @size ||= self.data.length
-      elsif self.data.respond_to?(:size)
-        @size ||= self.data.size
-      elsif self.data.respond_to?(:length)
-        @size ||= self.data.length
-      end
-      return @size
-    end
-  end
-end