merb 0.4.0 → 0.4.1

data/lib/merb/mixins/render.rb

@@ -7,10 +7,14 @@ module Merb
     def self.included(base)
       base.class_eval {        
         class_inheritable_accessor :_template_root,
-                                   :_layout
+                                   :_layout,
+                                   :_templates,
+                                   :_cached_partials
                                     
         self._layout = :application
         self._template_root = File.expand_path(MERB_VIEW_ROOT)
+        self._templates = {}
+        self._cached_partials = {}
         
         attr_accessor :template        
       }
@@ -150,18 +154,6 @@ module Merb
       when status = opts[:nothing]
         return render_nothing(status)
         
-      when partial = opts[:partial]
-        opts[:format] ||= :html
-        template = find_partial(partial, opts)
-        opts[:layout] = :none
-        
-        # Add an instance variable that can be used to create the locals in the
-        # partial
-        if opts[:locals]
-          @_merb_partial_locals = opts[:locals]
-        end
-        opts[:clean_context] = true
-        
       when opts[:inline]
         text = opts.delete(:inline)
         return render_inline(text, opts)
@@ -264,6 +256,10 @@ module Merb
     end
 
     def set_status(status)
+      if status.kind_of?(Symbol)
+        status  = Merb::ControllerExceptions::RESPONSE_CODES(status)
+        status || raise("Can't find a response code with that name")
+      end
       @_status = status
     end
 
@@ -280,11 +276,22 @@ module Merb
     # you can render partials in other view directories. So
     # if you create a views/shared directory then you can call
     # partials that live there like partial('shared/foo')
-    def partial(template, locals={})
-      options = {:partial => template, :locals => locals}
-      options.merge!(:format => @_template_format) if @_template_format
-      render options
-    end 
+    def partial(template, opts={})
+      choose_template_format(Merb.available_mime_types, {}) unless @_template_format
+      template = _cached_partials["#{template}.#{@_template_format}"] ||= find_partial(template)
+      unless template
+        raise TemplateNotFound, "No template matched at #{unmatched}"
+      end
+      
+      opts[:as] ||= template[(template.rindex('/_') + 2)..-1].split('.').first
+
+      if opts[:with] # Render a collection or an object
+       partial_for_collection(template, opts[:with], opts)
+      else # Just render a partial
+       engine = Template.engine_for(template)
+       render_partial(template, engine, opts || {})
+      end
+    end
 
     # +catch_content+ catches the thrown content from another template
     # So when you throw_content(:foo) {...} you can catch_content :foo
@@ -294,6 +301,32 @@ module Merb
     end
     
     private
+
+      def render_partial(template, engine, locals={})
+       @_merb_partial_locals = locals
+       options = {
+         :file => template,
+         :view_context => clean_view_context(engine),
+         :opts => { :locals => locals }
+       }
+       engine.transform(options)
+      end
+
+      def partial_for_collection(template, collection, opts={})
+       # Delete the internal keys, so that everything else is considered
+       # a local declaration in the partial
+       local_name = opts.delete(:as)
+       opts.delete(:with)
+
+       engine = Template.engine_for(template)
+
+       ret = ''
+       [ collection ].flatten.each do |object|
+         opts.merge!({local_name.to_sym => object})
+         ret << render_partial(template, engine, opts)
+       end
+       ret
+      end
     
       # this returns a ViewContext object populated with all
       # the instance variables in your controller. This is used
@@ -364,21 +397,19 @@ module Merb
         glob_template(path, opts)
       end
 
-      # This method will return a matching template at the specified path, first using the
-      # template_name.format.engine convention and if that fails, it falls back to the old
-      # style extensions (herb, jerb etc)
+      # This method will return a matching template at the specified path, using the
+      # template_name.format.engine convention
       def glob_template(path, opts = {})
-        extensions = Template::EXTENSIONS.keys
-        glob = "#{path}.#{@_template_format}.{#{opts[:ext] || extensions.join(",")}}"
-        Dir[glob].first || (@_merb_unmatched = glob; nil)
+        the_template = "#{path}.#{@_template_format}"
+        Merb::AbstractController._template_path_cache[the_template] || (@_merb_unmatched = (the_template + ".*"); nil)
       end
       
       # Chooses the format of the template based on the params hash or the explicit 
       # request of the developer.
       def choose_template_format(types, opts)
         opts[:format] ||= content_type
-        @_template_format = [(opts.keys & types.keys)].flatten.first # Check for render :js => etc
-        @_template_format ||= opts[:format] || :html                                           
+        @_template_format = (opts.keys & types.keys).first # Check for render :js => etc
+        @_template_format ||= opts[:format]                                         
         @_format_value = opts[@_template_format] || opts[:format] # get the value of the option if something
                                               # like :js was used
                                               
@@ -387,7 +418,6 @@ module Merb
           @_template_format = @_template_format.to_sym
           @_format_value = @_format_value.to_sym
         end
-        
         @_template_format
       end
 

data/lib/merb/part_controller.rb

@@ -1,6 +1,6 @@
 module Merb
   class PartController < AbstractController
-    self._template_root = File.expand_path(self._template_root / "../app/parts/views")
+    self._template_root = File.expand_path(self._template_root / "../parts/views")
     include Merb::WebControllerMixin
     
     def initialize(web_controller)

data/lib/merb/request.rb

@@ -254,7 +254,7 @@ module Merb
     end
 
     def accept
-      @env['HTTP_ACCEPT']
+      @env['HTTP_ACCEPT'].blank? ? "*/*" : @env['HTTP_ACCEPT']
     end
 
     def connection
@@ -316,7 +316,7 @@ module Merb
       def query_parse(qs, d = '&;')
         (qs||'').split(/[#{d}] */n).inject({}) { |h,p| 
           normalize_params(h, *Mongrel::HttpRequest.unescape(p).split('=',2))
-        }
+        }.to_mash
       end
     
       NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze

data/lib/merb/server.rb

@@ -261,20 +261,47 @@ module Merb
       end
       
       def load_action_arguments(klasses = Merb::Controller._subclasses)
-        klasses.each do |controller|
-          controller = Object.full_const_get(controller)
-          controller.action_argument_list = {}
-          controller.callable_actions.each do |action, bool|
-            controller.action_argument_list[action.to_sym] = ParseTreeArray.translate(controller, action).get_args
+        begin
+          klasses.each do |controller|
+            controller = Object.full_const_get(controller)
+            controller.action_argument_list = {}
+            controller.callable_actions.each do |action, bool|
+              controller.action_argument_list[action.to_sym] = ParseTreeArray.translate(controller, action).get_args
+            end
           end
+        rescue
+          klasses.each { |controller| controller.action_arguments = {} }
         end if defined?(ParseTreeArray)
       end
       
+      def load_controller_template_path_cache
+        
+        # This gets all templates set in the controllers template roots
+        template_paths = Merb::AbstractController._abstract_subclasses.map do |klass| 
+          Object.full_const_get(klass)._template_root
+        end.uniq.map do |path| 
+          Dir["#{path}/**/*"] 
+        end
+        
+        # This gets the templates that might be created outside controllers
+        # template roots.  eg app/views/shared/*
+        template_paths << Dir["#{MERB_ROOT}/app/views/**/*"]
+        
+        template_paths = template_paths.flatten.compact.uniq
+        
+        Merb::AbstractController.reset_template_path_cache!
+
+        template_paths.each do |template|
+          Merb::AbstractController.add_path_to_template_cache(template)
+        end
+      end
+      
       def load_application
         MERB_PATHS.each do |glob|
           Dir[MERB_ROOT + glob].each { |m| require m }
         end
         load_action_arguments
+        load_controller_template_path_cache
         @app_loaded = true
         (@after_app_blocks || []).each { |b| b.call }
       end
@@ -319,6 +346,7 @@ module Merb
               load(file)
               loaded_classes = Merb::Controller._subclasses - old_subclasses
               load_action_arguments(loaded_classes)
+              load_controller_template_path_cache
             rescue Exception => e
               puts "Error reloading file #{file}: #{e}"
               MERB_LOGGER.warn "  Error: #{e}"

data/lib/merb/template/erubis.rb

@@ -35,7 +35,7 @@ module Merb # :nodoc:
         
         # Creates a new Erubis object to parse the template given in +path+.
         def new_eruby_obj(path)
-          if @@erbs[path] && !cache_template?(path)
+          if @@erbs[path] && MERB_ENV == 'production' 
             return @@erbs[path]
           else  
             begin

data/lib/merb.rb

@@ -1,10 +1,20 @@
 require 'rubygems'
 if ENV['SWIFT']
- require 'swiftcore/swiftiplied_mongrel'
- puts "Using Swiftiplied Mongrel"
+  begin
+    require 'swiftcore/swiftiplied_mongrel'
+    puts "Using Swiftiplied Mongrel"
+  rescue LoadError
+    require 'mongrel'
+	puts "SWIFT variable set but not installed - falling back to normal Mongrel"
+  end
 elsif ENV['EVENT']
-  require 'swiftcore/evented_mongrel' 
-  puts "Using Evented Mongrel"
+  begin
+    require 'swiftcore/evented_mongrel' 
+    puts "Using Evented Mongrel"
+  rescue LoadError
+    require 'mongrel'
+	puts "EVENT variable set but swiftiply not installed - falling back to normal Mongrel"
+  end
 else
  require 'mongrel'
 end
@@ -23,7 +33,7 @@ autoload :MerbUploadHandler, 'merb/upload_handler'
 autoload :MerbHandler, 'merb/mongrel_handler'
 
 module Merb
-  VERSION='0.4.0' unless defined?(::Merb::VERSION)
+  VERSION='0.4.1' unless defined?(::Merb::VERSION)
   autoload :Authentication, 'merb/mixins/basic_authentication'
   autoload :ControllerMixin, 'merb/mixins/controller'
   autoload :ErubisCaptureMixin, 'merb/mixins/erubis_capture'

data/merb_generators/resource/resource_generator.rb

@@ -16,8 +16,15 @@ class ResourceGenerator < RubiGen::Base
 
   def manifest
     record do |m|
-      m.dependency "model", provided_args.dup, options.dup
-      m.dependency "resource_controller", provided_args.dup, options.dup
+      #singularize the model & pluralize the name of the controller
+      model_args = provided_args.dup
+      controller_args = provided_args.dup
+      
+      model_args[0] = model_args.first.singularize
+      controller_args[0] = controller_args.first.pluralize
+      
+      m.dependency "model", model_args, options.dup
+      m.dependency "resource_controller", controller_args, options.dup
     end
   end
 

data/spec/fixtures/config/merb.yml

@@ -0,0 +1,18 @@
+---
+:host: 127.0.0.1
+:port: "4000"
+#:path_prefix: "/my_app"
+
+### Test Erb in config
+:environment: <%= "test" if true %>
+
+:session_store: memory
+#:config: config/upload.conf
+#:cache_templates: true
+#:drb_server_port: 32323
+#:basic_auth: 
+#  :username: ezra
+#  :password: test
+#  :domain: localhost
+#:daemonize: true
+#:cluster: 3

data/spec/fixtures/controllers/dispatch_spec_controllers.rb

@@ -0,0 +1,227 @@
+class Foo < Merb::Controller
+
+  def index
+    "index"
+  end
+  
+  def bar
+    "bar"
+  end
+  
+  def error
+    raise AdminAccessRequired
+    "Hello World!"
+  end
+  
+  def raise404
+    raise NotFound
+  end
+end
+
+class Bar < Merb::Controller
+  
+  def foo(id)
+    id
+  end
+  
+  def bar(a, b = "2")
+    "#{a} #{b}"
+  end
+  
+  def baz(a, b = "2", c = "3")
+    "#{a} #{b} #{c}"
+  end
+  
+end
+
+class Baz < Merb::Controller
+  
+  def index
+  end
+  
+end
+
+class Bat < Merb::Controller
+end
+
+class AdminAccessRequired < Merb::ControllerExceptions::Unauthorized; end
+
+class Exceptions < Merb::Controller
+  def admin_access_required
+    "oh no!"
+  end
+end
+
+class Posts < Merb::Controller
+  # GET /posts
+  # GET /posts.xml
+  def index() :index end
+  # GET /posts/1
+  # GET /posts/1.xml
+  def show() :show end
+  # GET /posts/new
+  def new() :new end
+  # GET /posts/1;edit
+  def edit() :edit end
+  # POST /posts
+  # POST /posts.xml
+  def create() :create end
+  # PUT /posts/1
+  # PUT /posts/1.xml
+  def update() :update end
+  # DELETE /posts/1
+  # DELETE /posts/1.xml
+  def destroy() :destroy end
+  # GET /posts/1;stats
+  # PUT /posts/1;stats
+  def stats() :stats end  
+  # GET /posts;filter  
+  def filter() :filter end  
+end
+
+class As < Merb::Controller
+  # GET /as
+  # GET /as.xml
+  def index() :index end
+  # GET /as/1
+  # GET /as/1.xml
+  def show() :show end
+  # GET /as/new
+  def new() :new end
+  # GET /as/1;edit
+  def edit() :edit end
+  # POST /as
+  # POST /as.xml
+  def create() :create end
+  # PUT /as/1
+  # PUT /as/1.xml
+  def update() :update end
+  # DELETE /as/1
+  # DELETE /as/1.xml
+  def destroy() :destroy end 
+end
+
+class Bs < Merb::Controller
+  # GET /as/1/bs
+  # GET /as/1/bs.xml
+  def index() :index end
+  # GET /as/1/bs/1
+  # GET /as/1/bs/1.xml
+  def show() :show end
+  # GET /as/1/bs/new
+  def new() :new end
+  # GET /as/1/bs/1;edit
+  def edit() :edit end
+  # POST /as/1/bs
+  # POST /as/1/bs.xml
+  def create() :create end
+  # PUT /as/1/bs/1
+  # PUT /as/1/bs/1.xml
+  def update() :update end
+  # DELETE /as/1/bs/1
+  # DELETE /as/1/bs/1.xml
+  def destroy() :destroy end 
+end
+
+class Cs < Merb::Controller
+  # GET /as/1/bs/1/cs
+  # GET /as/1/bs/1/cs.xml
+  def index() :index end
+  # GET /as/1/bs/1/cs/1
+  # GET /as/1/bs/1/cs/1.xml
+  def show() :show end
+  # GET /as/1/bs/1/cs/new
+  def new() :new end
+  # GET /as/1/bs/1/cs/1;edit
+  def edit() :edit end
+  # POST /as/1/bs/1/cs
+  # POST /as/1/bs/1/cs.xml
+  def create() :create end
+  # PUT /as/1/bs/1/cs/1
+  # PUT /as/1/bs/1/cs/1.xml
+  def update() :update end
+  # DELETE /as/1/bs/1/cs/1
+  # DELETE /as/1/bs/1/cs/1.xml
+  def destroy() :destroy end 
+end
+
+class Tags < Merb::Controller
+  # GET /tags
+  # GET /tags.xml
+  def index() :index end
+  # GET /tags/1
+  # GET /tags/1.xml
+  def show() :show end
+  # GET /tags/new
+  def new() :new end
+  # GET /tags/1;edit
+  def edit() :edit end
+  # POST /tags
+  # POST /tags.xml
+  def create() :create end
+  # PUT /tags/1
+  # PUT /tags/1.xml
+  def update() :update end
+  # DELETE /tags/1
+  # DELETE /tags/1.xml
+  def destroy() :destroy end
+  # GET /tags/1;stats
+  # PUT /tags/1;stats
+  def stats() :stats end  
+  # GET /tags;filter  
+  def filter() :filter end  
+end
+
+class Comments < Merb::Controller
+  # GET /comments
+  # GET /comments.xml
+  def index() :index end
+  # GET /comments/1
+  # GET /comments/1.xml
+  def show() :show end
+  # GET /comments/new
+  def new() :new end
+  # GET /comments/1;edit
+  def edit() :edit end
+  # POST /comments
+  # POST /comments.xml
+  def create() :create end
+  # PUT /comments/1
+  # PUT /comments/1.xml
+  def update() :update end
+  # DELETE /comments/1
+  # DELETE /comments/1.xml
+  def destroy() :destroy end
+  # GET /comments/1;stats
+  # PUT /comments/1;stats
+  def stats() :stats end  
+end
+
+class Icon < Merb::Controller
+  # GET /icon
+  # GET /icon.xml
+  def show() :show end
+  # GET /icon/new
+  def new() :new end
+  # GET /icon;edit
+  def edit() :edit end
+  # POST /icon
+  # POST /icon.xml
+  def create() :create end
+  # PUT /icon7
+  # PUT /icon.xml
+  def update() :update end
+  # DELETE /icon
+  # DELETE /icon.xml
+  def destroy() :destroy end
+  # GET /icon;stats
+  # PUT /icon;stats
+  def stats() :stats end
+end  
+
+class Profile < Merb::Controller
+  def show() :show end
+end
+
+# If this throws an error, it's because parameterized args are somehow borked
+Merb::Server.load_application

data/spec/fixtures/controllers/render_spec_controllers.rb

@@ -0,0 +1,115 @@
+SPEC_VIEW_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', 'views'))
+
+module Merb
+  class Controller
+    self._template_root = SPEC_VIEW_ROOT
+  end
+  class ControllerExceptions::Base
+    def self._template_root; SPEC_VIEW_ROOT; end
+  end
+end
+
+# Fake class so we can render subdirectories of views
+class Examples < Merb::Controller
+
+end
+
+module Nested
+  class Example < Merb::Controller
+  end
+end
+
+class FakeModel
+  
+  def to_json
+    "{'foo':'bar'}"
+  end
+  
+  def to_xml
+    "<foo>bar</foo>"
+  end
+end
+
+class RenderObjectController < Merb::Controller
+  
+  
+  def render_object
+    provides :xml,:json
+    @foo = FakeModel.new
+    render @foo
+  end
+  
+  def render_object_with_template
+    provides :xml, :js
+    @foo = FakeModel.new
+    render @foo
+  end
+    
+end
+
+class ExtensionTemplateController < Merb::Controller
+  provides :js, :xml
+  def erubis_templates
+    render
+  end
+
+  def haml_templates
+    render
+  end
+
+  def markaby_templates
+    render
+  end
+
+  def old_style_erubis
+    render
+  end
+
+  def old_style_erubis2
+    render
+  end
+
+  def old_style_erubis3
+    render
+  end
+
+  def old_style_haml
+    render
+  end
+
+  def old_style_markaby
+    render
+  end
+
+  def old_style_builder
+    render
+  end
+
+  def index
+    render
+  end
+
+  def haml_index
+    render
+  end
+
+  def markaby_index
+    render
+  end
+  
+  def render_nested_js
+    render :format => :js
+  end
+  
+  def render_nested_xml
+    render :format => :xml
+  end
+  
+  def render_multiple_partials
+    render
+  end
+
+end
+
+Merb::Server.load_action_arguments
+Merb::Server.load_controller_template_path_cache

data/spec/fixtures/foo.rb

@@ -0,0 +1,3 @@
+class Foo
+  attr_accessor :bar
+end  

data/spec/fixtures/mailers/views/layout/application.html.erb

@@ -0,0 +1,3 @@
+BASIC
+<%= catch_content :layout %>
+LAYOUT

data/spec/fixtures/mailers/views/layout/application.text.erb

@@ -0,0 +1,3 @@
+TEXT
+<%= catch_content :layout %>
+ENDTEXT

data/spec/fixtures/mailers/views/test_mail_controller/eighth.html.erb

@@ -0,0 +1 @@
+<%= @testing %>

data/spec/fixtures/mailers/views/test_mail_controller/eighth.text.erb

@@ -0,0 +1 @@
+<%= @testing %>

data/spec/fixtures/mailers/views/test_mail_controller/first.html.erb

@@ -0,0 +1 @@
+FIRST

data/spec/fixtures/mailers/views/test_mail_controller/first.text.erb

@@ -0,0 +1 @@
+FIRST

data/spec/fixtures/mailers/views/test_mail_controller/ninth.html.erb

@@ -0,0 +1 @@
+<%= params[:x] %>

data/spec/fixtures/mailers/views/test_mail_controller/ninth.text.erb

@@ -0,0 +1 @@
+<%= params[:x] %>

data/spec/fixtures/mailers/views/test_mail_controller/second.text.erb

@@ -0,0 +1 @@
+SECOND

data/spec/fixtures/mailers/views/test_mail_controller/third.html.erb

@@ -0,0 +1 @@
+THIRDHTML