georgi-kontrol 0.1.5 → 0.1.6

data/examples/git_app.ru

@@ -2,9 +2,15 @@ require 'kontrol'
 require 'bluecloth'
 
 class GitApp < Kontrol::Application
+
+  def initialize(path)
+    super
+    @store = GitStore.new(path)
+  end
+
   map do
     get '/(.*)' do |name|
-      BlueCloth.new(store['pages', name + '.md']).to_html
+      BlueCloth.new(@store['pages', name + '.md']).to_html
     end
   end
 end

data/lib/kontrol/application.rb

@@ -6,7 +6,11 @@ module Kontrol
 
     class << self
       def map(&block)
-        @map = Builder.new(&block)
+        if block
+          @map = Builder.new(&block)
+        else
+          @map
+        end
       end
 
       def call(env)
@@ -16,26 +20,19 @@ module Kontrol
     
     include Helpers
 
-    attr_reader :path, :store
+    attr_reader :path
 
     def initialize(path = '.')
-      @path = File.expand_path(path)
-      
-      if File.directory?(File.join(path, '.git')) && ENV['RACK_ENV'] == 'production'
-        @store = GitStore.new(path)
-      else
-        @store = GitStore::FileStore.new(path)
-      end
+      @path = File.expand_path(path)      
     end
 
-    def templates
-      store['templates']
+    def load_template(file)
+      ERB.new(File.read("#{path}/templates/#{file}"))
     end
     
     # Render template with given variables.
     def render_template(file, vars)
-      template = templates[file] or raise "template #{file} not found"
-      Template.render(template, self, file, vars)
+      Template.render(load_template(file), self, file, vars)
     end
 
     def render_layout(vars)
@@ -45,7 +42,8 @@ module Kontrol
     # Render named template and insert into layout with given variables.
     def render(name, vars = {})
       content = render_template(name, vars)
-      if name[0, 1] == '_' || name.match(/\.rxml$/)
+      
+      if name[0, 1] == '_' or vars[:layout] == false
         content
       else
         vars.merge!(:content => content)
@@ -112,8 +110,6 @@ module Kontrol
       Thread.current['request'] = Rack::Request.new(env)
       Thread.current['response'] = Rack::Response.new([], nil, { 'Content-Type' => '' })
 
-      store.refresh!
-      
       env['kontrol.app'] = self
 
       status, header, body = self.class.call(env)
@@ -121,75 +117,20 @@ module Kontrol
       response.status = status if response.status.nil?
       response.header.merge!(header)
       response.body = body if response.body.empty?
-      response['Content-Length'] = response.body.size.to_s if response.status == 200
+      
+      if response.status != 304
+        response.body ||= ''
+        response['Content-Length'] = response.body.size.to_s
+      end
+      
       response['Content-Type'] = guess_content_type if response['Content-Type'].empty?
 
       response.finish
     end
 
     def inspect
-      "#<Kontrol::Application @path=#{path}>"
-    end
-
-    MIME_TYPES = {
-      "ai"    => "application/postscript",
-      "asc"   => "text/plain",
-      "avi"   => "video/x-msvideo",
-      "bin"   => "application/octet-stream",
-      "bmp"   => "image/bmp",
-      "class" => "application/octet-stream",
-      "cer"   => "application/pkix-cert",
-      "crl"   => "application/pkix-crl",
-      "crt"   => "application/x-x509-ca-cert",
-      "css"   => "text/css",
-      "dms"   => "application/octet-stream",
-      "doc"   => "application/msword",
-      "dvi"   => "application/x-dvi",
-      "eps"   => "application/postscript",
-      "etx"   => "text/x-setext",
-      "exe"   => "application/octet-stream",
-      "gif"   => "image/gif",
-      "htm"   => "text/html",
-      "html"  => "text/html",
-      "ico"   => "image/x-icon",
-      "jpe"   => "image/jpeg",
-      "jpeg"  => "image/jpeg",
-      "jpg"   => "image/jpeg",
-      "js"    => "text/javascript",
-      "lha"   => "application/octet-stream",
-      "lzh"   => "application/octet-stream",
-      "mov"   => "video/quicktime",
-      "mp3"   => "audio/mpeg",
-      "mpe"   => "video/mpeg",
-      "mpeg"  => "video/mpeg",
-      "mpg"   => "video/mpeg",
-      "pbm"   => "image/x-portable-bitmap",
-      "pdf"   => "application/pdf",
-      "pgm"   => "image/x-portable-graymap",
-      "png"   => "image/png",
-      "pnm"   => "image/x-portable-anymap",
-      "ppm"   => "image/x-portable-pixmap",
-      "ppt"   => "application/vnd.ms-powerpoint",
-      "ps"    => "application/postscript",
-      "qt"    => "video/quicktime",
-      "ras"   => "image/x-cmu-raster",
-      "rb"    => "text/plain",
-      "rd"    => "text/plain",
-      "rtf"   => "application/rtf",
-      "rss"   => "application/rss+xml",
-      "sgm"   => "text/sgml",
-      "sgml"  => "text/sgml",
-      "tif"   => "image/tiff",
-      "tiff"  => "image/tiff",
-      "txt"   => "text/plain",
-      "xbm"   => "image/x-xbitmap",
-      "xls"   => "application/vnd.ms-excel",
-      "xml"   => "text/xml",
-      "xpm"   => "image/x-xpixmap",
-      "xwd"   => "image/x-xwindowdump",
-      "zip"   => "application/zip",
-    }
-    
+      "#<#{self.class.name} @path=#{path}>"
+    end
   end
 
 end

data/lib/kontrol.rb

@@ -4,9 +4,8 @@ require 'erb'
 require 'yaml'
 require 'logger'
 
-begin; require 'git_store'; rescue LoadError; end
-
 require 'kontrol/helpers'
+require 'kontrol/mime_types'
 require 'kontrol/template'
 require 'kontrol/application'
 require 'kontrol/builder'

data/test/application_spec.rb

@@ -4,7 +4,7 @@ require 'rack/mock'
 
 describe Kontrol::Builder do
 
-  REPO = File.expand_path(File.dirname(__FILE__) + '/repo')
+  REPO = File.exist?('/tmp') ? '/tmp/test' : File.expand_path(File.dirname(__FILE__) + '/repo')
 
   before do
     FileUtils.rm_rf REPO
@@ -12,6 +12,8 @@ describe Kontrol::Builder do
     Dir.chdir REPO
     `git init`
 
+    ENV['RACK_ENV'] = 'production'
+
     @class = Class.new(Kontrol::Application)
     @app = @class.new(REPO)
     @request = Rack::MockRequest.new(@app)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgi-kontrol
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2008-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []