apiary 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    apiary (0.0.2)
+    apiary (0.0.4)
       callsite
-      em-http-request
       http_router
       method-args
       rack
       thin
+      thin_async
 
 GEM
   remote: http://rubygems.org/
@@ -39,6 +39,8 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
+    thin_async (0.1.1)
+      thin (>= 1.2.1)
     url_mount (0.2.1)
       rack
 
@@ -55,3 +57,4 @@ DEPENDENCIES
   rack
   rake
   thin
+  thin_async

data/README.markdown

@@ -35,4 +35,16 @@ And you'll get back
 
     74.21
     
-Currently, `get`, `post`, `put` and `delete` are supported. You can also supply a path after any verb to have a custom path. Also, the current Rack env hash is available under `rack_env` if you need to take a look at the current request.
+Currently, `get`, `post`, `put` and `delete` are supported. You can also supply a path after any verb to have a custom path. Also, the current Rack env hash is available under `rack_env` if you need to take a look at the current request.
+
+## Async Usage
+
+If you want to use this in async mode, put an `a` in front of the method annotation. For instance
+
+    aget
+    def c2f(val)
+      EM.add_timer(0.1) do
+        async_response << "The temperature is :"
+        async_response.end(Float(val) * 9 / 5 + 32)
+      end
+    end

data/apiary.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'thin'
   s.add_dependency 'http_router'
   s.add_dependency 'rack'
-  s.add_dependency 'em-http-request'
+  s.add_dependency 'thin_async'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'em-http-request'
   s.add_development_dependency 'minitest', '~> 2.0.0'
-  
 end

data/lib/apiary.rb

@@ -4,45 +4,41 @@ require 'http_router'
 require 'thin'
 require 'rack'
 require 'apiary/version'
+require 'apiary/api_method'
+require 'apiary/async_response'
 
 module Apiary
-  ApiMethod = Struct.new(:method, :http_method, :path)
 
-  attr_accessor :rack_env
+  attr_accessor :rack_env, :async_response
 
   module ClassMethods
 
-    def get(path = nil)
-      __set_routing(:get, path)
-    end
-
-    def post(path = nil)
-      __set_routing(:get, path)
-    end
-
-    def put(path = nil)
-      __set_routing(:put, path)
-    end
+    [:get, :post, :put, :delete].each do |m|
+      class_eval "
+      def a#{m}(path=nil)
+        __set_routing(:get, path, true)
+      end
 
-    def delete(path = nil)
-      __set_routing(:put, path)
+      def #{m}(path=nil)
+        __set_routing(:get, path)
+      end
+      "
     end
 
     def version(number)
       @version = number
     end
 
-    def __set_routing(method, path)
-      @http_method, @path = method, path
+    def __set_routing(method, path, async = false)
+      @http_method, @path, @async = method, path, async
     end
 
     def method_added(m)
       if @http_method
         MethodArgs.register(Callsite.parse(caller.first).filename)
         @cmds ||= []
-        @cmds << ApiMethod.new(m, @http_method, @path)
-        @http_method = nil
-        @path = nil
+        @cmds << ApiMethod.new(m, @http_method, @path, @async)
+        @http_method, @path, @async = nil, nil, nil
       end
     end
 
@@ -65,7 +61,19 @@ module Apiary
         route.to { |env|
           instance = (blk ? blk.call : new)
           instance.rack_env = env
-          Rack::Response.new(instance.send(cmd.method, *env['router.response'].param_values).to_s).finish
+          response = AsyncResponse.new(env)
+          if cmd.async?
+            instance.async_response = response
+            instance.send(cmd.method, *env['router.response'].param_values)
+          else
+            EM.defer(proc{
+              response.status = 200
+              response << instance.send(cmd.method, *env['router.response'].param_values).to_s
+            }, proc{
+              response.done
+            })
+          end
+          response.finish
         }
       end
       router

data/lib/apiary/api_method.rb

@@ -0,0 +1,5 @@
+module Apiary
+  class ApiMethod < Struct.new(:method, :http_method, :path, :async)
+    alias_method :async?, :async
+  end
+end

data/lib/apiary/async_response.rb

@@ -0,0 +1,10 @@
+require 'thin/async'
+
+module Apiary
+  class AsyncResponse < Thin::AsyncResponse
+    def end(out = nil)
+      self.<<(out.to_s) if out
+      done
+    end
+  end
+end

data/lib/apiary/version.rb

@@ -1,3 +1,3 @@
 module Apiary
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/fixtures/basic_async.rb

@@ -0,0 +1,21 @@
+class BasicAsync
+  include Apiary
+
+  version '1.0'
+
+  def initialize(var = nil)
+    @var = var
+  end
+
+  aget
+  def ping
+    EM.add_timer(0.1) do
+      async_response.end 'ping'
+    end
+  end
+
+  aget
+  def var
+    async_response.end @var
+  end
+end

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'em-http'
 require 'test/fixtures/basic'
+require 'test/fixtures/basic_async'
 
 class MiniTest::Unit::TestCase
   def run_with(cls, optional_blk = nil, &blk)

data/test/test_async.rb

@@ -0,0 +1,30 @@
+class TestAsync < MiniTest::Unit::TestCase
+  def test_simple
+    run_with(BasicAsync) do
+      request('/1.0/ping') do |http|
+        assert_equal 200, http.response_header.status
+        assert_equal 'ping', http.response
+        done
+      end
+    end
+  end
+
+  def test_not_found
+    run_with(BasicAsync) do
+      request('/1.0/something_else') do |http|
+        assert_equal 404, http.response_header.status
+        done
+      end
+    end
+  end
+
+  def test_custom_initializer
+    run_with(BasicAsync, proc{ BasicAsync.new('hi there')}) do
+      request('/1.0/var') do |http|
+        assert_equal 200, http.response_header.status
+        assert_equal 'hi there', http.response
+        done
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apiary
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: thin_async
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -117,9 +117,23 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: em-http-request
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,7 +145,7 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: Convert your existing class into an EM-based API.
 email: 
 - joshbuddy@gmail.com
@@ -149,9 +163,13 @@ files:
 - Rakefile
 - apiary.gemspec
 - lib/apiary.rb
+- lib/apiary/api_method.rb
+- lib/apiary/async_response.rb
 - lib/apiary/version.rb
 - test/fixtures/basic.rb
+- test/fixtures/basic_async.rb
 - test/helper.rb
+- test/test_async.rb
 - test/test_basic.rb
 has_rdoc: true
 homepage: https://github.com/joshbuddy/apiary
@@ -189,5 +207,7 @@ specification_version: 3
 summary: Convert your existing class into an EM-based API
 test_files: 
 - test/fixtures/basic.rb
+- test/fixtures/basic_async.rb
 - test/helper.rb
+- test/test_async.rb
 - test/test_basic.rb