merb 0.2.0 → 0.3.0

data/lib/merb/mixins/render_mixin.rb

@@ -49,7 +49,7 @@ module Merb
     #
     def render(opts={}, &blk)
       action = opts[:action] || params[:action]
-      opts[:layout] ||= ancestral_trait[:layout] 
+      opts[:layout] ||= _layout 
       
       case
       when status = opts[:nothing]
@@ -161,12 +161,12 @@ module Merb
         if action = opts[:action]
           path =
             File.expand_path(MERB_ROOT / "dist/app/views" / self.class.name.snake_case / action)
-        elsif layout = opts[:layout]
-          path = ancestral_trait[:layout_root] / layout
+        elsif _layout = opts[:layout]
+          path = _layout_root / _layout
         else
           raise "called find_template without an :action or :layout"  
         end  
-        extensions = [ancestral_trait[:template_extensions].keys].flatten.uniq
+        extensions = [_template_extensions.keys].flatten.uniq
         glob = "#{path}.{#{opts[:ext] || extensions.join(',')}}"
         Dir[glob].first
       end
@@ -175,11 +175,11 @@ module Merb
         if template =~ /\//
           t = template.split('/')
           template = t.pop
-          path = ancestral_trait[:template_root] / t.join('/') / "_#{template}"
+          path = _template_root / t.join('/') / "_#{template}"
         else  
-          path = ancestral_trait[:template_root]  / self.class.name.snake_case / "_#{template}"
+          path = _template_root  / self.class.name.snake_case / "_#{template}"
         end
-        extensions = [ancestral_trait[:template_extensions].keys].flatten.uniq
+        extensions = [_template_extensions.keys].flatten.uniq
         glob = "#{path}.{#{opts[:ext] || extensions.join(',')}}"
         Dir[glob].first
       end

data/lib/merb/mixins/responder_mixin.rb

@@ -1,5 +1,6 @@
+require 'enumerator'
+
 module Merb
-  # Thanks to Chris Wanstrath
   # use this in your controllers to switch output based on
   # the HTTP_ACCEPT header. like so:
   # respond_to do |type|
@@ -8,15 +9,13 @@ module Merb
   #   type.xml { @foo.to_xml }
   #   type.yaml { @foo.to_yaml }
   # end  
-  
-  # TODO : revisit this whole patern. Can we improve on this?
   module ResponderMixin
     
     def respond_to(&block)
       responder = Rest::Responder.new(@env['HTTP_ACCEPT'], params)
       block.call(responder)
       responder.respond(headers)
-      @status = responder.status
+      @status = responder.status if responder.status
       responder.body
     end
 
@@ -56,7 +55,6 @@ module Merb
           mime_type = negotiate_content
           if mime_type
             headers['Content-Type'] = mime_type.super_range
-            @status = 200
             @body   = @stack[mime_type.to_sym].call
           else
             headers['Content-Type'] = nil
@@ -68,10 +66,19 @@ module Merb
         protected
           
           def self.parse(accept_header)
-            index = 0
-            list = accept_header.split(/,/).map! do |entry|
+            # parse the raw accept header into a unique, sorted array of AcceptType objects
+            returning( accept_header.split(/,/).enum_for(:each_with_index).map do |entry,index|
               AcceptType.new(entry,index += 1)
-            end.sort!.uniq
+            end.sort.uniq ) do |list|
+              # firefox (and possibly other browsers) send broken default accept headers.
+              # fix them up by sorting alternate xml forms (namely application/xhtml+xml)
+              # ahead of pure xml types (application/xml,text/xml).
+              if app_xml = list.detect{|e| e.super_range == 'application/xml'}
+                list.select{|e| e.to_s =~ /\+xml/}.each { |acc_type|
+                  list[list.index(acc_type)],list[list.index(app_xml)] = 
+                    list[list.index(app_xml)],list[list.index(acc_type)] }
+              end
+            end
           end
           
         private
@@ -88,7 +95,7 @@ module Merb
             format = @params['format'].to_sym
             if @stack[format]
               if @accepts.map(&:to_sym).include?(format)
-                @accepts.select{|a| a.to_sym == format }.first
+                @accepts.detect{|a| a.to_sym == format }
               else
                 AcceptType.new(TYPES[format].first,0)
               end
@@ -116,7 +123,7 @@ module Merb
         end
       
         def <=>(entry)
-          returning (entry.quality <=> quality).to_s do |c|
+          returning((entry.quality <=> quality).to_s) do |c|
             c.replace((index <=> entry.index).to_s) if c == '0'
           end.to_i
         end

data/lib/merb/mixins/view_context_mixin.rb

@@ -17,8 +17,19 @@ module Merb
       %{<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(' ')} />}
+    # creates an <img> tag
+    # defaults to a src path prefix of /images/
+    #
+    # image_tag('foo.gif') => <img src='/images/foo.gif' />
+    # image_tag('foo.gif', :class => 'bar') => <img src='/images/foo.gif' class='bar' />
+    #
+    # you can override the default path by sending a :path parameter in the opts
+    #
+    # image_tag('foo.gif', :path => '/files/') => <img src='/files/foo.gif' />
+    #
+    def image_tag(img, opts={})
+      opts[:path] ||= '/images/'
+      %{<img src="#{opts.delete(:path) + img}" #{opts.map{|k,v| "#{k}=\"#{v}\""}.join(' ')} />}
     end
     
     # calls .to_json on data. This will use fjson if installed

data/lib/merb/session/merb_ar_session.rb

@@ -6,10 +6,10 @@ module Merb
 
     def setup_session
       MERB_LOGGER.info("Setting up session")
-      before = @cookies[ancestral_trait[:session_id_key]]
-      @session, @cookies[ancestral_trait[:session_id_key]] = Merb::Session.persist(@cookies[ancestral_trait[:session_id_key]])
+      before = @cookies[_session_id_key]
+      @session, @cookies[_session_id_key] = Merb::Session.persist(@cookies[_session_id_key])
       @_fingerprint_before = Marshal.dump(@session).hash
-      @_new_cookie = @cookies[ancestral_trait[:session_id_key]] != before
+      @_new_cookie = @cookies[_session_id_key] != before
     end
 
     def finalize_session
@@ -17,7 +17,7 @@ module Merb
       unless Marshal.dump(@session).hash == @_fingerprint_before
         @session.save
       end
-      set_cookie(ancestral_trait[:session_id_key], @cookies[ancestral_trait[:session_id_key]], Time.now+Merb::Const::WEEK*2) if @_new_cookie
+      set_cookie(_session_id_key, @cookies[_session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
     end 
 
   end

data/lib/merb/session/merb_memory_session.rb

@@ -4,14 +4,14 @@ module Merb
 
     def setup_session
       MERB_LOGGER.info("Setting up session")
-      before = @cookies[ancestral_trait[:session_id_key]]
-      @session , @cookies[ancestral_trait[:session_id_key]] = Merb::MemorySession.persist(@cookies[ancestral_trait[:session_id_key]])
-      @_new_cookie = @cookies[ancestral_trait[:session_id_key]] != before
+      before = @cookies[_session_id_key]
+      @session , @cookies[_session_id_key] = Merb::MemorySession.persist(@cookies[_session_id_key])
+      @_new_cookie = @cookies[_session_id_key] != before
     end
 
     def finalize_session
       MERB_LOGGER.info("Finalize session")
-      set_cookie(ancestral_trait[:session_id_key], @cookies[ancestral_trait[:session_id_key]], Time.now+Merb::Const::WEEK*2) if @_new_cookie
+      set_cookie(_session_id_key, @cookies[_session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
     end 
 
   end

data/lib/merb/template/erubis.rb

@@ -3,7 +3,7 @@ module Merb
 
 
     module Erubis
-      ::Merb::Controller.register_engine self, %w[ herb jerb erb ]
+      ::Merb::Controller.register_engine self, %w[ herb jerb erb rhtml ]
       class << self
         
         @@erbs = {}

data/lib/merb/template/haml.rb

@@ -23,15 +23,13 @@ module Merb
   module Template
     module Haml
     
-      # Custom HAML-options to be merged.
-    
-      trait :haml_options => {
-              :locals => {}
-            }
-    
        ::Merb::Controller.register_engine self, %w[ haml ]
     
       class << self
+        
+        class_inheritable_accessor :haml_options
+        self.haml_options = { :locals => {} }
+        
         @@hamls ||= {}
         @@mtimes ||= {}
         def exempt_from_layout?
@@ -40,15 +38,23 @@ module Merb
         
         def transform(options = {})
           opts, file, view_context = options.values_at(:opts, :file, :view_context)
-          opts = ancestral_trait[:haml_options].merge(opts)
-          if precompiled = get_precompiled(file)
-            opts[:precompiled] ||= precompiled
-            haml = ::Haml::Engine.new("", opts)
-          else
-            haml = ::Haml::Engine.new(IO.read(file), opts)
-            set_precompiled(file, haml.precompiled)
+          opts = haml_options.merge(opts)
+         	begin 
+         	  if precompiled = get_precompiled(file) 
+         	    opts[:precompiled] ||= precompiled 
+         	    haml = ::Haml::Engine.new("", opts) 
+         	  else 
+         	    haml = ::Haml::Engine.new(IO.read(file), opts) 
+         	    set_precompiled(file, haml.precompiled) 
+         	  end 
+         	
+         	  haml.to_html(view_context) 
+         	rescue 
+         	  # ::Haml::Engine often inserts a bogus "(haml):#{line_number}" entry in the backtrace. 
+         	  # Let's replace it with the path of the actual template 
+         	  $@[0].sub! /\(haml\)/, file  
+         	  raise # Raise the exception again
           end
-          haml.to_html(view_context)
         end
       
         private

data/lib/tasks/merb.rake

@@ -9,7 +9,16 @@ namespace :merb do
       f.chmod(0744)
     }
     
-    puts "Freezing Merb Framework into dist/framework"
-    puts "Use script/merb to start instead of plain merb"
+    puts "  Freezing Merb Framework into dist/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 MERB_ROOT / 'script/merb'
+    
+    puts "  Removed: "
+    puts "   - #{MERB_ROOT / 'dist/framework'} (recursive) "
+    puts "   - #{MERB_ROOT / 'script/merb'}"
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-03-18 00:00:00 -07:00
+  version: 0.3.0
+date: 2007-04-28 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -70,6 +70,8 @@ files:
 - lib/merb/core_ext/merb_class.rb
 - lib/merb/core_ext/merb_enumerable.rb
 - lib/merb/core_ext/merb_hash.rb
+- lib/merb/core_ext/merb_inflections.rb
+- lib/merb/core_ext/merb_inflector.rb
 - lib/merb/core_ext/merb_kernel.rb
 - lib/merb/core_ext/merb_module.rb
 - lib/merb/core_ext/merb_numeric.rb