merb-core 1.0.3 → 1.0.4

data/lib/merb-core/rack/adapter/irb.rb

@@ -149,6 +149,7 @@ module Merb
       def self.start(opts={})
         m = Merb::Rack::Console.new
         m.extend Merb::Test::RequestHelper
+        m.extend ::Webrat::Methods if defined?(::Webrat)
         Object.send(:define_method, :merb) { m }
         ARGV.clear # Avoid passing args to IRB
         m.open_sandbox! if sandboxed?

data/lib/merb-core/rack/adapter/thin.rb

@@ -13,7 +13,8 @@ module Merb
         
         if (@opts[:socket] || @opts[:socket_file])
           socket = port.to_s
-          socket_file = @opts[:socket_file] || "#{Merb.log_path}/#{Merb::Config[:name]}.#{socket}.sock"
+          socket_file = @opts[:socket_file] || "#{Merb.log_path}/#{Merb::Config[:name]}.%s.sock"
+          socket_file = socket_file % port
           Merb.logger.warn!("Using Thin adapter with socket file #{socket_file}.")
           @server = ::Thin::Server.new(socket_file, @opts[:app], @opts)
         else

data/lib/merb-core/test/matchers.rb

@@ -7,7 +7,9 @@ require "merb-core/test/matchers/request_matchers"
 Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers)
 Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers)
 
-module Merb::Test::ViewHelper
-  include ::Webrat::Matchers
-  include ::Webrat::HaveTagMatcher
-end
+if defined?(::Webrat)
+  module Merb::Test::ViewHelper
+    include ::Webrat::Matchers
+    include ::Webrat::HaveTagMatcher
+  end
+end

data/lib/merb-core/test/test_ext/rspec.rb

@@ -43,7 +43,10 @@ module Merb
       include ::Merb::Test::Matchers
       include ::Merb::Test::RouteHelper
       include ::Merb::Test::ControllerHelper
-      include ::Webrat::Methods
+      
+      if defined?(::Webrat)
+        include ::Webrat::Methods
+      end
       
       class << self
         # This is a copy of the method in rspec, so we can have

data/lib/merb-core/two-oh.rb

@@ -0,0 +1,50 @@
+module Merb::Test::MultipartRequestHelper
+  
+  def multipart_request(path, params = {}, env = {})
+    multipart = Merb::Test::MultipartRequestHelper::Post.new(params)
+    body, head = multipart.to_multipart
+    env["CONTENT_TYPE"] = head
+    env["CONTENT_LENGTH"] = body.size
+    env[:input] = StringIO.new(body)
+    request(path, env)
+  end
+
+  # An HTTP POST request that operates through the router and uses multipart
+  # parameters.
+  #
+  # ==== Parameters
+  # path<String>:: The path that should go to the router as the request uri.
+  # params<Hash>::
+  #   An optional hash that will end up as params in the controller instance.
+  # env<Hash>::
+  #   An optional hash that is passed to the fake request. Any request options
+  #   should go here (see +fake_request+).
+  # block<Proc>:: The block is executed in the context of the controller.
+  #
+  # ==== Notes
+  # To include an uploaded file, put a file object as a value in params.
+  def multipart_post(path, params = {}, env = {})
+    env[:method] = "POST"
+    multipart_request(path, params, env)
+  end
+
+  # An HTTP PUT request that operates through the router and uses multipart
+  # parameters.
+  #
+  # ==== Parameters
+  # path<String>:: The path that should go to the router as the request uri.
+  # params<Hash>::
+  #   An optional hash that will end up as params in the controller instance.
+  # env<Hash>::
+  #   An optional hash that is passed to the fake request. Any request options
+  #   should go here (see +fake_request+).
+  # block<Proc>:: The block is executed in the context of the controller.
+  #
+  # ==== Notes
+  # To include an uplaoded file, put a file object as a value in params.
+  def multipart_put(path, params = {}, env = {}, &block)
+    env[:method] = "PUT"
+    multipart_request(path, params, env)
+  end
+  
+end

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.3' unless defined?(Merb::VERSION)
-  DM_VERSION = '0.9.7' unless defined?(Merb::DM_VERSION)
+  VERSION = '1.0.4' unless defined?(Merb::VERSION)
+  DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -08:00
+date: 2008-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -231,8 +231,10 @@ files:
 - lib/merb-core/test/test_ext/rspec.rb
 - lib/merb-core/test/test_ext/string.rb
 - lib/merb-core/test.rb
+- lib/merb-core/two-oh.rb
 - lib/merb-core/version.rb
 - lib/merb-core.rb
+- lib/merb-core.rbc
 has_rdoc: true
 homepage: http://merbivore.com
 post_install_message: