krack 0.0.2 → 0.0.3

data/README.md

@@ -3,18 +3,33 @@
 Simple JSON APIs on Rack. Like so:
 
     # config.ru
-    
     require 'krack'
     
+    class Widget # < "ORM"
+      DB = {
+        "1" => {name: "Foo", color: "Black"},
+        "2" => {name: "Bar", color: "White"}
+      }
+      def self.all; DB end
+      def self.find(id); DB[id] end
+    end
+    
     module Widgets
-      class Show
+      class Index < Krack::Endpoint
         def respond
-          widget = Widget.find(params["id"])
-          {widget: widget.as_json}
+          {widgets: Widget.all}
+        end
+      end
+    
+      class Show < Krack::Endpoint
+        def respond
+          widget = Widget.find(params["id"]) or throw :halt, 404
+          {widget: widget}
         end
       end
     end
-
+    
     run Krack::Router.new {
+      get "/widgets",     Widgets::Index
       get "/widgets/:id", Widgets::Show
     }

data/krack.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'rack-test'
 end

data/lib/krack/endpoint.rb

@@ -12,8 +12,8 @@ module Krack
       @response = Rack::Response.new([], 200, {"Content-Type" => "application/json"})
       @params   = env["krack.params"].merge(@request.params)
 
-      on_call
       data = begin
+        on_call
         respond_or_halt
       rescue
         on_error($!)
@@ -31,11 +31,13 @@ module Krack
     def on_call; end
 
     def on_error(error)
-      Krack::Error.new(500).respond
+      on_halt(500)
     end
 
     def on_halt(halt)
-      Krack::Error.new(halt).respond
+      e = Krack::Error.new(halt)
+      response.status = e.status
+      e.to_h
     end
 
     def output(data)

data/lib/krack/error.rb

@@ -1,13 +1,12 @@
 module Krack
-  class Error < StandardError
-
+  class Error
     attr_accessor :status
 
     def initialize(status=500)
-      @status = status
+      @status = Rack::Utils::HTTP_STATUS_CODES.has_key?(status) ? status : 500
     end
 
-    def respond
+    def to_h
       {error: {status: status, message: Rack::Utils::HTTP_STATUS_CODES[status]}}
     end
   end

data/lib/krack/router.rb

@@ -13,11 +13,11 @@ module Krack
         next unless match = env["PATH_INFO"].match(route)
 
         env["krack.params"] = Hash[match.names.zip(match.captures)]
-        return app.dup.call(env)
+        return app.call(env)
       end
       not_found
     end
-    
+
     def not_found
       [404, {"Content-Type" => "text/plain"}, ["Not found"]]
     end

data/lib/krack/version.rb

@@ -1,3 +1,3 @@
 module Krack
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/endpoint_spec.rb

@@ -0,0 +1,49 @@
+require_relative 'spec_helper'
+
+class TestEndpoint < Krack::Endpoint
+  def respond
+    throw :halt, 400 if params["halt"] == "1"
+    raise if params["error"] == "1"
+
+    {
+      root: {
+        int_key: 1,
+        str_key: "foo bar",
+        arr_key: ["one", "two"],
+        test_param: params["test"]
+      }
+    }
+  end
+end
+
+def app
+  Krack::Router.new { get "/", TestEndpoint }
+end
+
+describe TestEndpoint do
+  it "should succeed" do
+    get "/"
+    json = assert_json
+    json["root"]["int_key"].must_equal 1
+    json["root"]["str_key"].must_equal "foo bar"
+    json["root"]["arr_key"].must_equal ["one", "two"]
+  end
+
+  it "should receive parameters" do
+    get "/", :test => "wibble"
+    json = assert_json
+    json["root"]["test_param"].must_equal "wibble"
+  end
+
+  it "should halt" do
+    get "/", :halt => "1"
+    json = assert_json(400)
+    json["root"].must_be_nil
+  end
+
+  it "should catch exceptions" do
+    get "/", :error => "1"
+    json = assert_json(500)
+    json["root"].must_be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,15 @@
 require 'minitest/autorun'
 require 'minitest/spec'
+require 'rack/test'
 
-require_relative '../lib/krack'
+require_relative '../lib/krack'
+
+include Rack::Test::Methods
+
+class MiniTest::Spec
+  def assert_json(status=200)
+    last_response.status.must_equal status
+    last_response.content_type.must_equal "application/json"
+    MultiJson.load(last_response.body)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krack
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple JSON APIs on Rack
 email:
 - team@kovalo.com
@@ -92,6 +108,7 @@ files:
 - lib/krack/error.rb
 - lib/krack/router.rb
 - lib/krack/version.rb
+- spec/endpoint_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kovalo/krack
@@ -119,6 +136,7 @@ signing_key:
 specification_version: 3
 summary: Simple JSON APIs on Rack
 test_files:
+- spec/endpoint_spec.rb
 - spec/router_spec.rb
 - spec/spec_helper.rb
 has_rdoc: