0
@@ -4,9 +4,15 @@
0
 require 'rubygems'
0
 require 'set'
0
 require 'fileutils'
0
+
0
+$LOAD_PATH.push File.dirname(__FILE__) unless 
0
+  $LOAD_PATH.include?(File.dirname(__FILE__)) || 
0
+  $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
0
+
0
 require 'merb_core/gem_ext/erubis'
0
 require 'merb_core/logger'
0
 require 'merb_core/version'
0
+require 'merb_core/core_ext'
0
 
0
 gem "assistance"
0
 require "assistance"
0
@@ -15,7 +21,7 @@ module Merb
0
   class << self
0
     
0
     attr_accessor :environment, :load_paths
0
-    self.load_paths = Hash.new
0
+    Merb.load_paths = Hash.new
0
     
0
     require 'merb_core/autoload'
0
     
0
@@ -59,7 +65,7 @@ module Merb
0
       
0
     # Set up default generator scope
0
     attr_accessor :generator_scope
0
-    self.generator_scope = [:merb_default, :merb, :rspec]
0
+    Merb.generator_scope = [:merb_default, :merb, :rspec]
0
   end
0
 
0
 end

0
@@ -62,29 +62,25 @@ module Merb::Template
0
     #   Merb::Template.register_extensions(Merb::Template::Erubis, ["erb"])
0
     # ]}}
0
     def register_extensions(engine, extensions) enforce!(engine => Class, extensions => Array)
0
+      raise ArgumentError, "The class you are registering does not have a compile_template method" unless
0
+        engine.respond_to?(:compile_template)
0
       extensions.each{|ext| EXTENSIONS[ext] = engine }
0
     end
0
   end
0
   
0
-  class Erubis
0
-    Merb::Template.register_extensions(self, %[erb])
0
-    
0
-    # ==== Parameters
0
-    # path<String>:: A full path to the template
0
-    def initialize(path)
0
-      @path = path
0
-    end
0
-    
0
+  require 'erubis'
0
+  class Erubis    
0
     # ==== Parameters
0
     # path<String>:: A full path to the template
0
     # name<String>:: The name of the method that will be created
0
     # mod<Module>:: The module that the compiled method will be placed into
0
-    def compile_template(path, name, mod)
0
-      template = Erubis::Eruby.new(File.read(path))
0
+    def self.compile_template(path, name, mod)
0
+      template = ::Erubis::Eruby.new(File.read(path))
0
       template.def_method(mod, name, path) 
0
       name     
0
     end
0
-    
0
+  
0
+    Merb::Template.register_extensions(self, %w[erb])    
0
   end
0
   
0
 end
0
\ No newline at end of file

0
@@ -1,59 +1,6 @@
0
 $TESTING=true
0
-require 'timeout'
0
-require 'open-uri'
0
-require 'net/http'
0
-require 'rubygems'
0
-require 'spec'
0
-require 'mocha'
0
-require 'hpricot'
0
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
0
-$:.push File.join(File.dirname(__FILE__), '..', 'lib', 'merb', 'server')
0
-require File.join(File.dirname(__FILE__), '..', 'lib', 'merb', 'config')
0
-Merb::Config.setup
0
-require 'merb'
0
-require 'merb/test/helper'
0
-
0
-FIXTURES = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures')) unless defined?(FIXTURES)
0
-
0
-require File.join(File.dirname(__FILE__), "spec_helpers", "url_shared_behaviour")
0
-
0
-Spec::Runner.configure do |config|
0
-  config.include(Merb::Test::Helper)
0
-  config.include(Merb::Test::RspecMatchers)
0
-  # config.include(Merb::Test::MerbRspecControllerRedirect)
0
-end
0
-
0
-# Creates a new controller, e.g.
0
-#   c = new_controller('index', Examples) do |request|
0
-#     request.post_body = "blah"
0
-#   end
0
-def new_controller(action = 'index', controller = nil, additional_params = {})
0
-  request = OpenStruct.new
0
-  request.params = {:action => action, :controller => (controller.to_s || "Test")}
0
-  request.params.update(additional_params)
0
-  request.cookies = {}
0
-  request.accept ||= '*/*'
0
-  
0
-  yield request if block_given?
0
-  
0
-  response = OpenStruct.new
0
-  response.read = ""
0
-  (controller || Merb::Controller).build(request, response)
0
-end
0
-
0
-class Merb::Controller
0
-  require "lib/merb/session/memory_session"
0
-  Merb::MemorySessionContainer.setup
0
-  include ::Merb::SessionMixin
0
-  self.session_secret_key = "footo the bar to the baz"
0
-end
0
-
0
-class String
0
-  def clean
0
-    Hpricot(chomp).to_s
0
-  end
0
-end
0
 
0
+require File.join(File.dirname(__FILE__), "..", "lib", "merb")
0
 
0
 # -- Global custom matchers --
0
 
0
@@ -67,31 +14,49 @@ end
0
 #
0
 #   "expected File but got Tempfile"
0
 
0
-class BeKindOf
0
+module Merb
0
+  module Test
0
+    module RspecMatchers
0
+      class BeKindOf
0
   
0
-  def initialize(expected) # + args
0
-    @expected = expected
0
-  end
0
-
0
-  def matches?(target)
0
-    @target = target
0
-    @target.kind_of?(@expected)
0
-  end
0
-
0
-  def failure_message
0
-    "expected #{@expected} but got #{@target.class}"
0
-  end
0
-
0
-  def negative_failure_message
0
-    "expected #{@expected} to not be #{@target.class}"
0
+        def initialize(expected) # + args
0
+          @expected = expected
0
+        end
0
+
0
+        def matches?(target)
0
+          @target = target
0
+          @target.kind_of?(@expected)
0
+        end
0
+
0
+        def failure_message
0
+          "expected #{@expected} but got #{@target.class}"
0
+        end
0
+
0
+        def negative_failure_message
0
+          "expected #{@expected} to not be #{@target.class}"
0
+        end
0
+
0
+        def description
0
+          "be_kind_of #{@target}"
0
+        end
0
+
0
+      end
0
+
0
+      def be_kind_of(expected) # + args
0
+        BeKindOf.new(expected)
0
+      end
0
+    end
0
+        
0
+    module Helper; end
0
   end
0
-
0
-  def description
0
-    "be_kind_of #{@target}"
0
-  end
0
-
0
 end
0
 
0
-def be_kind_of(expected) # + args
0
-  BeKindOf.new(expected)
0
+Spec::Runner.configure do |config|
0
+  config.include(Merb::Test::Helper)
0
+  config.include(Merb::Test::RspecMatchers)
0
+  Spec::Example::ExampleGroup.class_eval do
0
+    def running(&blk) blk; end
0
+    def executing(&blk) blk; end
0
+    def doing(&blk) blk; end    
0
+  end
0
 end
0
\ No newline at end of file