merb 0.4.2 → 0.5.0

data/lib/merb/session/cookie_store.rb

@@ -7,13 +7,13 @@ module Merb
   
   module SessionMixin #:nodoc:
     def setup_session
-      MERB_LOGGER.info("Setting Up Cookie Store Sessions")
+      Merb.logger.info("Setting Up Cookie Store Sessions")
       request.session = Merb::CookieStore.new(cookies[_session_id_key], session_secret_key)
       @original_session = request.session.read_cookie
     end
     
     def finalize_session
-      MERB_LOGGER.info("Finalize Cookie Store Session")
+      Merb.logger.info("Finalize Cookie Store Session")
       new_session = request.session.read_cookie
 
       if @original_session != new_session
@@ -74,24 +74,25 @@ module Merb
       end
     end
     
-    # assigns a key value pair
-    def []=(k, v)
+    # assigns a key value pair 
+    def []=(k, v) 
       @data[k] = v
     end
     
-    def [](k)
-      @data[k]
-    end
-    
-    # delete a key
-    def delete(key)
-      if @data.has_key?(key)
-        @data.delete(key)
-      end
+    def [](k) 
+      @data[k] 
+    end 
+     
+    def each(&b) 
+      @data.each(&b) 
     end
     
     private
     
+    def method_missing(name, *args, &block)
+      @data.send(name, *args, &block)
+    end
+    
     # Generate the HMAC keyed message digest. Uses SHA1.
     def generate_digest(data)
       OpenSSL::HMAC.hexdigest(DIGEST, @secret, data)

data/lib/merb/session/mem_cache_session.rb

@@ -5,7 +5,7 @@ module Merb
   module SessionMixin #:nodoc:
 
     def setup_session
-      MERB_LOGGER.info("Setting up session")
+      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::MemCacheSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
@@ -13,7 +13,7 @@ module Merb
     end
 
     def finalize_session
-      MERB_LOGGER.info("Finalize session")
+      Merb.logger.info("Finalize session")
       if @_fingerprint != Marshal.dump(request.session.data).hash
         ::Cache.put("session:#{@_session.session_id}", request.session.data)
       end
@@ -102,19 +102,29 @@ module Merb
    	def delete  
    	  @data = {} 
    	end
-   	
-    def [](key)
-      @data[key]
-    end
-
-    def []=(key, val)
-      @data[key] = val
-    end
 
     # Has the session been loaded yet?
     def loaded?
       !! @data
     end
+    
+    # assigns a key value pair 
+    def []=(k, v) 
+      @data[k] = v
+    end
+    
+    def [](k) 
+      @data[k] 
+    end 
+     
+    def each(&b) 
+      @data.each(&b) 
+    end
+    
+    private
+    def method_missing(name, *args, &block)
+      @data.send(name, *args, &block)
+    end
 
   end
 

data/lib/merb/session/memory_session.rb

@@ -3,14 +3,14 @@ module Merb
   module SessionMixin #:nodoc:
 
     def setup_session
-      MERB_LOGGER.info("Setting up session")
+      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session , cookies[_session_id_key] = Merb::MemorySession.persist(cookies[_session_id_key])
       @_new_cookie = cookies[_session_id_key] != before
     end
 
     def finalize_session
-      MERB_LOGGER.info("Finalize session")
+      Merb.logger.info("Finalize session")
       set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
      
@@ -83,18 +83,28 @@ module Merb
    	  @data = {} 
    	end
    	
-    def [](key)
-      @data[key]
-    end
-
-    def []=(key, val)
-      @data[key] = val
-    end
-
     # Has the session been loaded yet?
     def loaded?
       !! @data
     end
+    
+    # assigns a key value pair 
+    def []=(k, v) 
+      @data[k] = v
+    end
+    
+    def [](k) 
+      @data[k] 
+    end 
+     
+    def each(&b) 
+      @data.each(&b) 
+    end
+    
+    private
+    def method_missing(name, *args, &block)
+      @data.send(name, *args, &block)
+    end
 
   end
   
@@ -163,4 +173,4 @@ module Merb
   end # end MemorySessionContainer
 end
 
-Merb::MemorySessionContainer.setup(Merb::Server.config[:memory_session_ttl])
+Merb::MemorySessionContainer.setup(Merb::Config[:memory_session_ttl])

data/lib/merb/template.rb

@@ -27,10 +27,10 @@ module Merb
     # are directly referenced, or a file with their extension is found.
     # If these are declared inside the template engine then
     # they will never be found :(
-    register_extensions( :Erubis, %w[erb herb jerb rhtml])
+    register_extensions( :Erubis, %w[erb])
     register_extensions( :Haml, %w[haml])
     register_extensions( :Markaby, %w[mab])
-    register_extensions( :XMLBuilder, %w[builder rxml xerb])
+    register_extensions( :XMLBuilder, %w[builder])
     
   end
   

data/lib/merb/template/erubis.rb

@@ -3,37 +3,7 @@ module Merb # :nodoc:
 
     class ErubisViewContext < ViewContext
       include ::Merb::ErubisCaptureMixin
-      
-      def partial(template, opts={})
-
-        unless @_template_format
-          @web_controller.choose_template_format(Merb.available_mime_types, {})
-        end
-
-        template = @web_controller._cached_partials["#{template}.#{@_template_format}"] ||=
-          @web_controller.send(:find_partial, template)
-
-        template_method = template.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_")
-
-        unless self.respond_to?(template_method)
-          raise Merb::ControllerExceptions::TemplateNotFound, "No template matched at #{template}"          
-        end
-
-        if with = opts.delete(:with)
-          as = opts.delete(:as) || template.match(/(.*\/_)([^\.]*)/)[2]
-          @_merb_partial_locals = opts        
-          sent_template = [with].flatten.map do |temp|
-            @_merb_partial_locals[as.to_sym] = temp
-            send(template_method)
-          end.join
-        else
-          @_merb_partial_locals = opts        
-          sent_template = send(template_method)
-        end
-
-        return sent_template if sent_template
-
-      end      
+      include ::Merb::InlinePartialMixin
     end
     
     # Module to allow you to use Embedded Ruby templates through Erubis["http://www.kuwata-lab.com/erubis/"].
@@ -66,7 +36,7 @@ module Merb # :nodoc:
         
         # Creates a new Erubis object to parse the template given in +path+.
         def new_eruby_obj(path)
-          if @@erbs[path] && MERB_ENV == 'production' 
+          if @@erbs[path] && Merb.environment == 'production' 
             return @@erbs[path]
           else  
             begin
@@ -84,7 +54,7 @@ module Merb # :nodoc:
         
         private
           def cache_template?(path)
-            return false unless ::Merb::Server.config[:cache_templates]
+            return false unless ::Merb::Config[:cache_templates]
             return true unless @@erbs[path]
             @@mtimes[path] < File.mtime(path) ||
               (File.symlink?(path) && (@@mtimes[path] < File.lstat(path).mtime))

data/lib/merb/template/haml.rb

@@ -20,6 +20,10 @@ end
 module Merb
   module Template
     
+    class HamlViewContext < ViewContext
+      include ::Merb::InlinePartialMixin
+    end
+    
     module Haml
       
       class << self
@@ -36,7 +40,8 @@ module Merb
           
           begin 
 
-            opts[:locals] = {} # Merb handles the locals
+            # Merb handles the locals
+            opts.delete(:locals)
             
             template = text ? text : load_template(file)
             
@@ -51,7 +56,7 @@ module Merb
         end
         
         def view_context_klass
-          ::Merb::ViewContext
+          HamlViewContext
         end
       
         private
@@ -69,7 +74,7 @@ module Merb
           end
         
           def cache_template?(path)
-            return false unless ::Merb::Server.config[:cache_templates]
+            return false unless ::Merb::Config[:cache_templates]
             return true unless @@hamls[path]
             @@mtimes[path] < File.mtime(path) ||
               (File.symlink?(path) && (@@mtimes[path] < File.lstat(path).mtime))

data/lib/merb/test/fake_request.rb

@@ -19,6 +19,7 @@ module Merb
         r.body = req
         super(r)
         self.post_body = ''
+        @session = {}
       end
 
       def self.with(path, options = {})
@@ -31,7 +32,11 @@ module Merb
       def post_body=(post)
         @req = StringIO.new(post)
       end  
-    
+      
+      def session
+        @session
+      end
+      
       def [](key)
         @env[key]
       end
@@ -41,7 +46,7 @@ module Merb
       end
       
       private    
-      DEFAULT_ENV = {
+      DEFAULT_ENV = Mash.new({
         'SERVER_NAME' => 'localhost',
         'PATH_INFO' => '/',
         'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
@@ -63,7 +68,7 @@ module Merb
         'HTTP_ACCEPT' => 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
         'HTTP_CONNECTION' => 'keep-alive',
         'REQUEST_METHOD' => 'GET'      
-      } unless defined?(DEFAULT_ENV)
+      }) unless defined?(DEFAULT_ENV)
     end
   end
 end

data/lib/merb/test/helper.rb

@@ -5,22 +5,15 @@ include HpricotTestHelper
 module Merb
   module Test
     module Helper
+      include Merb::GeneralControllerMixin
+      
       # Create a FakeRequest suitable for passing to Controller.build
-      def fake_request(path="/",method='GET')
+      def fake_request(params = {})
         method = method.to_s.upcase
-        Merb::Test::FakeRequest.with(path, :request_method => method)
-      end
-
-      # Turn a named route into a string with the path
-      # This is the same method as is found in the controller
-      def url(name, *args)
-        Merb::Router.generate(name, *args)
+        Merb::Test::FakeRequest.with("/", {:request_method => "GET"}.merge(params))
       end
-
-
+      
       # For integration/functional testing
-
-
       def request(verb, path)
         response = StringIO.new
         @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
@@ -30,8 +23,44 @@ module Merb
         @controller, @action = Merb::Dispatcher.handle @request, response
       end
 
-      def get(path)
-        request("GET",path)
+      
+      # Makes a get request routed to +path+ with any options encoded into the 
+      # request url
+      # Example
+      # {{{ 
+      #   get "/users", :user => {:login => "dave", :email => "email@example.com"} 
+      # }}}
+      def get(path, opts = {}, &block)
+        request("GET",path_with_options(path,opts), &block)
+      end
+      
+      # Makes a post request routed to +path+ with any options encoded into the 
+      # request url
+      # Example
+      # {{{ 
+      #   post "/users", :user => {:login => "dave", :email => "email@example.com"} 
+      # }}}
+      def post(path, opts = {}, &block)
+        request("POST", path_with_options(path,opts), &block)
+      end
+      
+      # Makes a put request routed to +path+ with any options encoded into the 
+      # request url
+      # Example
+      # {{{ 
+      #   put "/users/1", :user => {:login => "dave", :email => "email@example.com"} 
+      # }}}
+      def put(path,opts = {}, &block)
+        request("PUT", path_with_options(path,opts), &block)
+      end
+      
+      # Makes a delete request routed to +path+ with any options encoded into the request url
+      # Example
+      # {{{ 
+      #   delete "/users/1", :user => {:login => "dave", :email => "email@example.com"} 
+      # }}}
+      def delete(path, opts= {}, &block)
+        request("DELETE", path_with_options(path,opts), &block)
       end
       
       def controller
@@ -54,7 +83,8 @@ module Merb
       #   params[:id].should == "1"
       # end
       def with_route(the_path, _method = "GET")
-        result = Merb::Router.match(fake_request(the_path, _method), {})
+        _fake_request = Merb::Test::FakeRequest.with(the_path, :request_method => _method)
+        result = Merb::Router.match(_fake_request, {})
         yield result[1] if block_given?
         result
       end 
@@ -90,14 +120,28 @@ module Merb
       #   }}}
       def dispatch_to(controller, action = :index, opts = {})
         klass = controller.class == Class ? controller : controller.class
-        klass.stub!(:find_by_title).and_return(@page)
-        the_controller = klass.build(fake_request)
-        the_controller.stub!(:params).and_return(opts.merge!(:controller => "#{klass.name.downcase}", :action => action.to_s))
-
-        yield the_controller if block_given?
-        @controller = the_controller
-        [the_controller, the_controller.dispatch(action.to_sym)]
+        @controller = klass.build(fake_request)
+        @controller.stub!(:params).and_return(opts.merge(:controller => klass.name.downcase, :action => action.to_s).to_mash)
+        yield @controller if block_given?
+        [@controller, @controller.dispatch(action.to_sym)]
+      end
+      
+      def path_with_options(path, opts)
+        path = path << "?" << params_to_query_string(opts) unless opts.empty?
+        path
       end
     end
   end
 end
+
+class Object
+  # Checks that an object has assigned an instance variable of name
+  # :name
+  # 
+  # ===Example in a spec
+  #  @my_obj.assings(:my_value).should == @my_value
+  def assigns(attr)
+    self.instance_variable_get("@#{attr}")
+  end
+end
+

data/lib/merb/test/rspec.rb

@@ -1,164 +1,18 @@
 require 'hpricot'
 require 'spec'
-module Merb
-  module Test
-    module MerbRspecControllerRedirect
-      class BeRedirect
-        def matches?(target)
-          @target = target
-          target == 302
-        end
-        def failure_message
-          "expected to redirect"
-        end
-        def negative_failure_message
-          "expected not to redirect"
-        end
-      end
-
-      class Redirect
-        def matches?(target)
-          @target = target
-          BeRedirect.new.matches?(target.status)
-        end
-        def failure_message
-          "expected #{@target.inspect} to redirect"
-        end
-        def negative_failure_message
-          "expected #{@target.inspect} not to redirect"
-        end
-      end
-
-      class RedirectTo
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(target)
-          @target = target.headers['Location']
-          @redirected = BeRedirect.new.matches?(target.status)
-          @target == @expected
-        end
-
-        def failure_message
-          msg = "expected a redirect to <#{@expected}>, but "
-          if @redirected
-            msg << "found one to <#{@target}>" 
-          else
-            msg << "there was no redirect"
-          end
-        end
-
-        def negative_failure_message
-          "expected not to redirect to <#{@expected}>, but did anyway"
-        end
-      end
 
-      def be_redirect
-        BeRedirect.new
-      end
+# Get all the rspec matchers for merb and include them
+Dir[(File.dirname(__FILE__) + "/rspec_matchers/**/*.rb")].each do |file|
+  require "#{file[0...-3]}"
+end
 
-      def redirect
-        Redirect.new
-      end
-
-      def redirect_to(expected)
-        RedirectTo.new(expected)
-      end
-    end
-      
+module Merb
+  module Test
     module RspecMatchers
-      class HaveSelector
-        def initialize(expected)
-          @expected = expected
-        end
-    
-        def matches?(stringlike)
-          @document = case stringlike
-          when Hpricot::Elem
-            stringlike
-          when StringIO
-            Hpricot.parse(stringlike.string)
-          else
-            Hpricot.parse(stringlike)
-          end
-          !@document.search(@expected).empty?
-        end
-    
-        def failure_message
-          "expected following text to match selector #{@expected}:\n#{@document}"
-        end
-
-        def negative_failure_message
-          "expected following text to not match selector #{@expected}:\n#{@document}"
-        end
-      end
-  
-      class MatchTag
-        def initialize(name, attrs)
-          @name, @attrs = name, attrs
-          @content = @attrs.delete(:content)
-        end
+      
+      include ControllerMatchers
+      include MarkupMatchers
 
-        def matches?(target)
-          @errors = []
-          unless target.include?("<#{@name}")
-            @errors << "Expected a <#{@name}>, but was #{target}"
-          end
-          @attrs.each do |attr, val|
-            unless target.include?("#{attr}=\"#{val}\"")
-              @errors << "Expected #{attr}=\"#{val}\", but was #{target}"
-            end
-          end
-          if @content
-            unless target.include?(">#{@content}<")
-              @errors << "Expected #{target} to include #{@content}"
-            end
-          end
-          @errors.size == 0
-        end
-    
-        def failure_message
-          @errors[0]
-        end
-    
-        def negative_failure_message
-          "Expected not to match against <#{@name} #{@attrs.map{ |a,v| "#{a}=\"#{v}\"" }.join(" ")}> tag, but it matched"
-        end
-      end
-  
-      class NotMatchTag
-        def initialize(attrs)
-          @attrs = attrs
-        end
-    
-        def matches?(target)
-          @errors = []
-          @attrs.each do |attr, val|
-            if target.include?("#{attr}=\"#{val}\"")
-              @errors << "Should not include #{attr}=\"#{val}\", but was #{target}"
-            end
-          end
-          @errors.size == 0
-        end
-    
-        def failure_message
-          @errors[0]
-        end
-      end
-  
-      def match_tag(name, attrs)
-        MatchTag.new(name, attrs)
-      end
-      def not_match_tag(attrs)
-        NotMatchTag.new(attrs)
-      end
-  
-      def have_selector(expected)
-        HaveSelector.new(expected)
-      end
-      alias_method :match_selector, :have_selector
-      # alias_method :match_regex, :match
     end
   end
 end