api-transformer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c0849ff779ae501cfe99583f2d4d09165e607a8
-  data.tar.gz: ef8495fb1b89371bf6332311ac80402551b0760a
+  metadata.gz: 956c01e6033f4197c83758b8bd20d63c10d96843
+  data.tar.gz: 32c0db4245df8c1c976abfa5797e42d7dc4bb187
 SHA512:
-  metadata.gz: 932f425f46f6a4d9a3bb310f8a32817cb30531c41b824801e07d7fc73f6e42d8042deb551142cc2053a0d17f6553cdaeca1f76db7c2a3b82b5e0380fa45e4d0c
-  data.tar.gz: e7a3fbed08c8bfd79fab20e7a43ff45c9559347db841f6cf96a103cd754504ba1847b8d052d75094f59a0d00ea66ccda4a5970fad9e523b997f9a79a14fc1f03
+  metadata.gz: 3d694ca4314b5139c2b7b0991f563fb578aa4cace652ad7d335dd3b148d2b01c06a46046268a8b9e87129ceb9705832be27b78a36c14a86d8b58be0cc6bc9676
+  data.tar.gz: 7773e131d6d087192fe37f1d7707d3d2702783852099df62b6f2910219b582ffab083d792b10d0cd39072da84bd026e2dff5e60dd23b7b12d545a3ad02e7462e

data/lib/api_transformer.rb

@@ -8,6 +8,7 @@ require_relative "./api_transformer/backend_response"
 require_relative "./api_transformer/frontend_response"
 require_relative "./api_transformer/frontend_response_builder"
 require_relative "./api_transformer/params"
+require_relative "./api_transformer/route"
 require_relative "./api_transformer/routes"
 require_relative "./api_transformer/rack/cookie_params"
 
@@ -45,29 +46,14 @@ module ApiTransformer
       route, path_params = @@routes.find(env["REQUEST_METHOD"], path)
 
       if route
-        run_route(route, path_params, env)
+        all_params = params.merge(path_params)
+        response = route.run(@@base_url, all_params, env)
+        streaming_response(response.status, response.headers)
       else
         [404, {}, "nope"]
       end
     end
 
-    def run_route(route, path_params, env)
-      indifferent_params = Params.try_convert(params.merge(path_params))
-      endpoint = Endpoint.new(@@base_url, env, route)
-      headers = env["client-headers"]
-
-      route[:helper_blocks].each { |block| endpoint.instance_eval(&block) }
-      endpoint.instance_exec(indifferent_params, headers, &route[:block])
-
-      status, headers = endpoint.run
-
-      EM.next_tick do
-        endpoint.complete
-      end
-
-      streaming_response(status, headers)
-    end
-
     class << self
       def inherited(klass)
         klass.use Goliath::Rack::Params
@@ -94,6 +80,22 @@ module ApiTransformer
         helper_blocks.unshift(block)
       end
 
+      def shared_endpoints(name, &block)
+        if shared_endpoint_blocks[name]
+          fail "shared_endpoints already defined for \"#{name}\""
+        else
+          shared_endpoint_blocks[name] = block
+        end
+      end
+
+      def include_endpoints(name)
+        if shared_endpoint_blocks[name]
+          instance_eval(&shared_endpoint_blocks[name])
+        else
+          fail "missing shared_endpoints for \"#{name}\""
+        end
+      end
+
       def get(path = "", options = {}, &block)
         add_route(:get, path, options, block)
       end
@@ -110,8 +112,8 @@ module ApiTransformer
         add_route(:delete, path, options, block)
       end
 
-      def reset_routes
-        @@routes = Routes.new
+      def reset
+        @@routes =  @failure_handlers = @helper_blocks = @shared_endpoints = nil
       end
 
       private
@@ -133,15 +135,9 @@ module ApiTransformer
         @helper_blocks ||= []
       end
 
-      def server
-        superclass
+      def shared_endpoint_blocks
+        @shared_endpoints ||= {}
       end
     end
-
-    private
-
-    def server
-      self.class
-    end
   end
 end

data/lib/api_transformer/route.rb

@@ -0,0 +1,26 @@
+require "ostruct"
+
+module ApiTransformer
+  # A route
+  class Route < OpenStruct
+    # For passing back a header and status
+    class Response < Struct.new(:status, :headers); end
+
+    def run(base_url, params, env)
+      indifferent_params = Params.try_convert(params)
+      endpoint = Endpoint.new(base_url, env, self)
+      headers = env["client-headers"]
+
+      helper_blocks.each { |block| endpoint.instance_eval(&block) }
+      endpoint.instance_exec(indifferent_params, headers, &self.block)
+
+      status, headers = endpoint.run
+
+      EM.next_tick do
+        endpoint.complete
+      end
+
+      Response.new(status, headers)
+    end
+  end
+end

data/lib/api_transformer/routes.rb

@@ -1,11 +1,6 @@
-require "ostruct"
-
 module ApiTransformer
   # Collection of routes
   class Routes
-    # A route
-    class Route < OpenStruct; end
-
     def initialize
       @routes = {}
     end

data/lib/api_transformer/version.rb

@@ -1,4 +1,4 @@
 # Top-level namespace
 module ApiTransformer
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/server_spec.rb

@@ -35,7 +35,7 @@ describe ApiTransformer::Server do
   let(:err) { proc { |c| fail "HTTP Request failed #{c.response}" } }
 
   before do
-    ApiTransformer::Server.reset_routes
+    ApiTransformer::Server.reset
   end
 
   it "works without any backend requests" do
@@ -827,4 +827,26 @@ describe ApiTransformer::Server do
       end
     end
   end
+
+  it "allows shared endpoints" do
+    server = create_server do
+      shared_endpoints "ping" do
+        get "/ping" do
+          response do
+            success { body "pong" }
+          end
+        end
+      end
+
+      namespace "/games" do
+        include_endpoints "ping"
+      end
+    end
+
+    with_api(server) do
+      get_request(path: "/games/ping") do |c|
+        c.response.must_equal "pong"
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-transformer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Bruz Marzolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -165,6 +165,7 @@ files:
 - lib/api_transformer/frontend_response_builder.rb
 - lib/api_transformer/params.rb
 - lib/api_transformer/rack/cookie_params.rb
+- lib/api_transformer/route.rb
 - lib/api_transformer/routes.rb
 - lib/api_transformer/version.rb
 - spec/server_spec.rb