merb 0.3.7 → 0.4.0

data/lib/merb/{merb_view_context.rb → view_context.rb}

@@ -1,12 +1,10 @@
-require File.dirname(__FILE__)+'/mixins/erubis_capture_mixin'
-require File.dirname(__FILE__)+'/mixins/view_context_mixin'
-require File.dirname(__FILE__)+'/mixins/form_control_mixin'
+
 
 module Merb
   PROTECTED_IVARS = %w[@_new_cookie
                        @method
                        @env
-                       @controller
+                       @web_controller
                        @_body
                        @_fingerprint_before
                        @_session
@@ -16,7 +14,18 @@ module Merb
                        @_status
                        @_view_context_cache
                        @_response
-                       @_params]
+                       @_params
+                       @thrown_content
+                       @_route
+                       @_benchmarks
+                       @_provided_formats
+                       @_format_value
+                       @_content_type
+                       @_merb_unmatched
+                       @_template_format
+                       @_provided_formats
+                       @template]
+
                        
   module GlobalHelper
   end    
@@ -26,18 +35,18 @@ module Merb
   class ViewContext
     include Merb::ViewContextMixin
     include Merb::FormControls
-    include Merb::GlobalHelper
+    include Merb::WebControllerMixin
     
     def initialize(controller)
+      @web_controller = controller
       @_merb_partial_locals = {}
-      @controller = controller
-      (@controller.instance_variables - PROTECTED_IVARS).each do |ivar|
-        self.instance_variable_set(ivar, @controller.instance_variable_get(ivar))
+      (@web_controller.instance_variables - PROTECTED_IVARS).each do |ivar|
+        self.instance_variable_set(ivar, @web_controller.instance_variable_get(ivar))
       end
       begin
-        self.class.class_eval("include Merb::#{@controller.class.name}Helper")
+        self.class.class_eval(" include Merb::GlobalHelper; include Merb::#{@web_controller.class.name}Helper") 
       rescue NameError
-        MERB_LOGGER.info("Missing Helper: Merb::#{@controller.class.name}Helper")
+        MERB_LOGGER.debug("Missing Helper: Merb::#{@web_controller.class.name}Helper")
       end  
     end
     
@@ -46,46 +55,22 @@ module Merb
       self
     end
       
-    # accessor for the view. refers to the current @controller object
+    # accessor for the view. refers to the current @web_controller object
     def controller
-      @controller
-    end
-    
-    def request
-      @controller.request  
-    end
-            
-    def params
-      @controller.params
-    end  
-    
-    def cookies
-      @controller.cookies
-    end  
-
-    def headers
-      @controller.headers
+      @web_controller
     end
-    
-    def session
-      @controller.session
-    end
-
-    def response
-      @controller.response
-    end
-      
+  
     alias_method :old_respond_to?, :respond_to?
     
     def respond_to?(sym, include_private=false)
-      old_respond_to?(sym, include_private) || @controller.respond_to?(sym, include_private) || @_merb_partial_locals.key?(sym)
+      old_respond_to?(sym, include_private) || @web_controller.respond_to?(sym, include_private) || @_merb_partial_locals.key?(sym)
     end
     
     # catch any method calls that the controller responds to
     # and delegate them back to the controller.
     def method_missing(sym, *args, &blk)
-      if @controller.respond_to? sym
-        @controller.send(sym, *args, &blk)
+      if @web_controller.respond_to? sym
+        @web_controller.send(sym, *args, &blk)
       elsif @_merb_partial_locals.key? sym
         @_merb_partial_locals[sym]
       else
@@ -95,4 +80,4 @@ module Merb
     
   end
   
-end
+end

data/lib/tasks/merb.rake

@@ -1,7 +1,7 @@
 def install_merb_script
   script_filepath = MERB_ROOT / 'script/merb'
   FileUtils.rm script_filepath if File.exist? script_filepath
-  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../dist/framework/merb/merb_server')\nMerb::Server.run\n"
+  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
   File.open(script_filepath, 'wb') {|f|
     f.write tmpl 
     f.chmod(0744)
@@ -9,36 +9,46 @@ def install_merb_script
 end
 
 namespace :merb do
-  desc "freeze the merb framework into dist/merb for portability"
+  desc "freeze the merb framework into merb for portability"
   task :freeze do
-    FileUtils.rm_rf MERB_ROOT / 'dist/framework'
-    FileUtils.cp_r MERB_FRAMEWORK_ROOT, (MERB_ROOT / 'dist/framework')
+    FileUtils.rm_rf MERB_ROOT / 'framework'
+    FileUtils.cp_r MERB_FRAMEWORK_ROOT, (MERB_ROOT / 'framework')
     install_merb_script
     
-    puts "  Freezing Merb Framework into dist/framework"
+    puts "  Freezing Merb Framework into framework"
     puts "  Use script/merb to start instead of plain merb"
   end
   desc "unfreeze this app from the framework and use system gem."
   task :unfreeze do
-    FileUtils.rm_rf MERB_ROOT / 'dist/framework'
+    FileUtils.rm_rf MERB_ROOT / 'framework'
     FileUtils.rm MERB_ROOT / 'script/merb'
     
     puts "  Removed: "
-    puts "   - #{MERB_ROOT / 'dist/framework'} (recursive) "
+    puts "   - #{MERB_ROOT / 'framework'} (recursive) "
     puts "   - #{MERB_ROOT / 'script/merb'}"
   end
   
-  desc "freeze the merb framework from svn"
+  desc "freeze the merb framework from svn, use REVISION=# to freeze a specific revision"
   task :freeze_from_svn do
-    install_path = MERB_ROOT / 'dist/framework'
+    install_path = MERB_ROOT / 'framework'
+    revision = ENV['REVISION'] || 'HEAD'
     puts "  Removing old framework" if File.exist? install_path
     FileUtils.rm_rf install_path
 
-    puts "  Freezing Merb Framework from svn"
-    system "svn co http://svn.devjavu.com/merb/trunk/lib #{install_path}"
+    puts "  Freezing Merb Framework from svn, revision #{revision}"
+    system "svn co -r #{revision} http://svn.devjavu.com/merb/trunk/lib #{install_path}"
     install_merb_script
     
     puts "  Use script/merb to start instead of plain merb"
   end
   
+end
+
+desc "Setup the Merb Environment by requiring merb and loading your merb_init.rb" 
+task :merb_env do 
+  require 'rubygems' 
+  require 'merb' 
+  Merb::Server.config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
+  MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment] 
+  load MERB_ROOT+'/config/merb_init.rb' 
 end

data/merb_default_generators/model/model_generator.rb

@@ -0,0 +1,16 @@
+require 'merb/generators/merb_generator_helpers'
+
+class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
+  
+  def initialize( *args )
+    super( *args )
+    options[:skip_migration] = true
+    @model_template_name = "new_model_template.erb"
+    @model_test_generator_name = "merb_model_test"
+  end
+  
+  def self.superclass
+    RubiGen::Base
+  end
+    
+end

data/merb_default_generators/model/templates/new_model_template.erb

@@ -0,0 +1,5 @@
+class <%= class_name %>
+<% unless table_attributes.empty? -%>
+  attr_accessor <%= table_attributes.map{|a| ":#{a.name}" }.compact.uniq.join(", ") %>
+<% end -%>
+end

data/merb_default_generators/resource_controller/resource_controller_generator.rb

@@ -0,0 +1,26 @@
+require 'merb/generators/merb_generator_helpers'
+
+class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
+
+  def initialize(*args)
+    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
+    name, *actions = args.flatten
+    runtime_options[:actions] = %w[index show new edit]
+    runtime_options[:test_stub_generator] = "merb_controller_test"
+    super( [name], runtime_options )
+  end
+
+  def self.superclass
+    RubiGen::Base
+  end
+  
+  protected
+  def banner
+        <<-EOS
+  Creates a Merb controller, views and specs using Active Record Models
+
+  USAGE: #{$0} #{spec.name} resource_name"
+  EOS
+  end
+  
+end

data/merb_default_generators/resource_controller/templates/controller.rb

@@ -0,0 +1,30 @@
+<% klass = class_name.singularize -%>
+<% ivar = class_name.snake_case.singularize -%>
+class <%= class_name %> < Application
+  provides :xml, :js, :yaml
+
+  def index
+    render
+  end
+  
+  def show
+    render
+  end
+  
+  def new
+    render
+  end
+  
+  def edit
+    render
+  end
+  
+  def create
+  end
+  
+  def update
+  end
+  
+  def destroy
+  end
+end

data/merb_default_generators/resource_controller/templates/edit.html.erb

@@ -0,0 +1 @@
+Edit Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/helper.rb

@@ -0,0 +1,5 @@
+module Merb
+  module <%= class_name %>Helper
+  
+  end
+end

data/merb_default_generators/resource_controller/templates/index.html.erb

@@ -0,0 +1 @@
+Index Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/new.html.erb

@@ -0,0 +1 @@
+New Action for <%= class_name %>

data/merb_default_generators/resource_controller/templates/show.html.erb

@@ -0,0 +1 @@
+Show Action for <%= class_name %>

data/merb_generators/controller/USAGE

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

data/merb_generators/controller/controller_generator.rb

@@ -0,0 +1,16 @@
+require 'merb/generators/merb_generator_helpers'
+
+class ControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
+
+  def initialize(*args)
+    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
+    name, *actions = args.flatten
+    runtime_options[:actions] = actions.empty? ? %w[index] : actions
+    super( [name], runtime_options  )
+  end
+  
+  def self.superclass
+    RubiGen::Base
+  end
+    
+end

data/merb_generators/controller/templates/controller.rb

@@ -0,0 +1,8 @@
+class <%= class_name %> < Application
+<% actions.each do |action| -%>
+  
+  def <%= action %>
+    render
+  end
+<% end -%>
+end

data/merb_generators/controller/templates/helper.rb

@@ -0,0 +1,5 @@
+module Merb
+module <%= class_name %>Helper
+  
+  end
+end

data/merb_generators/controller/templates/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= class_name %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>

data/merb_generators/resource/resource_generator.rb

@@ -0,0 +1,60 @@
+require 'merb'
+class ResourceGenerator < RubiGen::Base
+  
+  default_options :author => nil
+  
+  attr_reader :name, :class_name, :file_name, :provided_args
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    # @name = args.shift
+    @provided_args = runtime_args
+    # @class_name = args.first.camel_case
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      m.dependency "model", provided_args.dup, options.dup
+      m.dependency "resource_controller", provided_args.dup, options.dup
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a full resource.  This includes:
+
+    Model: A model class 
+    Migration: if required
+    Model Test or Spec stub
+    Resource Controller and views
+    Controller Test of Spec stubs
+    
+    Example
+    
+    ruby script/generate resource post title:string content:text created_at:datetime
+
+USAGE: #{$0} #{spec.name} name"
+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("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # 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
+end

data/rspec_generators/merb_controller_test/merb_controller_test_generator.rb

@@ -0,0 +1,67 @@
+require 'merb'
+class MerbControllerTestGenerator < RubiGen::Base
+  
+  default_options :author => nil
+  
+  attr_reader :name, :class_name, :file_name, :template_actions
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    @class_name = @name.camel_case
+    @file_name = @name.snake_case #.pluralize
+    @template_actions = runtime_options[:template_actions] || []
+    @engine = runtime_options[:engine] || "erb" # set by subclasses only
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      m.directory 'spec/controllers'
+      m.template "controller_spec.rb", "spec/controllers/#{file_name}_spec.rb"
+      
+      m.directory "spec/views/#{file_name}"
+      
+      
+      # Setup the view stubs for each view
+      @template_actions.each do |the_action|  
+        template_name = "#{the_action}.html.#{@engine}"
+        if File.exists?(File.join(MERB_ROOT, "app", "views", file_name, template_name))
+          m.template "#{the_action}_spec.rb", "spec/views/#{file_name}/#{the_action}_html_spec.rb"
+        end
+      end
+      
+      
+      m.directory 'spec/helpers'
+      m.template "helper_spec.rb", "spec/helpers/#{file_name}_helper_spec.rb"
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a ...
+
+USAGE: #{$0} #{spec.name} name"
+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("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # 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
+end