krack 0.0.3 → 0.1.0

data/README.md

@@ -2,34 +2,36 @@
 
 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
+```ruby
+# 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 Index < Krack::Endpoint
+    def respond
+      {widgets: Widget.all}
     end
-    
-    module Widgets
-      class Index < Krack::Endpoint
-        def respond
-          {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
+
+  class Show < Krack::Endpoint
+    def respond
+      widget = Widget.find(params["id"]) or throw :halt, 404
+      {widget: widget}
     end
-    
-    run Krack::Router.new {
-      get "/widgets",     Widgets::Index
-      get "/widgets/:id", Widgets::Show
-    }
+  end
+end
+
+run Krack::Router.new {
+  get "/widgets",     Widgets::Index
+  get "/widgets/:id", Widgets::Show
+}
+```

data/lib/krack/endpoint.rb

@@ -2,25 +2,25 @@ module Krack
   class Endpoint
     attr_reader :env, :request, :response, :params
 
-    def call(env)
-      dup.call!(env)
-    end
-
-    def call!(env)
+    def initialize(env)
       @env      = env
       @request  = Rack::Request.new(env)
       @response = Rack::Response.new([], 200, {"Content-Type" => "application/json"})
       @params   = env["krack.params"].merge(@request.params)
+    end
 
+    def self.call(env)
+      new(env).call!
+    end
+
+    def call!
       data = begin
-        on_call
         respond_or_halt
       rescue
         on_error($!)
       end
-
-      @response.write(output(data))
-      @response.finish
+      response.write(output(data))
+      response.finish
     end
 
     def respond_or_halt
@@ -28,8 +28,6 @@ module Krack
       on_halt(halt)
     end
 
-    def on_call; end
-
     def on_error(error)
       on_halt(500)
     end

data/lib/krack/router.rb

@@ -36,12 +36,7 @@ module Krack
       # Allow optional trailing slash, add start/end tokens
       route = "\\A#{route}\\/?\\z"
 
-      # App can be either a Rack class or an instance of such, e.g.
-      # Endpoints::Deals::Near or lambda { |env| ... }
-      # What goes into @routes is something that responds to #call
-      app = to.respond_to?(:call) ? to : to.new
-
-      @routes << [verb, Regexp.new(route), app]
+      @routes << [verb, Regexp.new(route), to]
     end
   end
 end

data/lib/krack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack