merb 0.0.8 → 0.0.9

data/lib/merb/merb_upload_handler.rb

@@ -10,7 +10,7 @@ class MerbUploadHandler < Mongrel::HttpHandler
     if options[:drb]
       require 'drb'
       DRb.start_service
-      Mongrel.const_set :Uploads, DRbObject.new(nil, "druby://#{Merb::Server.config[:host]}:#{Merb::Server.config[:session]}").upload_progress
+      Mongrel.const_set :Uploads, DRbObject.new(nil, "druby://#{Merb::Server.host}:#{Merb::Server.drb_server_port}").upload_progress
     else
       require File.dirname(__FILE__)+'/merb_upload_progress'
       Mongrel.const_set :Uploads, Merb::UploadProgress.new

data/lib/merb/merb_view_context.rb

@@ -1,8 +1,13 @@
 require File.dirname(__FILE__)+'/mixins/erubis_capture_mixin'
-require File.dirname(__FILE__)+'/mixins/javascript_mixin'
+require File.dirname(__FILE__)+'/mixins/view_context_mixin'
+require File.dirname(__FILE__)+'/mixins/form_control_mixin'
 
 module Merb
-  
+  PROTECTED_IVARS = %w[@cookies @session @headers @params 
+             @env @in @status @root @method @request @fingerprint_before
+             @_new_cookie @tmpl_ext_cache @body]
+  module GlobalHelper
+  end    
   # the ViewContext is really
   # just an empty container for us to fill with instance 
   # variables from the controller, include helpers into
@@ -10,13 +15,13 @@ module Merb
   # when evaluating the templates.
   class ViewContext
     include Merb::ErubisCaptureMixin
-    include Merb::JavascriptMixin
+    include Merb::ViewContextMixin
+    include Merb::FormControls
+    include Merb::GlobalHelper
     
     def initialize(controller)
       @controller = controller
-      (@controller.instance_variables - %w[@cookies @session @headers @params 
-                 @env @in @status @root @method @request @fingerprint_before
-                  @controller @k]).each do |ivar|
+      (@controller.instance_variables - PROTECTED_IVARS).each do |ivar|
         self.instance_variable_set(ivar, @controller.instance_variable_get(ivar))
       end
       begin

data/lib/merb/mixins/basic_authentication_mixin.rb

@@ -4,7 +4,7 @@ module Merb
     require 'base64'
     
     def credentials
-      if d = %w{REDIRECT_X_HTTP_AUTHORIZATION 
+      if d = %w{REDIRECT_X_HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION
              X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION}.
              inject([]) { |d,h| @env.has_key?(h) ? @env[h].to_s.split : d }
         return Base64.decode64(d[1]).split(':')[0..1] if d[0] == 'Basic'
@@ -13,25 +13,23 @@ module Merb
     
     def authenticated?
       username, password = *credentials
-      username == Merb::Server.config[:basic_auth][:username] and password == Merb::Server.config[:basic_auth][:password]
+      username == Merb::Server.basic_auth[:username] and password == Merb::Server.basic_auth[:password]
     end
     
-    def authenticate
+    def basic_authentication
       if !authenticated?
         throw :halt, :access_denied
       end
     end
       
-    def self.included(base)
-      base.class_eval do
-        def access_denied
-          @status = 401
-          @headers['Content-type'] = 'text/plain'
-          @headers['Status'] = 'Unauthorized'
-          @headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Server.config[:basic_auth][:domain]}\""
-          return 'Unauthorized'
-        end  
-      end
+    def access_denied
+      @status = 401
+      @headers['Content-type'] = 'text/plain'
+      @headers['Status'] = 'Unauthorized'
+      @headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Server.basic_auth[:domain]}\""
+      return 'Unauthorized'
+    end  
+
     end
       
   end

data/lib/merb/mixins/controller_mixin.rb

@@ -16,14 +16,8 @@ module Merb
     # serve the static file directly.
     def send_file(file, opts={})
       opts.update(Merb::Const::DEFAULT_SEND_FILE_OPTIONS.merge(opts))
-      [:type, :disposition].each do |arg|
-        raise ArgumentError, ":#{arg} option required" if opts[arg].nil?
-      end
-
       disposition = opts[:disposition].dup || 'attachment'
-
       disposition << %(; filename="#{opts[:filename] ? opts[:filename] : File.basename(file)}")
-
       headers.update(
         'Content-Type'              => opts[:type].strip,  # fixes a problem with extra '\r' with some browsers
         'Content-Disposition'       => disposition,
@@ -41,6 +35,18 @@ module Merb
       return
     end  
   
+    # Sets a cookie to be included in the response.
+    def set_cookie(name, value, expires)
+      (headers['Set-Cookie'] ||='') << 
+        (Merb::Const::SET_COOKIE % [name.to_s, escape(value.to_s), expires.rfc2822])
+    end
+    
+    # Marks a cookie as deleted. The cookie is given an expires stamp in 
+    # the past.
+    def delete_cookie(name)
+      set_cookie(name, nil, Merb::Const::COOKIE_EXPIRED_TIME)
+    end
+  
     # parses a query string or the payload of a POST
     # request into the params hash. So for example:
     # /foo?bar=nik&post[title]=heya&post[body]=whatever

data/lib/merb/mixins/form_control_mixin.rb

@@ -0,0 +1,94 @@
+require 'date'
+require 'ostruct'
+
+class OpenStruct
+  def temp hash
+    OpenStruct.new(@table.merge(hash))
+  end
+end
+
+module Merb
+  module FormControls
+    #
+    # this is the main merb form control helper. It can build
+    # either textfield, textarea, date selects, or time selects.
+    #
+    # <%= control_for @post, :title, :text, :id => 'foo', :size => 53 %>
+    # <%= control_for @post, :intro, :textarea, :class => 'post_intro', 
+    #	                                          :rows => 10, :cols => 50 %>
+    # <%= control_for @post, :created_at, :time %>
+    # <%= control_for @post, :published_at, :date %>
+    #
+    def control_for(obj, meth, type, opts={})
+      instance = obj
+      obj = obj.class
+      o = OpenStruct.new(:name  => "#{obj.to_s.downcase}[#{meth}]",
+                         :value => (instance.send(meth) rescue nil),
+                         :title => (opts.has_key?(:title) ? opts.delete(:title) : nil),
+                         :html  => opts)            
+      Control.send(type, o)                
+    end
+    
+    module Control
+      
+      # This is ripped wholesale from Ramaze with some modifications to work
+      # with AR objects instead of Og. Thanks again to Michael Fellinger
+      class << self
+
+        def number(o)
+          o.value ||= 0
+          text(o)
+        end
+
+        def text(o)
+          o.value ||= ""
+          tag = ''
+          tag << "#{o.title}: " if o.title
+          tag << %{<input type="text" name="#{o.name}" value="#{o.value}" #{o.html ? o.html.map{|k,v| "#{k}=\"#{v}\""}.join(' ') : nil}/>}
+        end
+
+        def textarea(o)
+          o.value ||= ""
+          %{<textarea name="#{o.name}" #{o.html ? o.html.map{|k,v| "#{k}=\"#{v}\""}.join(' ') : nil}>#{o.value}</textarea>}
+        end
+
+        def date(o)
+          o.value ||= Date.today
+          selects = []
+          selects << date_day(o.temp(:value => o.value.day))
+          selects << date_month(o.temp(:value => o.value.month))
+          selects << date_year(o.temp(:value => o.value.year))
+          selects.join("\n")
+        end
+
+        def time(o)
+          o.value ||= Time.now
+          selects = []
+          selects << date_day(o.temp(:value => o.value.day))
+          selects << date_month(o.temp(:value => o.value.month))
+          selects << date_year(o.temp(:value => o.value.year))
+          selects << time_hour(o.temp(:value => o.value.hour))
+          selects << time_minute(o.temp(:value => o.value.min))
+          selects << time_second(o.temp(:value => o.value.sec))
+          selects.join("\n")
+        end
+
+        def time_second(o) select(o.name+'[second]', (0...60),o.value) end
+        def time_minute(o) select(o.name+'[minute]', (0...60),o.value) end
+        def time_hour(o)   select(o.name+'[hour]', (0...24),o.value) end
+        def date_day(o)    select(o.name+'[day]', (1..31),o.value) end
+        def date_month(o)  select(o.name+'[month]', (1..12),o.value) end
+        def date_year(o)   select(o.name+'[year]', (1950..2050),o.value) end
+
+        def select(name, range, default)
+          out = %{<select name="#{name}">\n}
+          range.each do |i|
+            out << %{  <option value="#{i}"#{' selected="selected"' if default == i}>#{i}</option>\n}
+          end
+          out << "</select>\n"
+        end
+      end
+
+    end # Control
+  end # FormHelper
+end  # Merb

data/lib/merb/mixins/render_mixin.rb

@@ -1,10 +1,16 @@
 module Merb
 
   module RenderMixin
+    @@erbs = {}
+    @@mtimes = {}
+    
+    def self.erbs
+      @@erbs
+    end  
     
     # shortcut to a template path based on name.
     def template_dir(loc)
-      File.expand_path(Merb::Server.config[:merb_root] / "/dist/app/views/#{loc}")
+      File.expand_path(MERB_ROOT / "/dist/app/views/#{loc}")
     end  
     
     # returns the current method name. Used for
@@ -18,14 +24,14 @@ module Merb
     # extension from the :template_ext map froom your app's
     # configuration. defaults to .herb, .jerb & .xerb
     def template_extension_for(ext)
-      Merb::Server.config[:template_ext][ext]
+      (@tmpl_ext_cache ||= Merb::Server.template_ext)[ext]
     end
     
     # this returns a ViewContext object populated with all
     # the instance variables in your controller. This is used
     # as the view context object for the Erubis templates.
-    def create_view_context
-      ViewContext.new(self)
+    def _view_context
+      @_view_context_cache ||= ViewContext.new(self)
     end
     
     # does a render with no layout. Also sets the
@@ -35,11 +41,12 @@ module Merb
     def render_js(template=current_method_name(1))
       headers['Content-Type'] = "text/javascript"
       template = new_eruby_obj(template_dir(self.class.name.snake_case) / "/#{template}.#{template_extension_for(:js)}") 
-      template.evaluate(create_view_context)
+      template.evaluate(_view_context)
     end
     
     # renders nothing but sets the status, defaults
-    # to 200
+    # to 200. does send one \n newline char, tyhis is for
+    # safari and flash uploaders to work.
     def render_nothing(status=200)
       @status = status
       return "\n"
@@ -52,7 +59,7 @@ module Merb
     # extension
     def render_no_layout(template=current_method_name(1))
       template = new_eruby_obj(template_dir(self.class.name.snake_case) / "/#{template}.#{template_extension_for(:html)}")
-      template.evaluate(create_view_context)
+      template.evaluate(_view_context)
     end 
     
     # This is merb's partial render method. You name your 
@@ -72,7 +79,7 @@ module Merb
       else  
         tmpl = new_eruby_obj(template_dir(self.class.name.snake_case) / "/_#{template}.#{template_extension_for(:html)}")
       end
-      tmpl.evaluate(create_view_context)
+      tmpl.evaluate(_view_context)
     end 
     
     # This creates and returns a new Erubis object populated
@@ -80,11 +87,28 @@ module Merb
     # template then we rescue the Errno::ENOENT exception
     # and raise a no template found message
     def new_eruby_obj(path)
-      begin
-       Erubis::MEruby.new(IO.read(path))
-      rescue Errno::ENOENT
-        raise "No template found at path: #{path}"
-      end   
+      if @@erbs[path] && !cache_template?(path)
+        return @@erbs[path]
+      else  
+        begin
+          returning Erubis::MEruby.new(IO.read(path)) do |eruby|
+            eruby.init_evaluator :filename => path
+            if cache_template?(path)
+              @@erbs[path] = eruby
+              @@mtimes[path] = Time.now
+            end  
+          end
+        rescue Errno::ENOENT
+          raise "No template found at path: #{path}"
+        end
+      end  
+    end
+    
+    def cache_template?(path)
+      return false unless Merb::Server.config[:cache_templates]
+      return true unless @@erbs[path]
+      @@mtimes[path] < File.mtime(path) ||
+        (File.symlink?(path) && (@@mtimes[path] < File.lstat(path).mtime))
     end
     
     # this is the xml builder render method. This method
@@ -96,12 +120,15 @@ module Merb
     #   xml.bar "baz"
     # }
     def render_xml(template=current_method_name(1))
-      xml = Builder::XmlMarkup.new :indent => 2
-      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-      eval IO.read( template_dir(self.class.name.snake_case) + "/#{template}.#{template_extension_for(:xml)}" ) 
-      @headers['Content-Type'] = 'application/xml'
-      @headers['Encoding']     = 'UTF-8'
-      xml.target!
+      _xml_body = IO.read( template_dir(self.class.name.snake_case) + "/#{template}.#{template_extension_for(:xml)}" ) 
+      headers['Content-Type'] = 'application/xml'
+      headers['Encoding']     = 'UTF-8'
+      _view_context.instance_eval %{
+        xml = Builder::XmlMarkup.new :indent => 2
+        xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+        #{_xml_body}
+        return xml.target!
+      } 
     end
     
     # This is the main render method that handles layouts.
@@ -137,13 +164,12 @@ module Merb
     #     render :layout => :none
     #   end    
     def render(opts={})
-      template = opts[:action] || params[:action]
+      template = opts.is_a?(Symbol) ? opts : (opts[:action] || params[:action])
       tmpl_ext = template_extension_for(:html)
       MERB_LOGGER.info("Rendering template: #{template}.#{tmpl_ext}")
       name = self.class.name.snake_case
       template = new_eruby_obj(template_dir(name) / "/#{template}.#{tmpl_ext}")
-      view_context = create_view_context
-      layout_content = template.evaluate(view_context)
+      layout_content = template.evaluate(_view_context)
       self.layout = opts[:layout].to_sym if opts.has_key?(:layout)
       return layout_content if (layout == :none)
       if layout != :application
@@ -156,9 +182,9 @@ module Merb
         end  
       end      
       MERB_LOGGER.info("With Layout: #{layout_choice}.#{tmpl_ext}")
-      view_context.instance_eval { throw_content(:layout) { layout_content } }
+      _view_context.instance_variable_set('@_layout_content', layout_content)
       layout_tmpl = new_eruby_obj("#{template_dir('layout')}/#{layout_choice}.#{tmpl_ext}")     
-      layout_tmpl.evaluate(view_context)
+      layout_tmpl.evaluate(_view_context)
     end
     
   end  

data/lib/merb/mixins/view_context_mixin.rb

@@ -0,0 +1,122 @@
+module Merb
+  module ViewContextMixin
+  
+    def link_to(name, url='', opts={})
+      %{<a href="#{url}" #{opts.map{|k,v| "#{k}=\"#{v}\""}.join(' ')}>#{name}</a>}
+    end
+  
+    # escape text for javascript.
+    def escape_js(javascript)
+      (javascript || '').gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
+    end
+    
+    # creates an <a> tag with with an onclick containing
+    # a js function
+    # link_to_function('click me', "alert('hi!')")
+    def link_to_function(name, function)
+      %{<a href="#" onclick="#{function}; return false;">#{name}</a>}
+    end
+    
+    def image_tag(img, path='/images/', opts={})
+      %{<img src="#{path+img}" #{opts.map{|k,v| "#{k}=\"#{v}\""}.join(' ')} />}
+    end
+    
+    # calls .to_json on data. This will use fjson if installed
+    # so it can be faster than escape_js
+    def js(data)
+      if data.respond_to? :to_json
+        data.to_json
+      else
+        data.inspect.to_json
+      end
+    end
+    
+    # Requiring javascripts and stylesheets:
+    # you can use require_js(:prototype) or require_css(:shinystyles)
+    # from any view or layout and the scripts will only be included once
+    # in the head of the final page. In the head of your layout you will
+    # need to add these two tags:
+    #
+    # <%= include_required_js %>
+    # <%= include_required_css %>
+    #
+    # --app/views/layouts/application.rhtml
+    #
+    # <html>
+    #   <head>
+    #     <%= include_required_js %>
+    #     <%= include_required_css %>
+    #   </head>
+    #   <body>
+    #   <%= catch_content :layout %>
+    #   </body>
+    # </html>
+    # 
+    # --app/views/whatever/index.rhtml
+    #
+    # <%= partial(:part1) %>
+    # <%= partial(:part2) %>
+    # 
+    # --app/views/whatever/_part1.rhtml
+    #
+    # <% require_js  'this' -%>
+    # <% require_css 'that', 'another_one' -%>
+    # 
+    # --app/views/whatever/_part2.rhtml
+    #
+    # <% require_js 'this', 'something_else' -%>
+    # <% require_css 'that' -%>
+    
+    
+    # require_js(:myjs) can be used to require any javascript
+    # file anywhere in your templates. It will only include the
+    # javascript tag once in the header
+    def require_js(*js)
+      @required_js ||= []
+      @required_js |= js
+    end
+    
+    # require_css(:mystyles) can be used to require any javascript
+    # file anywhere in your templates. It will only include the
+    # javascript tag once in the header
+    def require_css(*css)
+      @required_css ||= []
+      @required_css |= css
+    end
+    
+    # this goes in the head of your layout if you will be using
+    # require_js
+    def include_required_js
+      js_include_tag(*@required_js)
+    end
+    
+    # this goes in the head of your layout if you will be using
+    # require_css 
+    def include_required_css
+      css_link_tag(*@required_js)
+    end
+    
+    # js_include_tag(:foo, :bar, :baz) will create a javascript 
+    # include tag for each script in the arguments. It will append
+    # '.js' if it is left out of the call.
+    def js_include_tag(*scripts)
+      return nil if scripts.empty?
+      scripts.inject('') do |memo,script|
+        script = script.to_s
+        memo << %Q|<script src="/javascripts/#{script=~/\.js$/ ? script : script+'.js' }" type="text/javascript">//</script>\n|
+      end
+    end
+    
+    # css_include_tag(:foo, :bar, :baz) will create a stylesheet  
+    # link tag for each stylesheet in the arguments. It will append
+    # '.css' if it is left out of the call.
+    def css_include_tag(*scripts)
+      return nil if scripts.empty?
+      scripts.inject('') do |memo,script|
+        script = script.to_s
+        memo << %Q|<link href="/stylesheets/#{script=~/\.css$/ ? script : script+'.css' }" media="all" rel="Stylesheet" type="text/css"/>\n|
+      end
+    end
+    
+  end  
+end