upfluence-utils 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5adaf52f62e7a463006bcea8739c404554bd49
-  data.tar.gz: 00ec26f0d3d7aded033c492d5db46c7cb6edaa5b
+  metadata.gz: 74c35a15e8d437a42908c4a72f26039143ffb7b2
+  data.tar.gz: d0d629dfe83c1790d15d25070cc28fd3911f2d55
 SHA512:
-  metadata.gz: 5bbc8f593aead775dd5a8c948638aa95b81b254452be7119e83b988d3aeb6c60d9d3ec7a57ad82180c825d91771738bfa871237dd45cc7de81bf309cdcc80359
-  data.tar.gz: 7d1cb5585122db4c8db5fd4195bf454d596d118b1177c4ea8a2f217c7bdcbd0f2755dff6dba12a8b7b672e5bf7d37b96b10cb76a690a27989a5045d12435c06b
+  metadata.gz: ad20176b39f988ab15f25906c936463de58182974a1b8d8cd435c00586996e6c9648d6a9c60adca9378a53576da2b982c8bd8638b2ac972fa8e41984e6e8ef34
+  data.tar.gz: e4ffa03cb0d0e392df2b0f5a09fa0d2bd7db0925a91f17e9759751462811a4b63a08259d9ddcec6a5bf79b43eb46b90a5e21e7e8da3252028e6ea96a8b8739b2

data/lib/upfluence/http/endpoint/api_endpoint.rb

@@ -47,10 +47,12 @@ module Upfluence
               ).to_json
             else
               status = 200
+              opts = args.first || {}
+
               result = if resource.is_a? Enumerable
-                         ActiveModel::ArraySerializer.new(
-                           resource, *args
-                         ).to_json
+                         ActiveModel::ArraySerializer.new(resource, *args).to_json
+                       elsif opts[:serializer]
+                         opts[:serializer].new(resource, *args).to_json
                        elsif resource.respond_to?(:serialize)
                          resource.serialize(*args).to_json
                        else

data/lib/upfluence/http/middleware/cors.rb

@@ -0,0 +1,37 @@
+module Upfluence
+  module HTTP
+    module Middleware
+      class CORS
+        HEADERS = {
+          'Access-Control-Allow-Origin' => '*',
+          'Access-Control-Allow-Headers' => 'Authorization, Content-Type, Scope',
+          'Access-Control-Allow-Methods' => 'GET, POST, PUT, OPTIONS, DELETE'
+        }.freeze
+
+        def initialize(app, headers = nil)
+          @app = app
+          @headers = headers || HEADERS
+        end
+
+        def call(env)
+          status, headers, body = options?(env) ? default_response : @app.call(env)
+          [status, merge_headers(headers), body]
+        end
+
+        private
+
+        def default_response
+          [200, {}, ['']]
+        end
+
+        def options?(env)
+          Rack::Request.new(env).options?
+        end
+
+        def merge_headers(headers)
+          headers.merge(@headers) { |_, x, _| x }
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/server.rb

@@ -13,6 +13,7 @@ require 'upfluence/http/middleware/logger'
 require 'upfluence/http/middleware/application_headers'
 require 'upfluence/http/middleware/handle_exception'
 require 'upfluence/http/middleware/prometheus'
+require 'upfluence/http/middleware/cors'
 require 'upfluence/handler/base'
 
 module Upfluence
@@ -47,6 +48,7 @@ module Upfluence
           use Rack::Lint if Upfluence.env.development?
           use Rack::TempfileReaper
           use Rack::ETag
+          use Middleware::CORS if Upfluence.env.development?
 
           map '/healthcheck'  do
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.5.5'.freeze
+    VERSION = '0.5.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Upfluence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,6 +254,7 @@ files:
 - lib/upfluence/http/endpoint/healthcheck.rb
 - lib/upfluence/http/endpoint/profiler.rb
 - lib/upfluence/http/middleware/application_headers.rb
+- lib/upfluence/http/middleware/cors.rb
 - lib/upfluence/http/middleware/handle_exception.rb
 - lib/upfluence/http/middleware/logger.rb
 - lib/upfluence/http/middleware/prometheus.rb