merb 0.3.7 → 0.4.0

data/lib/merb/template/markaby.rb

@@ -1,4 +1,3 @@
-
 begin
   require 'markaby'
 rescue LoadError
@@ -7,22 +6,20 @@ end
   
 module Markaby  
   class Builder
-    def _buf; self end
-    def throw_content(name, &block)
-      @helpers.instance_variable_set "@_#{name}_content",
-        eval("@_#{name}_content = (@_#{name}_content|| '') + capture(&block)")
+    def _buffer( binding )
+      eval( "_erbout", binding )
+    end
+    
+    def concat( string, binding )
+      _buffer( binding ) << string
     end
   end
 end
   
 module Merb
   
-  module Template
-    
-    module Markaby
-    
-      ::Merb::AbstractController.register_engine self, %w[ mab ]
-    
+  module Template  
+    module Markaby    
       class << self
 
         def exempt_from_layout?
@@ -32,7 +29,7 @@ module Merb
         # OPTIMIZE :  add mab template caching. what does this mean for mab? 
         # mab is just ruby, there's no two phase compile and run
         def transform(options = {})
-          opts, file, view_context = options.values_at(:opts, :file, :view_context)
+          opts, text, file, view_context = options.values_at(:opts, :text, :file, :view_context)
           
           if opts[:locals]
             locals = ""
@@ -42,12 +39,17 @@ module Merb
             locals
           end
           
+          template = text ? text : File.read(file)
           mab = ::Markaby::Builder.new({}, view_context) {
-            instance_eval("#{locals}#{File.read(file)}")
+            instance_eval("#{locals}#{template}")
           }
           mab.to_s
         end
-
+        
+        def view_context_klass
+          ::Merb::ViewContext
+        end
+        
       end
       
     end

data/lib/merb/template/xml_builder.rb

@@ -9,10 +9,11 @@ module Merb
   module Template # :nodoc:
     # A module to allow you to use Builder["http://builder.rubyforge.org/"] templates in your Merb applications.
     # Your Builder templates must end in .rxml, .xerb, or .builder for Merb to use them.
-    module XMLBuilder
     
-      ::Merb::AbstractController.register_engine self, %w[ rxml xerb builder]
     
+    
+    module XMLBuilder
+        
       class << self
 
         def exempt_from_layout? # :nodoc:
@@ -25,8 +26,8 @@ module Merb
         # executes the Builder template by feeding it to <tt>Builder::XmlMarkup.new</tt>, 
         # then calls <tt>target!</tt> on the<tt>Builder::XmlMarkup</tt> instance to get its XML output.   
         def transform(options = {})
-          opts, file, view_context = options.values_at(:opts, :file, :view_context)
-          xml_body = IO.read(file) 
+          opts, text, file, view_context = options.values_at(:opts, :text, :file, :view_context)
+          xml_body = text ? text : IO.read(file) 
           view_context.headers['Content-Type'] = 'application/xml'
           view_context.headers['Encoding']     = 'UTF-8'
           view_context.instance_eval %{
@@ -37,6 +38,9 @@ module Merb
           }
         end
 
+        def view_context_klass
+          ::Merb::ViewContext
+        end
       end
       
     end

data/lib/merb/test/{merb_fake_request.rb → fake_request.rb}

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Merb
   module Test
     # FakeRequest sets up a default enviroment which can be overridden either
@@ -8,14 +10,19 @@ module Merb
       alias :params :env
       alias :to_hash :env
     
-      def initialize(env = {}, method = 'GET', req = StringIO.new)
+      def initialize(env = {}, req = StringIO.new)
         env[:http_cookie] = env.delete(:cookies) if env[:cookies]
         env.environmentize_keys!
-        super(DEFAULT_ENV.dup.merge(env), method, req)
+        
+        r = OpenStruct.new
+        r.params = DEFAULT_ENV.dup.merge(env)
+        r.body = req
+        super(r)
         self.post_body = ''
       end
 
       def self.with(path, options = {})
+        options.merge!(:QUERY_STRING => path.split("?")[1])
         options.environmentize_keys!
         new({'REQUEST_URI' => path,
              'PATH_INFO' => path.sub(/\?.*$/,'')}.merge(options))
@@ -32,8 +39,7 @@ module Merb
       def []=(key, value)
         @env[key] = value
       end
-
-    
+      
       private    
       DEFAULT_ENV = {
         'SERVER_NAME' => 'localhost',
@@ -57,7 +63,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)
     end
   end
 end

data/lib/merb/test/helper.rb

@@ -0,0 +1,31 @@
+require 'merb/test/fake_request'
+require 'merb/test/hpricot'
+include HpricotTestHelper
+
+# Create a FakeRequest suitable for passing to Controller.build
+def fake_request(path="/",method='GET')
+  method = method.to_s.upcase
+  Merb::Test::FakeRequest.with(path, :request_method => method)
+end
+
+# Turn a named route into a string with the path
+def url(name, *args)
+  Merb::Router.generate(name, *args)
+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'))
+  
+  yield @request if block_given?
+  
+  @controller, @action = Merb::Dispatcher.handle @request, response
+end
+
+def get(path)
+  request("GET",path)
+end

data/lib/merb/test/hpricot.rb

@@ -0,0 +1,136 @@
+# http://yehudakatz.com/2007/01/27/a-better-assert_select-assert_elements/
+# based on assert_elements
+# Author: Yehuda Katz
+# Email:  wycats @nospam@ gmail.com
+# Web:    http://www.yehudakatz.com
+#
+# which was based on HpricotTestHelper
+# Author: Luke Redpath
+# Email: contact @nospam@ lukeredpath.co.uk
+# Web: www.lukeredpath.co.uk / opensource.agileevolved.com
+
+require 'hpricot'
+
+class Hpricot::Elem
+  def should_contain(value)
+    self.inner_text.include?(value)
+  end
+
+  def should_match(regex)
+    self.inner_text.match(regex)
+  end
+  
+  # courtesy of 'thomas' from the comments
+  # of _whys blog - get in touch if you want a better credit!
+  def inner_text
+    self.children.collect do |child|
+      child.is_a?(Hpricot::Text) ? child.content : ((child.respond_to?("inner_text") && child.inner_text) || "")
+    end.join.strip
+  end
+end
+
+module HpricotTestHelper
+  # returns the inner content of
+  # the first tag found by the css query
+  def tag(css_query)
+    process_output
+    @output.content_for(css_query)
+  end
+  
+  # returns an array of tag contents
+  # for all of the tags found by the
+  # css query
+  def tags(css_query)
+    process_output
+    @output.content_for_all(css_query)
+  end
+  
+  # returns a raw Hpricot::Elem object
+  # for the first result found by the query
+  def element(css_query)
+    process_output
+    @output[css_query].first
+  end
+  
+  # returns an array of Hpricot::Elem objects
+  # for the results found by the query
+  def elements(css_query)
+    process_output
+    Hpricot::Elements[*css_query.split(",").map(&:strip).map do |query|
+      @output[query]
+    end.flatten]
+  end
+  
+  def get_elements css_query, text
+    els = elements(css_query)
+    case text
+      when String then els.reject! {|t| !t.should_contain(text) }
+      when Regexp then els.reject! {|t| !t.should_match(text) }
+    end
+    els
+  end
+  
+  def assert_elements css_query, equality = nil, &block
+    message = equality.delete(:message) if equality.is_a?(Hash)
+
+    case equality
+      when Numeric then equality = {:count => equality}
+      when Range then equality = {:minimum => equality.to_a.first, :maximum => equality.to_a.last }
+      else equality ||= {}
+    end
+    
+    equality.merge!({:minimum => 1}) if (equality.keys & [:minimum, :maximum, :count]).empty?
+    
+    els = get_elements(css_query, equality[:text])
+
+    ret = equality.keys.include?(:minimum) ? (els.size >= equality[:minimum]) : true 
+    ret &&= (els.size <= equality[:maximum]) if equality.keys.include?(:maximum)
+    ret &&= (els.size == equality[:count]) if equality.keys.include?(:count)
+    
+    if block && !els.empty?
+      ret &&= self.dup.instance_eval do
+        @output = HpricotTestHelper::DocumentOutput.new(els.inner_html)
+        @block = true 
+        instance_eval(&block)
+      end
+    end
+    
+    if(equality[:count] != 0)
+      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.inspect }\" was not found."
+    else
+      assert ret, "#{ message } \"#{ css_query }\" with \"#{ equality.reject{|k,v| k == :count}.inspect }\" was found, but you specified :count => 0."
+    end
+    ret
+  end
+  
+  # small utility class for working with
+  # the Hpricot parser class
+  class DocumentOutput
+    def initialize(response_body)
+      @parser = Hpricot.parse(response_body)
+    end
+
+    def content_for(css_query)
+      @parser.search(css_query).first.inner_text
+    end
+
+    def content_for_all(css_query)
+      @parser.search(css_query).collect(&:inner_text)
+    end
+
+    def [](css_query)
+      @parser.search(css_query)
+    end
+  end
+  
+  protected
+    # creates a new DocumentOutput object from the response
+    # body if hasn't already been created. This is
+    # called automatically by the element and tag methods
+    def process_output
+      if !@block && (@output.nil? || (@controller.body != @response_output))
+        @output = HpricotTestHelper::DocumentOutput.new(@controller.body)
+        @response_output = @controller.body  
+      end
+    end
+end

data/lib/merb/test/{merb_multipart.rb → multipart.rb}

@@ -39,7 +39,7 @@ module Merb
         end
         
         def push_params(params)
-          params.each do |key, value|
+          params.sort_by {|k| k.to_s}.each do |key, value|
             if value.respond_to?(:read)
               @multipart_params << FileParam.new(key, value.path, value.read)
             else

data/lib/merb/test/rspec.rb

@@ -0,0 +1,93 @@
+require 'hpricot'
+require 'spec'
+module MerbRspecMatchers
+  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
+    end
+
+    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
+      @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
+
+Spec::Runner.configure do |config|
+  config.include(MerbRspecMatchers)
+end

data/lib/merb/{merb_upload_handler.rb → upload_handler.rb}

@@ -28,15 +28,14 @@ end
 class MerbUploadHandler < Mongrel::HttpHandler
 
   def initialize(options = {})
-    @path_info      = Array(options[:path_info])
-    @frequency      = options[:frequency] || 3
+    @path_match     = Regexp.new(options[:upload_path_match])
+    @frequency      = options[:upload_frequency] || 3
     @request_notify = true
-    if options[:drb]
+    if options[:start_drb]
       require 'drb'
       DRb.start_service
-      Mongrel.const_set :Uploads, DRbObject.new(nil, "druby://#{Merb::Server.host}:#{Merb::Server.drb_server_port}").upload_progress
+      Mongrel.const_set :Uploads, DRbObject.new(nil, "druby://#{options[:host]}:#{options[:drb_server_port]}").upload_progress
     else
-      require File.dirname(__FILE__)+'/merb_upload_progress'
       Mongrel.const_set :Uploads, Merb::UploadProgress.new
     end
     Mongrel::Uploads.debug = true if options[:debug]
@@ -72,7 +71,7 @@ class MerbUploadHandler < Mongrel::HttpHandler
     end
     
     def valid_upload?(params)
-      @path_info.any? { |p| params[Mongrel::Const::PATH_INFO].include?(p) } &&
+      params[Mongrel::Const::PATH_INFO].match(@path_match) &&
         [Mongrel::Const::POST, Mongrel::Const::PUT].include?(params[Mongrel::Const::REQUEST_METHOD]) &&
         Mongrel::HttpRequest.query_parse(params[Mongrel::Const::QUERY_STRING])[Mongrel::Const::UPLOAD_ID]
     end

data/lib/merb/{merb_upload_progress.rb → upload_progress.rb}

@@ -1,7 +1,7 @@
 module Merb
   # Keeps track of the status of all currently processing uploads
   class UploadProgress
-    include DRbUndumped
+    include DRbUndumped if defined?(DRbUndumped)
     attr_accessor :debug
     def initialize
       @guard    = Mutex.new