merb 0.3.7 → 0.4.0

data/app_generators/merb_plugin/templates/sampleplugin_spec.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "<%= name %>" do
+  it "should do nothing" do
+    true.should == true
+  end
+end

data/app_generators/merb_plugin/templates/spec_helper.rb

@@ -0,0 +1,2 @@
+$TESTING=true
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')

data/bin/merb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'merb/merb_server'
+require 'merb/server'
 
 Merb::Server.run

data/lib/autotest/discover.rb

@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  "merb" if File.exist?('config/merb_init.rb')
+end

data/lib/autotest/merb_rspec.rb

@@ -0,0 +1,79 @@
+# based on rails_rspec.rb from rspec_on_rails by Nick Sieger
+
+### rspec_on_rails (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
+### 
+### Permission is hereby granted, free of charge, to any person
+### obtaining a copy of this software and associated documentation files
+### (the "Software"), to deal in the Software without restriction,
+### including without limitation the rights to use, copy, modify, merge,
+### publish, distribute, sublicense, and/or sell copies of the Software,
+### and to permit persons to whom the Software is furnished to do so,
+### subject to the following conditions:
+### 
+### The above copyright notice and this permission notice shall be
+### included in all copies or substantial portions of the Software.
+### 
+### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+### EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+### MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+### NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+### BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+### ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+### CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+### SOFTWARE.
+
+require 'autotest/rspec'
+
+class Autotest::MerbRspec < Autotest::Rspec
+
+  def initialize # :nodoc:
+    super
+    @exceptions = %r%^\./(?:coverage|gems|doc|log|public|schema|script|previous_failures.txt)%
+    @test_mappings = {
+      %r%^(test|spec)/fixtures/(.*).yml$% => proc { |_, m|
+        ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
+      },
+      %r%^spec/(models|controllers|views|helpers|lib)/.*rb$% => proc { |filename, _|
+        filename
+      },
+      %r%^app/models/(.*)\.rb$% => proc { |_, m|
+        ["spec/models/#{m[1]}_spec.rb"]
+      },
+      %r%^app/helpers/application_helper\.rb$% => proc {
+        files_matching %r%^spec/(views|helpers)/.*_spec\.rb$%
+      },
+      %r%^app/helpers/(.*)_helper\.rb$% => proc { |_, m|
+        if m[1] == "application" then
+          files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
+        else
+          ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+        end
+      },
+      # Handles both the old .rhtml and new .html.erb extensions
+      # index.rhtml    => index_rhtml_spec.rb
+      # index.html.erb => index_html_spec.rb
+      %r%^app/views/([^.]*)\.([^.]*)(\..*)?$% => proc { |_, m|
+        files_matching %r%^spec/views/#{m[1]}(_|\.)#{m[2]}_spec.rb$%
+      },
+      %r%^app/controllers/application\.rb$% => proc { |_, m|
+        files_matching %r%^spec/controllers/.*_spec\.rb$%
+      },
+      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
+        ["spec/controllers/#{m[1]}_spec.rb"]
+      },
+      %r%^config/router\.rb$% => proc { # FIX:
+        files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
+      },
+      %r%^config/database\.yml$% => proc { |_, m|
+        files_matching %r%^spec/models/.*_spec\.rb$%
+      },
+      %r%^(spec/(spec_helper|shared/.*)|config/(dependencies|merb_init|environment(s/test)?))\.rb$% => proc {
+        files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
+      },
+      %r%^lib/(.*)\.rb$% => proc { |_, m|
+        ["spec/lib/#{m[1]}_spec.rb"]
+      },
+    }    
+  end
+    
+end

data/lib/merb.rb

@@ -9,114 +9,93 @@ else
  require 'mongrel'
 end
 require 'fileutils'
-require 'erubis'
-require 'logger'
-require 'json'
+require 'merb/erubis_ext'
+require 'merb/logger'
+begin
+  require 'json/ext'
+rescue LoadError
+  puts "Using pure ruby JSON lib"
+  require 'json/pure'
+end
 
+require 'set'
+autoload :MerbUploadHandler, 'merb/upload_handler'
+autoload :MerbHandler, 'merb/mongrel_handler'
 
 module Merb
-  VERSION='0.3.7' unless defined?VERSION
+  VERSION='0.4.0' unless defined?(::Merb::VERSION)
+  autoload :Authentication, 'merb/mixins/basic_authentication'
+  autoload :ControllerMixin, 'merb/mixins/controller'
+  autoload :ErubisCaptureMixin, 'merb/mixins/erubis_capture'
+  autoload :FormControls, 'merb/mixins/form_control'
+  autoload :RenderMixin, 'merb/mixins/render'
+  autoload :ResponderMixin, 'merb/mixins/responder'
+  autoload :ViewContextMixin, 'merb/mixins/view_context'
+  autoload :WebControllerMixin, 'merb/mixins/web_controller'
+  autoload :Caching, 'merb/caching'
+  autoload :AbstractController, 'merb/abstract_controller'
+  autoload :Const, 'merb/constants'
+  autoload :Controller, 'merb/controller'
+  autoload :Dispatcher, 'merb/dispatcher'
+  autoload :DrbServiceProvider, 'drb_server'
+  autoload :ControllerExceptions, 'merb/exceptions'
+  autoload :MailController, 'merb/mail_controller'
+  autoload :Mailer, 'merb/mailer'
+  autoload :PartController, 'merb/part_controller'
+  autoload :Request, 'merb/request'
+  autoload :Router, 'merb/router'
+  autoload :Server, 'merb/server'
+  autoload :UploadProgress, 'merb/upload_progress'
+  autoload :ViewContext, 'merb/view_context'
+  autoload :SessionMixin, 'merb/session'
+  autoload :Template, 'merb/template'
+  autoload :Plugins, 'merb/plugins'
+  autoload :Rack,'merb/rack_adapter'
+
+  # Set up Merb::Server.config[] as an accessor for @@merb_opts
   class Server
     class << self
-      def config
-        @@merb_opts ||= {}
-      end
-      def method_missing(meth, *args, &block)
-        if meth.to_s[-1..-1] == '='
-          key = meth.to_s[0..-2].to_sym
-          config.send("[]=", key, *args)
-        elsif args.empty?
-          config[meth]
-        else
-          super
-        end
-      end
+      def config() @@merb_opts ||= {} end
     end  
   end
-end
-
-module Erubis
-  class MEruby < Erubis::Eruby
-    include PercentLineEnhancer
-    include StringBufferEnhancer
-  end
+  
+  # Set up default generator scope
+  GENERATOR_SCOPE = [:merb_default, :merb, :rspec]
 end
 
 def __DIR__; File.dirname(__FILE__); end
-
-require File.join(__DIR__, 'merb/core_ext')
-
-MERB_FRAMEWORK_ROOT = __DIR__
-
-MERB_ROOT = Merb::Server.merb_root || Dir.pwd
-DIST_ROOT = Merb::Server.dist_root || Dir.pwd+'/dist'
-MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment]
-MERB_VIEW_ROOT = MERB_ROOT / "dist/app/views"
-
-logpath = $TESTING ? "/tmp/merb_test.log" : "#{MERB_ROOT}/log/merb.#{Merb::Server.port}.log"
-MERB_LOGGER = Logger.new(logpath)
-# DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
-MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '')
-                    when 'debug' 
-                      Logger::DEBUG
-                    when 'info'  
-                      Logger::INFO
-                    when 'warn' 
-                      Logger::WARN
-                    when 'error'  
-                      Logger::ERROR
-                    when 'fatal' 
-                      Logger::FATAL
-                    when 'unknown'  
-                      Logger::UNKNOWN
-                    else                        
-                      Logger::INFO
-                    end  
-         
 lib = File.join(__DIR__, 'merb')
-Dir.entries(lib).sort.select{|f| f !~ /merb\/session\// }.each {|fn| require File.join(lib, fn) if fn =~ /\.rb$/}
-
-require File.join(__DIR__, 'merb/vendor/paginator/paginator')
-
-class Merb::Controller
-  lib = File.join(__DIR__, 'merb')
-  if Merb::Server.memory_session 
-    require lib + "/session/merb_memory_session"
-    Merb::MemorySessionContainer.setup
-    include ::Merb::SessionMixin
-    puts "memory session mixed in"
-  end
-  
-  if Merb::Server.sql_session
-    puts "ActiveRecord session mixed in"
-    begin
-      require 'action_controller/flash'
-      puts "Rails session compatibilty on."
-    rescue  LoadError
-      puts "Rails session compatibilty disabled. If you need this then install the actionpack gem"
-    end    
-    require lib + "/session/merb_ar_session"
-    include ::Merb::SessionMixin
-  end
+require File.join(__DIR__, 'merb/core_ext')
 
-  if Merb::Server.mem_cache_session
-    require lib + "/session/merb_mem_cache_session"
-    include ::Merb::SessionMixin
-    puts "MemCache session mixed in"
-  end
-  
-  if Merb::Server.basic_auth
-    require lib + "/mixins/basic_authentication_mixin"
-    include ::Merb::Authentication
-    puts "Basic Authentication mixed in"
-  end
+unless Object.const_defined?('MERB_ENV')
+  MERB_ENV = Merb::Server.config[:environment].nil? ? ($TESTING ? 'test' : 'development') : Merb::Server.config[:environment]
 end
 
-if defined? ActiveRecord
-  Thread.new{ loop{ sleep(60*60); ActiveRecord::Base.verify_active_connections! } }.priority = -10
-end
+MERB_FRAMEWORK_ROOT = __DIR__
+MERB_ROOT = Merb::Server.config[:merb_root] || Dir.pwd
+MERB_VIEW_ROOT = MERB_ROOT / "app/views"
+MERB_SKELETON_DIR = File.join(MERB_FRAMEWORK_ROOT, '../app_generators/merb/templates')
+logpath = if $TESTING
+           "#{MERB_ROOT}/log/merb_test.log"
+          elsif !(Merb::Server.config[:daemonize] || Merb::Server.config[:cluster] )
+            STDOUT
+          else
+            "#{MERB_ROOT}/log/merb.#{Merb::Server.config[:port]}.log"
+          end
+FileUtils.mkdir_p(File.dirname(logpath)) if logpath.is_a?(String)
+MERB_LOGGER = Merb::Logger.new(logpath)
+MERB_LOGGER.level = Merb::Logger.const_get(Merb::Server.config[:log_level].upcase) rescue Merb::Logger::INFO
+MERB_PATHS = [ 
+  "/app/models/**/*.rb",
+  "/app/controllers/application.rb",
+  "/app/controllers/**/*.rb",
+  "/app/helpers/**/*.rb",
+  "/app/mailers/**/*.rb",
+  "/app/parts/**/*.rb",
+  "/config/router.rb"
+  ]
 
 if $TESTING
   test_files = File.join(lib, 'test', '*.rb')
   Dir[test_files].each { |file| require file }
-end  
+end

data/lib/merb/{merb_abstract_controller.rb → abstract_controller.rb}

@@ -1,5 +1,3 @@
-require File.dirname(__FILE__)+'/mixins/render_mixin'
-
 module Merb
   
   class AbstractController                 
@@ -7,13 +5,18 @@ module Merb
     
     class_inheritable_accessor :before_filters
     class_inheritable_accessor :after_filters
+    class_inheritable_accessor :action_argument_list    
+    self.action_argument_list = Hash.new([])
+    
+    
     
     # Holds internal execution times. Prefaced with an underscore to not 
     # conflict with user-defined controller instance variables.
-    attr_accessor :_benchmarks
+    attr_accessor :_benchmarks, :thrown_content
     
     def initialize(*args)
       @_benchmarks = {}
+      @thrown_content = AbstractController.default_thrown_content
     end
     
     def dispatch(action=:to_s)
@@ -23,6 +26,7 @@ module Merb
         @_benchmarks[:before_filters_time] = Time.now - start if before_filters
         result
       end
+    
       @_body = case caught
       when :filter_chain_completed
         call_action(action)
@@ -45,7 +49,12 @@ module Merb
   protected
     
     def call_action(action)
-      send(action)
+      # [[:id], [:foo, 7]]
+      args = self.class.action_argument_list[action.to_sym].map do |arg, default|
+        raise BadRequest unless params[arg.to_sym] || default
+        params[arg.to_sym] || default
+      end
+      send(action, *args)
     end
     
     # calls a filter chain according to rules.
@@ -55,7 +64,7 @@ module Merb
         if rule.has_key?(:only)
           if rule[:only].include?(params[:action].intern)
             ok = true
-          end  
+          end
         elsif rule.has_key?(:exclude)
           if !rule[:exclude].include?(params[:action].intern)
             ok = true
@@ -188,6 +197,20 @@ module Merb
       end
       return opts
     end
+    
+    def self.default_thrown_content
+      Hash.new{ |hash, key| hash[key] = "" }
+    end
+    
+    # Set here to respond when rendering to cover the provides syntax of setting the content_type
+    def content_type_set?
+      false
+    end
+    
+
+    def content_type
+      params[:format]
+    end
   end  
   
 end

data/lib/merb/caching/action_cache.rb

@@ -1,56 +1,92 @@
 module Merb
   module Caching
-  
+    
+    
+    # Action caching provides the ability to cache the output of individual actions.  This output will be stored using fragment caching 
+    # (Merb::Caching::Fragment).  The output is stored based on a multipart key, which is comprised of the following pieces, in this order:
+    # * controller
+    # * action
+    # * parameters  (represented as a list of parameter name/value pairs, sorted by name)
+    # 
+    #
+    # === Examples
+    #
+    #  class UserController < Merb::Controller 
+    #    cache_action(:show, :index) 
+    # 
+    #    def show 
+    #       ... do some work to show a user ... 
+    #    end  
+    #    
+    #    def index
+    #       ... get the list of users ...
+    #    end
+    #  end 
+    #
+    # In this case, we would expect show to take an :id parameter, and index to take no parameters, so the fragment stored for this action 
+    # will be represented thus:
+    #   get :show, :id => 25    => [:user_controller, :show, :id, 25]
+    #   get :index => [:user_controller, :index]
+    # 
+    # Action caches are expired based on the action alone (TODO: We need to modify expire action to allow expiration for specific parameter values).
+    #   expire_action(:show)  => This will expire all cached show actions (i.e. All users, in this case)    
+     
     module Actions 
   
       def self.included(base) # :nodoc: 
-        base.class_eval {
-          def caching_enabled?
-            @_caching_enabled ||= ::Merb::Server.cache_templates
-          end
-        }
+
         base.extend(ClassMethods)
       end
   
       module ClassMethods
   
-        # Cache the given actions.
-        
+        # Cache the specific actions.  If those actions take parameters, then those parameters will be considered part of the key.
+        # 
         def cache_action(*actions)
-          return unless caching_enabled?
           before :_get_action_fragment, :only => actions        
           after :_store_action_fragment, :only => actions
         end
         
       end
-  
-      private 
-  
+
+      
+      # Expire all cached content for the specific action, or array of actions.  
+      def expire_action(*actions)
+        return unless _caching_enabled?        
+        for action in [actions].flatten
+          ::Merb::Caching::Fragment.expire_fragment(params_key(:action => action))
+        end
+      end
+
+      
+      private
+
+      def _caching_enabled?
+        ::Merb::Server.config[:cache_templates]
+      end
+
       def _get_action_fragment
-        fragment_name = "#{params[:action]}#{@request.query_string}"
-        if fragment = ::Merb::Caching::Fragment.get(fragment_name)
+        return unless _caching_enabled?        
+        if fragment = ::Merb::Caching::Fragment.get(params_key)
           throw :halt, fragment
         end
       end
-  
-      def _store_action_fragment
-        fragment_name = "#{params[:action]}#{@request.query_string}"
-        ::Merb::Caching::Fragment.put(fragment_name, @body)
-      end
-  
-      def caching_enabled?
-        @_caching_enabled ||= ::Merb::Server.cache_templates
+      
+      def _store_action_fragment        
+        return unless _caching_enabled?
+        ::Merb::Caching::Fragment.put(params_key, body)
       end
       
-      def expire_action(*actions)
-        return unless caching_enabled?
-        for action in [actions].flatten
-          expire_fragment(action)
-        end
+      
+      def params_key(overrides = {})
+        key = []
+        additional_parameters = params.clone.merge(overrides)
+        key << additional_parameters.delete(:controller).to_s.snake_case        
+        key << additional_parameters.delete(:action).to_s.snake_case        
+        key << additional_parameters.keys.sort{|a,b| a.to_s <=> b.to_s}.collect{|k| [k.to_s, additional_parameters[k].to_s]}.flatten
+        key.flatten
       end
   
     end
-  
   end
-  
 end