www 0.0.3 → 0.0.4

data/README.md

@@ -11,43 +11,37 @@ app.rb
     # encoding: utf-8
     require 'www'
 
-    class Foo < Www::Base
-      before do
-        # do something
-      end
-
+    class App < Www::Base
       get '/'
-      def index
-        "index"
+      def index(params)
+        params
       end
 
       get '/foo'
-      def foo(params)
-        haml :title => 'foo'
-      end
-
-      get '/regexp/?(.*)' # ex: /regexp/foo
-      def regexp(arg, params)
-        "#{arg} - #{params.inspect}"
+      def foo
+        haml :title => 'foo', :body => 'bar'
       end
 
       get '/(\d{4})/(\d{2})/(\d{2})' # ex: /2009/10/10
       def entry(year, month, date)
         [year, month, date]
       end
-
-      def helper
-        'bar'
-      end
     end
 
-views/foo.haml
+foo.haml
+
+    %h2= title
+    %p= body
+
+example.haml (as template)
 
     !!!
     %html
+      %head
+        %title= 'www-example'
       %body
-        %h1= title
-        %p= helper
+        %h1 www-example
+        != yield
 
 config.ru
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/example/app.rb

@@ -1,32 +1,19 @@
 # encoding: utf-8
 require 'www'
 
-class Foo < Www::Base
-  before do
-    # do something
-  end
-
+class App < Www::Base
   get '/'
-  def index
-    "index"
+  def index(params)
+    params
   end
 
   get '/foo'
-  def foo(params)
-    haml :title => 'foo'
-  end
-
-  get '/regexp/?(.*)' # ex: /regexp/foo
-  def regexp(arg, params)
-    "#{arg} - #{params.inspect}"
+  def foo
+    haml :title => 'foo', :body => 'bar'
   end
 
   get '/(\d{4})/(\d{2})/(\d{2})' # ex: /2009/10/10
   def entry(year, month, date)
     [year, month, date]
   end
-
-  def helper
-    'bar'
-  end
 end

data/example/foo.haml

@@ -1,5 +1,2 @@
-!!!
-%html
-  %body
-    %h1= title
-    %p= helper
+%h2= title
+%p= body

data/example/layout.haml

@@ -0,0 +1,7 @@
+!!!
+%html
+  %head
+    %title= 'www-example'
+  %body
+    %h1 www-example
+    != yield

data/lib/www/base.rb

@@ -4,15 +4,12 @@ module Www
     include View
 
     class << self
-      @@current_route = nil
-      @@routes = []
-
       def routes
-        @@routes
+        @@routes ||= []
       end
 
       def route(pattern, methods = [:get])
-        @@current_route = Route.new(pattern, methods, self)
+        @current_route = Route.new(pattern, methods, self)
       end
       alias_method :_, :route
 
@@ -30,10 +27,10 @@ module Www
       end
 
       def method_added(name)
-        return unless @@current_route
-        @@current_route.name = name
-        @@routes << @@current_route
-        @@current_route = nil
+        return unless @current_route
+        @current_route.name = name
+        routes << @current_route
+        @current_route = nil
 
         class_eval do
           alias_method :"www_#{name}", name
@@ -57,7 +54,7 @@ module Www
       end
 
       def find_route(path, request_method)
-        [@@routes.detect { |route|
+        [routes.detect { |route|
             path.match(route.pattern) && route.request_methods.include?(request_method.downcase.to_sym) }, $~]
       end
 
@@ -81,7 +78,6 @@ module Www
     end
 
     def initialize(request = nil)
-      # TODO: @_ で始まるようにした方がいいかもしれない
       @request = request
       @response = Rack::Response.new
     end

data/lib/www/view.rb

@@ -8,6 +8,14 @@ module Www
     end
 
     module ClassMethods
+      def layout(layout)
+        @layout = layout
+      end
+
+      def layout_path
+        @layout || 'layout'
+      end
+
       def view_dir(dir)
         @view_dir = dir
       end
@@ -26,9 +34,16 @@ module Www
     def render(type, *args)
       name = args[0].is_a?(String) ? args.shift : @route_name
       values = args[0]
-      path = File.join(self.class.view_dir_path, "#{name}.#{type}")
-      template = Tilt.new(path)
-      template.render self, values # TODO: helper class instead of Object.new
+      view_path = File.join(self.class.view_dir_path, "#{name}.#{type}")
+      layout_path = "#{self.class.layout_path}.#{type}"
+
+      if File.exists?(layout_path)
+        Tilt.new(layout_path).render self, values do
+          Tilt.new(view_path).render self, values
+        end
+      else
+        Tilt.new(view_path).render self, values
+      end
     end
   end
 end

data/spec/views/foo.haml

@@ -1 +1 @@
-= params.inspect
+= foo

data/spec/views/layout.haml

@@ -0,0 +1,3 @@
+%html
+  %body
+    != yield

data/spec/www_spec.rb

@@ -1,5 +1,6 @@
 class Foo < Www::Base
   view_dir 'spec/views'
+  layout 'spec/views/layout'
 
   before {}
   before(:foo, :index) {}
@@ -11,7 +12,7 @@ class Foo < Www::Base
 
   get '/foo'
   def foo(params)
-    haml :params => params
+    haml :foo => params['foo']
   end
 
   get '/regexp/?(.*)'
@@ -45,7 +46,13 @@ describe "Www" do
 
   it 'should call foo as "/foo" with params' do
     params = {'foo' => 'bar'}
-    get('/foo', params).body.chomp.should == params.inspect
+    get('/foo', params).body.should == <<-EOS
+<html>
+  <body>
+    bar
+  </body>
+</html>
+    EOS
   end
 
   it 'should call regexp as "/regexp/..."' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - jugyo
@@ -83,6 +83,7 @@ files:
 - example/app.rb
 - example/config.ru
 - example/foo.haml
+- example/layout.haml
 - lib/www.rb
 - lib/www/app.rb
 - lib/www/base.rb
@@ -90,6 +91,7 @@ files:
 - lib/www/view.rb
 - spec/spec_helper.rb
 - spec/views/foo.haml
+- spec/views/layout.haml
 - spec/www_spec.rb
 has_rdoc: true
 homepage: http://github.com/jugyo/www