RubyGems - georgi-kontrol - Versions diffs - 0.2 → 0.3 - Mend

georgi-kontrol 0.2 → 0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/README.md CHANGED

@@ -158,6 +158,10 @@ We create a Markdown file name `index.md`:
 We have now a simple page, which should be rendered as response. We
 create a simple app in a file `git_app.ru`:
+    require 'kontrol'
+    require 'bluecloth'
+    require 'git_store'
     class GitApp < Kontrol::Application
       def initialize(path)
@@ -172,6 +176,9 @@ create a simple app in a file `git_app.ru`:
       end
     end
+    run GitApp.new
 Add all the page to your git repository:
     git init

data/examples/git_app.ru CHANGED

@@ -1,5 +1,6 @@
 require 'kontrol'
 require 'bluecloth'
+require 'git_store'
 class GitApp < Kontrol::Application
@@ -10,7 +11,7 @@ class GitApp < Kontrol::Application
   map do
     page '/(.*)' do |name|
-      text BlueCloth.new(@store[name + '.md']).to_html
+      text BlueCloth.new(@store[name]).to_html
     end
   end
 end

data/lib/kontrol/application.rb CHANGED

@@ -20,25 +20,29 @@ module Kontrol
     end
     def load_template(file)
-      ERB.new(File.read("#{path}/templates/#{file}"))
+      ERB.new(File.read("#{self.path}/templates/#{file}"))
     end
     # Render template with given variables.
     def render_template(file, vars)
-      Template.render(load_template(file), self, file, vars)
+      template = load_template(file) or raise "not found: #{path}"
+      Template.render(template, self, "#{self.path}/templates/#{file}", vars)
     end
     # Render named template and insert into layout with given variables.
-    def render(name, vars = {})
-      content = render_template(name, vars)
-      layout = vars[:layout] || "layout.rhtml"
+    def render(name, options = {})
+      options = options.merge(:request => request, :params => params)
+      content = render_template(name, options)
+      layout = options.delete(:layout)
       if name[0, 1] == '_'
         return content
       elsif layout == false
         response.body = content
       else
-        response.body = render_template(layout, vars.merge(:content => content))
+        options.merge!(:content => content)
+        response.body = render_template(layout || "layout.rhtml", options)
       end
       response['Content-Length'] = response.body.size.to_s
@@ -77,6 +81,10 @@ module Kontrol
     def get?    ; request.get?                end
     def put?    ; request.put?                end
     def delete? ; request.delete?             end
+    def post    ; request.post? and yield     end
+    def get     ; request.get? and yield      end
+    def put     ; request.put? and yield      end
+    def delete  ; request.delete? and yield   end
     def text(s)
       response.body = s
@@ -121,9 +129,21 @@ module Kontrol
       "#<#{self.class.name} @path=#{path}>"
     end
+    def respond_to?(name)
+      if match = name.to_s.match(/^(.*)_path$/)
+        router.__find__(match[1])
+      else
+        super
+      end
+    end
     def method_missing(name, *args, &block)
       if match = name.to_s.match(/^(.*)_path$/)
-        router.__find__(match[1]).generate(*args)
+        if route = router.__find__(match[1])
+          route.generate(*args)
+        else
+          super
+        end
       else
         super
       end

data/lib/kontrol/route.rb CHANGED

@@ -20,7 +20,9 @@ module Kontrol
     end
     def generate(*args)
-      @format % args
+      @format % args.map { |arg|
+        arg.respond_to?(:to_param) ? arg.to_param : arg.to_s
+      }
     end
   end

data/lib/kontrol/template.rb CHANGED

@@ -13,7 +13,7 @@ module Kontrol
         instance_variable_set "@#{k}", v
       end
     end
     def __binding__
       binding
     end

data/test/application_spec.rb CHANGED

@@ -7,6 +7,14 @@ describe Kontrol::Application do
     @class = Class.new(Kontrol::Application)
     @app = @class.new
     @request = Rack::MockRequest.new(@app)
+    def @app.load_template(file)
+      if file == "layout.rhtml"
+        ERB.new '<html><%= @content %></html>'
+      else
+        ERB.new '<p><%= @body %></p>'
+      end
+    end
   end
   def get(*args)
@@ -90,15 +98,17 @@ describe Kontrol::Application do
     get('/')['Content-Length'].should == '5'
   end
-  it "should render templates" do
-    def @app.load_template(file)
-      if file == "layout.rhtml"
-        ERB.new '<html><%= @content %></html>'
-      else
-        ERB.new '<p><%= @body %></p>'
+  it "should render no layout" do
+    map do
+      index '/' do
+        render 'index.rhtml', :body => 'BODY', :layout => false
       end
     end
+    get('/').body.should == '<p>BODY</p>'
+  end
+  it "should render templates" do
     map do
       index '/' do
         render 'index.rhtml', :body => 'BODY'

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georgi-kontrol
 version: !ruby/object:Gem::Version
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors:
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-04-13 00:00:00 -07:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable:
 dependencies: []
@@ -65,6 +65,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key:
 specification_version: 2
-summary: a micro web framework
+summary: a micro framework
 test_files: []