rack-server-pages 0.0.5 → 0.0.6

data/CHANGES.md

@@ -1,7 +1,14 @@
 CHANGES
 =======
 
-### [0.0.5](https://github.com/migrs/rack-server-pages/tree/v0.0.5) / 2012-03-18
+### [0.0.6](https://github.com/migrs/rack-server-pages/tree/v0.0.6) / 2012-05-16
+
+  * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.5...v0.0.6)
+
+  * Feature
+    - Passing local parameters to partial template (Tilt mode only)
+
+### [0.0.5](https://github.com/migrs/rack-server-pages/tree/v0.0.5) / 2012-04-18
 
   * [Changes](https://github.com/migrs/rack-server-pages/compare/v0.0.4...v0.0.5)
 

data/README.md

@@ -477,7 +477,6 @@ And create `public/info.php` :)
 ## ToDo
 
 ### Implements
-- Error handling
 - Static file generator (for designer)
 
 ### Tasks

data/lib/rack-server-pages/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ServerPages
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/lib/rack/server_pages.rb

@@ -219,8 +219,8 @@ module Rack
         end
       end
 
-      def render_with_layout(scope, &block)
-        content = render(scope, &block)
+      def render_with_layout(scope, locals = {}, &block)
+        content = render(scope, locals = {}, &block)
         if layout = scope.layout and layout_file = Dir["#{layout}{.*,}"].first
           scope.layout(false)
           Template[layout_file].render_with_layout(scope) { content }
@@ -234,8 +234,8 @@ module Rack
           (@tilt ||= Tilt[@file]) ? self : nil
         end
 
-        def render(scope, &block)
-          @tilt.new(@file).render(scope, &block)
+        def render(scope, locals = {}, &block)
+          @tilt.new(@file).render(scope, locals, &block)
         end
 
         def default_mime_type
@@ -255,7 +255,8 @@ module Rack
           (@file =~ /\.(#{self.class.extensions.join('|')})$/) and ::File.exist?(@file) ? self : nil
         end
 
-        def render(scope, &block)
+        def render(scope, locals = {}, &block)
+          ## TODO: support locals
           ERB.new(IO.read(@file)).result(scope._binding(&block))
         end
 
@@ -292,9 +293,9 @@ module Rack
         halt
       end
 
-      def partial(file, &block)
+      def partial(file, locals = {}, &block)
         if tpl_file = Dir["#{file}{.*,}"].first and template = Template[tpl_file]
-          template.render(self, &block)
+          template.render(self, locals, &block)
         else
           IO.read(file)
         end

data/public/sample.erb

@@ -5,6 +5,7 @@ What's your name?:
   <input type="text" name="name" value="<%=h params["name"]%>" />
   <input type="submit" />
 </form>
+<%= partial 'views/examples/_time.html', :a => 'PartA', :b => 'PartB' %>
 
 <%= @sample1 %>
 <%= @sample2 %>

data/views/examples/_time.html.erb

@@ -1 +1,4 @@
 <p><code>Time: <%= Time.now %></code></p>
+<%= a rescue nil %>
+<%= b rescue nil %>
+<%= c rescue nil %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-server-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000Z
+date: 2012-05-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70273387486420 !ruby/object:Gem::Requirement
+  requirement: &70139451581180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273387486420
+  version_requirements: *70139451581180
 description: ! "Rack middleware and appilcation for serving dynamic pages in very
   simple way.\n                     There are no controllers and no models, just only
   views like a asp, jsp and php!"