remote-controller 0.1.2 → 0.1.3

data/.ruby-gemset

@@ -0,0 +1 @@
+remote_controller

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p0

data/lib/remote_controller/base.rb

@@ -1,12 +1,22 @@
 require 'net/http'
 
 class RemoteController::Base
+  DefaultMultipartBoundary = "-----------1a5ef2de8917334afe03269e42657dea596c90fb"
+  
   include RemoteController::CGIHelpers
   
   class RemoteControllerError < StandardError #:nodoc:
   end
   
-  def initialize(url)
+  def initialize(url, options = {})
+    @options = {
+      verbose: false,
+      log_factory: RemoteController::DefaultLogFactory
+    }.merge options
+    
+    logger_factory = @options[:verbose] ? @options[:log_factory] : RemoteController::EmptyLoggerFactory
+    @log = logger_factory.create_logger('remote-controller')
+    
     @url = url
     @error_handlers = []
   end
@@ -50,9 +60,8 @@ class RemoteController::Base
       
       uri = URI.parse(@url)
       action_path = "#{uri.path}/#{action_name}"
-      
+      @log.info('Preparing request...')
       request = nil
-      
       case method
       when :get
         request = Net::HTTP::Get.new("#{action_path}?#{to_param(parameters)}")
@@ -60,18 +69,22 @@ class RemoteController::Base
         request = Net::HTTP::Post.new(action_path)
         request.body = to_param(parameters)
       when :multipart
-        request = Net::HTTP::Post::Multipart.new(action_path, parameters)
+        request = Net::HTTP::Post::Multipart.new(action_path, parameters, {}, DefaultMultipartBoundary)
       else
         raise RemoteControllerError.new("Unsupported method")
       end
       initialize_request(request)
+      @log.info("Sending request. Method: #{method}, uri: #{action_path}.")
       response = Net::HTTP.start(uri.host, uri.port) {|http|
             http.request(request)
       }
+      @log.info("Response received: #{response.code} #{response.message}")
       process_headers(response)
       begin
+        @log.info('Evaluating response')
         response.value #Will raise error in case response is not 2xx
       rescue
+        @log.info("Response returned error: #{$!}")
         @error_handlers.each { |e| e.call($!) }
         raise $!
       end

data/lib/remote_controller/version.rb

@@ -1,3 +1,3 @@
 module RemoteController
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/remote_controller.rb

@@ -1,11 +1,34 @@
 module RemoteController 
-  require 'remote_controller/multipart'
+  class DefaultLogFactory
+    def self.create_logger(name)
+      require 'logger' unless defined? Logger
+      log = Logger.new(STDOUT)
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime.strftime('%Y-%m-%d %H:%M:%S,%L')} [#{severity}] (#{name}) - #{msg}\n"
+      end
+      log
+    end
+  end
+  
+  class EmptyLoggerFactory
+    def self.fatal(*args); end
+    def self.error(*args); end
+    def self.warn(*args); end
+    def self.info(*args); end
+    def self.debug(*args); end
+    
+    def self.create_logger(*args)
+      self
+    end
+  end
+  
+  require 'net/http/post/multipart'
   autoload :CookiesContainer, 'remote_controller/cookies_container'
   autoload :CGIHelpers, 'remote_controller/cgi_helpers'
   autoload :Base, 'remote_controller/base'
   autoload :VERSION, 'remote_controller/version'
   
   def self.file_part(file_path, content_type)
-    RemoteController::Multipart::UploadIO.new(file_path, content_type)
+    UploadIO.new(file_path, content_type)
   end
 end

data/remote-controller.gemspec

@@ -9,10 +9,13 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/evgeny-myasishchev/remote-controller'
   s.summary     = %q{Helps to invoke actions of remote controllers.}
   s.description = %q{Library to simplify remote controller actions invocation.}
+  
+  s.rubyforge_project     = 'remote-controller'
+  s.required_ruby_version = '>= 1.9.3'
+  
+  s.add_dependency 'multipart-post', '>= 1.2.0'
 
-  s.rubyforge_project = 'remote-controller'
-
-  s.add_development_dependency 'http-testing', '>= 0.1.3'
+  s.add_development_dependency 'http-testing', '>= 0.1.5'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
 

data/test/remote_controller_cookies_container_test.rb

@@ -1,31 +1,3 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
 require  File.dirname(__FILE__) + '/test_helper'
 
 class RemoteControllerCookiesContainerTest < Test::Unit::TestCase

data/test/remote_controller_test.rb

@@ -68,7 +68,7 @@ class RemoteControllerTest < Test::Unit::TestCase
   def test_invoke_args_multipart
     @context.start do |request, response|
       assert_equal "POST", request.request_method
-      assert_equal ["multipart/form-data; boundary=#{Net::HTTP::Post::Multipart::DEFAULT_BOUNDARY}"], request.header["content-type"]
+      assert_equal ["multipart/form-data; boundary=#{RemoteController::Base::DefaultMultipartBoundary}"], request.header["content-type"]
     end
     @controller.args_post(:multipart, {:arg1 => "value1", :arg2 => "value2"})
     @context.wait

metadata

@@ -1,77 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remote-controller
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Evgeny Myasishchev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: http-testing
+date: 2013-04-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: http-testing
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to simplify remote controller actions invocation.
-email: 
+email:
 - evgeny.myasishchev@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -81,58 +94,38 @@ files:
 - lib/remote_controller/base.rb
 - lib/remote_controller/cgi_helpers.rb
 - lib/remote_controller/cookies_container.rb
-- lib/remote_controller/multipart.rb
-- lib/remote_controller/multipart/composite_io.rb
-- lib/remote_controller/multipart/multipartable.rb
-- lib/remote_controller/multipart/parts.rb
-- lib/remote_controller/multipart/parts/epilogue_part.rb
-- lib/remote_controller/multipart/parts/file_part.rb
-- lib/remote_controller/multipart/parts/param_part.rb
-- lib/remote_controller/multipart/parts/part.rb
 - lib/remote_controller/version.rb
 - lib/samples/sample1.rb
 - lib/samples/sample1.txt
 - remote-controller.gemspec
 - test/remote_controller_action_args_test.rb
-- test/remote_controller_composite_io_test.rb
 - test/remote_controller_cookies_container_test.rb
 - test/remote_controller_error_handling_test.rb
 - test/remote_controller_test.rb
-- test/remote_controller_test_multipart_test.rb
 - test/test_helper.rb
 - tmp/.gitkeep
 homepage: http://github.com/evgeny-myasishchev/remote-controller
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: remote-controller
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Helps to invoke actions of remote controllers.
 test_files: []
-

data/lib/remote_controller/multipart/composite_io.rb

@@ -1,111 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-# Concatenate together multiple IO objects into a single, composite IO object
-# for purposes of reading as a single stream.
-#
-# Usage:
-#
-#     crio = CompositeReadIO.new(StringIO.new('one'), StringIO.new('two'), StringIO.new('three'))
-#     puts crio.read # => "onetwothree"
-#  
-class RemoteController::Multipart::CompositeReadIO
-  # Create a new composite-read IO from the arguments, all of which should
-  # respond to #read in a manner consistent with IO.
-  def initialize(*ios)
-    @ios = ios.flatten
-  end
-
-  # Read from the IO object, overlapping across underlying streams as necessary.
-  def read(amount = nil, buf = nil)
-    buffer = buf || ''
-    done = if amount; nil; else ''; end
-    partial_amount = amount
-
-    loop do
-      result = done
-
-      while !@ios.empty? && (result = @ios.first.read(partial_amount)) == done
-        @ios.shift
-      end
-
-      buffer << result if result
-      partial_amount -= result.length if partial_amount && result != done
-
-      break if partial_amount && partial_amount <= 0
-      break if result == done
-    end
-
-    if buffer.length > 0
-      buffer
-    else
-      done
-    end
-  end
-end
-
-# Convenience methods for dealing with files and IO that are to be uploaded.
-module RemoteController::Multipart::UploadIO
-  # Create an upload IO suitable for including in the params hash of a
-  # Net::HTTP::Post::Multipart.
-  #
-  # Can take two forms. The first accepts a filename and content type, and
-  # opens the file for reading (to be closed by finalizer). The second accepts
-  # an already-open IO, but also requires a third argument, the filename from
-  # which it was opened.
-  #
-  #     UploadIO.new("file.txt", "text/plain")
-  #     UploadIO.new(file_io, "text/plain", "file.txt")
-  def self.new(filename_or_io, content_type, filename = nil)
-    io = filename_or_io
-    unless io.respond_to? :read
-      io = File.open(filename_or_io)
-      filename = filename_or_io
-    end
-    convert!(io, content_type, File.basename(filename), filename)
-    io
-  end
-
-  # Enhance an existing IO for including in the params hash of a
-  # Net::HTTP::Post::Multipart by adding #content_type, #original_filename,
-  # and #local_path methods to the object's singleton class.
-  def self.convert!(io, content_type, original_filename, local_path)
-    io.instance_eval(<<-EOS, __FILE__, __LINE__)
-      def content_type
-        "#{content_type}"
-      end
-      def original_filename
-        "#{original_filename}"
-      end
-      def local_path
-        "#{local_path}"
-      end
-    EOS
-    io
-  end
-end

data/lib/remote_controller/multipart/multipartable.rb

@@ -1,40 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-module RemoteController::Multipart::Multipartable
-  DEFAULT_BOUNDARY = "-----------1a5ef2de8917334afe03269e42657dea596c90fb"
-  def initialize(path, params, headers={}, boundary = DEFAULT_BOUNDARY)
-    super(path, headers)
-    parts = params.map {|k,v| RemoteController::Multipart::Parts::Part.new(boundary, k, v)}
-    parts << RemoteController::Multipart::Parts::EpiloguePart.new(boundary)
-    ios = parts.map{|p| p.to_io }
-    self.set_content_type("multipart/form-data", { "boundary" => boundary })
-    self.content_length = parts.inject(0) {|sum,i| sum + i.length }
-    self.body_stream = RemoteController::Multipart::CompositeReadIO.new(*ios)
-  end
-end

data/lib/remote_controller/multipart/parts/epilogue_part.rb

@@ -1,36 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-# Represents the epilogue or closing boundary.
-class RemoteController::Multipart::Parts::EpiloguePart
-  include RemoteController::Multipart::Parts::Part
-  def initialize(boundary)
-    @part = "--#{boundary}--\r\n"
-    @io = StringIO.new(@part)
-  end
-end

data/lib/remote_controller/multipart/parts/file_part.rb

@@ -1,49 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-# Represents a part to be filled from file IO.
-class RemoteController::Multipart::Parts::FilePart
-  include RemoteController::Multipart::Parts::Part
-  attr_reader :length
-  def initialize(boundary, name, io)
-    file_length = io.respond_to?(:length) ?  io.length : File.size(io.path)
-    @head = build_head(boundary, name, io.original_filename, io.content_type, file_length)
-    @length = @head.length + file_length
-    @io = RemoteController::Multipart::CompositeReadIO.new(StringIO.new(@head), io, StringIO.new("\r\n"))
-  end
-
-  def build_head(boundary, name, filename, type, content_len)
-    part = ''
-    part << "--#{boundary}\r\n"
-    part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{filename}\"\r\n"
-    part << "Content-Length: #{content_len}\r\n"
-    part << "Content-Type: #{type}\r\n"
-    part << "Content-Transfer-Encoding: binary\r\n"
-    part << "\r\n"
-  end
-end

data/lib/remote_controller/multipart/parts/param_part.rb

@@ -1,43 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-class RemoteController::Multipart::Parts::ParamPart
-  include RemoteController::Multipart::Parts::Part
-  def initialize(boundary, name, value)
-    @part = build_part(boundary, name, value)
-    @io = StringIO.new(@part)
-  end
-
-  def build_part(boundary, name, value)
-    part = ''
-    part << "--#{boundary}\r\n"
-    part << "Content-Disposition: form-data; name=\"#{name.to_s}\"\r\n"
-    part << "\r\n"
-    part << "#{value}\r\n"
-  end
-end

data/lib/remote_controller/multipart/parts/part.rb

@@ -1,45 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-module RemoteController::Multipart::Parts::Part
-  def self.new(boundary, name, value)
-    if value.respond_to? :content_type
-      RemoteController::Multipart::Parts::FilePart.new(boundary, name, value)
-    else
-      RemoteController::Multipart::Parts::ParamPart.new(boundary, name, value)
-    end
-  end
-
-  def length
-    @part.length
-  end
-
-  def to_io
-    @io
-  end
-end

data/lib/remote_controller/multipart/parts.rb

@@ -1,6 +0,0 @@
-module RemoteController::Multipart::Parts end
-  
-require 'remote_controller/multipart/parts/part'
-require 'remote_controller/multipart/parts/param_part'
-require 'remote_controller/multipart/parts/file_part'
-require 'remote_controller/multipart/parts/epilogue_part'

data/lib/remote_controller/multipart.rb

@@ -1,63 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-
-#Example:
-# url = URI.parse('http://www.example.com/upload')
-# File.open("./image.jpg") do |jpg|
-#   req = Net::HTTP::Post::Multipart.new url.path,
-#     "file" => UploadIO.new(jpg, "image/jpeg", "image.jpg")
-#   res = Net::HTTP.start(url.host, url.port) do |http|
-#     http.request(req)
-#   end
-# end
-
-
-require 'net/http'
-require 'stringio'
-
-module RemoteController::Multipart end
-
-require 'remote_controller/multipart/parts'
-require 'remote_controller/multipart/composite_io'
-require 'remote_controller/multipart/multipartable'
-
-module Net #:nodoc:
-  class HTTP #:nodoc:
-    class Put
-      class Multipart < Put
-        include RemoteController::Multipart::Multipartable
-      end
-    end
-    class Post #:nodoc:
-      class Multipart < Post
-        include RemoteController::Multipart::Multipartable
-      end
-    end
-  end
-end

data/test/remote_controller_composite_io_test.rb

@@ -1,76 +0,0 @@
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-require  File.dirname(__FILE__) + '/test_helper'
-require 'stringio'
-
-class RemoteControllerCompositeReadIOTest < Test::Unit::TestCase
-  
-  include RemoteController::Multipart
-  
-  def setup
-    @io = CompositeReadIO.new(CompositeReadIO.new(StringIO.new('the '), StringIO.new('quick ')),
-            StringIO.new('brown '), StringIO.new('fox'))
-  end
-
-  def test_full_read_from_several_ios
-    assert_equal 'the quick brown fox', @io.read
-  end
-  
-  def test_partial_read
-    assert_equal 'the quick', @io.read(9)
-  end
-  
-  def test_partial_read_to_boundary
-    assert_equal 'the quick ', @io.read(10)    
-  end
-  
-  def test_read_with_size_larger_than_available
-    assert_equal 'the quick brown fox', @io.read(32)
-  end
-  
-  def test_read_into_buffer
-    buf = ''
-    @io.read(nil, buf)
-    assert_equal 'the quick brown fox', buf
-  end
-  
-  def test_multiple_reads
-    assert_equal 'the ', @io.read(4)
-    assert_equal 'quic', @io.read(4)
-    assert_equal 'k br', @io.read(4)
-    assert_equal 'own ', @io.read(4)
-    assert_equal 'fox',  @io.read(4)
-  end
-  
-  def test_read_after_end
-    @io.read
-    assert_equal "", @io.read
-  end
-
-  def test_read_after_end_with_amount
-    @io.read(32)
-    assert_equal nil, @io.read(32)
-  end
-end

data/test/remote_controller_test_multipart_test.rb

@@ -1,91 +0,0 @@
-#--
-# (c) Copyright 2007-2008 Nick Sieger.
-# See the file README.txt included with the distribution for
-# software license details.
-#++
-# (The MIT License)
-# 
-# Copyright (c) 2007-2009 Nick Sieger <nick@nicksieger.com>
-# 
-# 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.
-
-require  File.dirname(__FILE__) + '/test_helper'
-
-class RemoteControllerMultiPartTest < Test::Unit::TestCase
-  
-  include RemoteController::Multipart
-  
-  TEMP_FILE = "temp.txt"
-
-  HTTPPost = Struct.new("HTTPPost", :content_length, :body_stream, :content_type)
-  HTTPPost.module_eval do
-    def set_content_type(type, params = {})
-      self.content_type = type + params.map{|k,v|"; #{k}=#{v}"}.join('')
-    end
-  end
-  
-  def setup
-    @another_temp_file = "#{File.dirname(__FILE__)}/../tmp/temp_file.txt"
-  end
-
-  def teardown
-    File.delete(TEMP_FILE) rescue nil
-    File.delete(@another_temp_file) rescue nil
-  end
-
-  def test_form_multipart_body
-    File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
-    @io = File.open(TEMP_FILE)
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
-    assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
-  end
-  def test_form_multipart_body_no_text_plain
-    File.open(@another_temp_file, "w") {|f| f << "1234567890"}
-    @io = File.open(@another_temp_file)
-    UploadIO.convert! @io, "application/octet-stream", File.basename(@another_temp_file), File.basename(@another_temp_file)    
-    file_part = RemoteController::Multipart::Parts::FilePart.new("--bound", "name", @io)
-  end  
-  def test_form_multipart_body_put
-    File.open(TEMP_FILE, "w") {|f| f << "1234567890"}
-    @io = File.open(TEMP_FILE)
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
-    assert_results Net::HTTP::Put::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
-  end
-  
-  def test_form_multipart_body_with_stringio
-    @io = StringIO.new("1234567890")
-    UploadIO.convert! @io, "text/plain", TEMP_FILE, TEMP_FILE
-    assert_results Net::HTTP::Post::Multipart.new("/foo/bar", :foo => 'bar', :file => @io)
-  end
-
-  def assert_results(post)
-    assert post.content_length && post.content_length > 0
-    assert post.body_stream
-    assert_equal "multipart/form-data; boundary=#{Multipartable::DEFAULT_BOUNDARY}", post['content-type']
-    body = post.body_stream.read
-    boundary_regex = Regexp.quote Multipartable::DEFAULT_BOUNDARY
-    assert body =~ /1234567890/
-    # ensure there is at least one boundary
-    assert body =~ /^--#{boundary_regex}\r\n/
-    # ensure there is an epilogue
-    assert body =~ /^--#{boundary_regex}--\r\n/
-    assert body =~ /text\/plain/
-  end
-end