api_proxy 0.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7234b39e258e9e2e84285f0cf39720cc43d6587b6f17db929da2150d46af931
-  data.tar.gz: 2e695372d5b8ce3f211b4cbb6627bdd9fecb564d8e073ac74351a0f8512a23a0
+  metadata.gz: 1d1ac2a1d2b57c66377b1e28d0ae1ab5c0cceff203eae7d23f089df9f5a4b1e2
+  data.tar.gz: 5d03d9c8643879f8d145b63c5704f37e96e9e78564e3b74944edf7f74c9f650a
 SHA512:
-  metadata.gz: 2ec33885e2e58f3d0d5fbc548d5950d40c4d52a435910862d9d723826d6e7e3ca1c4852b74a721a0228a170999154ec1eaa64d08136b6aa381a8fd94821f0c2d
-  data.tar.gz: c210dc5eb556c7afad43face37d5a6fb204b010804ac27858ceb01bb5d1775300f630f92271aaea48277ac48d1d67188cba080818285ec9b3cf3e8634f8e2366
+  metadata.gz: dfded3b838256acfa4ac94f12ff4d437992accc9fa0bae0248fe5891d366a810d91b585188ba3aeaeaaa58abb4982c97e1b33753fadc66466b71cbd75186d09d
+  data.tar.gz: '08ae6bbb9c9ee7c71929dca3a3b944bdf32ff972a91d379ed86e86f842bd075dd323294fe355eff22958c499e61ea44542fa56e35644aa77b83dcabb1163e559'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_proxy (0.1.3)
+    api_proxy (0.2.3)
       activesupport (>= 4.0)
       api_signature (~> 0.1.2)
       httparty (>= 0.15)

data/README.md

@@ -31,11 +31,7 @@ ApiProxy.configure(:my_namespace) do |config|
   config.api_key = ENV['SERVICE_API_KEY']
   config.api_secret = ENV['SERVICE_API_SECRET']
 
-  config.url_scheme = 'http'
-  config.api_host = 'localhost'
-  config.api_port = 3000
-
-  config.api_prefix = '/api/v1/'
+  config.api_url = 'http://localhost:3002/api/v1'
 
   config.request_starts_with = '/_some_key'
 end

data/lib/api_proxy.rb

@@ -8,8 +8,9 @@ require 'active_support/core_ext/module'
 module ApiProxy
   autoload :Config, 'api_proxy/config'
   autoload :Middleware, 'api_proxy/middleware'
-  autoload :RequestOptionsBuilder, 'api_proxy/request_options_builder'
-  autoload :Request, 'api_proxy/request'
+  autoload :HeadersFilter, 'api_proxy/headers_filter'
+  autoload :SignedRequest, 'api_proxy/signed_request'
+  autoload :ResponseBuilder, 'api_proxy/response_builder'
 
   def self.configuration(namespace)
     @configuration ||= {}

data/lib/api_proxy/config.rb

@@ -4,10 +4,7 @@ module ApiProxy
   class Config
     attr_accessor :api_key,
                   :api_secret,
-                  :url_scheme,
-                  :api_host,
-                  :api_port,
-                  :api_prefix,
+                  :api_url,
                   :request_starts_with,
                   :request_allowed,
                   :custom_headers,
@@ -17,15 +14,14 @@ module ApiProxy
       load_defaults
     end
 
+    private
+
     def load_defaults
       @api_key = 'key'
       @api_secret = 'secret'
 
-      @url_scheme = 'http'
-      @api_host = 'localhost'
-      @api_port = 3000
+      @api_url = 'http://localhost:3000/api/v1'
 
-      @api_prefix = '/api/v1/'
       @request_starts_with = '/_ts'
 
       @request_allowed = ->(_env) { true }

data/lib/api_proxy/headers_filter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ApiProxy
+  class HeadersFilter
+    ALLOWED_HEADERS = [
+      'content-type',
+      'etag',
+      'cache-control',
+      'content-length',
+      'content-disposition',
+      'content-transfer-encoding'
+    ].freeze
+
+    def initialize(headers)
+      @headers = headers
+    end
+
+    def filter
+      @headers.select { |key, _value| ALLOWED_HEADERS.include?(key) }
+    end
+  end
+end

data/lib/api_proxy/middleware.rb

@@ -4,24 +4,15 @@ module ApiProxy
   class Middleware
     def initialize(app, namespace = :default)
       @app = app
-      @config = ApiProxy.configuration(namespace)
+      @namespace = namespace
     end
 
     def call(env)
-      return @app.call(env) unless allow_request?(env)
+      builder = ApiProxy::ResponseBuilder.new(env, @namespace)
 
-      builder = RequestOptionsBuilder.new(env, @config)
-      request = ApiProxy::Request.new(builder)
+      return @app.call(env) unless builder.allow_request?
 
-      response = request.result
-
-      Rack::Response.new(response.to_s, response.code, request.headers)
-    end
-
-    def allow_request?(env)
-      return false unless env['REQUEST_PATH'].start_with?(@config.request_starts_with)
-
-      @config.request_allowed.call(env)
+      builder.response
     end
   end
 end

data/lib/api_proxy/response_builder.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+module ApiProxy
+  class ResponseBuilder
+    attr_reader :env, :namespace, :config
+
+    def initialize(env, namespace = :default)
+      @env = env
+      @namespace = namespace
+      @config = ApiProxy.configuration(namespace)
+    end
+
+    def allow_request?
+      return false unless request.path.start_with?(config.request_starts_with)
+
+      config.request_allowed.call(@env)
+    end
+
+    def response
+      Rack::Response.new(
+        result.to_s,
+        result.code,
+        ApiProxy::HeadersFilter.new(result.headers).filter
+      )
+    end
+
+    private
+
+    def request
+      @request ||= Rack::Request.new(@env)
+    end
+
+    def result
+      @result ||= ApiProxy::SignedRequest.new(request.request_method, url, options).perform
+    end
+
+    def url
+      path = request.path.gsub(config.request_starts_with, '')
+      File.join(config.api_url.to_s, path)
+    end
+
+    def options
+      { namespace: namespace, body: filtered_params, headers: headers }
+    end
+
+    def filtered_params
+      request.params.reject { |key, _value| config.reject_params.include?(key.to_s) }
+    end
+
+    def headers
+      config.custom_headers.call(env)
+    end
+  end
+end

data/lib/api_proxy/signed_request.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'httparty'
+require 'api_signature'
+
+module ApiProxy
+  class SignedRequest
+    include ::HTTParty
+
+    attr_reader :request_method, :url, :options
+
+    def initialize(request_method, url, options = {})
+      @request_method = request_method.to_s.downcase
+      @url = URI.parse(url)
+      @options = options
+    end
+
+    def perform
+      self.class.send(request_method, url, headers: headers, body: body, format: :json)
+    end
+
+    private
+
+    def headers
+      (options[:headers] || {}).merge(signature_headers)
+    end
+
+    def body
+      options[:body]
+    end
+
+    def signature_headers
+      ApiSignature::Builder.new(signature_options).headers
+    end
+
+    def signature_options
+      {
+        access_key: config.api_key,
+        secret: config.api_secret,
+        request_method: request_method,
+        path: url.path
+      }
+    end
+
+    def config
+      ApiProxy.configuration(options[:namespace]) || :default
+    end
+  end
+end

data/lib/api_proxy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiProxy
-  VERSION = '0.1.3'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - Igor Malinovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,9 +215,10 @@ files:
 - bin/setup
 - lib/api_proxy.rb
 - lib/api_proxy/config.rb
+- lib/api_proxy/headers_filter.rb
 - lib/api_proxy/middleware.rb
-- lib/api_proxy/request.rb
-- lib/api_proxy/request_options_builder.rb
+- lib/api_proxy/response_builder.rb
+- lib/api_proxy/signed_request.rb
 - lib/api_proxy/version.rb
 homepage: https://github.com/psyipm/api_proxy
 licenses:

data/lib/api_proxy/request.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'httparty'
-
-module ApiProxy
-  class Request
-    include ::HTTParty
-
-    attr_reader :builder
-
-    delegate :url, :options, :request_method, to: :builder
-
-    ALLOWED_HEADERS = [
-      'content-type',
-      'etag',
-      'cache-control',
-      'content-length',
-      'content-disposition',
-      'content-transfer-encoding'
-    ].freeze
-
-    def initialize(request_options_builder)
-      @builder = request_options_builder
-    end
-
-    def result
-      @result ||= perform_request
-    end
-
-    def headers
-      result.headers.select { |key, _value| ALLOWED_HEADERS.include?(key) }
-    end
-
-    private
-
-    def perform_request
-      self.class.send(request_method, url, options)
-    end
-  end
-end

data/lib/api_proxy/request_options_builder.rb

@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-require 'api_signature'
-require 'rack'
-
-module ApiProxy
-  class RequestOptionsBuilder
-    attr_reader :env, :config
-
-    delegate :api_key,
-             :api_secret,
-             :api_host,
-             :api_port,
-             :api_prefix,
-             :url_scheme,
-             :request_starts_with, to: :config
-
-    def initialize(env, config)
-      @env = env
-      @config = config
-    end
-
-    def options
-      { headers: headers, body: body, format: :json }
-    end
-
-    def url
-      URI::Generic.build(scheme: url_scheme, host: api_host, port: api_port, path: path)
-    end
-
-    def request_method
-      request.request_method.downcase
-    end
-
-    private
-
-    def body
-      request.params.reject { |key, _value| config.reject_params.include?(key) }
-    end
-
-    def request
-      @request ||= Rack::Request.new(env)
-    end
-
-    def headers
-      custom_headers = config.custom_headers.call(env)
-
-      signature_builder.headers.merge(custom_headers)
-    end
-
-    def signature_builder
-      @signature_builder ||= ApiSignature::Builder.new(request_params)
-    end
-
-    def request_params
-      {
-        access_key: api_key,
-        secret: api_secret,
-        request_method: request_method,
-        scheme: url_scheme,
-        host: api_host,
-        port: api_port,
-        path: path
-      }
-    end
-
-    def path
-      request_path = request.path.gsub(request_starts_with, '')
-
-      File.join(api_prefix, request_path)
-    end
-  end
-end