knot 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Gemfile

@@ -1,13 +1,11 @@
 source 'http://rubygems.org'
 
-gem "rack"
-gem "rack-protection"
-gem "yajl-ruby"
-
+gem "rack", '1.4.1'
+gem "rack-protection", '1.2.0'
 
 group :test, :development do
-  gem "rack-test"
-  gem "rspec"
-  gem "rake"
-  gem "unicorn"
+  gem "rack-test", '0.6.1'
+  gem "rspec", '2.11.0'
+  gem "rake", '0.9.2.2'
+  gem "unicorn", '4.3.1'
 end

data/Gemfile.lock

@@ -10,28 +10,26 @@ GEM
       rack (>= 1.0)
     raindrops (0.10.0)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rack
-  rack-protection
-  rack-test
-  rake
-  rspec
-  unicorn
-  yajl-ruby
+  rack (= 1.4.1)
+  rack-protection (= 1.2.0)
+  rack-test (= 0.6.1)
+  rake (= 0.9.2.2)
+  rspec (= 2.11.0)
+  unicorn (= 4.3.1)

data/README.md

@@ -0,0 +1,16 @@
+# Knot
+True README is coming soon. 
+
+For now, Knot is an early version of creating a very small, lightweight wrapper over Rack for simple HTTP apps
+
+Currently, it can:
+
+### route requests
+* has optional filters that take place before a specified set of requests
+
+### render ERB templates
+* it caches templates, even in development, so you'll have to restart your server.
+
+### render JSON
+
+### basic HTTP (responses / redirects / headers)

data/Rakefile

@@ -1,3 +1,5 @@
+require './gem_version'
+
 task :default => ["knot:test"]
 
 namespace :knot do
@@ -12,4 +14,21 @@ namespace :knot do
     Kernel.system("bundle exec rspec")
   end
 
+  namespace :gem do
+
+    task :gemify => [:build, :deploy]
+
+    desc "Builds Knot's gemspec"
+    task :build do
+      system "gem build knot.gemspec"
+    end
+
+    desc "Deploys the Knot gem to rubygems"
+    task :deploy do
+      system "gem push knot-#{VERSION}"
+    end
+
+  end
+
 end
+

data/TODO

@@ -0,0 +1,13 @@
+- URL Helpers
+- Test Helpers
+- Error handlers -- 500 / 404
+- Include layouts for erb
+
+- Security:
+  - secure forms with authenticity token
+  - application auth token
+
+- Assets
+  - investigate asset pipeline
+
+- Travis build

data/gem_version.rb

@@ -0,0 +1 @@
+VERSION = '0.0.2'

data/knot.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'knot/version'
+require './gem_version'
 
 Gem::Specification.new do |gem|
   gem.name          = "knot"
-  gem.version       = Knot::VERSION
+  gem.version       = VERSION
   gem.authors       = ["Brian Pratt"]
   gem.email         = ["brian@8thlight.com"]
   gem.description   = "Knot"
@@ -19,5 +19,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('rack')
   gem.add_dependency('rack-protection')
-  gem.add_dependency('yajl-ruby')
 end

data/lib/knot/application.rb

@@ -31,10 +31,12 @@ module Knot
     end
 
     def call(env)
+      request = Rack::Request.new(env)
+
       begin
-        route_request(env)
-      rescue => e
-        return [500, {'Content-Type' => 'text/html'}, ["An error occured: ", e.message + "\n", e.backtrace.join("\n")]]
+        route_request(request)
+      rescue => err
+        handle_error(request, config._handlers[:internal_error], 500, err)
       end
     end
 
@@ -42,10 +44,9 @@ module Knot
       self.class.config
     end
 
-    def route_request(env)
+    def route_request(request)
       config.routers.each do |router|
         begin
-          request = Rack::Request.new(env)
           response = router._call!(request)
           return response.to_rack
         rescue Knot::Dispatch::NoRouteError
@@ -53,7 +54,13 @@ module Knot
         end
       end
 
-      return [404, {"Content-Type" => "text/html"}, ["Aw snap"]]
+      handle_error(request, config._handlers[:not_found], 404)
+    end
+
+    def handle_error(request, handler, status, error = nil)
+      response = Knot::Router.new(request, handler)._call!(error)
+      response.status = status
+      return response.to_rack
     end
   end
 end

data/lib/knot/application/configuration.rb

@@ -3,6 +3,11 @@ module Knot
     class Configuration
       attr_writer :template_path
 
+      def initialize
+        handle(:not_found) { "Aw snap" }
+        handle(:internal_error) { "Error!?" }
+      end
+
       def add_router(router)
         routers << router
       end
@@ -15,6 +20,14 @@ module Knot
         @template_path ||= "templates/"
       end
 
+      def handle(type, &block)
+        _handlers[type] = Knot::Dispatch::Route.new("", "", "", &block)
+      end
+
+      def _handlers
+        @_handlers ||= {}
+      end
+
       def finalize!
         routers.each do |router|
           router.config.knot_template_home = template_path

data/lib/knot/dispatch/route.rb

@@ -16,7 +16,7 @@ module Knot::Dispatch
     private
 
     def http_method_match?(request)
-      request.request_method == @http_method 
+      request.request_method == @http_method
     end
   end
 end

data/lib/knot/dispatch/router.rb

@@ -10,25 +10,29 @@ module Knot::Dispatch
     extend Knot::Dispatch::Router::API
 
     def self._call!(request)
-      new(request)._call!
+      new(request, matching_route(request))._call!
     end
 
     def self.config
       @config ||= Knot::Dispatch::Router::Config.new(self)
     end
 
-    attr_reader :request, :response
+    def self.matching_route(request)
+      route = config.routes.find { |route| route.match?(request) }
+      raise Knot::Dispatch::NoRouteError, "no route matches #{request.path}" if route.nil?
 
-    def initialize(request)
-      @request = request
-      @response = Knot::Dispatch::Response.new
+      return route
     end
 
-    def _call!
-      route = _config.routes.find { |route| route.match?(request) }
+    attr_reader :request, :response, :route
 
-      raise Knot::Dispatch::NoRouteError, "no route matches #{request.path}" if route.nil?
+    def initialize(request, route)
+      @request = request
+      @response = Knot::Dispatch::Response.new
+      @route = route
+    end
 
+    def _call!(error = nil)
       request.params.merge! Path.path_params(route.path, request)
 
       blocks = _config.applicable_filters(route).map(&:block)
@@ -36,7 +40,7 @@ module Knot::Dispatch
 
       catch(:halt) {
         blocks.map do |block|
-          result = instance_eval &block
+          result = instance_exec error, &block
           response.body << result if result.is_a?(String)
         end.last
       }

data/lib/knot/dispatch/router/context.rb

@@ -1,6 +1,6 @@
 require 'knot/render'
 require 'knot/dispatch'
-require 'yajl/json_gem'
+require 'json'
 
 module Knot::Dispatch
   class Router

data/spec/acceptance/acceptance_spec.rb

@@ -20,8 +20,8 @@ describe "basic test for API" do
 
   it "returns 404" do
     response = request.get "/not_to_be_found"
+    response.body.should == "Didn't find that page."
     response.status.should == 404
-    response.body.should == "Aw snap"
   end
 
   it "redirects" do
@@ -42,6 +42,7 @@ describe "basic test for API" do
   context "when an exception is raised" do
     it "returns 500" do
       response = request.get "/raise_exception"
+      response.body.should == "Someone committed a merge conflict: whoa nelly!!"
       response.status.should == 500
     end
   end

data/spec/acceptance/test_app.rb

@@ -45,6 +45,14 @@ class TestApp < Knot::Application
   configure do |config|
     config.add_router TestRouter
     config.template_path = "spec/acceptance/templates"
+
+    config.handle(:not_found) do
+      "Didn't find that page."
+    end
+
+    config.handle(:internal_error) do |error|
+      "Someone committed a merge conflict: #{error.message}"
+    end
   end
 end
 

data/spec/knot/dispatch/filter_spec.rb

@@ -27,5 +27,5 @@ describe Knot::Dispatch::Filter do
         filter.apply_to?(stub(:name => :another)).should be_true
       end
     end
-  end 
+  end
 end

data/spec/knot/dispatch/router_spec.rb

@@ -78,14 +78,14 @@ describe Knot::Dispatch::Router do
 
     context "#params" do
       it "gives access to the request's params" do
-        router = Knot::Dispatch::Router.new(request)
+        router = Knot::Dispatch::Router.new(request, nil)
         router.params.should == request.params
       end
     end
 
     context "#redirect" do
       it "sets status and location header" do
-        router = Knot::Dispatch::Router.new(request)
+        router = Knot::Dispatch::Router.new(request, nil)
         response = catch(:halt) { router.redirect('http://www.google.com') }
         response.status.should == 302
         response.headers['Location'].should == "http://www.google.com"
@@ -94,7 +94,7 @@ describe Knot::Dispatch::Router do
 
     context "#json" do
       it "returns the object in json" do
-        router = Knot::Dispatch::Router.new(request)
+        router = Knot::Dispatch::Router.new(request, nil)
         response = catch(:halt) { router.json(:foo => "bar") }
         JSON.parse(response.body.first).should == {'foo' => 'bar'}
       end
@@ -102,7 +102,7 @@ describe Knot::Dispatch::Router do
 
     context "#status" do
       it "sets the status code on the response" do
-        router = Knot::Dispatch::Router.new(request)
+        router = Knot::Dispatch::Router.new(request, nil)
         router.status(422)
         router.response.status.should == 422
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Knot
 email:
 - brian@8thlight.com
@@ -66,13 +50,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- README
+- README.md
 - Rakefile
+- TODO
 - config.ru
+- gem_version.rb
 - knot.gemspec
 - lib/knot.rb
 - lib/knot/application.rb
@@ -117,6 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2018670246009455394
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README

@@ -1,2 +0,0 @@
-# Knot
-It's pretty much top secret.