merb 0.4.2 → 0.5.0

data/lib/merb/core_ext/kernel.rb

@@ -1,4 +1,41 @@
 module Kernel
+  # Loads the given string as a gem.
+  # An optional second parameter of a version string can be specified and is passed to rubygems.
+  # If rubygems cannot find the gem it requires the string as a library.
+  
+  # Note that this new version tries to load the file via ROOT/gems first before moving off to
+  # the system gems (so if you have a lower version of a gem in ROOT/gems, it'll still get loaded)
+  
+  def dependency(name, *ver)
+    begin
+      # If it's not in ROOT/gems, skip to the next attempt
+      raise LoadError unless File.directory?(Merb.root / "gems")
+      
+      # cache the gem path
+      begin
+        # Clear out the paths and reset them to Merb
+        Gem.use_paths(Merb.root / "gems", [Merb.root / "gems"])
+        
+        # Try activating the gem (Failure will raise a LoadError)
+        Gem.activate(name, true, *ver)
+        Merb.logger.info("#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ...")
+      ensure
+        # Either way, set the gem path back to normal
+        Gem.clear_paths
+      end
+
+    # If we couldn't load the gem or there was no ROOT/gems, try again, now with the full gem path
+    rescue LoadError
+      begin
+        # Try activating again
+        Gem.activate(name, true, *ver)
+        Merb.logger.info("#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ...")
+      rescue LoadError
+        # Failed requiring as a gem, let's try loading with a normal require.
+        require name
+      end
+    end
+  end
   
   # Loads both gem and library dependencies that are passed in as arguments.
   # Each argument can be:
@@ -15,23 +52,7 @@ module Kernel
       end
     end
   end
-  
-  # Loads the given string as a gem.
-  # An optional second parameter of a version string can be specified and is passed to rubygems.
-  # If rubygems cannot find the gem it requires the string as a library.
-  
-  def dependency(name, *ver)
-    begin
-      Gem.activate(name, true, *ver)
-      message = "#{Time.now.httpdate}: loading gem '#{name}' from #{__app_file_trace__.first} ..."
-      puts(message)
-      MERB_LOGGER.info(message)
-    rescue LoadError
-      # Failed requiring as a gem, let's try loading with a normal require.
-      requires(name)
-    end
-  end
-
+    
   # Requires the library string passed in.
   # If the library fails to load then it will display a helpful message.
   
@@ -41,19 +62,19 @@ module Kernel
     require(library)
     message = "#{Time.now.httpdate}: loading library '#{library}' from #{__app_file_trace__.first} ..."
     puts(message)
-    MERB_LOGGER.info(message)
+    Merb.logger.info(message)
   rescue LoadError
     # TODO: adjust the two messages below to use merb's logger.error/info once logging refactor is complete.
     message = "#{Time.now.httpdate}: <e> Could not find '#{library}' as either a library or gem, loaded from #{__app_file_trace__.first}.\n"
     puts(message)
-    MERB_LOGGER.error(message)
+    Merb.logger.error(message)
     
     # Print a helpful message
     message =  "#{Time.now.httpdate}: <i> Please be sure that if '#{library}': \n"
     message << "#{Time.now.httpdate}: <i>   * is a normal ruby library (file), be sure that the path of the library it is present in the $LOAD_PATH via $LOAD_PATH.unshift(\"/path/to/#{library}\") \n"
     message << "#{Time.now.httpdate}: <i>   * is included within a gem, be sure that you are specifying the gem as a dependency \n"
     puts(message)
-    MERB_LOGGER.error(message)
+    Merb.logger.error(message)
     exit() # Missing library/gem must be addressed.
   end
   
@@ -66,7 +87,7 @@ module Kernel
     puts message if message
   end
   
-  # Used in MERB_ROOT/dependencies.yml
+  # Used in Merb.root/dependencies.yml
   # Tells merb which ORM (Object Relational Mapper) you wish to use.
   # Currently merb has plugins to support ActiveRecord, DataMapper, and Sequel.
   #
@@ -85,7 +106,7 @@ module Kernel
     Kernel.dependency(orm_plugin)
   end
   
-  # Used in MERB_ROOT/dependencies.yml
+  # Used in Merb.root/dependencies.yml
   # Tells merb which testing framework to use.
   # Currently merb supports rspec and test_unit for testing
   #
@@ -107,9 +128,9 @@ module Kernel
 
   def __app_file_trace__
     caller.select do |call| 
-      call.include?(MERB_ROOT) && !call.include?(MERB_ROOT + "/framework")
+      call.include?(Merb.root) && !call.include?(Merb.root + "/framework")
     end.map do |call|
-      file, line = call.scan(Regexp.new("#{MERB_ROOT}/(.*):(.*)")).first
+      file, line = call.scan(Regexp.new("#{Merb.root}/(.*):(.*)")).first
       "#{file}:#{line}"
     end
   end
@@ -171,7 +192,7 @@ module Kernel
   
   # Requires ruby-prof (<tt>sudo gem install ruby-prof</tt>)
   # Takes a block and profiles the results of running the block 100 times.
-  # The resulting profile is written out to MERB_ROOT/log/#{name}.html.
+  # The resulting profile is written out to Merb.root/log/#{name}.html.
   # <tt>min</tt> specifies the minimum percentage of the total time a method must take for it to be included in the result.
   #
   # Example
@@ -189,7 +210,7 @@ module Kernel
       100.times{return_result = yield}
     end
     printer = RubyProf::GraphHtmlPrinter.new(result)
-    path = File.join(MERB_ROOT, 'log', "#{name}.html")
+    path = File.join(Merb.root, 'log', "#{name}.html")
     File.open(path, 'w') do |file|
      printer.print(file, {:min_percent => min,
                           :print_file => true})
@@ -208,4 +229,14 @@ module Kernel
     args.pop if Hash === args.last
   end
   
+  unless Kernel.respond_to?(:debugger)
+    # define debugger method so that code even works if debugger was not
+    # requested
+    # Drops a not to the logs that Debugger was not available
+    def debugger
+       Merb.logger.info "\n***** Debugger requested, but was not " + 
+                        "available: Start server with --debugger " +
+                        "to enable *****\n"
+    end
+  end
 end

data/lib/merb/dispatcher.rb

@@ -2,7 +2,7 @@ module Merb
   class Dispatcher
     
     DEFAULT_ERROR_TEMPLATE = Erubis::MEruby.new((File.read(
-	File.join(MERB_ROOT, 'app/views/exceptions/internal_server_error.html.erb')) rescue "Internal Server Error!"))
+	File.join(Merb.root, 'app/views/exceptions/internal_server_error.html.erb')) rescue "Internal Server Error!"))
         
     class << self
       
@@ -11,7 +11,7 @@ module Merb
       end
       
       @@mutex = Mutex.new
-      @@use_mutex = ::Merb::Server.config[:use_mutex]
+      @@use_mutex = ::Merb::Config[:use_mutex]
       # This is where we grab the incoming request REQUEST_URI and use that in
       # the merb RouteMatcher to determine which controller and method to run.
       # Returns a 2 element tuple of: [controller, action]
@@ -21,20 +21,20 @@ module Merb
       def handle(http_request, response)
         start   = Time.now
         request = Merb::Request.new(http_request)
-        MERB_LOGGER.info("Params: #{request.params.inspect}")
-        MERB_LOGGER.info("Cookies: #{request.cookies.inspect}")
+        Merb.logger.info("Params: #{request.params.inspect}")
+        Merb.logger.info("Cookies: #{request.cookies.inspect}")
         # user friendly error messages
         if request.route_params.empty?
           raise ControllerExceptions::BadRequest, "No routes match the request"
         elsif request.controller_name.nil?
           raise ControllerExceptions::BadRequest, "Route matched, but route did not specify a controller" 
         end
-        MERB_LOGGER.debug("Routed to: #{request.route_params.inspect}")
+        Merb.logger.debug("Routed to: #{request.route_params.inspect}")
         # set controller class and the action to call
         klass = request.controller_class
         dispatch_action(klass, request.action, request, response)
       rescue => exception
-        MERB_LOGGER.error(Merb.exception(exception))
+        Merb.logger.error(Merb.exception(exception))
         exception = controller_exception(exception)
         dispatch_exception(request, response, exception)
       end

data/lib/merb/drb_server.rb

@@ -1,5 +1,5 @@
 require 'drb'
-require File.dirname(__FILE__)+'/merb_upload_progress'
+require File.dirname(__FILE__)+'/upload_progress'
 
 module Merb
   

data/lib/merb/generators/merb_generator_helpers.rb

@@ -255,6 +255,7 @@ EOS
         @engine           = runtime_options[:engine] || "erb" # set by subclasses only
         @template_actions = runtime_options[:actions] || %w[index] # Used by subclasses only
         @test_generator   = runtime_options[:test_stub_generator] || "merb_controller_test"
+        @base_dest_folder = runtime_options[:base_dest_folder] || "app"
         extract_options
       end
 
@@ -264,10 +265,10 @@ EOS
           # ensure there are no other definitions of this model already defined.
           m.class_collisions(@class_name)
           
-          m.directory "app/controllers"
-          m.template "controller.rb", "app/controllers/#{file_name}.rb", :assigns => {:actions => @template_actions}
+          m.directory "#{@base_dest_folder}/controllers"
+          m.template "controller.rb", "#{@base_dest_folder}/controllers/#{file_name}.rb", :assigns => {:actions => @template_actions}
           
-          m.directory "app/views/#{file_name}"
+          m.directory "#{@base_dest_folder}/views/#{file_name}"
           
           # Include templates if they exist
           @template_actions.each do |the_action|  
@@ -275,12 +276,12 @@ EOS
             template_path = "/" + source_path(spec.name).split("/")[0..-2].join("/")
 
             if File.exists?(File.join(template_path,template_name))
-              m.template template_name, "app/views/#{file_name}/#{template_name}"
+              m.template template_name, "#{@base_dest_folder}/views/#{file_name}/#{template_name}"
             end
           end
 
-          m.directory "app/helpers/"
-          m.template "helper.rb", "app/helpers/#{file_name}_helper.rb"
+          m.directory "#{@base_dest_folder}/helpers/"
+          m.template "helper.rb", "#{@base_dest_folder}/helpers/#{file_name}_helper.rb"
           m.dependency @test_generator, [name], :destination => destination_root, :template_actions => @template_actions
         end
       end

data/lib/merb/logger.rb

@@ -28,7 +28,7 @@ module Merb
         @log.sync = true
         @log.write("# Logfile created on %s\n" % [Time.now.to_s])
       end
-      if !MERB_ENV.match(/development|test/) && 
+      if !Merb.environment.match(/development|test/) && 
          !RUBY_PLATFORM.match(/java|mswin/) &&
          !(@log == STDOUT) &&
           @log.respond_to?(:write_nonblock)

data/lib/merb/mail_controller.rb

@@ -183,7 +183,7 @@ module Merb
         rescue => e
           # An error should be logged if no template is found instead of an error raised
           if @_missing_templates
-            MERB_LOGGER.error(e)
+            Merb.logger.error(e)
           else
             @_missing_templates = true
           end
@@ -237,9 +237,9 @@ module Merb
       body            = dispatch method
       if !@mail.html.blank? || !@mail.text.blank? 
         @mailer.deliver!
-        MERB_LOGGER.info "#{method} sent to #{@mail.to} about #{@mail.subject}"
+        Merb.logger.info "#{method} sent to #{@mail.to} about #{@mail.subject}"
       else
-        MERB_LOGGER.info "#{method} was not sent because nothing was rendered for it"
+        Merb.logger.info "#{method} was not sent because nothing was rendered for it"
       end
     end
 
@@ -258,7 +258,6 @@ module Merb
     # This method is here to overwrite the one in the general_controller mixin
     # The method ensures that when a url is generated with a hash, it contains a controller
     def get_controller_for_url_generation(opts)
-      puts @base_controller.params[:controller] if @base_controller
       controller = opts[:controller] || ( @base_controller.params[:controller] if @base_controller)
        raise "No Controller Specified for url()" unless controller
        controller

data/lib/merb/mailer.rb

@@ -3,7 +3,7 @@ begin
   require 'net/smtp'
 rescue LoadError
   puts "You need to install the mailfactory gem to use Merb::Mailer"
-  MERB_LOGGER.warn "You need to install the mailfactory gem to use Merb::Mailer"
+  Merb.logger.warn "You need to install the mailfactory gem to use Merb::Mailer"
 end  
 
 class MailFactory
@@ -25,7 +25,7 @@ module Merb
   # 
  	#   or 
  	# 
- 	#   Merb::Mailer.config = {:sendmail_path => '/somewhere/odd')
+ 	#   Merb::Mailer.config = {:sendmail_path => '/somewhere/odd'}
   #   Merb::Mailer.delivery_method = :sendmail
   #
   # You could send mail manually like this (but it's better to use

data/lib/merb/mixins/basic_authentication.rb

@@ -13,7 +13,7 @@ module Merb
     
     def authenticated?
       username, password = *credentials
-      username == Merb::Server.config[:basic_auth][:username] and password == Merb::Server.config[:basic_auth][:password]
+      username == Merb::Config[:basic_auth][:username] and password == Merb::Config[:basic_auth][:password]
     end
     
     def basic_authentication
@@ -26,7 +26,7 @@ module Merb
       set_status(401)
       headers['Content-type'] = 'text/plain'
       headers['Status'] = 'Unauthorized'
-      headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Server.config[:basic_auth][:domain]}\""
+      headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Config[:basic_auth][:domain]}\""
       return 'Unauthorized'
     end  
       

data/lib/merb/mixins/controller.rb

@@ -66,7 +66,7 @@ module Merb
     # fully-qualified URL.
     #
     def redirect(url)
-      MERB_LOGGER.info("Redirecting to: #{url}")
+      Merb.logger.info("Redirecting to: #{url}")
       set_status(302)
       headers['Location'] = url
       "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"

data/lib/merb/mixins/general_controller.rb

@@ -52,11 +52,11 @@ module Merb
     #  url(:edit_blogpost, @post)                         # => /blogposts/1/edit
     #  url(:custom_new_blogpost, :action => 'alternate')  # => /blogposts/new/alternate
     #   
-    #  url(:comments, :blogpost => @post)         # => /blogposts/1/comments
-    #  url(:new_comment, :blogpost => @post)      # => /blogposts/1/comments/new
+    #  url(:comments, :blogpost_id => @post)         # => /blogposts/1/comments
+    #  url(:new_comment, :blogpost_id => @post)      # => /blogposts/1/comments/new
     #  url(:comment, @comment)                    # => /blogposts/1/comments/1
     #  url(:edit_comment, @comment)               # => /blogposts/1/comments/1/edit
-    #  url(:custom_new_comment, :blogpost => @post)
+    #  url(:custom_new_comment, :blogpost_id => @post)
     #
     #  url(:page => 2)                            # => /posts/show/1?page=2
     #  url(:new_post, :page => 3)                 # => /posts/new?page=3
@@ -86,7 +86,7 @@ module Merb
         else
           raise "URL not generated: #{route_name.inspect}, #{new_params.inspect}"
         end
-      url = Merb::Server.config[:path_prefix] + url if Merb::Server.config[:path_prefix]
+      url = Merb::Config[:path_prefix] + url if Merb::Config[:path_prefix]
       url
     end
 
@@ -97,10 +97,12 @@ module Merb
       end
       route = symbol.is_a?(Symbol) ? Merb::Router.named_routes[symbol] : symbol
       unless route
-        raise InternalServerError, "URL could not be constructed. Route symbol not found: #{symbol.inspect}" 
+        raise "URL could not be constructed. Route symbol not found: #{symbol.inspect}" 
       end
+
       path = route.generate(new_params, params)
       keys = route.symbol_segments
+      
       if new_params.is_a? Hash
         if ext = format_extension(new_params)
           new_params.delete(:format)
@@ -190,7 +192,7 @@ module Merb
     #   # => /products/3
     #
     def format_extension(new_params={})
-      use_format = Merb::Server.config[:use_format_in_urls]
+      use_format = Merb::Config[:use_format_in_urls]
       if use_format.nil?
         prms = params.merge(new_params)
         use_format = prms[:format] != 'html' && prms[:format]
@@ -223,18 +225,10 @@ module Merb
     alias h escape_xml
     alias html_escape escape_xml
   
-    # Escapes +s+ for use in a URL.
-    #
-    # ==== Parameter
-    #
-    # +s+ - String to URL escape.
-    #
     def escape(s)
-      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-        '%'+$1.unpack('H2'*$1.size).join('%').upcase
-      }.tr(' ', '+')
+      ::Merb::Request.escape(s)
     end
-  
+
     # Unescapes a string (i.e., reverse URL escaping).
     #
     # ==== Parameter 
@@ -242,11 +236,10 @@ module Merb
     # +s+ - String to unescape.
     #
     def unescape(s)
-      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
-        [$1.delete('%')].pack('H*')
-      }
+      ::Merb::Request.unescape(s)
     end
     
+    
     private
     # Used for sepccing
     def get_controller_for_url_generation(options)
@@ -255,4 +248,4 @@ module Merb
     end
       
   end
-end
+end

data/lib/merb/mixins/inline_partial.rb

@@ -0,0 +1,32 @@
+module Merb::InlinePartialMixin
+  def partial(template, opts={})
+
+    unless @_template_format
+      @web_controller.choose_template_format(Merb.available_mime_types, {})
+    end
+
+    found_template = @web_controller._cached_partials["#{template}.#{@_template_format}"] ||=
+      @web_controller.send(:find_partial, template, opts)
+
+    template_method = found_template.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_")
+
+    unless self.respond_to?(template_method)
+      return super
+    end
+
+    if with = opts.delete(:with)
+      as = opts.delete(:as) || found_template.match(/(.*\/_)([^\.]*)/)[2]
+      @_merb_partial_locals = opts
+      sent_template = [with].flatten.map do |temp|
+        @_merb_partial_locals[as.to_sym] = temp
+        send(template_method)
+      end.join
+    else
+      @_merb_partial_locals = opts        
+      sent_template = send(template_method)
+    end
+
+    return sent_template if sent_template
+
+  end      
+end

data/lib/merb/mixins/render.rb

@@ -12,7 +12,7 @@ module Merb
                                    :_cached_partials
                                     
         self._layout = :application
-        self._template_root = File.expand_path(MERB_VIEW_ROOT)
+        self._template_root = File.expand_path(Merb.view_path)
         self._templates = {}
         self._cached_partials = {}
         
@@ -226,7 +226,7 @@ module Merb
         # set any additinal headers that may be associated with the current mime type
         Merb.response_headers[tmpl_fmt].each do |key,value|
           headers[key.to_s] = value
-        end if Merb.response_headers[tmpl_fmt]
+        end
         
       end
     end
@@ -421,7 +421,7 @@ module Merb
       # This method will return a matching template at the specified path, using the
       # template_name.format.engine convention
       def glob_template(path, opts = {})
-        the_template = "#{path}.#{@_template_format}"
+        the_template = "#{path}.#{opts[:format] || @_template_format}"
         Merb::AbstractController._template_path_cache[the_template] || (@_merb_unmatched = (the_template + ".*"); nil)
       end