merb 0.0.8 → 0.0.9

data/examples/README_EXAMPLES

@@ -0,0 +1,10 @@
+I have removed the useless example app from here for now. 
+PLease see mrblog for a better sample app:
+
+svn co http://svn.devjavu.com/merb/mrblog/trunk
+
+To generate your own new merb app first install the gem and then:
+
+$ merb -g appname
+or
+$ merb --generate-app appname

data/lib/merb.rb

@@ -3,28 +3,55 @@ require 'mongrel'
 require 'fileutils'
 require 'erubis'
 require 'logger'
-require 'mime/types'
 
+begin
+  require 'fjson'
+  puts "using fjson"
+rescue LoadError
+  require 'json'
+end
 
 module Merb
-  VERSION='0.0.8' unless defined?VERSION
+  VERSION='0.0.9' unless defined?VERSION
   class Server
-    def self.config
-      @@merb_opts ||= {}
+    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
     end  
   end
 end
 
-class MerbControllerError < RuntimeError; end
+module Erubis
+  class MEruby < Erubis::Eruby
+    include PercentLineEnhancer
+    include StringBufferEnhancer
+  end
+end
+
+def __DIR__; File.dirname(__FILE__); end
 
-MERB_FRAMEWORK_ROOT = File.dirname(__FILE__)
+require File.join(__DIR__, 'merb/core_ext')
 
-MERB_ROOT = Merb::Server.config[:merb_root] || Dir.pwd
-DIST_ROOT = Merb::Server.config[:dist_root] || Dir.pwd+'/dist'
+MERB_FRAMEWORK_ROOT = __DIR__
 
-MERB_LOGGER = Logger.new("#{MERB_ROOT}/log/merb.#{Merb::Server.config[:port]}.log")
+MERB_ROOT = Merb::Server.merb_root || Dir.pwd
+DIST_ROOT = Merb::Server.dist_root || Dir.pwd+'/dist'
+
+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.config[:log_level].downcase rescue '')
+MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '')
                     when 'debug' 
                       Logger::DEBUG
                     when 'info'  
@@ -40,23 +67,23 @@ MERB_LOGGER.level = case (Merb::Server.config[:log_level].downcase rescue '')
                     else                        
                       Logger::INFO
                     end  
+
                       
-corelib = File.join(File.dirname(__FILE__), 'merb/core_ext')
-Dir.entries(corelib).sort.each {|fn| require File.join(corelib, fn) if fn =~ /\.rb$/}          
-lib = File.join(File.dirname(__FILE__), 'merb')
+         
+lib = File.join(__DIR__, 'merb')
 Dir.entries(lib).sort.each {|fn| require File.join(lib, fn) if fn =~ /\.rb$/}
 
+require File.join(__DIR__, 'merb/vendor/paginator/paginator')
+
 class Merb::Controller
-  if Merb::Server.config[:session] 
-    require "drb"
-    DRb.start_service('druby://localhost:0')
-    Merb.const_set :DRbSession, DRbObject.new(nil, "druby://#{Merb::Server.config[:host]}:#{Merb::Server.config[:session]}")
-    require "merb/session/merb_drb_session"
+  if Merb::Server.memory_session 
+    require "merb/session/merb_memory_session"
+    Merb::MemorySession.setup
     include ::Merb::SessionMixin
-    puts "drb session mixed in"
+    puts "memory session mixed in"
   end
   
-  if Merb::Server.config[:sql_session]
+  if Merb::Server.sql_session
     puts "ActiveRecord session mixed in"
     begin
       require 'action_controller/flash'
@@ -68,7 +95,7 @@ class Merb::Controller
     include ::Merb::SessionMixin
   end
   
-  if Merb::Server.config[:basic_auth] 
+  if Merb::Server.basic_auth
     require "merb/mixins/basic_authentication_mixin"
     include ::Merb::Authentication
     puts "Basic Authentication mixed in"

data/lib/merb/core_ext.rb

@@ -1,2 +1,12 @@
-require File.dirname(__FILE__)+'/core_ext/merb_kernel'
-aquire File.dirname(__FILE__)+'/core_ext/*'
+corelib = __DIR__+'/merb/core_ext'
+
+%w[ merb_class
+    merb_kernel
+    merb_object
+    merb_enumerable
+    merb_module
+    merb_string
+    merb_hash
+    merb_numeric
+    merb_symbol
+  ].each {|fn| require File.join(corelib, fn)} 

data/lib/merb/core_ext/merb_class.rb

@@ -41,11 +41,11 @@ class Class # :nodoc:
     cattr_writer(*syms)
   end
   
-  def meta_reader(*syms)
+  def shared_reader(*syms)
     syms.each do |sym|
       class_eval <<-EOS
         def self.#{sym}
-          read_meta_attribute(:#{sym})
+          read_shared_attribute(:#{sym})
         end
 
         def #{sym}
@@ -55,11 +55,11 @@ class Class # :nodoc:
     end
   end
 
-  def meta_writer(*syms)
+  def shared_writer(*syms)
     syms.each do |sym|
       class_eval <<-EOS
         def self.#{sym}=(obj)
-          write_meta_attribute(:#{sym}, obj)
+          write_shared_attribute(:#{sym}, obj)
         end
 
         def #{sym}=(obj)
@@ -69,38 +69,38 @@ class Class # :nodoc:
     end
   end
 
-  def meta_accessor(*syms)
-    meta_reader(*syms)
-    meta_writer(*syms)
+  def shared_accessor(*syms)
+    shared_reader(*syms)
+    shared_writer(*syms)
   end
 
-  def meta_attributes
-    @meta_attributes ||= {}
+  def shared_attributes
+    @shared_attributes ||= {}
   end
   
-  def write_meta_attribute(key, value)
-    meta_attributes[key] = value
+  def write_shared_attribute(key, value)
+    shared_attributes[key] = value
   end
 
-  def read_meta_attribute(key)
-    meta_attributes[key]
+  def read_shared_attribute(key)
+    shared_attributes[key]
   end
   
-  def reset_meta_attributes
-    meta_attributes.clear
+  def reset_shared_attributes
+    shared_attributes.clear
   end
 
   private 
-    def inherited_with_meta_attributes(child)
-      inherited_without_meta_attributes(child) if respond_to?(:inherited_without_meta_attributes)
+    def inherited_with_shared_attributes(child)
+      inherited_without_shared_attributes(child) if respond_to?(:inherited_without_shared_attributes)
       
-      new_meta_attributes = meta_attributes.inject({}) do |memo, (key, value)|
+      new_shared_attributes = shared_attributes.inject({}) do |memo, (key, value)|
         memo.update(key => (value.dup rescue value))
       end
       
-      child.instance_variable_set('@meta_attributes', new_meta_attributes)
+      child.instance_variable_set('@shared_attributes', new_shared_attributes)
     end
 
-    alias inherited_without_meta_attributes inherited
-    alias inherited inherited_with_meta_attributes
+    alias inherited_without_shared_attributes inherited
+    alias inherited inherited_with_shared_attributes
 end

data/lib/merb/core_ext/merb_kernel.rb

@@ -13,4 +13,64 @@ module Kernel
       end
     end
   end
+  
+  def rescue_require(sym, message = nil)
+    require sym
+  rescue LoadError, RuntimeError
+    puts message if message
+  end
+  
+  # Gives you back the file, line and method of the caller number i
+  # Example:
+  #   __caller_info__(1) # -> ['/usr/lib/ruby/1.8/irb/workspace.rb', '52', 'irb_binding']
+
+  def __caller_info__(i = 1)
+    file, line, meth = caller[i].scan(/(.*?):(\d+):in `(.*?)'/).first
+  end
+
+  # Gives you some context around a specific line in a file.
+  # the size argument works in both directions + the actual line,
+  # size = 2 gives you 5 lines of source, the returned array has the
+  # following format.
+  #   [
+  #     line = [
+  #              lineno           = Integer,
+  #              line             = String, 
+  #              is_searched_line = (lineno == initial_lineno)
+  #            ],
+  #     ...,
+  #     ...
+  #   ]
+  # Example:
+  #  __caller_lines__('/usr/lib/ruby/1.8/debug.rb', 122, 2) # ->
+  #   [
+  #     [ 120, "  def check_suspend",                               false ],
+  #     [ 121, "    return if Thread.critical",                     false ],
+  #     [ 122, "    while (Thread.critical = true; @suspend_next)", true  ],
+  #     [ 123, "      DEBUGGER__.waiting.push Thread.current",      false ],
+  #     [ 124, "      @suspend_next = false",                       false ]
+  #   ]
+
+  def __caller_lines__ file, line, size = 4
+    return [['Template Error!', "problem while rendering", false]] if file =~ /\(erubis\)/
+    lines = File.readlines(file)
+    current = line.to_i - 1
+
+    first = current - size
+    first = first < 0 ? 0 : first
+
+    last = current + size
+    last = last > lines.size ? lines.size : last
+
+    log = lines[first..last]
+
+    area = []
+
+    log.each_with_index do |line, index|
+      index = index + first + 1
+      area << [index, line.chomp, index == current + 1]
+    end
+
+    area
+  end
 end

data/lib/merb/core_ext/merb_object.rb

@@ -3,4 +3,18 @@ class Object
     yield(value)
     value
   end
+  
+  def __meta() class << self; self end end
+  def meta_eval(&blk) __meta.instance_eval( &blk ) end
+  def meta_def(name, &blk) meta_eval { define_method name, &blk } end
+  def class_def name, &blk
+    self.class.class_eval { define_method name, &blk }
+  end   
+  def blank?
+    if    respond_to? :empty? then empty?
+    elsif respond_to? :zero?  then zero?
+    else !self
+    end   
+  end
+
 end

data/lib/merb/core_ext/merb_string.rb

@@ -4,7 +4,7 @@ class String
   # :allow_reloading is set to true in the config
   # file or command line options.
   def import
-    if Merb::Server.config[:allow_reloading] 
+    if Merb::Server.allow_reloading
       Object.send(:remove_const, self.camel_case.intern) rescue nil
       load(self.snake_case  + '.rb')
     else  
@@ -14,16 +14,12 @@ class String
   
   # "FooBar".snake_case #=> "foo_bar"
   def snake_case
-    return self unless self =~ %r/[A-Z]/
-    self.reverse.scan(%r/[A-Z]+|[^A-Z]*[A-Z]+?/).reverse.map{|word| word.reverse.downcase}.join '_'
+    gsub(/\B[A-Z]/, '_\&').downcase
   end
 
   # "foo_bar".camel_case #=> "FooBar"
   def camel_case
-    return self if self =~ %r/[A-Z]/ and self !~ %r/_/
-    words = self.strip.split %r/\s*_+\s*/
-    words.map!{|w| w.downcase.sub(%r/^./){|c| c.upcase}}
-    words.join
+    split('_').map{|e| e.capitalize}.join
   end
 
   # Concatenates a path
@@ -31,10 +27,4 @@ class String
     File.join(self, o.to_s)
   end
   
-  def to_const
-    const = const.to_s.dup
-    base = const.sub!(/^::/, '') ? Object : ( self.kind_of?(Module) ? self : self.class )
-    const.split(/::/).inject(base){ |mod, name| mod.const_get(name) }
-  end
-  
 end

data/lib/merb/generators/merb_app/merb_app.rb

@@ -0,0 +1,33 @@
+require 'fileutils'
+require 'find'
+
+begin
+  require 'archive/tar/minitar'
+rescue LoadError
+  puts "You must gem install archive-tar-minitar to use the merb app generator"
+  exit!
+end
+
+module Merb
+  
+  class AppGenerator    
+    SKELETON = File.expand_path File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'examples/skeleton.tar')
+    
+    def self.run(path)
+      @path = path
+      @path = File.expand_path(@path)
+      if File.exists? @path
+        STDERR.puts "ERROR: Path #{@path} already exists! Aborting!"
+        exit 1
+      end
+
+      puts "Copying skeleton app to '#@path'"
+      # Unpacks 'test.tar' to 'x', creating 'x' if necessary.
+      Archive::Tar::Minitar.unpack(SKELETON, @path)
+      puts 'Done' 
+    end  
+
+  end
+        
+end  
+

data/lib/merb/merb_constants.rb

@@ -14,5 +14,12 @@ module Merb
       :disposition  => 'attachment'.freeze
     }.freeze
     
+    SET_COOKIE = " %s=%s; path=/; expires=%s".freeze
+    COOKIE_SPLIT = /[;,] */n.freeze
+    COOKIE_REGEXP = /\s*(.+)=(.*)\s*/.freeze
+    COOKIE_EXPIRED_TIME  = Time.at(0).freeze
+    HOUR = 60*60
+    DAY = HOUR*24
+    WEEK = DAY*7
   end
 end

data/lib/merb/merb_controller.rb

@@ -13,8 +13,8 @@ module Merb
   # puts that into params as well.
   class Controller
     
-    meta_accessor :layout
-    
+    shared_accessor :layout, :session_id_key, :cache_templates
+        
     include Merb::ControllerMixin
     include Merb::RenderMixin
     include Merb::ResponderMixin
@@ -37,6 +37,7 @@ module Merb
       cookies = query_parse(env['HTTP_COOKIE'], ';,')
       querystring = query_parse(env['QUERY_STRING'])
       self.layout ||= :application
+      self.session_id_key ||= :_session_id
       @in = req
       if MULTIPART_REGEXP =~ env['CONTENT_TYPE']
         boundary_regexp = /(?:\r?\n|\A)#{Regexp::quote("--#$1")}(?:--)?\r$/
@@ -66,7 +67,11 @@ module Merb
             end
             io_buffer << chunk
           end
-          querystring[name]=attrs if name
+          if name =~ /(.*)?\[\]/
+            (querystring[$1] ||= []) << attrs
+          else  
+            querystring[name]=attrs if name
+          end
           attrs[:tempfile].rewind if attrs.is_a?MerbHash
         end
       elsif @method == :post
@@ -80,7 +85,7 @@ module Merb
         end  
       end
       @cookies, @params = cookies.dup, querystring.dup.merge(args)
-      @cookies.merge!(:session_id => @params[:session_id]) if @params.has_key?(:session_id)
+      @cookies.merge!(:_session_id => @params[:_session_id]) if @params.has_key?(:_session_id)
       @method = @params.delete(:_method).downcase.to_sym if @params.has_key?(:_method)
       @request = Request.new(@env, @method)
       MERB_LOGGER.info("Params: #{params.inspect}")
@@ -90,19 +95,19 @@ module Merb
       start = Time.now
       setup_session if respond_to?:setup_session
       cought = catch(:halt) { call_filters(before_filters) }
-      case cought
+      @body = case cought
       when :filter_chain_completed
-        @body = send(action)
+        send(action)
       when String
-        @body = cought
+        cought
       when nil
-        @body = filters_halted
+        filters_halted
       when Symbol
-        @body = send(cought)
+        send(cought)
       when Proc
-        @body = cought.call(self)  
+        cought.call(self)  
       else
-        raise MerbControllerError, "The before filter chain is broken dude."
+        raise MerbControllerError, "The before filter chain is broken dude. wtf?"
       end
       call_filters(after_filters) 
       finalize_session if respond_to?:finalize_session
@@ -145,13 +150,13 @@ module Merb
       @session
     end
     
-    # meta_accessor sets up a class instance variable that can
+    # shared_accessor sets up a class instance variable that can
     # be unique for each class but also inherits the meta attrs
     # from its superclasses. Since @@class variables are almost
     # global vars within an inheritance tree, we use 
     # @class_instance_variables instead
-    meta_accessor :before_filters
-    meta_accessor :after_filters
+    shared_accessor :before_filters
+    shared_accessor :after_filters
     
     # calls a filter chain according to rules.
     def call_filters(filter_set)
@@ -229,18 +234,13 @@ module Merb
          not both at the same time for the same filter."
       ) if opts.has_key?(:only) && opts.has_key?(:exclude)
       
-      if opts[:only] && opts[:only].is_a?(Symbol)
-        opts[:only] = [opts[:only]]
-      end 
-      if opts[:exclude] && opts[:exclude].is_a?(Symbol)
-        opts[:exclude] = [opts[:exclude]]
-      end
+      opts = shuffle_filters!(opts)
       
       case filter
       when Symbol, String, Proc
         (self.before_filters ||= []) << [filter, opts]
       else
-        raise(MerbControllerError, 
+        raise(ArgumentError, 
           'filters need to be either a Symbol, String or a Proc'
         )        
       end  
@@ -260,17 +260,25 @@ module Merb
         "You can specify either :only or :exclude but 
          not both at the same time for the same filter."
       ) if opts.has_key?(:only) && opts.has_key?(:exclude)
+      
       raise(ArgumentError, 
         'after filters can only be a Proc object'
       ) unless Proc === filter
+      
+      opts = shuffle_filters!(opts)
+      
+      (self.after_filters ||= []) << [filter, opts]
+    end
+    
+    def self.shuffle_filters!(opts={})
       if opts[:only] && opts[:only].is_a?(Symbol)
         opts[:only] = [opts[:only]]
       end 
       if opts[:exclude] && opts[:exclude].is_a?(Symbol)
         opts[:exclude] = [opts[:exclude]]
       end
-      (self.after_filters ||= []) << [filter, opts]
-    end
+      return opts
+    end  
     
   end