RubyGems - merb - Versions diffs - 0.0.8 → 0.0.9 - Mend

merb 0.0.8 → 0.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (95) hide show

data/README +64 -80
data/Rakefile +25 -12
data/bin/merb +2 -223
data/examples/README_EXAMPLES +10 -0
data/examples/skeleton.tar +0 -0
data/lib/merb.rb +48 -21
data/lib/merb/core_ext.rb +12 -2
data/lib/merb/core_ext/merb_class.rb +21 -21
data/lib/merb/core_ext/merb_kernel.rb +60 -0
data/lib/merb/core_ext/merb_object.rb +14 -0
data/lib/merb/core_ext/merb_string.rb +3 -13
data/lib/merb/generators/merb_app/merb_app.rb +33 -0
data/lib/merb/merb_constants.rb +7 -0
data/lib/merb/merb_controller.rb +31 -23
data/lib/merb/merb_drb_server.rb +6 -60
data/lib/merb/merb_exceptions.rb +162 -2
data/lib/merb/merb_handler.rb +8 -19
data/lib/merb/merb_mailer.rb +60 -0
data/lib/merb/merb_router.rb +1 -1
data/lib/merb/merb_server.rb +240 -0
data/lib/merb/merb_upload_handler.rb +1 -1
data/lib/merb/merb_view_context.rb +11 -6
data/lib/merb/mixins/basic_authentication_mixin.rb +11 -13
data/lib/merb/mixins/controller_mixin.rb +12 -6
data/lib/merb/mixins/form_control_mixin.rb +94 -0
data/lib/merb/mixins/render_mixin.rb +50 -24
data/lib/merb/mixins/view_context_mixin.rb +122 -0
data/lib/merb/session/merb_ar_session.rb +13 -14
data/lib/merb/session/merb_memory_session.rb +105 -0
metadata +13 -132
data/examples/app_skeleton/Rakefile +0 -82
data/examples/app_skeleton/dist/app/helpers/global_helper.rb +0 -6
data/examples/app_skeleton/dist/conf/merb.yml +0 -11
data/examples/app_skeleton/dist/conf/merb_init.rb +0 -16
data/examples/app_skeleton/dist/conf/mup.conf +0 -5
data/examples/app_skeleton/dist/conf/router.rb +0 -19
data/examples/app_skeleton/scripts/merb_stop +0 -13
data/examples/app_skeleton/scripts/new_migration +0 -21
data/examples/app_skeleton/test/test_helper.rb +0 -1
data/examples/sample_app/Rakefile +0 -82
data/examples/sample_app/dist/app/controllers/files.rb +0 -31
data/examples/sample_app/dist/app/controllers/posts.rb +0 -71
data/examples/sample_app/dist/app/controllers/test.rb +0 -40
data/examples/sample_app/dist/app/helpers/global_helper.rb +0 -7
data/examples/sample_app/dist/app/helpers/posts_helper.rb +0 -4
data/examples/sample_app/dist/app/models/comment.rb +0 -3
data/examples/sample_app/dist/app/models/post.rb +0 -4
data/examples/sample_app/dist/app/views/files/progress.jerb +0 -3
data/examples/sample_app/dist/app/views/files/start.herb +0 -62
data/examples/sample_app/dist/app/views/files/upload.herb +0 -6
data/examples/sample_app/dist/app/views/layout/application.herb +0 -61
data/examples/sample_app/dist/app/views/layout/foo.herb +0 -6
data/examples/sample_app/dist/app/views/posts/_comments.herb +0 -11
data/examples/sample_app/dist/app/views/posts/comment.jerb +0 -1
data/examples/sample_app/dist/app/views/posts/list.herb +0 -5
data/examples/sample_app/dist/app/views/posts/new.herb +0 -37
data/examples/sample_app/dist/app/views/posts/show.herb +0 -37
data/examples/sample_app/dist/app/views/posts/xml_test.xerb +0 -3
data/examples/sample_app/dist/app/views/shared/_test.herb +0 -1
data/examples/sample_app/dist/app/views/test/foo.herb +0 -2
data/examples/sample_app/dist/app/views/test/hello.herb +0 -5
data/examples/sample_app/dist/app/views/test/json.jerb +0 -1
data/examples/sample_app/dist/conf/merb.yml +0 -11
data/examples/sample_app/dist/conf/merb_init.rb +0 -24
data/examples/sample_app/dist/conf/mup.conf +0 -5
data/examples/sample_app/dist/conf/router.rb +0 -19
data/examples/sample_app/dist/public/images/bg.jpg +0 -0
data/examples/sample_app/dist/public/images/book.gif +0 -0
data/examples/sample_app/dist/public/images/booksmall.gif +0 -0
data/examples/sample_app/dist/public/images/greenright.jpg +0 -0
data/examples/sample_app/dist/public/images/louiecon.gif +0 -0
data/examples/sample_app/dist/public/images/menu.gif +0 -0
data/examples/sample_app/dist/public/images/menuleft.gif +0 -0
data/examples/sample_app/dist/public/images/menuright.gif +0 -0
data/examples/sample_app/dist/public/images/mountain.jpg +0 -0
data/examples/sample_app/dist/public/images/n3.jpg +0 -0
data/examples/sample_app/dist/public/images/nautica.jpg +0 -0
data/examples/sample_app/dist/public/javascripts/application.js +0 -0
data/examples/sample_app/dist/public/javascripts/effects.js +0 -975
data/examples/sample_app/dist/public/javascripts/mup.js +0 -113
data/examples/sample_app/dist/public/javascripts/prototype.js +0 -2264
data/examples/sample_app/dist/public/stylesheets/merb.css +0 -277
data/examples/sample_app/dist/public/test.html +0 -5
data/examples/sample_app/dist/schema/migrations/001_add_comments_to_posts.rb +0 -22
data/examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb +0 -14
data/examples/sample_app/dist/schema/schema.rb +0 -28
data/examples/sample_app/foo.txt +0 -0
data/examples/sample_app/log/merb.4000.pid +0 -1
data/examples/sample_app/script/merb_stop +0 -13
data/examples/sample_app/script/new_migration +0 -21
data/examples/sample_app/test/test_helper.rb +0 -1
data/lib/merb/mixins/javascript_mixin.rb +0 -147
data/lib/merb/session/merb_drb_session.rb +0 -65
data/test/test_helper.rb +0 -1
data/test/unit/route_matcher_test.rb +0 -46

data/README CHANGED

@@ -12,59 +12,18 @@ mongrel
 erubis
 json or fjson
 mime-types
+archive-tar-minitar
+rspec
 Install these gems first then you can build the merb gem from svn trunk like so:
-$ sudo gem install mongrel erubis json mime-types --include-dependencies
-$ svn co http://svn.devjavu.com/merb
+$ sudo gem install mongrel erubis json mime-types archive-tar-minitar rspec --include-dependencies
+$ svn co http://svn.devjavu.com/merb/trunk merb
 $ cd merb
-$ sudo rake install
+$ rake install
-**Important**
-The new default filename extensions for templates are as follows
-html ->  .herb
-js   ->  .jerb
-xml  ->  .xerb
+To generate a new merb app after the gem is installed:
+$ merb -g myapp
-You can change the extensions to anything you want in your config file in
-yourapp/dist/conf/merb.yml. See the default settings in the sample app.
-First you need to install the dependencies. Merb requires the follwing gems
-erubis
-json
-fjson # will be used if present. requires C extension.
-# fastthread will be used if present and is reccommended.
-sudo gem install fastthread --source=http://mongrel.rubyforge.org/
-If you have checked out merb trunk from svn you will want to build and install
-the gem to use merb. Run this command from the root of the merb svn checkout
-to do that:
-$ sudo rake install
-If you installed merb from gems then unpack the gem and grab the sample app
-$ gem unpack merb
-now with either the svn or the unpacked gem you can try out the sample app.
-$ cd merb*
-$ cd examples/sample_app
-$ merb
-You will need the mongrel_upload_progress gem installed to go to /files
-so use the -f flag to load a config file for mongrel_upload_progress
-$ merb -f dist/conf/mup.conf
-then the sample app will be running on port 4000 in the foreground.
-you can go to a few urls:
-http://localhost:4000/files/start
-http://localhost:4000/foo/123/baz/12234345
 **FEATURES**
@@ -111,7 +70,7 @@ 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_no_layout or do layout :none right before you render
+You can use render_no_layout or do render :layout => :none
 class Test < Merb::Controller
@@ -122,28 +81,24 @@ class Test < Merb::Controller
   end
 end
-<html>
-  <head>
-    <title>Hello, <%= @name %></title>
-  </head>
-  <body>
-<%= @layout_content %>
-  </body>
-</html>
-<h1><%= params.inspect %></h1>
-<h1><%= cookies.inspect %></h1>
-<% 5.times do %>
-  <h1>Hello, <%= @name %>!</h1>
-<% end %>
 You can also render partials like so:
 <%= partial(:comments) %>
 This assumes a _comments.rhtml 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
@@ -166,30 +121,65 @@ $('comments').update('<%=js partial(:posts) %>');
 </ul>
-*Controllers also now have before filters*
+*Controllers have powerful before and after filters*
 Use the before method in your controllers. before accepts either a symbol
 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.
+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.
 class Foo < Merb::Controller
-  before :setup_user
-  before lambda {|c| c.headers['X-Foo] = 'bar' }
+  before :setup_user, :only => :foo
+  before lambda {|c| c.headers['X-Foo] = 'bar' }, :exclude => [:foo, :baz]
   def setup_user
     # blah blah
   end
+  def foo
+    # blah
+  end
   def regular_action
     # blah
   end
 end
-Sessions are available when you start merb with the -s flag. See sample app for
-migration too add session table.
+To stop the before filter chain you use throw :halt with a few options:
+# halts the filter chain and calls filters_halted which you can override
+# in your controller to specialize it.
+throw :halt
+# halts the filters and calls the method named after the symbol:
+throw :halt, :other_action
+# halts the filter chain and returns the result of the Proc being called
+throw :halt, Proc.new{ |c| c.redirect "/foo" }
+# halts the chain and returns whatever is in the string
+throw :halt, "<h1>You don't have permissions IDIOT!</h1>"
+or even render templates:
+throw :halt, render 'foo'
+throw :halt, partial 'foo'
+After filters only accept a Proc and call that proc with the controller:
+after Proc.new {|c| Tidy.new(c.body) }, :only => :index
+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: dist/app/helpers/global_helper.rb will be available to all of your views. Helpers named afdter your controller plus _helper.rb will be included in the views for that controller only.
 *The merb server*
@@ -215,11 +205,7 @@ $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. Start the server
-and browse to http://localhost:4000/files/start  and you will get a file upload
-form. This uses the mongrel_upload_progress gem so that must be installed first.
-There is a very simple upload controller example that handles this upload with a
+multiple concurrent file uploads at once without blocking an entire rails backend for each file upload. Merb allows multiple file uploads at once.
 progress bar. 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.
@@ -242,13 +228,11 @@ and DIST_ROOT. MERB_ROOT is the root of the whole tree. And DISTROOT is MERB_ROO
 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.
-app_skeleton
+merb_app:
   Rakefile
   README
   scripts
   test
-    test_helper.rb
-    fixtures
     spec
     unit
   plugins

data/Rakefile CHANGED

@@ -6,11 +6,16 @@ require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'code_statistics'
 require 'fileutils'
-require File.dirname(__FILE__)+'/tools/rakehelp'
+def __DIR__
+  File.dirname(__FILE__)
+end
+require __DIR__+'/tools/rakehelp'
 include FileUtils
 NAME = "merb"
-VERS = "0.0.8"
+VERS = "0.0.9"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--opname", "index.html",
@@ -19,19 +24,15 @@ RDOC_OPTS = ['--quiet', '--title', "Merb Documentation",
   "--inline-source"]
 setup_clean [ "pkg", "lib/*.bundle", "*.gem",
-            "doc", ".config", "examples/sample_app/dist/public/files/**/*"]
+            "doc", ".config", "examples/sample_app/dist/public/files/**/*", 'examples/sample_app/log/*']
 desc "Packages up Merb."
 task :default => [:package]
-task :package => [:really_clean, :clean, :rdoc]
+task :merb => [:clean, :rdoc, :package]
 task :doc => [:rdoc]
-task :really_clean do
-  rm_rf 'examples/sample_app/log/*'
-end
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
@@ -59,22 +60,20 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('mongrel')
   s.add_dependency('erubis')
   s.add_dependency('json')
-  s.add_dependency('mime-types')
   s.required_ruby_version = '>= 1.8.4'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{app,bin,test,lib,examples}/**/*")
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{bin,test,lib,examples}/**/*")
   s.require_path = "lib"
   s.bindir = "bin"
 end
 Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
+  #p.need_tar = true
   p.gem_spec = spec
 end
 task :install do
-  sh %{rake clean}
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERS}}
 end
@@ -90,6 +89,20 @@ task :doc_rforge do
   sh %{scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
 end
+desc "Pack skeleton app as a tar.gz file"
+task :skeleton do
+  require 'archive/tar/minitar'
+  include Archive::Tar
+  Find.find(File.join(__DIR__,'examples/skeleton')) do |f|
+    FileUtils.rm_rf(f) if /\.svn$/ =~ f
+  end
+  File.open(File.join(__DIR__,'examples/skeleton.tar'), 'wb') do |tar|
+    Dir.chdir 'examples/skeleton'
+    Minitar.pack('.', tar, true)
+  end
+end
 desc 'Run unit tests'
 Rake::TestTask.new('test_unit') do |t|
   t.libs << 'test'

data/bin/merb CHANGED

@@ -1,227 +1,6 @@
 #!/usr/local/bin/ruby
-require 'rubygems'
-begin
-  require 'fastthread'
-  require 'thread'
-  puts 'Using FastThread'
-rescue LoadError
-  puts "not using FastThread"
-end
-begin
-  require 'fjson'
-  puts "using fjson"
-rescue LoadError
-  require 'json'
-end
-require 'optparse'
-require 'ostruct'
-require 'fileutils'
-require 'yaml'
-require 'erubis'
-module Erubis
-  class MEruby < Erubis::Eruby
-    include PercentLineEnhancer
-    include StringBufferEnhancer
-  end
-end
-module Merb; end
-class Merb::Config
-  def self.setup
-    defaults = {
-      :host => "0.0.0.0",
-      :port => "4000",
-      :allow_reloading => true,
-      :merb_root => Dir.pwd,
-      :template_ext => {:html => :herb, :js => :jerb, :xml => :xerb}
-    }
-    begin
-      options = defaults.merge(YAML.load(Erubis::MEruby.new(IO.read("#{defaults[:merb_root]}/dist/conf/merb.yml")).result))
-    rescue
-      options = defaults
-    end
-    options
-  end
-end
-class Merb::Server
-  def self.merb_config
-    options = Merb::Config.setup
-    opts = OptionParser.new do |opts|
-      opts.banner = "Usage: merb [fdcphmisl] [argument]"
-      opts.define_head "Merb Mongrel+ Erb. Lightweight replacement for ActionPack"
-      opts.separator '*'*80
-      opts.separator 'If no flags are given, Merb starts in the foreground on port 4000'
-      opts.separator '*'*80
-      opts.on("-f", "--config-file FILENAME", "This flag is for adding extra config files for things like the upload progress module") do |config|
-        options[:config] = config
-      end
-      opts.on("-d", "--daemonize", "This will run a single merb in the background") do |config|
-        options[:daemonize] = true
-      end
-      opts.on("-c", "--cluster-nodes NUM_MERBS", "Number of merb daemons to run") do |nodes|
-        options[:cluster] = nodes
-      end
-      opts.on("-p", "--port PORTNUM", "Port to run merb on, defaults to 4000") do |port|
-        options[:port] = port
-      end
-      opts.on("-h", "--host HOSTNAME", "Host to bind to(default is all IP's)") do |host|
-        options[:host] = host
-      end
-      opts.on("-m", "--merb-root MERB_ROOT", "the path to the MERB_ROOT for the app you want to run") do |merb_root|
-        options[:merb_root] = File.expand_path(merb_root)
-      end
-      opts.on("-i", "--irb-console", "This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.") do |console|
-        options[:console] = true
-      end
-      opts.on("-s", "--session-drb-port PORTNUM", "This is the port number to run the drb daemon on for sessions and uplod progress monitoring.") do |drb_port|
-        options[:session] = drb_port
-      end
-      opts.on("-l", "--log-level LEVEL", "Log levels can be set to any of these options: DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN") do |loglevel|
-        options[:log_level] = loglevel
-      end
-      opts.on("-?", "--help", "Show this help message") do
-        puts opts
-        exit
-      end
-    end
-    opts.parse!(@@merb_raw_opts)
-    @@merb_opts = options
-    puts %{Merb started with these options:}
-    puts @@merb_opts.to_yaml; puts
-  end
-  def self.initialize_merb
-    require 'merb'
-    require @@merb_opts[:merb_root]+'/dist/conf/router.rb'
-    require @@merb_opts[:merb_root]+'/dist/conf/merb_init.rb'
-  end
-  def self.run
-    @@merb_raw_opts = ARGV
-    merb_config
-    @@merb_opts[:dist_root] = @@merb_opts[:merb_root]+'/dist'
-    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/controllers') )
-    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/app/models') )
-    $LOAD_PATH.unshift( File.join(@@merb_opts[:dist_root] , '/lib') )
-    if @@merb_opts[:console]
-      initialize_merb
-      ARGV.clear # Avoid passing args to IRB
-      require 'irb'
-      require 'irb/completion'
-      def exit
-        exit!
-      end
-      if File.exists? ".irbrc"
-        ENV['IRBRC'] = ".irbrc"
-      end
-      IRB.start
-      exit!
-    end
-    if @@merb_opts[:session]
-      start(@@merb_opts[:session], :drbserver_start)
-    end
-    if @@merb_opts[:cluster]
-      delete_pidfiles
-      @@merb_opts[:port].to_i.upto(@@merb_opts[:port].to_i+@@merb_opts[:cluster].to_i-1) do |port|
-        puts "Starting merb server on port: #{port}"
-        start(port)
-      end
-    elsif @@merb_opts[:daemonize]
-      delete_pidfiles(@@merb_opts[:port])
-      start(@@merb_opts[:port])
-    else
-      initialize_merb
-      trap('TERM') { exit }
-      mongrel_start(@@merb_opts[:port])
-    end
-  end
-  def self.store_pid(pid,port)
-    File.open("#{@@merb_opts[:merb_root]}/log/merb.#{port}.pid", 'w'){|f| f.write("#{Process.pid}\n")}
-  end
-  def self.start(port,what=:mongrel_start)
-    fork do
-      Process.setsid
-      exit if fork
-      if what == :mongrel_start
-        store_pid(Process.pid, port)
-      else
-        store_pid(Process.pid, "drb.#{port}")
-      end
-      Dir.chdir @@merb_opts[:merb_root]
-      File.umask 0000
-      STDIN.reopen "/dev/null"
-      STDOUT.reopen "/dev/null", "a"
-      STDERR.reopen STDOUT
-      trap("TERM") { exit }
-      send(what, port)
-    end
-  end
-  def self.delete_pidfiles(portor_star='*')
-    Dir["#{@@merb_opts[:merb_root]}/log/merb.#{portor_star}.pid"].each do |pid|
-      FileUtils.rm(pid)  rescue nil
-    end
-  end
-  def self.drbserver_start(port)
-    puts "Starting merb drb server on port: #{port}"
-    require 'merb/session/merb_drb_server'
-    DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DRbSession.setup)
-    DRb.thread.join
-  end
-  def self.mongrel_start(port)
-    @@merb_opts[:port] = port
-    initialize_merb
-    config = Mongrel::Configurator.new :host => (@@merb_opts[:host]||"0.0.0.0"), :port => (port ||4000) do
-      config = YAML.load(Erubis::Eruby.new(IO.read(File.expand_path(@@merb_opts[:config]))).result) if @@merb_opts[:config]
-      listener do
-        uri( "/", :handler => MerbUploadHandler.new(config), :in_front => true) if @@merb_opts[:config]
-        uri "/", :handler => MerbHandler.new(@@merb_opts[:dist_root]+'/public')
-        uri "/favicon.ico", :handler => Mongrel::Error404Handler.new("")
-      end
-      trap("INT") { stop }
-      run
-    end
-    config.join
-  end
-  def self.config
-    @@merb_opts
-  end
-end
+require 'rubygems'
+require 'merb/merb_server'
 Merb::Server.run