merb 0.3.7 → 0.4.0

data/README

@@ -5,15 +5,22 @@
 Install these gems first:
 
 * mongrel
-* erubis
 * json
+* json_pure
+* erubis
 * mime-types
-* archive-tar-minitar
 * rspec
+* hpricot
+* mocha
+* rubigen
+* haml
+* markaby
+* mailfactory
+* activerecord (if you want to store sessions in a database)
 
 Then you can build the merb gem from svn trunk like so:
 
-  $ sudo gem install mongrel erubis json mime-types archive-tar-minitar rspec --include-dependencies
+  $ sudo gem install mongrel json json_pure erubis mime-types rspec hpricot mocha rubigen haml markaby mailfactory -y
   $ svn co http://svn.devjavu.com/merb/trunk merb
   $ cd merb
   $ rake install
@@ -61,8 +68,8 @@ The <tt>r.default_routes</tt> routes adds the standard routes:
 Classes with built in render method and template handling
 with instance vars available in the views automatically. Merb also supports 
 layouts. It will look for a layout named after your controller class first and
-then fall back to application.herb if no layout exists named after your controller.
-You can use render <tt>:layout => :none</tt>.
+then fall back to application.html.erb if no layout exists named after your
+controller. You can use render <tt>:layout => :none</tt>.
 
 Merb does not automatically render for you in your controller actions, you have
 to call render yourself. I consider this a big advantage over the way rails does 
@@ -246,14 +253,14 @@ memory_session set to true. See generated app for migration too add session tabl
 
 === Helpers
 
-dist/app/helpers/global_helper.rb will be available to all of your views.
+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/dist/conf/router.rb file. So by default it runs on port 4000
+the appdir/config/router.rb file. So by default it runs on port 4000
 
 	$ cd /path/to/your/merb/app
 	$ merb  
@@ -298,29 +305,21 @@ A file upload will have a hash of params like this:
 
 == Merb app layout
 
-A Merb app contains everything it needs to run in production in the 
-MERB_ROOT/dist directory. So for deployment you only need to deploy the dist dir. This
-keeps your test code and development plugins separate from your main app and lets you
-not deploy them to the live server. You deal with two things with this setup, MERB_ROOT
-and DIST_ROOT. MERB_ROOT is the root of the whole tree. And DISTROOT is MERB_ROOT+/dist
-You will cd into MERB_ROOT to run the merb command line. ANd when you deploy live you
-will put the dist dir into another empty MERB_ROOT on the production server.
-
 	merb_app:
+
+	  app
+	    controllers
+	    models
+	    views
+	    parts
+	    mailers
+	  config
+	  lib
+	  public
+	  schema
 	  Rakefile
-	  README
 	  scripts
 	  test
 	    spec
 	    unit
 	  plugins
-	  dist
-	    app
-	      controllers
-	      models
-	      views
-	    conf
-	    lib
-	    public
-	    plugins
-	    schema

data/Rakefile

@@ -13,13 +13,11 @@ require __DIR__+'/tools/rakehelp'
 require __DIR__+'/tools/annotation_extract'
 include FileUtils
 
-
 NAME = "merb"
-VERS = "0.3.7"
+VERS = "0.4.0"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 
-setup_clean [ "pkg", "lib/*.bundle", "*.gem", 
-            "doc", ".config", "examples/sample_app/dist/public/files/**/*", 'examples/sample_app/log/*', 'coverage']
+setup_clean [ "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", 'coverage', "cache"]
 
 
 desc "Packages up Merb."
@@ -35,7 +33,7 @@ Rake::RDocTask.new do |rdoc|
      rdoc.main = "README" # page to start on
      rdoc.title = "Merb Docs"
      rdoc.template = __DIR__+"/tools/allison/allison.rb"
-     rdoc.rdoc_dir = 'doc' # rdoc output folder
+     rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
      rdoc.options << '--line-numbers' << '--inline-source'
 end
 
@@ -58,11 +56,11 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('mongrel')
   s.add_dependency('erubis')
-  s.add_dependency('json')
   s.add_dependency('mime-types')
+  s.add_dependency('rubigen')
   s.required_ruby_version = '>= 1.8.4'
 
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,test,lib,examples}/**/*") 
+  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.require_path = "lib"
   s.bindir = "bin"
@@ -75,64 +73,56 @@ end
 
 task :install do
   sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
 end
 
 task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
+desc "run webgen"
+task :doc_webgen do
+  sh %{cd doc/site ; webgen}
+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/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
-end
-
-desc 'Run unit tests'
-Rake::TestTask.new('test_unit') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/unit/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run functional tests'
-Rake::TestTask.new('test_functional') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/functional/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests'
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  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}
 end
 
-desc 'Run all tests, specs and finish with rcov'
+desc 'Run all specs and then rcov'
 task :aok do
   sh %{rake specs;rake rcov}
 end
 
 desc "Run all specs"
 Spec::Rake::SpecTask.new('specs') do |t|
-  t.spec_opts = ["--format", "specdoc"]
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+end
+
+desc "Run a specific spec with TASK=xxxx"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
   t.libs = ['lib', 'server/lib' ]
-  t.spec_files = Dir['specs/**/*_spec.rb'].sort
+  t.spec_files = ["spec/merb/#{ENV['TASK']}_spec.rb"]
 end
 
 desc "Run all specs output html"
 Spec::Rake::SpecTask.new('specs_html') do |t|
   t.spec_opts = ["--format", "html"]
   t.libs = ['lib', 'server/lib' ]
-  t.spec_files = Dir['specs/**/*_spec.rb'].sort
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
 end
 
 desc "RCov"
 Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_opts = ["--format", "specdoc"]
-  t.spec_files = Dir['specs/**/*_spec.rb'].sort
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
   t.libs = ['lib', 'server/lib' ]
   t.rcov = true
 end
@@ -158,3 +148,25 @@ desc "Add new files to subversion"
 task :svn_add do
    system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
 end
+
+
+# Run specific tests or test files
+# 
+# Based on a technique popularized by Geoffrey Grosenbach
+rule "" do |t|
+  spec_cmd = (RUBY_PLATFORM =~ /java/) ? 'jruby -S spec' : 'spec'
+  # spec:spec_file:spec_name
+  if /spec:(.*)$/.match(t.name)
+    arguments = t.name.split(":")
+    file_name = arguments[1]
+    spec_name = arguments[2..-1]
+
+    if File.exist?("spec/merb/#{file_name}_spec.rb")
+      run_file_name = "spec/merb/#{file_name}_spec.rb" 
+    end
+    
+    example = !spec_name.empty? ? " -e '#{spec_name}'" : ""
+
+    sh "#{spec_cmd} #{run_file_name} --format specdoc --colour #{example}" 
+  end
+end

data/app_generators/merb/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/app_generators/merb/merb_generator.rb

@@ -0,0 +1,107 @@
+class MerbGenerator < RubiGen::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name']) unless defined? DEFAULT_SHEBANG
+  
+  default_options   :shebang => DEFAULT_SHEBANG
+  
+  attr_reader :name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    @destination_root = File.expand_path(@name)
+    extract_options
+  end
+
+  def manifest
+    script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory ''
+      BASEDIRS.each { |path| m.directory path }
+      
+      # copy skeleton
+      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/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"
+      m.file_copy_each %w( master.css ), "public/stylesheets"
+      m.file_copy_each %w( merb.fcgi ), "public"
+      m.file_copy_each %w( boot.rb merb_init.rb router.rb upload.conf dependencies.rb), "config"
+      m.file_copy_each %w( development.rb production.rb test.rb ), "config/environments"
+      m.file_copy_each %w( spec_helper.rb ), "spec"
+      m.file_copy_each %w( test_helper.rb), "test"
+
+      # build default config
+      m.template "config/merb.yml", "config/merb.yml", :assigns => {:key => "#{@name.upcase}#{rand(9999)}"}
+      
+      # build scripts
+      %w( stop_merb generate destroy ).each do |file|
+        m.file     "script/#{file}",        "script/#{file}", script_options
+        m.template "script/win_script.cmd", "script/#{file}.cmd", :assigns => { :filename => file } if windows
+      end
+    end
+  end
+  
+  def windows
+    (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
+  end
+  
+  protected
+    def banner
+      <<-EOS
+Creates a Merb application stub.
+
+USAGE: #{spec.name} -g path"
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # # For each option below, place the default
+      # # at the top of the file next to "default_options"
+      # opts.on("-r", "--ruby=path", String,
+      #        "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
+      #        "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+
+    # Installation skeleton.  Intermediate directories are automatically
+    # created so don't sweat their absence here.
+    BASEDIRS = %w(
+      app/controllers
+      app/models
+      app/helpers
+      app/mailers/helpers
+      app/mailers/views
+      app/mailers/views/layout
+      app/parts
+      app/views/layout
+      app/views/exceptions
+      config/environments
+      lib
+      log
+      public/images
+      public/javascripts
+      public/stylesheets
+      script
+      spec/models
+      spec/controllers
+      test/unit
+      gems
+    )
+    
+end

data/app_generators/merb/templates/Rakefile

@@ -0,0 +1,99 @@
+require 'rake'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'spec/rake/spectask'
+require 'fileutils'
+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 MERB_FRAMEWORK_ROOT+'/tasks'
+MERB_ROOT = File.dirname(__FILE__)
+include FileUtils
+
+# Get Merb plugins and dependencies
+require File.dirname(__FILE__)+'/config/dependencies.rb'
+Merb::Plugins.rakefiles.each {|r| require r } 
+
+#desc "Packages up Merb."
+#task :default => [:package]
+
+desc "load merb_init.rb"
+task :merb_init do
+  require 'merb'
+  require File.dirname(__FILE__)+'/config/merb_init.rb'
+end  
+
+task :uninstall => [:clean] do
+  sh %{sudo gem uninstall #{NAME}}
+end
+
+desc 'Run unit tests'
+Rake::TestTask.new('test_unit') do |t|
+  t.libs << 'test'
+  t.pattern = 'test/unit/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Run functional tests'
+Rake::TestTask.new('test_functional') do |t|
+  t.libs << 'test'
+  t.pattern = 'test/functional/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Run all tests'
+Rake::TestTask.new('test') do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc "Run all specs"
+Spec::Rake::SpecTask.new('specs') do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+end
+
+desc "Run a specific spec with TASK=xxxx"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.libs = ['lib', 'server/lib' ]
+  t.spec_files = ["spec/merb/#{ENV['TASK']}_spec.rb"]
+end
+
+desc "Run all specs output html"
+Spec::Rake::SpecTask.new('specs_html') do |t|
+  t.spec_opts = ["--format", "html"]
+  t.libs = ['lib', 'server/lib' ]
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+end
+
+desc "RCov"
+Spec::Rake::SpecTask.new('rcov') do |t|
+  t.spec_opts = ["--format", "specdoc", "--colour"]
+  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+  t.libs = ['lib', 'server/lib' ]
+  t.rcov = true
+end
+
+desc 'Run all tests, specs and finish with rcov'
+task :aok do
+  sh %{rake rcov}
+  sh %{rake spec}
+end
+
+##############################################################################
+# SVN
+##############################################################################
+
+desc "Add new files to subversion"
+task :svn_add do
+   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
+end