upfluence-utils 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f81e3d2290b40407d5ad7dcf745f261499a2952
-  data.tar.gz: c1dde053901fb782d8863709c711753c61e8c784
+  metadata.gz: 4162426d70b7a8ac73a57eaa83dabb1984e9d59c
+  data.tar.gz: fc37016f0ae7d50d8a0e25af7ab4729d707596f6
 SHA512:
-  metadata.gz: 52ad714f7e763d782d73e71712e69c4261b59291ae6dbb442db23c52f3f6d45206384942d722d3782f86ffaa3d2649cc8f3b81b54c9bc8553fddd2cf2e1fab5e
-  data.tar.gz: d70bcb3de7d6f27a72d0f69239645cc0ae36adf9b7cbade9d509ab60979fa7461f2c8eb26bb5cdd68fdcf8d0712466b172cb515c1f0987e78f8b9717dbbd1faa
+  metadata.gz: 08424881e4d05ad873a82ff8ebf52994fd43a215e6d36908bd1cdafa92aba71b8438e5866ffbd84eca416fa593767475f3617ad7d0e05c7b85e0210f4ca8252f
+  data.tar.gz: b086601b01b55e85162f208c672b021c7d788fccdeb91f64e85d6644cef8e3ae0dbedaec8d2ae34b1c30a8da82392156aacc833eb8ba53e1e46d9d9d29558b3f

data/lib/upfluence/endpoint/api_endpoint.rb

@@ -1,78 +1,8 @@
 require 'sinatra'
+require 'upfluence/http/endpoint/api_endpoint'
 
 module Upfluence
   module Endpoint
-    class BadRequest < StandardError; end
-    class ApiEndpoint < Sinatra::Base
-      disable :show_exceptions
-
-      configure :development do
-        require 'sinatra/reloader'
-        register Sinatra::Reloader
-      end
-
-      configure :test do
-        enable :raise_errors
-      end
-
-      helpers do
-        def ok
-          content_type :json
-          [200, { status: 'OK' }.to_json]
-        end
-
-        def access_token
-          token = params[:access_token]
-
-          unless token
-            pattern      = /^Bearer /
-            header       = request.env['HTTP_AUTHORIZATION']
-            token = header.gsub(pattern, '') if header && header.match(pattern)
-          end
-
-          token
-        end
-
-        def respond_with(resource, *args)
-          if resource.respond_to?(:errors) && resource.errors.any?
-            status = 422
-            result = Base::Exceptions::ValidationError.from_model(
-              resource
-            ).to_json
-          else
-            status = 200
-            result = if resource.is_a? Enumerable
-                       ActiveModel::ArraySerializer.new(
-                         resource, *args
-                       ).to_json
-                     elsif resource.respond_to?(:serialize)
-                       resource.serialize(*args).to_json
-                     else
-                       ActiveModel::Serializer.serializer_for(resource).new(resource, *args).to_json
-                     end
-          end
-
-          halt [status, result]
-        end
-
-        def json_params
-          ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(request_body))
-        end
-
-        def request_body
-          @request_body ||= request.body.read
-        end
-      end
-    end
-
-    Sinatra::Base.error BadRequest do
-      status 400
-      { error: 'Bad request' }.to_json
-    end
-
-    Sinatra::Base.error JSON::ParserError do
-      status 400
-      { message: 'Invalid JSON' }.to_json
-    end
+    ApiEndpoint = HTTP::Endpoint::APIEndpoint
   end
 end

data/lib/upfluence/error_logger/null.rb

@@ -8,6 +8,13 @@ module Upfluence
 
         def call(env)
           @app.call(env)
+        rescue => e
+          Upfluence.logger.error("Error: #{e.class}: #{e.message}")
+          e.backtrace.each do |b|
+            Upfluence.logger.error("\t#{b}")
+          end
+
+          raise e
         end
       end
 

data/lib/upfluence/http/builder.rb

@@ -0,0 +1,19 @@
+require 'rack/builder'
+require 'thrift/server/rack_application'
+require 'upfluence/utils'
+
+module Upfluence
+  module HTTP
+    class Builder < Rack::Builder
+      def run_thrift(processor, handler, timeout = 30)
+        run Thrift::RackApplication.for(
+          '/',
+          processor.new(
+            Upfluence::Utils::Thrift::Middleware.setup(handler, timeout)
+          ),
+          Thrift::BinaryProtocolFactory.new
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+require 'sinatra'
+
+module Upfluence
+  module HTTP
+    module Endpoint
+      class BadRequest < StandardError; end
+      class APIEndpoint < Sinatra::Base
+        disable :show_exceptions
+        disable :logging
+
+        configure :development do
+          require 'sinatra/reloader'
+          register Sinatra::Reloader
+        end
+
+        configure :test do
+          enable :raise_errors
+        end
+
+        helpers do
+          def ok
+            content_type :json
+            [200, { status: 'OK' }.to_json]
+          end
+
+          def access_token
+            token = params[:access_token]
+
+            unless token
+              pattern      = /^Bearer /
+              header       = request.env['HTTP_AUTHORIZATION']
+              token = header.gsub(pattern, '') if header && header.match(pattern)
+            end
+
+            token
+          end
+
+          def respond_with(resource, *args)
+            if resource.respond_to?(:errors) && resource.errors.any?
+              status = 422
+              result = Base::Exceptions::ValidationError.from_model(
+                resource
+              ).to_json
+            else
+              status = 200
+              result = if resource.is_a? Enumerable
+                         ActiveModel::ArraySerializer.new(
+                           resource, *args
+                         ).to_json
+                       elsif resource.respond_to?(:serialize)
+                         resource.serialize(*args).to_json
+                       else
+                         ActiveModel::Serializer.serializer_for(resource).new(resource, *args).to_json
+                       end
+            end
+
+            halt [status, result]
+          end
+
+          def json_params
+            ActiveSupport::HashWithIndifferentAccess.new(JSON.parse(request_body))
+          end
+        end
+
+        def request_body
+          @request_body ||= request.body.read
+        end
+      end
+
+      Sinatra::Base.error BadRequest do
+        [400, {}, { error: 'bad_request' }.to_json]
+      end
+
+      Sinatra::Base.error JSON::ParserError do
+        [400, {}, { message: 'invalid_json' }.to_json]
+      end
+
+      Sinatra::Base.not_found do
+        [404, {}, { error: 'not_found' }.to_json]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Upfluence
+  module HTTP
+    module Endpoint
+      class Healthcheck
+        def call(_env)
+          [200, {}, ["ok\n"]]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Upfluence
+  module HTTP
+    module Middleware
+      class ApplicationHeaders
+        def initialize(app, handler)
+          @app = app
+          @headers = {
+            "X-Upfluence-Unit-Name" => handler.getName,
+            "X-Upfluence-Version" => build_version(handler.getVersion)
+          }
+        end
+
+        def call(env)
+          status, header, body = @app.call(env)
+          [status, header.merge(@headers), body]
+        end
+
+        private
+
+        def build_version(thrift_version)
+          if v = thrift_version.semantic_version
+            return "v#{v.major}.#{v.minor}.#{v.patch}"
+          end
+
+          if v = thrift_version.git_version
+            return "v0.0.0-#{v.commit}"
+          end
+
+          'undefined'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Upfluence
+  module HTTP
+    module Middleware
+      class HandleException
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          @app.call(env)
+        rescue StandardError, LoadError, SyntaxError => e
+          [500, {}, ["{\"error\": \"#{e.class.name}\"}"]]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'rack/body_proxy'
+
+module Upfluence
+  module HTTP
+    module Middleware
+      class Logger
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          began_at = Time.now
+          status, header, body = @app.call(env)
+          header = Rack::Utils::HeaderHash.new(header)
+          body = Rack::BodyProxy.new(body) do
+            log(env, status, header, began_at)
+          end
+          [status, header, body]
+        end
+
+        private
+
+        def log(env, status, _header, began_at)
+          now = Time.now
+
+          Upfluence.logger.info(
+            "%d %s %s%s (%s) %.2fms" % [
+              status, env[Rack::REQUEST_METHOD],
+              env[Rack::PATH_INFO],
+              env[Rack::QUERY_STRING].empty? ? "" : "?"+env[Rack::QUERY_STRING],
+              env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+              (now - began_at) * 1000
+            ]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/http/server.rb

@@ -0,0 +1,73 @@
+require 'rack/handler'
+require 'rack/etag'
+
+require 'upfluence/environment'
+require 'upfluence/error_logger'
+
+require 'upfluence/http/builder'
+require 'upfluence/http/endpoint/healthcheck'
+require 'upfluence/http/middleware/logger'
+require 'upfluence/http/middleware/application_headers'
+require 'upfluence/http/middleware/handle_exception'
+require 'upfluence/handler/base'
+
+module Upfluence
+  module HTTP
+    class Server
+      DEFAULT_OPTIONS = {
+        server: :thin,
+        Port: ENV['PORT'] || 8080,
+        Host: '0.0.0.0',
+        threaded: true,
+        interfaces: []
+      }.freeze
+
+      def initialize(options = {}, &block)
+        @options = DEFAULT_OPTIONS.dup.merge(options)
+        opts = @options
+        base_handler = Handler::Base.new(opts[:interfaces])
+
+        @builder = Builder.new do
+          use Middleware::Logger
+          use Middleware::ApplicationHeaders, base_handler
+          use Middleware::HandleException
+          use Upfluence.error_logger.middleware
+          use Rack::ContentLength
+          use Rack::Chunked
+          use Rack::Lint if Upfluence.env.development?
+          use Rack::TempfileReaper
+          use Rack::ETag
+
+          map '/healthcheck'  do
+            run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
+          end
+
+          map '/base' do
+            run_thrift Base::BaseService::Processor, base_handler
+          end
+
+          instance_eval(&block)
+        end
+
+        @handler = Rack::Handler.get(@options[:server])
+
+        if @options[:server] == :thin
+          require 'thin/logging'
+
+          Thin::Logging.silent = true
+        end
+      end
+
+      def serve
+        ENV['RACK_ENV'] = Upfluence.env.to_s
+        @handler.run(@builder, @options) do |server|
+          server.threaded = @options[:threaded] if server.respond_to? :threaded=
+
+          if server.respond_to?(:threadpool_size=) && @options[:threadpool_size]
+            server.threadpool_size = @options[:threadpool_size]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/mixin/strong_parameters.rb

@@ -254,11 +254,7 @@ module Upfluence
       end
 
       def json_params
-        begin
-          @_json_params ||= Parameters.new(super)
-        rescue
-          raise "You must extend Upfluence::Endpoint::ApiEndpoint to use json_params"
-        end
+        @_json_params ||= Parameters.new(super)
       end
 
       def json_params=(val)

data/lib/upfluence/utils.rb

@@ -1,6 +1,5 @@
 require 'upfluence/utils/version'
 require 'upfluence/utils/thrift'
-require 'upfluence/utils/http/middleware/logger'
 require 'upfluence/logger'
 require 'upfluence/error_logger'
 require 'upfluence/environment'

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/rbutils.gemspec

@@ -26,5 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sentry-raven'
   spec.add_runtime_dependency 'sinatra-contrib'
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'thin'
+  spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'active_model_serializers', '~> 0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Upfluence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -192,10 +220,16 @@ files:
 - lib/upfluence/error_logger/null.rb
 - lib/upfluence/error_logger/sentry.rb
 - lib/upfluence/handler/base.rb
+- lib/upfluence/http/builder.rb
+- lib/upfluence/http/endpoint/api_endpoint.rb
+- lib/upfluence/http/endpoint/healthcheck.rb
+- lib/upfluence/http/middleware/application_headers.rb
+- lib/upfluence/http/middleware/handle_exception.rb
+- lib/upfluence/http/middleware/logger.rb
+- lib/upfluence/http/server.rb
 - lib/upfluence/logger.rb
 - lib/upfluence/mixin/strong_parameters.rb
 - lib/upfluence/utils.rb
-- lib/upfluence/utils/http/middleware/logger.rb
 - lib/upfluence/utils/http/middleware/null.rb
 - lib/upfluence/utils/thrift.rb
 - lib/upfluence/utils/thrift/middleware.rb

data/lib/upfluence/utils/http/middleware/logger.rb

@@ -1,39 +0,0 @@
-require 'rack/body_proxy'
-
-module Upfluence
-  module Utils
-    module HTTP
-      module Middleware
-        class Logger
-          def initialize(app)
-            @app = app
-          end
-
-          def call(env)
-            began_at = Time.now
-            status, header, body = @app.call(env)
-            header = Rack::Utils::HeaderHash.new(header)
-            body = Rack::BodyProxy.new(body) { log(env, status, header, began_at) }
-            [status, header, body]
-          end
-
-          private
-
-          def log(env, status, header, began_at)
-            now = Time.now
-
-            Upfluence.logger.info(
-              "%d %s %s%s (%s) %.2fms\n" % [
-                status, env[Rack::REQUEST_METHOD],
-                env[Rack::PATH_INFO],
-                env[Rack::QUERY_STRING].empty? ? "" : "?"+env[Rack::QUERY_STRING],
-                env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
-                (now - began_at) * 1000
-              ]
-            )
-          end
-        end
-      end
-    end
-  end
-end