merb-core 0.9.7 → 0.9.8

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

@@ -1,6 +1,94 @@
 require 'rubygems'
-require 'open3'
 require 'benchmark'
+require 'drb'
+require 'spec'
+require 'spec/runner/formatter/base_text_formatter'
+require 'spec/spec_helper.rb'
+
+# Load this stuff so it only has to be loaded once for the entire suite
+require 'spec/mocks'
+require 'spec/mocks/extensions'
+require 'spec/runner/formatter/specdoc_formatter'
+require 'base64'
+require 'nkf'
+require 'kconv'
+require 'rack'
+
+begin
+  require 'json'
+rescue
+  require 'json/pure'
+end
+
+Merb::Dispatcher
+
+module Spec
+  module Runner
+    module Formatter
+      class BaseTextFormatter
+        def dump_failure(counter, failure)
+          output = @options.error_stream
+          output.puts
+          output.puts "#{counter.to_s})"
+          output.puts colourise("#{failure.header}\n#{failure.exception.message}", failure)
+          output.puts format_backtrace(failure.exception.backtrace)
+          output.flush
+        end
+      end
+    end
+  end
+end
+
+module Merb
+  class Counter
+    include DRb::DRbUndumped
+
+    attr_accessor :time
+    def initialize
+      @examples, @failures, @errors, @pending, @total_time = 0, 0, 0, 0, 0
+      @err = ""
+      @mutex = Mutex.new
+    end
+  
+    def add(spec, out, err)
+      @mutex.synchronize do
+        puts
+        puts "Running #{spec}."
+        STDOUT.puts out
+        STDOUT.flush
+        match = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) errors?)?(?:, (\d+) pending?)?/m)
+        time = out.match(/Finished in (\d+\.\d+) seconds/)
+        @total_time += time[1].to_f if time
+        if match
+          e, f, errors, pending = match[1..-1]
+          @examples += e.to_i
+          @failures += f.to_i
+          @errors += errors.to_i
+          @pending += pending.to_i
+        end
+        unless err.chomp.empty?
+          @err << err.chomp << "\n"
+        end
+      end
+    end
+
+    def report
+      puts @err
+      puts
+      if @failures != 0 || @errors != 0
+        print "\e[31m" # Red
+      elsif @pending != 0
+        print "\e[33m" # Yellow
+      else
+        print "\e[32m" # Green
+      end
+      puts "Total actual time: #{@total_time}"
+      puts "#{@examples} examples, #{@failures} failures, #{@errors} errors, #{@pending} pending, #{sprintf("suite run in %3.3f seconds", @time.real)}"
+      # TODO: we need to report pending examples all together
+       puts "\e[0m"    
+    end  
+  end
+end
 
 # Runs specs in all files matching the file pattern.
 #
@@ -14,36 +102,40 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = [])
   require "optparse"
   require "spec"
   globs = globs.is_a?(Array) ? globs : [globs]
-  examples, failures, errors, pending = 0, 0, 0, 0
+  
+  counter = Merb::Counter.new
+  forks = 0
 
   time = Benchmark.measure do
+    pid = nil
     globs.each do |glob|
-      (Dir[glob] - except).each do |spec|
-        STDOUT.puts "\n\nRunning #{spec}...\n"
-        response = Open3.popen3("#{spec_cmd} #{File.expand_path(spec)} #{run_opts}") do |i,o,e|
-          while out = o.gets
-            STDOUT.puts out
-            STDOUT.flush
-            if out =~ /\d+ example/
-              e, f, p = out.match(/(\d+) examples?, (\d+) failures?(?:, (\d+) pending?)?/)[1..-1]
-              examples += e.to_i; failures += f.to_i; pending += p.to_i
-            end
+      Dir[glob].each do |spec|
+        drb_uri = DRb.start_service(nil, counter).uri
+        Kernel.fork do
+          $VERBOSE = nil
+          DRb.stop_service
+          DRb.start_service
+          counter_client = DRbObject.new_with_uri(drb_uri)
+          err, out = StringIO.new, StringIO.new
+          def out.tty?() true end
+          options = Spec::Runner::OptionParser.parse(%W(#{spec} -fs --color), err, out)
+          options.filename_pattern = File.expand_path(spec)
+          Spec::Runner::CommandLine.run(options)
+          begin
+            counter_client.add(spec, out.string, err.string)
+          rescue DRb::DRbConnError => e
+            puts "#{Process.pid}: Exception caught"
+            puts "#{e.class}: #{e.message}"
+            retry
           end
-          errors += 1 if e.is_a?(IO)
-          STDOUT.puts e.read if e.is_a?(IO)
+          exit
         end
       end
+      Process.waitall
     end
   end
-
-  puts
-  puts "*** TOTALS ***"
-  if failures == 0
-    print "\e[32m"
-  else
-    print "\e[31m"
-  end
-  puts "#{examples} examples, #{failures} failures, #{errors} errors, #{pending} pending, #{sprintf("suite run in %3.3f seconds", time.real)}"
-  # TODO: we need to report pending examples all together
-  print "\e[0m"
-end
+  
+  counter.time = time
+  counter.report
+  exit!
+end

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

@@ -0,0 +1,181 @@
+require 'spec'
+module Kernel
+  def given(*args, &example_group_block)
+    args << {} unless Hash === args.last
+    params = args.last
+    
+    params[:shared] = true
+    
+    describe(*args) do
+      before(:each) do
+        self.instance_eval(&example_group_block)
+      end
+    end
+  end  
+end
+
+module Spec
+  module Matchers
+    def fail
+      raise_error(Spec::Expectations::ExpectationNotMetError)
+    end
+
+    def fail_with(message)
+      raise_error(Spec::Expectations::ExpectationNotMetError, message)
+    end
+  end
+end
+
+module Merb
+  module Test
+    def self.add_helpers(&block)
+      if Merb.test_framework == :rspec
+        ExampleGroup.class_eval(&block)
+      else
+        raise NotImplementedError
+      end
+    end
+
+    class ExampleGroup < Spec::Example::ExampleGroup
+
+      include ::Merb::Test::ViewHelper
+      include ::Merb::Test::RouteHelper
+      include ::Merb::Test::ControllerHelper
+
+      def initialize(defined_description, &implementation)
+        @_defined_description = defined_description
+        @_implementation = implementation
+      end
+
+      class << self
+        # This is a copy of the method in rspec, so we can have
+        # describe "...", :when => "logged in", and the like
+        def describe(*args, &example_group_block)
+          args << {} unless Hash === args.last
+          if example_group_block
+            params = args.last
+            params[:spec_path] = eval("caller(0)[1]", example_group_block) unless params[:spec_path]
+            if params[:shared]
+              ::Spec::Example::SharedExampleGroup.new(*args, &example_group_block)
+            else
+              self.subclass("Subclass") do
+                describe(*args)
+                if params[:when] || (params[:when] = params[:given])
+                  module_eval %{it_should_behave_like "#{params[:when]}"}
+                end
+                module_eval(&example_group_block)
+              end
+            end
+          else
+            set_description(*args)
+            before_eval
+            self
+          end
+        end
+        alias context describe
+
+        def given(*args, &example_group_block)
+          args << {} unless Hash === args.last
+          params = args.last
+          
+          params[:shared] = true
+          
+          describe(*args, &example_group_block)
+        end
+      end
+
+      ::Spec::Example::ExampleGroupFactory.default(self)
+    end
+  end
+end
+
+module Spec
+  module Matchers
+  
+    def self.create(*names, &block)
+      @guid ||= 0
+      mod = Module.new do
+        klass = Class.new(MatcherDSL) do
+          def initialize(expected_value)
+            @expected_value = expected_value
+          end          
+        end
+        klass.class_eval(&block)
+        
+        names.each do |name|
+          define_method(name) do |*expected_value|
+            # Avoid a warning for the form should foo.
+            klass.new(expected_value && expected_value[0])
+          end
+        end
+      end
+      Merb::Test::ExampleGroup.send(:include, mod)
+    end
+  
+    class MatcherDSL
+      include Merb::Test::RouteHelper
+      
+      def self.matches(&block)
+        define_method(:matches_proxy, &block)
+        
+        define_method(:matches?) do |object|
+          @object = object
+          if block.arity == 2
+            matches_proxy(@object, @expected_value)
+          else
+            matches_proxy(@object)
+          end
+        end
+      end
+      
+      def self.expected_value(&block)
+        define_method(:transform_expected, &block)
+        
+        define_method(:initialize) do |expected_value|
+          @expected_value = transform_expected(expected_value) || expected_value
+        end
+      end
+      
+      def self.negative_failure_message(&block)
+        define_method(:proxy_negative_failure_message, &block)
+        
+        define_method(:negative_failure_message) do
+          proxy_negative_failure_message(@object, @expected_value)
+        end
+      end
+
+      def self.failure_message(&block)
+        define_method(:proxy_failure_message, &block)
+        
+        define_method(:failure_message) do
+          proxy_failure_message(@object, @expected_value)
+        end
+      end
+      
+      def self.message(&block)
+        class_eval do
+          def failure_message
+            generic_message(@object, @expected_value, nil)
+          end
+          
+          def negative_failure_message
+            generic_message(@object, @expected_value, " not")
+          end
+        end
+        
+        define_method(:proxy_generic_message, &block)
+
+        ar = block.arity
+        
+        define_method(:generic_message) do |object, expected, not_string|
+          if ar == 3
+            proxy_generic_message(not_string, object, expected)
+          else
+            proxy_generic_message(not_string, object)
+          end
+        end
+      end
+    end
+  
+  end
+end

data/lib/merb-core/version.rb

@@ -1,11 +1,3 @@
 module Merb
-  VERSION = '0.9.7' unless defined?(Merb::VERSION)
-
-  # Merb::RELEASE meanings:
-  # 'dev'   : unreleased
-  # 'pre'   : pre-release Gem candidates
-  #  nil    : released
-  # You should never check in to trunk with this changed.  It should
-  # stay 'dev'.  Change it to nil in release tags.
-  RELEASE = 'dev' unless defined?(Merb::RELEASE)
+  VERSION = '0.9.8' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +03:00
+date: 2008-10-06 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.6
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: erubis
@@ -120,342 +120,8 @@ files:
 - CHANGELOG
 - PUBLIC_CHANGELOG
 - CONTRIBUTORS
-- docs/bootloading.dox
-- docs/documentation_standards
-- docs/merb-core-call-stack-diagram.mmap
-- docs/merb-core-call-stack-diagram.pdf
-- docs/merb-core-call-stack-diagram.png
-- docs/new_render_api
 - bin/merb
 - bin/merb-specs
-- spec/private
-- spec/private/config
-- spec/private/config/adapter_spec.rb
-- spec/private/config/config_spec.rb
-- spec/private/config/environment_spec.rb
-- spec/private/config/merb_spec.rb
-- spec/private/config/spec_helper.rb
-- spec/private/core_ext
-- spec/private/core_ext/kernel_spec.rb
-- spec/private/dispatch
-- spec/private/dispatch/bootloader_spec.rb
-- spec/private/dispatch/fixture
-- spec/private/dispatch/fixture/app
-- spec/private/dispatch/fixture/app/controllers
-- spec/private/dispatch/fixture/app/controllers/application.rb
-- spec/private/dispatch/fixture/app/controllers/exceptions.rb
-- spec/private/dispatch/fixture/app/controllers/foo.rb
-- spec/private/dispatch/fixture/app/helpers
-- spec/private/dispatch/fixture/app/helpers/global_helpers.rb
-- spec/private/dispatch/fixture/app/views
-- spec/private/dispatch/fixture/app/views/exeptions
-- spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb
-- spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb
-- spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb
-- spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb
-- spec/private/dispatch/fixture/app/views/foo
-- spec/private/dispatch/fixture/app/views/foo/bar.html.erb
-- spec/private/dispatch/fixture/app/views/layout
-- spec/private/dispatch/fixture/app/views/layout/application.html.erb
-- spec/private/dispatch/fixture/config
-- spec/private/dispatch/fixture/config/black_hole.rb
-- spec/private/dispatch/fixture/config/environments
-- spec/private/dispatch/fixture/config/environments/development.rb
-- spec/private/dispatch/fixture/config/environments/production.rb
-- spec/private/dispatch/fixture/config/environments/test.rb
-- spec/private/dispatch/fixture/config/init.rb
-- spec/private/dispatch/fixture/config/rack.rb
-- spec/private/dispatch/fixture/config/router.rb
-- spec/private/dispatch/fixture/log
-- spec/private/dispatch/fixture/log/merb_test.log
-- spec/private/dispatch/fixture/public
-- spec/private/dispatch/fixture/public/images
-- spec/private/dispatch/fixture/public/images/merb.jpg
-- spec/private/dispatch/fixture/public/merb.fcgi
-- spec/private/dispatch/fixture/public/stylesheets
-- spec/private/dispatch/fixture/public/stylesheets/master.css
-- spec/private/dispatch/route_params_spec.rb
-- spec/private/dispatch/spec_helper.rb
-- spec/private/router
-- spec/private/router/behavior_spec.rb
-- spec/private/router/fixture
-- spec/private/router/fixture/log
-- spec/private/router/fixture/log/merb_test.log
-- spec/private/router/route_spec.rb
-- spec/private/router/router_spec.rb
-- spec/private/vendor
-- spec/private/vendor/facets
-- spec/private/vendor/facets/plural_spec.rb
-- spec/private/vendor/facets/singular_spec.rb
-- spec/public
-- spec/public/abstract_controller
-- spec/public/abstract_controller/controllers
-- spec/public/abstract_controller/controllers/alt_views
-- spec/public/abstract_controller/controllers/alt_views/layout
-- spec/public/abstract_controller/controllers/alt_views/layout/application.erb
-- spec/public/abstract_controller/controllers/alt_views/layout/merb
-- spec/public/abstract_controller/controllers/alt_views/layout/merb/test
-- spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures
-- spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract
-- spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb
-- spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb
-- spec/public/abstract_controller/controllers/alt_views/merb
-- spec/public/abstract_controller/controllers/alt_views/merb/test
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots
-- spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb
-- spec/public/abstract_controller/controllers/alt_views/partial
-- spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots
-- spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb
-- spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location
-- spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb
-- spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited
-- spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb
-- spec/public/abstract_controller/controllers/cousins.rb
-- spec/public/abstract_controller/controllers/display.rb
-- spec/public/abstract_controller/controllers/filters.rb
-- spec/public/abstract_controller/controllers/helpers.rb
-- spec/public/abstract_controller/controllers/partial.rb
-- spec/public/abstract_controller/controllers/render.rb
-- spec/public/abstract_controller/controllers/views
-- spec/public/abstract_controller/controllers/views/helpers
-- spec/public/abstract_controller/controllers/views/helpers/capture
-- spec/public/abstract_controller/controllers/views/helpers/capture/index.erb
-- spec/public/abstract_controller/controllers/views/helpers/capture_eq
-- spec/public/abstract_controller/controllers/views/helpers/capture_eq/index.erb
-- spec/public/abstract_controller/controllers/views/helpers/capture_with_args
-- spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb
-- spec/public/abstract_controller/controllers/views/helpers/concat
-- spec/public/abstract_controller/controllers/views/helpers/concat/index.erb
-- spec/public/abstract_controller/controllers/views/layout
-- spec/public/abstract_controller/controllers/views/layout/alt.erb
-- spec/public/abstract_controller/controllers/views/layout/custom.erb
-- spec/public/abstract_controller/controllers/views/merb
-- spec/public/abstract_controller/controllers/views/merb/test
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents
-- spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb
-- spec/public/abstract_controller/controllers/views/partial
-- spec/public/abstract_controller/controllers/views/partial/another_directory
-- spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/basic_partial
-- spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb
-- spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots
-- spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb
-- spec/public/abstract_controller/controllers/views/partial/nested_partial
-- spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb
-- spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb
-- spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory
-- spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_both
-- spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/_collection.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_locals
-- spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals
-- spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb
-- spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb
-- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial
-- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb
-- spec/public/abstract_controller/controllers/views/partial/with_as_partial
-- spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb
-- spec/public/abstract_controller/controllers/views/partial/with_nil_partial
-- spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb
-- spec/public/abstract_controller/controllers/views/partial/with_partial
-- spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb
-- spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb
-- spec/public/abstract_controller/controllers/views/test_display
-- spec/public/abstract_controller/controllers/views/test_display/foo.html.erb
-- spec/public/abstract_controller/controllers/views/test_render
-- spec/public/abstract_controller/controllers/views/test_render/foo.html.erb
-- spec/public/abstract_controller/controllers/views/wonderful
-- spec/public/abstract_controller/controllers/views/wonderful/index.erb
-- spec/public/abstract_controller/display_spec.rb
-- spec/public/abstract_controller/filter_spec.rb
-- spec/public/abstract_controller/helper_spec.rb
-- spec/public/abstract_controller/partial_spec.rb
-- spec/public/abstract_controller/render_spec.rb
-- spec/public/abstract_controller/spec_helper.rb
-- spec/public/boot_loader
-- spec/public/boot_loader/boot_loader_spec.rb
-- spec/public/boot_loader/spec_helper.rb
-- spec/public/controller
-- spec/public/controller/authentication_spec.rb
-- spec/public/controller/base_spec.rb
-- spec/public/controller/conditional_get_spec.rb
-- spec/public/controller/config
-- spec/public/controller/config/init.rb
-- spec/public/controller/controllers
-- spec/public/controller/controllers/authentication.rb
-- spec/public/controller/controllers/base.rb
-- spec/public/controller/controllers/conditional_get.rb
-- spec/public/controller/controllers/cookies.rb
-- spec/public/controller/controllers/dispatcher.rb
-- spec/public/controller/controllers/display.rb
-- spec/public/controller/controllers/redirect.rb
-- spec/public/controller/controllers/responder.rb
-- spec/public/controller/controllers/url.rb
-- spec/public/controller/controllers/views
-- spec/public/controller/controllers/views/layout
-- spec/public/controller/controllers/views/layout/custom.html.erb
-- spec/public/controller/controllers/views/layout/custom_arg.html.erb
-- spec/public/controller/controllers/views/layout/custom_arg.json.erb
-- spec/public/controller/controllers/views/merb
-- spec/public/controller/controllers/views/merb/test
-- spec/public/controller/controllers/views/merb/test/fixtures
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_and_local_provides/index.xml.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/no_layout.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb
-- spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb
-- spec/public/controller/cookies_spec.rb
-- spec/public/controller/dispatcher_spec.rb
-- spec/public/controller/display_spec.rb
-- spec/public/controller/redirect_spec.rb
-- spec/public/controller/responder_spec.rb
-- spec/public/controller/spec_helper.rb
-- spec/public/controller/url_spec.rb
-- spec/public/core
-- spec/public/core/merb_core_spec.rb
-- spec/public/core_ext
-- spec/public/core_ext/fixtures
-- spec/public/core_ext/fixtures/core_ext_dependency.rb
-- spec/public/core_ext/kernel_spec.rb
-- spec/public/core_ext/spec_helper.rb
-- spec/public/DEFINITIONS
-- spec/public/directory_structure
-- spec/public/directory_structure/directory
-- spec/public/directory_structure/directory/app
-- spec/public/directory_structure/directory/app/controllers
-- spec/public/directory_structure/directory/app/controllers/application.rb
-- spec/public/directory_structure/directory/app/controllers/base.rb
-- spec/public/directory_structure/directory/app/controllers/custom.rb
-- spec/public/directory_structure/directory/app/views
-- spec/public/directory_structure/directory/app/views/base
-- spec/public/directory_structure/directory/app/views/base/template.html.erb
-- spec/public/directory_structure/directory/app/views/wonderful
-- spec/public/directory_structure/directory/app/views/wonderful/template.erb
-- spec/public/directory_structure/directory/config
-- spec/public/directory_structure/directory/config/router.rb
-- spec/public/directory_structure/directory/log
-- spec/public/directory_structure/directory/log/merb_test.log
-- spec/public/directory_structure/directory_spec.rb
-- spec/public/logger
-- spec/public/logger/logger_spec.rb
-- spec/public/logger/spec_helper.rb
-- spec/public/rack
-- spec/public/rack/conditinal_get_middleware_spec.rb
-- spec/public/rack/csrf_middleware_spec.rb
-- spec/public/rack/rack_middleware_spec.rb
-- spec/public/rack/shared_example_groups.rb
-- spec/public/reloading
-- spec/public/reloading/directory
-- spec/public/reloading/directory/app
-- spec/public/reloading/directory/app/controllers
-- spec/public/reloading/directory/app/controllers/application.rb
-- spec/public/reloading/directory/app/controllers/reload.rb
-- spec/public/reloading/directory/config
-- spec/public/reloading/directory/config/init.rb
-- spec/public/reloading/directory/log
-- spec/public/reloading/directory/log/merb_test.log
-- spec/public/reloading/reload_spec.rb
-- spec/public/request
-- spec/public/request/multipart_spec.rb
-- spec/public/request/request_spec.rb
-- spec/public/router
-- spec/public/router/default_spec.rb
-- spec/public/router/deferred_spec.rb
-- spec/public/router/fixation_spec.rb
-- spec/public/router/fixture
-- spec/public/router/fixture/log
-- spec/public/router/fixture/log/merb_test.log
-- spec/public/router/namespace_spec.rb
-- spec/public/router/nested_matches_spec.rb
-- spec/public/router/nested_resources_spec.rb
-- spec/public/router/resource_spec.rb
-- spec/public/router/resources_spec.rb
-- spec/public/router/spec_helper.rb
-- spec/public/router/special_spec.rb
-- spec/public/router/string_spec.rb
-- spec/public/session
-- spec/public/session/controllers
-- spec/public/session/controllers/sessions.rb
-- spec/public/session/cookie_session_spec.rb
-- spec/public/session/memcached_session_spec.rb
-- spec/public/session/memory_session_spec.rb
-- spec/public/session/multiple_sessions_spec.rb
-- spec/public/session/no_session_spec.rb
-- spec/public/session/session_spec.rb
-- spec/public/template
-- spec/public/template/template_spec.rb
-- spec/public/template/templates
-- spec/public/template/templates/error.html.erb
-- spec/public/template/templates/template.html.erb
-- spec/public/template/templates/template.html.myt
-- spec/public/test
-- spec/public/test/controller_matchers_spec.rb
-- spec/public/test/controllers
-- spec/public/test/controllers/controller_assertion_mock.rb
-- spec/public/test/controllers/dispatch_controller.rb
-- spec/public/test/controllers/spec_helper_controller.rb
-- spec/public/test/multipart_request_helper_spec.rb
-- spec/public/test/multipart_upload_text_file.txt
-- spec/public/test/request_helper_spec.rb
-- spec/public/test/route_helper_spec.rb
-- spec/public/test/route_matchers_spec.rb
-- spec/public/test/view_helper_spec.rb
-- spec/public/test/view_matchers_spec.rb
-- spec/spec_helper.rb
 - lib/merb-core
 - lib/merb-core/autoload.rb
 - lib/merb-core/bootloader.rb
@@ -490,6 +156,7 @@ files:
 - lib/merb-core/dispatch/router
 - lib/merb-core/dispatch/router/behavior.rb
 - lib/merb-core/dispatch/router/cached_proc.rb
+- lib/merb-core/dispatch/router/resources.rb
 - lib/merb-core/dispatch/router/route.rb
 - lib/merb-core/dispatch/router.rb
 - lib/merb-core/dispatch/session
@@ -506,6 +173,7 @@ files:
 - lib/merb-core/plugins.rb
 - lib/merb-core/rack
 - lib/merb-core/rack/adapter
+- lib/merb-core/rack/adapter/abstract.rb
 - lib/merb-core/rack/adapter/ebb.rb
 - lib/merb-core/rack/adapter/evented_mongrel.rb
 - lib/merb-core/rack/adapter/fcgi.rb
@@ -529,16 +197,19 @@ files:
 - lib/merb-core/rack/middleware/static.rb
 - lib/merb-core/rack/middleware/tracer.rb
 - lib/merb-core/rack/middleware.rb
+- lib/merb-core/rack/stream_wrapper.rb
 - lib/merb-core/rack.rb
 - lib/merb-core/server.rb
 - lib/merb-core/tasks
 - lib/merb-core/tasks/audit.rake
+- lib/merb-core/tasks/gem_management.rb
 - lib/merb-core/tasks/merb.rb
 - lib/merb-core/tasks/merb_rake_helper.rb
 - lib/merb-core/tasks/stats.rake
 - lib/merb-core/test
 - lib/merb-core/test/helpers
 - lib/merb-core/test/helpers/controller_helper.rb
+- lib/merb-core/test/helpers/mock_request_helper.rb
 - lib/merb-core/test/helpers/multipart_request_helper.rb
 - lib/merb-core/test/helpers/request_helper.rb
 - lib/merb-core/test/helpers/route_helper.rb
@@ -546,6 +217,7 @@ files:
 - lib/merb-core/test/helpers.rb
 - lib/merb-core/test/matchers
 - lib/merb-core/test/matchers/controller_matchers.rb
+- lib/merb-core/test/matchers/request_matchers.rb
 - lib/merb-core/test/matchers/route_matchers.rb
 - lib/merb-core/test/matchers/view_matchers.rb
 - lib/merb-core/test/matchers.rb
@@ -555,13 +227,9 @@ files:
 - lib/merb-core/test/test_ext
 - lib/merb-core/test/test_ext/hpricot.rb
 - lib/merb-core/test/test_ext/object.rb
+- lib/merb-core/test/test_ext/rspec.rb
 - lib/merb-core/test/test_ext/string.rb
 - lib/merb-core/test.rb
-- lib/merb-core/vendor
-- lib/merb-core/vendor/facets
-- lib/merb-core/vendor/facets/dictionary.rb
-- lib/merb-core/vendor/facets/inflect.rb
-- lib/merb-core/vendor/facets.rb
 - lib/merb-core/version.rb
 - lib/merb-core.rb
 has_rdoc: true