merb-core 0.9.6 → 0.9.7

data/spec/public/session/controllers/sessions.rb

@@ -19,6 +19,10 @@ module Merb::Test::Fixtures
       
       def retrieve
       end
+      
+      def destroy
+        request.session.clear!
+      end
     
     end
     

data/spec/public/session/memcached_session_spec.rb

@@ -4,8 +4,8 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 require File.join(File.dirname(__FILE__), "session_spec")
 require File.join(File.dirname(__FILE__), "controllers", "sessions")
 
-require 'memcached'
-Merb::MemcacheSession.store = Memcached.new('127.0.0.1:11211', { :namespace => 'my_app' })
+require 'memcache'
+Merb::MemcacheSession.store = MemCache.new('127.0.0.1:11211', { :namespace => 'my_app' })
 
 describe Merb::MemcacheSession do
   

data/spec/public/session/multiple_sessions_spec.rb

@@ -4,8 +4,8 @@ require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
 require File.join(File.dirname(__FILE__), "session_spec")
 require File.join(File.dirname(__FILE__), "controllers", "sessions")
 
-require 'memcached'
-Merb::MemcacheSession.store = Memcached.new('127.0.0.1:11211', { :namespace => 'my_app' })
+require 'memcache'
+Merb::MemcacheSession.store = MemCache.new('127.0.0.1:11211', { :namespace => 'my_app' })
 
 describe "An app with multiple session stores configured" do
   

data/spec/public/session/session_spec.rb

@@ -70,6 +70,21 @@ describe "All session-stores mixed into Merb::Controller", :shared => true do
     end    
   end
   
+  it "should allow the session to be destroyed" do
+    session_store_type = @session_class.session_store_type.to_s
+    with_cookies(@controller_klass) do
+      controller = dispatch_to(@controller_klass, :index, :foo => session_store_type)
+      controller = dispatch_to(@controller_klass, :retrieve)
+      controller.request.session[:foo].should == session_store_type
+      
+      controller = dispatch_to(@controller_klass, :destroy)
+      controller.request.session.should be_empty
+      cookie_header = controller.headers["Set-Cookie"].first
+      cookie_header.should match(/_session_id=;/)
+      cookie_header.should match(/01-Jan-1970/)
+    end
+  end
+  
   it "should not set the Set-Cookie header when the session(_id) didn't change" do
     session_store_type = @session_class.session_store_type.to_s
     with_cookies(@controller_klass) do

data/spec/public/test/request_helper_spec.rb

@@ -65,6 +65,11 @@ describe Merb::Test::RequestHelper do
       
       controller.params[:action].should == "show"
     end
+
+    it "should support setting request.raw_post" do
+      controller = dispatch_to(@controller_klass, :show, {}, {:post_body => 'some XML'})
+      controller.request.raw_post.should == 'some XML'
+    end
   end
   
   describe "#dispatch_with_basic_authentication_to" do
@@ -213,11 +218,27 @@ describe Merb::Test::RequestHelper do
       end
     end
     
+    it "should support setting request.raw_post" do
+      controller = request("/namespaced/spec_helper_controller", {}, {:post_body => 'some XML'})
+      controller.request.raw_post.should == 'some XML'
+    end
+
     it "should get namespaced index action" do
       Merb::Test::ControllerAssertionMock.should_receive(:called).with(:index)
       controller = request("/namespaced/spec_helper_controller")
       controller.class.should == Namespaced::SpecHelperController
     end
+
+    it "should make the post body available in the request on deferred routing" do
+      Merb::Router.prepare do |r|
+        r.match('/xmlrpc').defer_to do |request, params|
+          request.raw_post.should == 'XMLRPC request body'
+          {:controller => 'spec_helper_controller', :action => :index}
+        end
+      end
+
+      request('/xmlrpc', {}, {:post_body => 'XMLRPC request body'})
+    end
   end
   
 end

data/spec/public/test/route_helper_spec.rb

@@ -8,6 +8,9 @@ end
 describe Merb::Test::RouteHelper do
   before(:each) do
     Merb::Router.prepare do |r|
+      r.match("/").defer_to do |request, params|
+        { :controller => 'test_controller', :action => request.raw_post } unless request.raw_post.blank?
+      end
       r.match("/", :method => :get).to(:controller => "test_controller", :action => "get").name(:getter)
       r.match("/", :method => :post).to(:controller => "test_controller", :action => "post")
       r.match("/:id").to(:controller => "test_controller", :action => "get").name(:with_id)
@@ -67,5 +70,9 @@ describe Merb::Test::RouteHelper do
     it "should contain any parameters in the result" do
       request_to("/123")[:id].should == "123"
     end
+
+    it "should play nice with raw_post in deferred routing" do
+      request_to("/", :post, {:post_body => 'deferred'})[:action].should == 'deferred'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +03:00
+date: 2008-09-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -93,24 +93,14 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: memcache-client
-  type: :development
+  name: thor
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.6
     version: 
 description: Merb. Pocket rocket web framework.
 email: ez@engineyard.com
@@ -540,7 +530,6 @@ files:
 - lib/merb-core/rack/middleware/tracer.rb
 - lib/merb-core/rack/middleware.rb
 - lib/merb-core/rack.rb
-- lib/merb-core/script.rb
 - lib/merb-core/server.rb
 - lib/merb-core/tasks
 - lib/merb-core/tasks/audit.rake

data/lib/merb-core/script.rb

@@ -1,112 +0,0 @@
-module Merb
-  module ScriptHelpers
-    
-    # Adapt rubygems - shortcut for setup_local_gems that figures out the
-    # local gem path to use.
-    def setup_local_gems!(rootdir = nil)
-      if bundled? && local_gems = setup_local_gems(File.join(rootdir || merb_root, 'gems'))
-        if local_gems.is_a?(Array)
-          puts "Using local gems in addition to system gems..."
-          if verbose?
-            puts "Found #{local_gems.length} local gems:"
-            local_gems.each { |name| puts "- #{name}" }
-          end
-        elsif local_gems
-          puts "Using MiniGems to locate local/system gems..."
-        end
-      elsif use_minigems?
-        puts "Using MiniGems to locate system gems..."
-      else
-        puts "Using system gems..."
-      end
-    end
-    
-    # Adapt rubygems - because the /usr/bin/merb script already setup merb-core loadpaths
-    # from the system-wide rubygem paths. The code below will make sure local gems always
-    # get precedence over system gems and resolves any conflicts that may arise.
-    #
-    # Only native Gem methods are used to handle the internal logic transparently.
-    # These methods are proved either by minigems or standard rubygems.
-    #
-    # Note: currently the Kernel.load_dependency method will always load local gems.
-    def setup_local_gems(gems_path)
-      if File.directory?(gems_path)
-        if use_minigems?
-          # Reset all loaded system gems - replace with local gems
-          Gem.clear_paths
-          Gem.path.unshift(gems_path)
-          return true
-        else
-          # Remember originally loaded system gems and create a lookup of gems to load paths  
-          system_gemspecs = Gem.cache.gems
-          system_load_paths = extract_gem_load_paths(system_gemspecs)
-          
-          # Reset all loaded system gems - replace with local gems
-          Gem.clear_paths
-          Gem.path.unshift(gems_path)
-          Gem.cache.load_gems_in(File.join(gems_path, "specifications"))
-          
-          # Collect any local gems we're going to use
-          local_gems = Gem.cache.map { |name, spec| name }
-          
-          # Create a lookup of gems to load paths for all local gems
-          local_load_paths = extract_gem_load_paths(Gem.cache.gems)
-          
-          # Filter out local gems from the originally loaded system gems to prevent conflicts
-          active_system_gems = []
-          system_gemspecs.each do |name, spec|
-            active_system_gems << spec unless local_load_paths[spec.name]
-          end
-          
-          # Re-add the system gems - conflicts with local gems have been avoided
-          Gem.cache.add_specs(*active_system_gems)
-          
-          # Add local paths to LOAD_PATH - remove overlapping system gem paths
-          local_load_paths.each do |name, paths|
-            $LOAD_PATH.unshift(*paths)
-            $LOAD_PATH.replace($LOAD_PATH - system_load_paths[name] || [])
-          end
-          return local_gems
-        end
-      end
-    end
-    
-    # Figure out the merb root or default to current directory
-    def merb_root
-      root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
-      root = ARGV[ARGV.index(root_key) + 1] if root_key
-      root.to_a.empty? ? Dir.getwd : root
-    end
-    
-    # See if we're running merb locally - enabled by default
-    # The ENV variables are considered for Rakefile usage.
-    def bundled?
-      enabled  = ENV.key?("BUNDLE")    || %w[-B --bundle].detect { |o| ARGV.index(o) }
-      disabled = ENV.key?("NO_BUNDLE") || %w[--no-bundle].detect { |o| ARGV.index(o) }
-      enabled || !disabled
-    end
-    
-    # Add some extra feedback if verbose is enabled
-    def verbose?
-      %w[-V --verbose].detect { |o| ARGV.index(o) }
-    end
-    
-    # Whether minigems has been loaded instead of the full rubygems
-    def use_minigems?
-      Gem.respond_to?(:minigems?) && Gem.minigems?
-    end
-    
-    # Helper method to extract a Hash lookup of gem name to load paths
-    def extract_gem_load_paths(source_index)
-      source_index.inject({}) do |load_paths, (name, spec)|
-        require_paths = spec.require_paths
-        require_paths << spec.bindir unless spec.executables.empty?
-        load_paths[spec.name] = require_paths.map do |path| 
-          File.join(spec.full_gem_path, path)
-        end
-        load_paths
-      end
-    end
-    
-  end
-end