waves 0.8.1 → 0.8.2

data/doc/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/layers/renderers/erubis.rb

@@ -7,7 +7,7 @@ module Erubis # :nodoc:
   class Context
     
     def <<(s) 
-      eval("_buf", @binding).concat s # add to rendered output
+      eval("_buf << '#{s}'", @binding)
     end
     
     def capture
@@ -17,7 +17,7 @@ module Erubis # :nodoc:
       result
     end
     
-    def render(eruby)
+    def to_s(eruby)
       unless @binding
         @binding = binding
         eval("_buf = ''; _context = []", @binding)
@@ -49,7 +49,7 @@ module Waves
             instance_variable_set("@#{key}",val)
           end
         end
-        context.render(eruby)
+        context.to_s(eruby)
       end
 
 

data/lib/resources/mixin.rb

@@ -78,6 +78,8 @@ module Waves
           def process
             begin
               before ; body = send( request.method ) ; after
+            rescue Waves::Dispatchers::Redirect => e
+              raise e
             rescue Exception => e
               response.status = ( StatusCodes[ e.class ] || 500 )
               ( body = handler( e ) ) rescue raise e
@@ -112,7 +114,7 @@ module Waves
           def deferred? ; false ; end
           
           before {} ; after {} ; always {}
-          handler( Waves::Dispatchers::Redirect ) { |e| raise e }
+          # handler( Waves::Dispatchers::Redirect ) { |e| raise e }
       
           %w( post get put delete head ).each do | method |
             on( method ) { not_found }

data/lib/runtime/response_mixin.rb

@@ -42,18 +42,16 @@ module Waves
       ( rname.nil? ? resource.class.paths : app::Resources[ rname ].paths ).new( request )
     end
 
-    def basename ; @basename ||= path.sub(/\.([^\.]+)$/,'') ; end
+    # these take strings or operate on the path by default
+    def basename( str = nil ) ; ( str or path ).sub(/\.([^\.]+)$/,'') ; end
 
-    def extension
-      @extension ||= if ( m = path.match(/\.([^\.]+)$/) ) 
-        m[1]
-      end
+    def extension( str = nil )
+      ( m = ( str or path ).match(/\.([^\.]+)$/) ) ? m[1] : nil
     end
     
     def render( path, assigns = {} )
       Waves::Views::Base.new( request ).render( path, assigns )
     end
-    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waves
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Dan Yoder