merb 0.1.0 → 0.2.0

data/lib/merb/mixins/view_context_mixin.rb

@@ -31,6 +31,30 @@ module Merb
       end
     end
     
+    
+    # Helper method to cache a fragment. 
+    # <h1>Article list</h1>
+    #
+    # <% cache(:article_list) do %>
+    #   <ul>
+    #   <% @articles.each do |a| %>
+    #     <li><%= a.title %></li>
+    #   <% end %>
+    #   </ul>
+    # <% end %>
+
+    def cache(name, &block)
+      return block.call unless caching_enabled?
+      buffer = eval("_buf", block.binding)
+      if fragment = ::Merb::Caching::Fragment.get(name)
+        buffer.concat(fragment)
+      else
+        pos = buffer.length
+        block.call
+        ::Merb::Caching::Fragment.put(name, buffer[pos..-1])
+      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

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[session_id_key]
-      @session, cookies[session_id_key] = Merb::Session.persist(cookies[session_id_key])
+      before = @cookies[ancestral_trait[:session_id_key]]
+      @session, @cookies[ancestral_trait[:session_id_key]] = Merb::Session.persist(@cookies[ancestral_trait[:session_id_key]])
       @_fingerprint_before = Marshal.dump(@session).hash
-      @_new_cookie = cookies[session_id_key] != before
+      @_new_cookie = @cookies[ancestral_trait[: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(session_id_key, cookies[session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
+      set_cookie(ancestral_trait[:session_id_key], @cookies[ancestral_trait[: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[session_id_key]
-      @session , cookies[session_id_key] = Merb::MemorySession.persist(cookies[session_id_key])
-      @_new_cookie = cookies[session_id_key] != before
+      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
     end
 
     def finalize_session
       MERB_LOGGER.info("Finalize session")
-      set_cookie(session_id_key, cookies[session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
+      set_cookie(ancestral_trait[:session_id_key], @cookies[ancestral_trait[:session_id_key]], Time.now+Merb::Const::WEEK*2) if @_new_cookie
     end 
 
   end
@@ -73,6 +73,7 @@ module Merb
       def delete(key)
         @mutex.synchronize {
           @sessions.delete(key)
+          @timestamps.delete(key)
         }
       end
       
@@ -102,4 +103,4 @@ module Merb
     
   end # end DRbSession
 
-end  
+end

data/lib/merb/template.rb

@@ -0,0 +1,10 @@
+module Merb
+  module Template
+    # TODO : pull up common methods from template engines.
+  end  
+end  
+
+template = __DIR__+'/merb/template'
+
+%w[ erubis markaby xml_builder haml
+  ].each {|fn| require File.join(template, fn)}

data/lib/merb/template/erubis.rb

@@ -0,0 +1,52 @@
+module Merb
+  module Template
+
+
+    module Erubis
+      ::Merb::Controller.register_engine self, %w[ herb jerb erb ]
+      class << self
+        
+        @@erbs = {}
+        @@mtimes = {}
+        
+        def exempt_from_layout?
+          false    
+        end
+    
+        def transform(options = {})
+          opts, file, view_context = options.values_at(:opts, :file, :view_context)
+          eruby = new_eruby_obj(file)
+          view_context.class.send(:include, ::Merb::ErubisCaptureMixin)
+          eruby.evaluate(view_context)
+        end
+        
+        def new_eruby_obj(path)
+          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], @@mtimes[path] = eruby, 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
+        
+      end
+    end
+  
+  end
+   
+end

data/lib/merb/template/haml.rb

@@ -0,0 +1,77 @@
+
+
+begin
+  require 'haml/engine'
+rescue LoadError
+  puts "you must install the haml gem to use .haml templates"
+end
+module ActionView
+  # stub, in case the requires for that active_* stuff of Haml doesn't fail
+  # but we are not running Rails ;)
+  class Base
+    # stub
+    def concat
+    end
+    # stub
+    def form_tag
+    end
+  end
+end
+
+
+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
+        @@hamls ||= {}
+        @@mtimes ||= {}
+        def exempt_from_layout?
+          false    
+        end
+        
+        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)
+          end
+          haml.to_html(view_context)
+        end
+      
+        private
+        
+        def get_precompiled(path, opts={})
+          if @@hamls[path] && !cache_template?(path)
+            return @@hamls[path]
+          end   
+        end
+        
+       def set_precompiled(path, precompiled)
+         @@hamls[path], @@mtimes[path] = precompiled, Time.now 
+       end
+        
+        def cache_template?(path)
+          return false unless ::Merb::Server.config[:cache_templates]
+          return true unless @@hamls[path]
+          @@mtimes[path] < File.mtime(path) ||
+            (File.symlink?(path) && (@@mtimes[path] < File.lstat(path).mtime))
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/merb/template/markaby.rb

@@ -0,0 +1,48 @@
+
+begin
+  require 'markaby'
+rescue LoadError
+  puts "you must install the markaby gem to use .mab templates"
+end
+  
+module Markaby  
+  class Builder
+    def _buf; self end
+    def throw_content(name, &block)
+      @helpers.instance_variable_set "@_#{name}_content",
+        eval("@_#{name}_content = (@_#{name}_content|| '') + capture(&block)")
+    end
+  end
+end
+  
+module Merb
+  
+  module Template
+    
+    module Markaby
+    
+      ::Merb::Controller.register_engine self, %w[ mab ]
+    
+      class << self
+
+        def exempt_from_layout?
+          false    
+        end
+        
+        # OPTIMIZE :  add mab template caching. what does this mean for mab? 
+        # mab is just ruby, there's no two phase compile and run
+        def transform(options = {})
+          opts, file, view_context = options.values_at(:opts, :file, :view_context)
+          mab = ::Markaby::Builder.new({}, view_context) {
+            instance_eval(File.read(file))
+          }
+          mab.to_s
+        end
+
+      end
+      
+    end
+        
+  end
+    
+end

data/lib/merb/template/xml_builder.rb

@@ -0,0 +1,34 @@
+module Merb
+  
+  module Template
+    
+    module XMLBuilder
+    
+      ::Merb::Controller.register_engine self, %w[ rxml xerb builder]
+    
+      class << self
+
+        def exempt_from_layout?
+          true    
+        end
+        
+        def transform(options = {})
+          opts, file, view_context = options.values_at(:opts, :file, :view_context)
+          xml_body = IO.read(file) 
+          view_context.headers['Content-Type'] = 'application/xml'
+          view_context.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
+
+      end
+      
+    end
+        
+  end
+    
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.9
+rubygems_version: 0.9.2
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-01-18 00:00:00 -08:00
+  version: 0.2.0
+date: 2007-03-18 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -38,11 +38,14 @@ files:
 - lib/merb.rb
 - lib/merb_tasks.rb
 - lib/tasks
+- lib/merb/caching
+- lib/merb/caching.rb
 - lib/merb/core_ext
 - lib/merb/core_ext.rb
 - lib/merb/generators
 - lib/merb/merb_constants.rb
 - lib/merb/merb_controller.rb
+- lib/merb/merb_dispatcher.rb
 - lib/merb/merb_drb_server.rb
 - lib/merb/merb_exceptions.rb
 - lib/merb/merb_handler.rb
@@ -56,7 +59,14 @@ files:
 - lib/merb/merb_yaml_store.rb
 - lib/merb/mixins
 - lib/merb/session
+- lib/merb/template
+- lib/merb/template.rb
 - lib/merb/vendor
+- lib/merb/caching/action_cache.rb
+- lib/merb/caching/fragment_cache.rb
+- lib/merb/caching/store
+- lib/merb/caching/store/file_cache.rb
+- lib/merb/caching/store/memory_cache.rb
 - lib/merb/core_ext/merb_class.rb
 - lib/merb/core_ext/merb_enumerable.rb
 - lib/merb/core_ext/merb_hash.rb
@@ -72,12 +82,15 @@ files:
 - lib/merb/mixins/controller_mixin.rb
 - lib/merb/mixins/erubis_capture_mixin.rb
 - lib/merb/mixins/form_control_mixin.rb
-- lib/merb/mixins/merb_status_codes.rb
 - lib/merb/mixins/render_mixin.rb
 - lib/merb/mixins/responder_mixin.rb
 - lib/merb/mixins/view_context_mixin.rb
 - lib/merb/session/merb_ar_session.rb
 - lib/merb/session/merb_memory_session.rb
+- lib/merb/template/erubis.rb
+- lib/merb/template/haml.rb
+- lib/merb/template/markaby.rb
+- lib/merb/template/xml_builder.rb
 - lib/merb/vendor/paginator
 - lib/merb/vendor/paginator/paginator.rb
 - lib/merb/vendor/paginator/README.txt
@@ -120,19 +133,8 @@ files:
 - examples/skeleton/test/unit
 test_files: []
 
-rdoc_options: 
-- --quiet
-- --title
-- Merb Documentation
-- --opname
-- index.html
-- --line-numbers
-- TODO
-- --main
-- README
-- --inline-source
-- --exclude
-- ^(app|uploads)
+rdoc_options: []
+
 extra_rdoc_files: 
 - README
 - LICENSE

data/lib/merb/mixins/merb_status_codes.rb

@@ -1,59 +0,0 @@
-module Merb
-  # thanks to Michael Fellinger
-  STATUS_CODEs = {
-    # 1xx Informational (Request received, continuing process.)
-    :continue                         => 100,
-    :switching_protocols              => 101,
-
-    # 2xx Success (The action was successfully received, understood, and accepted.)
-    :ok                               => 200,
-    :created                          => 201,
-    :accepted                         => 202,
-    :non_authorative_information      => 203,
-    :no_content                       => 204,
-    :resent_content                   => 205,
-    :partial_content                  => 206,
-    :multi_status                     => 207,
-    
-    # 3xx Redirection (The client must take additional action to complete the request.)
-    :multiple_choices                 => 300,
-    :moved_permamently                => 301,
-    :moved_temporarily                => 302,
-    :found                            => 302,
-    :see_other                        => 303,
-    :not_modified                     => 304,
-    :use_proxy                        => 305,
-    :switch_proxy                     => 306,
-    :temporary_redirect               => 307,
-    
-    # 4xx Client Error (The request contains bad syntax or cannot be fulfilled.)
-    :bad_request                      => 400,
-    :unauthorized                     => 401,
-    :payment_required                 => 402,
-    :forbidden                        => 403,
-    :not_found                        => 404,
-    :method_not_allowed               => 405,
-    :not_aceptable                    => 406,
-    :proxy_authentication_required    => 407,
-    :request_timeout                  => 408,
-    :conflict                         => 409,
-    :gone                             => 410,
-    :length_required                  => 411,
-    :precondition_failed              => 412,
-    :request_entity_too_large         => 413,
-    :request_uri_too_long             => 414,
-    :unsupported_media_type           => 415,
-    :requested_range_not_satisfiable  => 416,
-    :expectation_failed               => 417,
-    :retry_with                       => 449,
-
-    # 5xx Server Error (The server failed to fulfill an apparently valid request.)
-    :internal_server_error            => 500,
-    :not_implemented                  => 501,
-    :bad_gateway                      => 502,
-    :service_unavailable              => 503,
-    :gateway_timeout                  => 504,
-    :http_version_not_supported       => 505,
-    :bandwidth_limit_exceeded         => 509, # (not official)
-  }
-end