georgi-kontrol 0.1.1 → 0.1.2

data/.gitignore

@@ -1 +1,2 @@
 *~
+test/repo

data/README.md

@@ -2,8 +2,7 @@ Kontrol - a micro framework
 ===========================
 
 Kontrol is a small web framework written in Ruby, which runs directly
-on [Rack][5]. It provides a simple pattern matching algorithm for routing
-and uses GitStore as data storage.
+on [Rack][5]. It uses regular expressions for routing.
 
 All examples can be found in the [examples folder][3] of the kontrol
 project, which is hosted on [this github page][4].

data/lib/kontrol/application.rb

@@ -1,92 +1,40 @@
+require 'digest/sha1'
+
 module Kontrol
 
   class Application
 
-    include Helpers
-
     class << self
-
-      def config_reader(file, *names)
-        names.each do |name|
-          name = name.to_s        
-          define_method(name) { config[file][name] }
-        end
-      end
-    end
-
-    attr_reader :path, :store, :last_commit
-
-    config_reader 'assets.yml', :javascript_files, :stylesheet_files
-
-    def initialize(options = {})
-      options.each do |k, v|
-        send "#{k}=", v
+      def map(&block)
+        @map = Builder.new(&block)
       end
 
-      @mtime = {}
-      @last_mtime = Time.now
-      @path = File.expand_path('.')
-
-      initialize_repo if defined?(GitStore)
-    end
-
-    def initialize_repo      
-      @store = GitStore.new(path)
-      @store.load
-    rescue Grit::InvalidGitRepositoryError      
-    end
-
-    def assets
-      store['assets'] ||= GitStore::Tree.new
-    end
-
-    def config
-      store['config'] ||= GitStore::Tree.new
-    end
-
-    def templates
-      store['templates'] ||= GitStore::Tree.new
+      def call(env)
+        @map.call(env)
+      end     
     end
     
-    def repo
-      @store.repo
-    end
+    include Helpers
 
-    def check_reload
-      commit = store.repo.commits('master', 1)[0]
+    attr_reader :path, :store
 
-      if commit and (last_commit.nil? or last_commit.id != commit.id)
-        @last_commit = commit
-        @last_mtime = last_commit.committed_date
-        @mtime = {}
-        store.load        
-        load_store_from_disk
-      elsif ENV['RACK_ENV'] != 'production'
-        load_store_from_disk 
+    def initialize(path)
+      @path = path
+      
+      if File.directory?(File.join(path, '.git')) && ENV['RACK_ENV'] == 'production'
+        @store = GitStore.new(path)
+      else
+        @store = GitStore::FileStore.new(path)
       end
     end
 
-    def load_store_from_disk
-      store.each_with_path do |blob, path|
-        path = "#{self.path}/#{path}"
-        if File.exist?(path)
-          mtime = File.mtime(path)
-          if mtime != @mtime[path]
-            @mtime[path] = mtime
-            @last_mtime = mtime if mtime > @last_mtime
-            blob.load(File.read(path))
-          end
-        end
-      end
+    def templates
+      store['templates']
     end
-
+    
     # Render template with given variables.
     def render_template(file, vars)
-      if store
-        template = templates[file] or raise "template #{file} not found"
-      else
-        template = ERB.new(File.read("#{path}/templates/#{file}"))
-      end
+      template = templates[file] or raise "template #{file} not found"
       Template.render(template, self, file, vars)
     end
 
@@ -105,27 +53,30 @@ module Kontrol
       end
     end
 
-    def if_modified_since(date = @last_mtime.httpdate)
+    def etag(string)
+      Digest::SHA1.hexdigest(string)
+    end
+
+    def if_modified_since(time)
+      date = time.respond_to?(:httpdate) ? time.httpdate : time
       response['Last-Modified'] = date
+      
       if request.env['HTTP_IF_MODIFIED_SINCE'] == date
         response.status = 304
       else
-        yield
-      end
-    end
-
-    def render_javascripts
-      if_modified_since do
-        javascript_files.map { |file| assets["javascripts/#{file.strip}.js"] }.join
+        yield        
       end
     end
-
-    def render_stylesheets
-      if_modified_since do
-        stylesheet_files.map { |file| assets["stylesheets/#{file.strip}.css"] }.join
+    
+    def if_none_match(etag)
+      response['Etag'] = etag
+      if request.env['HTTP_IF_NONE_MATCH'] == etag
+        response.status = 304
+      else
+        yield
       end
     end
-
+    
     def request
       Thread.current['request']
     end
@@ -157,35 +108,15 @@ module Kontrol
       MIME_TYPES[ext] || 'text/html'
     end
 
-    class << self
-
-      def map(&block)
-        @map = Builder.new(&block)
-      end
-
-      def get_map
-        @map
-      end
-      
-    end
-
-    def find_map
-      if store and store['map.rb']
-        store['map.rb']
-      else
-        self.class.get_map
-      end
-    end
-
     def call(env)
       Thread.current['request'] = Rack::Request.new(env)
       Thread.current['response'] = Rack::Response.new([], nil, { 'Content-Type' => '' })
 
-      check_reload if store
+      store.refresh!
       
       env['kontrol.app'] = self
 
-      status, header, body = find_map.call(env)
+      status, header, body = self.class.call(env)
 
       response.status = status if response.status.nil?
       response.header.merge!(header)

data/lib/kontrol/router.rb

@@ -29,15 +29,14 @@ module Kontrol
     def call(env)
       path = env["PATH_INFO"].to_s.squeeze("/")      
 
-      for pattern, app, options in @routing
-        match = path.match(/^#{pattern}/)
-        if match and options_match(env, options)
+      @routing.each do |pattern, app, options|        
+        if (match = path.match(/^#{pattern}/)) && options_match(env, options)
           env = env.dup
           (env['kontrol.args'] ||= []).concat(match.to_a[1..-1])
           if match[0] == pattern
             env["SCRIPT_NAME"] += match[0]
             env["PATH_INFO"] = path[match[0].size..-1]
-          end
+          end          
           return app.call(env)
         end
       end

data/test/application_spec.rb

@@ -1,9 +1,10 @@
 require 'kontrol'
+require 'git_store'
 require 'rack/mock'
 
 describe Kontrol::Builder do
 
-  REPO = File.expand_path(File.dirname(__FILE__) + '/test_repo')
+  REPO = File.expand_path(File.dirname(__FILE__) + '/repo')
 
   before do
     FileUtils.rm_rf REPO
@@ -11,7 +12,8 @@ describe Kontrol::Builder do
     Dir.chdir REPO
     `git init`
 
-    @app = Kontrol::Application.new
+    @class = Class.new(Kontrol::Application)
+    @app = @class.new(REPO)
     @request = Rack::MockRequest.new(@app)
   end
 
@@ -32,7 +34,7 @@ describe Kontrol::Builder do
   end
   
   def map(&block)
-    @app.map(&block)
+    @class.map(&block)
   end
   
   def file(file, data)
@@ -57,6 +59,15 @@ describe Kontrol::Builder do
     put("/two").body.should == 'four'
   end
 
+  it "should redirect" do
+    map do
+      get '/' do redirect 'x' end
+    end
+
+    get('/')['Location'].should == 'x'
+    get('/').status.should == 301
+  end
+
   it "should reload after a commit" do
     file 'file', 'file'
 
@@ -74,24 +85,24 @@ describe Kontrol::Builder do
   end
 
   it "should serve assets" do
-    file 'config/assets.yml', '{ javascript_files: [index], stylesheet_files: [styles] }'
     file 'assets/javascripts/index.js', 'index'
     file 'assets/stylesheets/styles.css', 'styles'
     file 'assets/file', 'file'
     
     map do
       get '/assets/javascripts\.js' do
-        render_javascripts
+        scripts = store['assets/javascripts'].to_a.join
+        if_none_match(etag(scripts)) { scripts }
       end
 
       get '/assets/stylesheets\.css' do
-        render_stylesheets
+        styles = store['assets/stylesheets'].to_a.join
+        if_none_match(etag(styles)) { styles }
       end
 
       get '/assets/(.*)' do |path|
-        if_modified_since do
-          assets[path]
-        end
+        file = store['assets'][path]
+        if_none_match(etag(file)) { file }
       end
     end
 
@@ -101,9 +112,9 @@ describe Kontrol::Builder do
     get("/assets/stylesheets.css")['Content-Type'].should == 'text/css'
     
     get("/assets/file").body.should == 'file'
-    last_mod = get("/assets/file")['Last-Modified']
+    etag = get("/assets/file")['Etag']
     
-    get("/assets/file", 'HTTP_IF_MODIFIED_SINCE' => last_mod).status.should == 304
+    get("/assets/file", 'HTTP_IF_NONE_MATCH' => etag).status.should == 304
   end
 
   it "should render templates" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgi-kontrol
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matthias Georgi