merb 0.4.0 → 0.4.1

data/README

@@ -1,7 +1,7 @@
 = Merb
-<em>Lightweight MVC Ruby app server. For high performance dynamic pages.</em>
 
-==== Dependencies
+==== FrameWork Development Dependencies
+
 Install these gems first:
 
 * mongrel
@@ -16,52 +16,45 @@ Install these gems first:
 * haml
 * markaby
 * mailfactory
-* activerecord (if you want to store sessions in a database)
+* Ruby2Ruby
 
 Then you can build the merb gem from svn trunk like so:
 
-  $ sudo gem install mongrel json json_pure erubis mime-types rspec hpricot mocha rubigen haml markaby mailfactory -y
+  $ sudo gem install mongrel json json_pure erubis mime-types rspec hpricot mocha rubigen haml markaby mailfactory Ruby2Ruby -y
   $ svn co http://svn.devjavu.com/merb/trunk merb
   $ cd merb
   $ rake install
 
 To generate a new merb app after the gem is installed:
 
-  $ merb -g myapp
-
-To run your application, simply type +merb+ in the project directory.
+  $ merb  myapp
 
-== Features 
+=== The +merb+ server
 
-=== Mongrel handler
-Merb has a Mongrel handler built in that parses incoming requests
-including multipart uploads and post as well as <tt>?query=strings</tt>. Puts the
-params into params and the cookies into cookies when it instantiates your
-controller class.
+right now you add your routes in
+the appdir/config/router.rb file. So by default it runs on port 4000
 
-=== RouteMatcher and route compiler
+	$ cd /path/to/your/merb/app
+	$ merb  
 
-Reads your route definition and compiles
-a method on the fly that will match the request path against each route and do the right thing.
+Or to start merb on a different port:
 
-=== _NEW_ RESTful Routes
+	$ merb -p 3500
 
-Note the <tt>r.resource :posts</tt> macro. That makes it possible to use a RESTful CRUD style controller for the posts resource
+To start a cluster of merb servers you specify the first port and then how many 
+servers you want spawned. SO this command will start a merb instance on ports
+3000, 3001, 3002
 
-	Merb::Router.prepare do |r|
-	  r.resources :posts
-	  r.default_routes
-	  r.add '/', :controller => 'files', :action => 'index'
-	end
+	$ merb -p 3000 -c 3
 
-The <tt>r.default_routes</tt> routes adds the standard routes:
+To start a Merb IRB console where all your models and other classes are pre loaded
+use the -i flag
 
-	/controller/action/id.xml
-	/controller/action/id
-	/controller/action.xml
-	/controller/action
-	/controller.xml  # index action
-	/controller      # index action
+	$ merb -i
+	
+To see all the available command line flags use:
+ 
+  $ merb -h	
 
 === Controllers
 
@@ -97,104 +90,6 @@ release the mutex. It’s basically like handing over the proc to mongrel and
 mongrel handles calling it in a thread safe manner.
 
 
-	class Test < Merb::Controller 
-	  def hello
-	    # params, headers and cookies are available here.
-	    @name = params[:name]
-	    render 
-	  end 
-	end
-
-You can also render partials like so:
-
-	<%= partial(:comments) %>
-
-This assumes a <tt>_comments.rhtml</tt> file in the same view dir as the current 
-controller/view.
-
-Partials compile the template ands returns a string. So you can also call
-them and assign them to a var if you want:
-
-	def someaction
-	  @one = partial(:one)
-	  @two = partial(:two)
-	end
-
-Partials can also render views from other controllers by specifying the path:
-
-	partial('/shared/foo')
-
-Merb also allows for returning JavaScript instead of html for ajax actions
-You have to use the render_js instead of normal render:
-
-	def ajax_action
-	  @posts = Post.find :all
-	  render_js
-	end
-
-	# ajax_action.jerb
-	$('comments').update('<%=js partial(:posts) %>');
-
-	# _posts.herb
-	<ul>
-	  <% @posts.each do |p| %>
-	    <li>
-	    <%= p.title %><br />
-	    <%= p.body %>
-	    </li>
-	  <% end %>
-	</ul>	
-
-The .jerb template is used for this purpose.
-
-==== RESTful Controllers
-
-RESTful controllers use a different dispatch system based on the request method verbs. Merb
-supports multi return values based on the accept header via +respond_to+.
-
-	class Posts < Merb::Controller
-	  # GET /posts
-	  # GET /posts.xml
-	  def index
-	    @posts = Post.find :all
-	    respond_to {|format|
-	      format.html { render }
-	      format.js   { render :js => :index }
-	      format.xml  { render :xml => @posts.to_xml }
-	    }
-	  end
-
-	  # GET /posts/1
-	  # GET /posts/1.xml
-	  def show
-	  end
-
-	  # GET /posts/new
-	  def new
-	  end
-
-	  # GET /posts/1;edit
-	  def edit
-	  end
-
-	  # POST /posts
-	  # POST /posts.xml
-	  def create
-	  end
-
-	  # PUT /posts/1
-	  # PUT /posts/1.xml
-	  def update
-	  end
-
-	  # DELETE /posts/1
-	  # DELETE /posts/1.xml
-	  def destroy
-	  end
-	end
-	
-Learn more about this in the controller documentation.
-
 ==== Before and after filters
 
 Use the before method in your controllers. before accepts either a symbol, string or a Proc/lambda object. If you give it a symbol it will call a method with the same name as the symbol. If you give it a proc that takes one argument it will call the proc with the current controller as that argument. You can use :only and :exclude as options to your filters to exclude or include actionsfrom certain filters. :only and :exclude take :symbols or [:sym, :sam] array of symbols.
@@ -246,51 +141,19 @@ After filters accept a symbol, string or Proc and call that proc with the contro
 
 	after Proc.new {|c| Tidy.new(c.body) }, :only => :index
 
-=== Sessions
-
-Sessions are available when you start merb with the sql_session set to true or the 
-memory_session set to true. See generated app for migration too add session table.
-
 === Helpers
 
 app/helpers/global_helper.rb will be available to all of your views.
  Helpers named after your controller plus _helper.rb will be included in the views
  for that controller only.
 
-=== The +merb+ server
-
-right now you add your routes in
-the appdir/config/router.rb file. So by default it runs on port 4000
-
-	$ cd /path/to/your/merb/app
-	$ merb  
-
-Or to start merb on a different port:
-
-	$ merb -p 3500
-
-To start a cluster of merb servers you specify the first port and then how many 
-servers you want spawned. SO this command will start a merb instance on ports
-3000, 3001, 3002
-
-	$ merb -p 3000 -c 3
-
-To start a Merb IRB console where all your models and other classes are pre loaded
-use the -i flag
-
-	$merb -i
-
 === File uploads
-This is one of the things that Merb was written for. Rails doesn't allow 
-multiple concurrent file uploads at once without blocking an entire rails backend for each file upload. Merb allows multiple file uploads at once.
 When a file is uploaded with Merb, it gets put in a Tempfile. So 
 you just want to copy it to the right place on the filesystem.
 
 	def upload
 	  puts params[:file].inspect
-  
 	  FileUtils.mv params[:file][:tempfile].path, MERB_ROOT+"/uploads/#{params[:file][:filename]}"
-
 	  render
 	end
 

data/Rakefile

@@ -14,7 +14,7 @@ require __DIR__+'/tools/annotation_extract'
 include FileUtils
 
 NAME = "merb"
-VERS = "0.4.0"
+VERS = "0.4.1"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 
 setup_clean [ "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", 'coverage', "cache"]
@@ -28,17 +28,16 @@ task :doc => [:rdoc]
 
 
 Rake::RDocTask.new do |rdoc|
-     files =['README', 'LICENSE', 'TODO', 'lib/**/*.rb']
-     rdoc.rdoc_files.add(files)
-     rdoc.main = "README" # page to start on
-     rdoc.title = "Merb Docs"
-     rdoc.template = __DIR__+"/tools/allison/allison.rb"
-     rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
-     rdoc.options << '--line-numbers' << '--inline-source'
+      files = ['README', 'LICENSE', 'CHANGELOG',
+               'lib/**/*.rb']
+      rdoc.rdoc_files.add(files)
+      rdoc.main = 'README'
+      rdoc.title = 'Merb Docs'
+      rdoc.template = `allison --path`.chomp+'.rb'
+      rdoc.rdoc_dir = 'doc/rdoc'
+      rdoc.options << '--line-numbers' << '--inline-source'
 end
 
-
-
 spec = Gem::Specification.new do |s|
   s.name = NAME
   s.version = VERS
@@ -60,7 +59,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rubigen')
   s.required_ruby_version = '>= 1.8.4'
 
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,test,lib,examples,app_generators,merb_generators,merb_default_generators,rspec_generators,test_unit_generators,script}/**/*") 
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,spec,lib,examples,app_generators,merb_generators,merb_default_generators,rspec_generators,test_unit_generators,script}/**/*") 
       
   s.require_path = "lib"
   s.bindir = "bin"
@@ -88,10 +87,8 @@ end
 desc "rdoc to rubyforge"
 task :doc_rforge do
   sh %{rake doc}
-  sh %{rake doc_webgen}
   sh %{sudo chmod -R 755 doc}
-  sh %{scp -r -p doc/site/output/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
-  sh %{scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb/rdoc}
+  sh %{/usr/bin/scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
 end
 
 desc 'Run all specs and then rcov'
@@ -140,6 +137,10 @@ task :stats do
   CodeStatistics.new(*STATS_DIRECTORIES).to_s
 end
 
+task :release => :package do
+  sh %{rubyforge add_release merb merb #{VERS} pkg/#{NAME}-#{VERS}.gem}
+end
+
 ##############################################################################
 # SVN
 ##############################################################################

data/app_generators/merb/merb_generator.rb

@@ -26,7 +26,8 @@ class MerbGenerator < RubiGen::Base
       m.file_copy_each %w( Rakefile )
       m.file_copy_each %w( application.rb exceptions.rb ), "app/controllers"
       m.file_copy_each %w( global_helper.rb ), "app/helpers"
-      m.file_copy_each %w( application.erb ), "app/mailers/views/layout"
+      m.file_copy_each %w( application.html.erb ), "app/parts/views/layout"      
+      m.file_copy_each %w( application.html.erb application.text.erb ), "app/mailers/views/layout"
       m.file_copy_each %w( application.html.erb ), "app/views/layout"
       m.file_copy_each %w( internal_server_error.html.erb not_found.html.erb not_acceptable.html.erb ), "app/views/exceptions"
       m.file_copy_each %w( merb.jpg ), "public/images"
@@ -86,9 +87,9 @@ EOS
       app/models
       app/helpers
       app/mailers/helpers
-      app/mailers/views
       app/mailers/views/layout
-      app/parts
+      app/parts/helpers
+      app/parts/views/layout
       app/views/layout
       app/views/exceptions
       config/environments

data/app_generators/merb/templates/Rakefile

@@ -7,12 +7,7 @@ require 'rubygems'
 
 MERB_ENV = ENV['MERB_ENV'] if ENV['MERB_ENV']
 
-if File.directory?( File.join(File.dirname(__FILE__), "framework"))
-  $:.unshift('framework')
-  require File.join(File.dirname(__FILE__), "framework/merb")
-else  
-  require 'merb'
-end
+require File.dirname(__FILE__)+'/config/boot.rb'
 require MERB_FRAMEWORK_ROOT+'/tasks'
 MERB_ROOT = File.dirname(__FILE__)
 include FileUtils

data/app_generators/merb/templates/app/mailers/views/layout/application.text.erb

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

data/app_generators/merb/templates/app/parts/views/layout/application.html.erb

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

data/app_generators/merb/templates/app/views/layout/application.html.erb

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
   <head>
     <title>Fresh Merb App</title>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8">
   </head>
   <body>

data/app_generators/merb/templates/config/dependencies.rb

@@ -28,7 +28,7 @@ use_test :rspec
 
 # These are some examples of how you might specify dependencies.
 # 
-# dependencies "RedCloth", "merb-form-helpers"
+# dependencies "RedCloth", "merb_helpers"
 # OR
 # dependency "RedCloth", "> 3.0"
 # OR

data/app_generators/merb/templates/config/router.rb

@@ -24,7 +24,10 @@ Merb::Router.prepare do |r|
   # RESTful routes
   # r.resources :posts
 
-  # Default route, usually you don't want to change this
+  # This is the default route for /:controller/:action/:id
+  # This is fine for most cases.  If you're heavily using resource-based
+  # routes, you may want to comment/remove this line to prevent
+  # clients from calling your create or destroy actions with a GET
   r.default_routes
   
   # Change this for your home page to be available at /

data/app_generators/merb/templates/spec/spec_helper.rb

@@ -1,7 +1,6 @@
-require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-
+MERB_ENV="test"
 $TESTING=true
-
+require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
 require File.join(MERB_ROOT, 'config', 'merb_init')
 
 require 'merb/test/helper'

data/lib/autotest/merb_rspec.rb

@@ -23,6 +23,7 @@
 ### SOFTWARE.
 
 require 'autotest/rspec'
+require 'merb/core_ext/inflector'
 
 class Autotest::MerbRspec < Autotest::Rspec
 

data/lib/merb/abstract_controller.rb

@@ -8,7 +8,17 @@ module Merb
     class_inheritable_accessor :action_argument_list    
     self.action_argument_list = Hash.new([])
     
-    
+    cattr_accessor :_abstract_subclasses
+    cattr_accessor :_template_path_cache
+    self._abstract_subclasses = []
+    self._template_path_cache
+    
+    class << self
+      def inherited(klass)
+        _abstract_subclasses << klass.to_s unless _abstract_subclasses.include?(klass.to_s)
+        super
+      end
+    end    
     
     # Holds internal execution times. Prefaced with an underscore to not 
     # conflict with user-defined controller instance variables.
@@ -46,6 +56,25 @@ module Merb
       @_benchmarks[:after_filters_time] = Time.now - start if after_filters
     end
     
+    
+    # Adds a path to the template path cache.  This is requried for 
+    # any view templates or layouts to be found during renering.
+    #
+    # Example
+    # 
+    # Merb::AbstractController.add_path_to_template_cache('/full/path/to/template.html.erb')
+    def self.add_path_to_template_cache(template)
+      arry = template.split("/").last.split(".")
+      return false if template == "" || arry.size != 3
+      key = template.split(".")[0..-2].join(".")
+      self._template_path_cache[key] = template
+    end
+    
+    # Resets the template_path_cache to an empty hash
+    def self.reset_template_path_cache!
+      self._template_path_cache = {}
+    end
+    
   protected
     
     def call_action(action)
@@ -209,7 +238,7 @@ module Merb
     
 
     def content_type
-      params[:format]
+      params[:format] || :html
     end
   end  
   

data/lib/merb/controller.rb

@@ -7,22 +7,22 @@ module Merb
   # to your controller via params. It also parses the ?query=string and
   # puts that into params as well.
   class Controller < AbstractController
+    class_inheritable_accessor :_session_id_key, :_session_expiry
     cattr_accessor :_subclasses
     self._subclasses = []
     
-    class_inheritable_accessor :_session_id_key, :_session_expiry
-    self._session_id_key = :_session_id
+    self._session_id_key = '_session_id'
     self._session_expiry = Time.now + Merb::Const::WEEK * 2
 
     include Merb::ControllerMixin
     include Merb::ResponderMixin
     include Merb::ControllerExceptions
-    
+        
     class << self
       def inherited(klass)
-        _subclasses << klass.to_s
+        _subclasses << klass.to_s unless _subclasses.include?(klass.to_s)
         super
-      end
+      end      
       
       def callable_actions
         @callable_actions ||= begin

data/lib/merb/core_ext/get_args.rb

@@ -25,7 +25,9 @@ begin
     def get_args
       arg_node = deep_array_node(:args)
       args = arg_node.arg_nodes
-      lasgns = arg_node.deep_array_node(:block)[1..-1]
+      default_node = arg_node.deep_array_node(:block)
+      return args unless default_node
+      lasgns = default_node[1..-1]
       lasgns.each do |asgn|
         args.assoc(asgn[1]) << eval(RubyToRuby.new.process(asgn[2]))
       end
@@ -37,6 +39,8 @@ begin
   module GetArgs
     def get_args
       klass, meth = self.to_s.split(/ /).to_a[1][0..-2].split("#")
+      # Remove stupidity for #<Method: Class(Object)#foo>
+      klass = $` if klass =~ /\(/
       ParseTreeArray.translate(Object.const_get(klass), meth).get_args
     end
   end

data/lib/merb/exceptions.rb

@@ -92,10 +92,27 @@ module Merb
   #   restricted to administrators.</p>
   #
   module ControllerExceptions
+    
+    # Mapping of status code names to their numeric value.
+    STATUS_CODES = {}
+    
     class Base < StandardError
       def name
         self.class.to_s.snake_case.split('::').last
       end
+      
+      #
+      # Registers any subclasses with status codes for easy lookup by
+      # set_status in Merb::Controller.
+      #
+      # Inheritance ensures this method gets inherited by any subclasses, so
+      # it goes all the way down the chain of inheritance.
+      #
+      def self.inherited(subclass)
+        if subclass.const_defined?(:STATUS)
+          STATUS_CODES[subclass.name.snake_case.to_sym] = subclass.const_get(:STATUS)
+        end
+      end
     end
     
     class Informational                 < Merb::ControllerExceptions::Base; end

data/lib/merb/generators/merb_app/merb_app.rb

@@ -9,7 +9,10 @@ module Merb
       require 'rubigen'
 
       require 'rubigen/scripts/generate'
-      RubiGen::Base.use_application_sources!
+      source = RubiGen::PathSource.new(:application, 
+        File.join(File.dirname(__FILE__), "../../../../app_generators"))
+      RubiGen::Base.reset_sources
+      RubiGen::Base.append_sources source
       RubiGen::Scripts::Generate.new.run([path], :generator => 'merb', :backtrace => true)
     end  
 

data/lib/merb/generators/merb_plugin.rb

@@ -9,7 +9,10 @@ module Merb
       require 'rubigen'
 
       require 'rubigen/scripts/generate'
-      RubiGen::Base.use_application_sources!
+      source = RubiGen::PathSource.new(:application, 
+        File.join(File.dirname(__FILE__), "../../../app_generators"))
+      RubiGen::Base.reset_sources
+      RubiGen::Base.append_sources source
       RubiGen::Scripts::Generate.new.run([path], :generator => 'merb_plugin', :backtrace => true)
     end  
 

data/lib/merb/logger.rb

@@ -30,7 +30,11 @@ module Merb
     end
 
     def flush
-      @log.write @buffer.slice!(0..-1).to_s unless  @buffer.size == 0
+      if @log.respond_to?(:write_nonblock)
+        @log.write_nonblock @buffer.slice!(0..-1).to_s unless @buffer.size == 0
+      else
+        @log.write @buffer.slice!(0..-1).to_s unless @buffer.size == 0
+      end
     end
 
     def close

data/lib/merb/mail_controller.rb

@@ -66,7 +66,7 @@ module Merb
   
   class MailController < AbstractController
    
-    self._template_root = File.expand_path(self._template_root / "../app/mailers/views")
+    self._template_root = File.expand_path(self._template_root / "../mailers/views")
     class_inheritable_accessor :_mailer_klass
     self._mailer_klass  = Merb::Mailer
     

data/lib/merb/mailer.rb

@@ -20,7 +20,7 @@ module Merb
   #     :port=>'25',              
   #     :user=>'user',
   #     :pass=>'pass',
-  #     :auth=>:plain # :plain, :login, or :cram_md5, default :plain
+  #     :auth=>:plain # :plain, :login, :cram_md5, the default is no auth
   #   }
   # 
  	#   or 
@@ -52,7 +52,7 @@ module Merb
     # :plain, :login, or :cram_md5
     def net_smtp
       Net::SMTP.start(config[:host], config[:port].to_i, config[:domain], 
-                      config[:user], config[:pass], (config[:auth].to_sym||:plain)) { |smtp|
+                      config[:user], config[:pass], config[:auth]) { |smtp|
         smtp.send_message(@mail.to_s, @mail.from.first, @mail.to)
       }
     end

data/lib/merb/mixins/controller.rb

@@ -62,7 +62,7 @@ module Merb
         route_name = nil
       end
       
-      url = if new_params.respond_to?(:keys) &&
+      url = if new_params.respond_to?(:keys) && route_name.nil? &&
         !(new_params.keys & [:controller, :action, :id]).empty?
           url_from_default_route(new_params)
         elsif route_name.nil? && !route.regexp?
@@ -81,6 +81,10 @@ module Merb
     end
 
     def url_from_route(symbol, new_params = {})
+      if new_params.respond_to?(:new_record?) && new_params.new_record?
+        symbol = "#{symbol}".singularize.to_sym
+        new_params = {}
+      end
       route = symbol.is_a?(Symbol) ? Merb::Router.named_routes[symbol] : symbol
       raise "URL could not be constructed. Route symbol not found: #{symbol.inspect}" unless route
       path = route.generate(new_params, params)