api-transformer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a3b324b1f0fd77ef0091e47311ef9e0029b92a
-  data.tar.gz: 7cf42588afe1e037df1ce743e4ac2c0e4c5a2398
+  metadata.gz: 6c0849ff779ae501cfe99583f2d4d09165e607a8
+  data.tar.gz: ef8495fb1b89371bf6332311ac80402551b0760a
 SHA512:
-  metadata.gz: ddf7f252707a1340651a815251a1597a461495cee7be30a70521c01faea1d5c1394af59c753cb34422e96a3a91d61494fd22f515ed036cd27416fa123ac622a0
-  data.tar.gz: e670c237da02b04c635ad9b7ad76acec3612b8640afe0174257903802276d56d55852c5461324885634a41a8d5866b44190a35698f532a2f0fb89f68b1da5fcb
+  metadata.gz: 932f425f46f6a4d9a3bb310f8a32817cb30531c41b824801e07d7fc73f6e42d8042deb551142cc2053a0d17f6553cdaeca1f76db7c2a3b82b5e0380fa45e4d0c
+  data.tar.gz: e7a3fbed08c8bfd79fab20e7a43ff45c9559347db841f6cf96a103cd754504ba1847b8d052d75094f59a0d00ea66ccda4a5970fad9e523b997f9a79a14fc1f03

data/lib/api_transformer/backend_request.rb

@@ -5,7 +5,7 @@ module ApiTransformer
   class BackendRequest
     attr_reader :name
     attr_accessor :path, :method, :query_params, :form_params, :json_params,
-                  :cookie_params
+                  :cookie_params, :header_params
 
     def initialize(name, base_url, frontend_headers)
       @name = name
@@ -16,6 +16,7 @@ module ApiTransformer
       @form_params = {}
       @json_params = {}
       @cookie_params = {}
+      @header_params = {}
     end
 
     def send
@@ -45,7 +46,13 @@ module ApiTransformer
     end
 
     def headers
-      ret = [stripped_frontend_headers, content_type, cookies].reduce(&:merge)
+      ret = [
+        stripped_frontend_headers,
+        @header_params,
+        content_type,
+        cookies
+      ].reduce(&:merge)
+
       ret.delete("Host")
       ret
     end

data/lib/api_transformer/backend_request_sender.rb

@@ -52,5 +52,9 @@ module ApiTransformer
     def cookie_param(key, value)
       @backend_request.cookie_params[key] = value
     end
+
+    def header_param(key, value)
+      @backend_request.header_params[key] = value
+    end
   end
 end

data/lib/api_transformer/backend_response.rb

@@ -27,13 +27,25 @@ module ApiTransformer
     end
 
     def json
-      @data ||= Data.try_convert(JSON.parse(@body))
-    rescue JSON::ParserError
+      @data ||= begin
+        json = JSON.parse(@body)
+
+        if json.respond_to?(:keys)
+          Data.try_convert(json)
+        else
+          json
+        end
+      end
+    rescue JSON::ParserError, Encoding::InvalidByteSequenceError
       {}
     end
 
     def [](key)
-      json[key]
+      if json.respond_to?(:keys)
+        json[key]
+      else
+        nil
+      end
     end
 
     def cookies
@@ -46,6 +58,14 @@ module ApiTransformer
       Data.try_convert(data)
     end
 
+    def content_type
+      @http.response_header["CONTENT_TYPE"]
+    end
+
+    def headers
+      @http.response_header
+    end
+
     def stream(&block)
       if block
         block.call(@body)

data/lib/api_transformer/endpoint.rb

@@ -57,7 +57,11 @@ module ApiTransformer
       iterator = EM::Synchrony::Iterator.new(@backend_request_senders)
 
       iterator.each do |sender, iter|
-        send_request(sender, iter)
+        if @backend_responses.values.all?(&:success?)
+          send_request(sender, iter)
+        else
+          iter.next
+        end
       end
     end
 

data/lib/api_transformer/frontend_response.rb

@@ -6,28 +6,36 @@ module ApiTransformer
     attr_accessor :status
     attr_writer :body, :content_type
 
+    def initialize
+      @hash = {}
+      @cookies = {}
+      @headers = {}
+    end
+
     def set(key, value)
-      @hash ||= {}
       @hash[key] = value
     end
 
     def set_cookie(key, value)
-      @cookies ||= {}
       @cookies[key] = value
     end
 
+    def set_header(key, value)
+      @headers[key] = value
+    end
+
     def body
-      @hash && @hash.to_json || @body
+      @hash.any? && @hash.to_json || @body
     end
 
     def headers
-      cookie_header.merge(content_type_header)
+      [@headers, cookie_header, content_type_header].reduce(&:merge)
     end
 
     private
 
     def cookie_header
-      if @cookies
+      if @cookies.any?
         pairs = @cookies.map { |key, value| "#{key}=#{value}" }
         { "Set-Cookie" => pairs.join("; ") }
       else

data/lib/api_transformer/frontend_response_builder.rb

@@ -50,6 +50,10 @@ module ApiTransformer
       @frontend_response.set_cookie(key, value)
     end
 
+    def header(key, value)
+      @frontend_response.set_header(key, value)
+    end
+
     def attribute(key, value)
       @frontend_response.set key, value
     end

data/lib/api_transformer/version.rb

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

data/spec/server_spec.rb

@@ -209,6 +209,35 @@ describe ApiTransformer::Server do
     end
   end
 
+  it "sends header params in backend requests" do
+    server = extend_server echo_greeting_server do
+      get "/endpoint" do
+        request :echo do
+          path "/echo_header"
+          method :get
+
+          header_param "Range", "bytes=0-"
+        end
+
+        response do |data|
+          attribute :greeting, data[:echo].headers["Range"]
+        end
+      end
+
+      get "/echo_header" do |_, headers|
+        response do
+          success { header :Range, headers["Range"] }
+        end
+      end
+    end
+
+    with_api(server) do
+      get_request(path: "/endpoint") do |c|
+        c.response.must_equal '{"greeting":"bytes=0-"}'
+      end
+    end
+  end
+
   describe "json params" do
     it "sends json params in backend requests" do
       proxy_json = extend_server echo_greeting_server do
@@ -469,6 +498,22 @@ describe ApiTransformer::Server do
     end
   end
 
+  it "can respond with arbitrary headers" do
+    server = create_server do
+      get "/endpoint" do
+        response do
+          success { header "Range", "bytes=0-" }
+        end
+      end
+    end
+
+    with_api(server) do
+      get_request(path: "/endpoint") do |c|
+        c.response_header["Range"].must_equal "bytes=0-"
+      end
+    end
+  end
+
   it "makes the results of requests available to subsequent requests" do
     multiple_requests = create_server do
       get "/multi" do
@@ -488,6 +533,7 @@ describe ApiTransformer::Server do
           success do
             attribute :name, data[:two][:result]
             cookie "type", data[:two].cookies[:type]
+            content_type data[:one].content_type
           end
         end
       end
@@ -512,6 +558,7 @@ describe ApiTransformer::Server do
       get_request(path: "/multi") do |c|
         c.response.must_equal '{"name":"Bob"}'
         c.response_header["Set-Cookie"].must_equal "type=delicious"
+        c.response_header["Content-Type"].must_equal "application/json"
       end
     end
   end
@@ -685,6 +732,43 @@ describe ApiTransformer::Server do
     end
   end
 
+  it "does not send requests after a failed request" do
+    server = create_server do
+      get "/endpoint" do
+        request :fail do
+          path "/fail"
+          method :get
+        end
+
+        request :never_runs do
+          fail "should not get here"
+        end
+
+        response do |data|
+          failure true do
+            status 400
+            attribute :oh, data[:fail][:oh]
+          end
+        end
+      end
+
+      get "/fail" do
+        response do
+          success do
+            status 400
+            attribute :oh, "no"
+          end
+        end
+      end
+    end
+
+    with_api(server) do
+      get_request(path: "/endpoint") do |c|
+        c.response.must_equal '{"oh":"no"}'
+      end
+    end
+  end
+
   it "does not crash when there are no routes for an HTTP verb" do
     server = create_server do
       get "/ping" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-transformer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bruz Marzolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack