jetra 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa7e4e2588d06014573fb36f1d28716444f274c5
-  data.tar.gz: a32c028e4476b946805f17a912def4d45a0776c9
+SHA256:
+  metadata.gz: 1841c50b2435c1f93d9282553d527b31d6799ed2a90701b4c3dad2cf614e1aa0
+  data.tar.gz: dbafef64109519c9ea4adf70dbea208349ab18ba2855b346fdaedfb16eb33fd3
 SHA512:
-  metadata.gz: f050228840fab29f268f6334194f14bc4e7d73d2e89a6fb7ee20428c63193f943e82497657a2c8e65a8e27577cc4b88632d6ee7f06e9ffa5aa0783f39552afbb
-  data.tar.gz: 9072e8212803b81db4c373b36c2290ccc2e4c4d51ecdd30c90f8eb4a1da6d7ecc05072d4c43822b4fa1f47a282d42930a75a0f1d766305856dd939ecb1ef4427
+  metadata.gz: 3d6af2c6ed57fd5aa5270a807fdfc720335a4b717873ea396f1fcea7a58ec802be8f4cffa40811a955a078563033d6e0b449760fdfb8cd96241dd2d585c0e0e4
+  data.tar.gz: 519e259d4550d4523b1373c455637489205c5e570210f0d38b9b1889a3372eaf4bd76f47ec356361fce70808cf485058b192e6c1c83e22934358d4b462c60e61

data/lib/jetra/adapter/grpc.rb

@@ -0,0 +1,94 @@
+
+require 'grpc'
+
+require "jetra/adapter/grpc/jetra_pb"
+require "jetra/adapter/grpc/jetra_services_pb"
+
+require 'json'
+
+module Jetra
+
+    class GrpcAdapter < Jetra::Grpc::Interface::Service
+
+        def initialize(app, &custom_block)
+            
+            @app = app
+
+            @custom_block = custom_block
+        end
+
+        def call(request, _unused_call)
+
+            if @custom_block
+                @custom_block.call(request)
+            end
+
+            route = request.route || ""
+            
+            params = parse_params(request.params)
+
+            sym_route = route.to_sym
+
+            res = @app.call(sym_route, params)
+
+            response = Jetra::Grpc::JetraResponse.new
+            response.status = res.status
+            response.body = res.body.to_json
+            response
+        end
+
+        def parse_params(params)
+            indifferent_params(JSON.load(params).to_h)
+        rescue => boom
+            {}
+        end
+
+        # Enable string or symbol key access to the nested params hash.
+        def indifferent_params(object)
+            case object
+            when Hash
+                new_hash = indifferent_hash
+                object.each { |key, value| new_hash[key] = indifferent_params(value) }
+                new_hash
+            when Array
+                object.map { |item| indifferent_params(item) }
+            else
+                object
+            end
+        end
+
+        # Creates a Hash with indifferent access.
+        def indifferent_hash
+            Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+        end
+    end
+
+    class GrpcServer
+
+        def initialize(handler, bind)
+
+            server = GRPC::RpcServer.new
+            server.add_http2_port(bind, :this_port_is_insecure)
+            server.handle(handler)
+
+            @server = server
+        end
+
+        def serve
+            @server.run_till_terminated_or_interrupted([1, 'int', 'SIGQUIT'])
+        end
+    end
+
+    class GrpcClient
+
+        def initialize(host_and_port)
+            @client = Jetra::Grpc::Interface::Stub.new(host_and_port, :this_channel_is_insecure)
+        end
+
+        def call(request)
+            @client.call(request)
+        end
+
+    end
+
+end

data/lib/jetra/adapter/grpc/jetra_pb.rb

@@ -0,0 +1,24 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: jetra.proto
+
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("jetra.proto", :syntax => :proto3) do
+    add_message "jetra.grpc.JetraRequest" do
+      optional :route, :string, 1
+      optional :params, :string, 2
+    end
+    add_message "jetra.grpc.JetraResponse" do
+      optional :status, :int32, 1
+      optional :body, :string, 2
+    end
+  end
+end
+
+module Jetra
+  module Grpc
+    JetraRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("jetra.grpc.JetraRequest").msgclass
+    JetraResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("jetra.grpc.JetraResponse").msgclass
+  end
+end

data/lib/jetra/adapter/grpc/jetra_services_pb.rb

@@ -0,0 +1,24 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: jetra.proto for package 'jetra.grpc'
+
+require 'grpc'
+require_relative 'jetra_pb'
+
+module Jetra
+  module Grpc
+    module Interface
+      class Service
+
+        include GRPC::GenericService
+
+        self.marshal_class_method = :encode
+        self.unmarshal_class_method = :decode
+        self.service_name = 'jetra.grpc.Interface'
+
+        rpc :Call, JetraRequest, JetraResponse
+      end
+
+      Stub = Service.rpc_stub_class
+    end
+  end
+end

data/lib/jetra/adapter/rack.rb

@@ -1,6 +1,7 @@
 
 require "set"
 require 'json'
+require 'rack'
 
 module Jetra
 

data/lib/jetra/adapter/thrift.rb

@@ -5,7 +5,6 @@ require "jetra/adapter/thrift/jetra_types"
 require "jetra/adapter/thrift/jetra_constants"
 require "jetra/adapter/thrift/service"
 
-require "set"
 require 'json'
 
 module Jetra
@@ -66,4 +65,50 @@ module Jetra
 
   end
 
+  class ThriftServer
+
+    def initialize(handler, port)
+      port = port
+      processor = Thrift::Service::Processor.new(handler)
+      transport = ::Thrift::ServerSocket.new(port)
+      transportFactory = ::Thrift::FramedTransportFactory.new()
+      @server = ::Thrift::NonblockingServer.new(processor, transport, transportFactory)
+    end
+
+    def serve
+      @server.serve()
+    end
+
+  end
+
+  class ThriftClient
+
+    def initialize(host, port)
+
+      transport = ::Thrift::FramedTransport.new(::Thrift::Socket.new(host, port))
+      protocol = ::Thrift::BinaryProtocol.new(transport)
+
+      @transport = transport
+
+      @client = Thrift::Service::Client.new(protocol)
+    end
+
+    def call(request)
+
+      @client.call(request)
+
+    rescue ::Thrift::TransportException, IOError => boom
+
+      establish_connection
+
+      @client.call(request)
+
+    end
+
+    def establish_connection
+      @transport.open
+    end
+
+  end
+
 end

data/lib/jetra/base.rb

@@ -4,7 +4,7 @@ module Jetra
 
   class NotFoundException < Exception ; end
 
-  class Halt ; end
+  class Halt < Exception ; end
 
   class Request
 
@@ -20,7 +20,7 @@ module Jetra
     
     attr_accessor :status, :body
 
-    def initialize(status=0, body=nil)
+    def initialize(status=-1, body="")
       @status = status.to_i
       @body = body
     end
@@ -43,31 +43,31 @@ module Jetra
       @request  = Request.new(route, params)
       @response = Response.new
 
-      @params   = indifferentParams(@request.params)
+      @params   = indifferent_params(@request.params)
 
       invoke { dispatch! }
 
       @response.finish
     end
 
-    def currentClass
+    def current_class
       self.class
     end
 
-    def indifferentParams(object)
+    def indifferent_params(object)
       case object
       when Hash
-        newHash = indifferentHash
-        object.each { |key, value| newHash[key] = indifferentParams(value) }
+        newHash = indifferent_hash
+        object.each { |key, value| newHash[key] = indifferent_params(value) }
         newHash
       when Array
-        object.map { |item| indifferentParams(item) }
+        object.map { |item| indifferent_params(item) }
       else
         object
       end
     end
 
-    def indifferentHash
+    def indifferent_hash
       Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
     end
 
@@ -97,20 +97,20 @@ module Jetra
       route!
     rescue ::Exception => boom
       gotError = true
-      handleException!(boom)
+      handle_exception!(boom)
     ensure
       begin
         filter! :after
       rescue ::Exception => boom
-        handleException!(boom) unless gotError
+        handle_exception!(boom) unless gotError
       end
     end
 
-    def handleException!(boom)
+    def handle_exception!(boom)
 
-      response.status = 0
+      response.status = -1
 
-      errorBlock!(boom.class, boom)
+      error_block!(boom.class, boom)
 
       raise boom
     end
@@ -121,25 +121,25 @@ module Jetra
     end
 
     def filter!(type)
-      currentClass.filters[type].each do |args|
+      current_class.filters[type].each do |args|
         processRoute(*args)
       end
     end
 
     def route!
 
-      if block = currentClass.routes[@request.route.to_sym]
+      if block = current_class.routes[@request.route.to_sym]
         processRoute do |*args|
           routeEval { block[*args] }
         end
       end
 
-      routeMissing
+      route_missing
     end
 
-    def errorBlock!(errorClass, *blockParams)
+    def error_block!(errorClass, *blockParams)
 
-      if errorBlocks = currentClass.errors[errorClass]
+      if errorBlocks = current_class.errors[errorClass]
         errorBlocks.reverse_each do |errorBlock|
           args = [errorBlock]
           args += [blockParams]
@@ -148,7 +148,7 @@ module Jetra
       end
 
       if errorClass.respond_to? :superclass and errorClass.superclass <= Exception
-        errorBlock!(errorClass.superclass, *blockParams)
+        error_block!(errorClass.superclass, *blockParams)
       end
     end
 
@@ -160,42 +160,34 @@ module Jetra
       block ? block[self,values] : yield(self,values)
     end
 
-    def routeMissing
+    def route_missing
       raise NotFoundException.new("route not found")
     end
 
-    def successResponse(body, args = {status: 1})
-      status = args[:status]
-      raise "status code must >= 1 when using success" if status < 1
+    def success_response(body, status=0)
 
-      if body.class == String
-        body = {msg: body}
-      end
+      raise "status code must >= 0 when success" if status < 0
 
       response.body = body
       response.status = status
-      nil
     end
 
-    def failureResponse(body, args = {status: -1})
-      status = args[:status]
-      raise "status code must <= -1 when using failure" if status > -1
+    def failure_response(body, status=-1)
 
-      if body.class == String
-        body = {msg: body}
-      end
+      raise "status code must <= -1 when failure" if status > -1
 
       response.body = body
       response.status = status
-      nil
     end
 
-    def haltSuccess(body, args = {status: 1})
-      halt successResponse(body, args)
+    def halt_success(body, status=0)
+      success_response(body, status)
+      halt
     end
 
-    def haltFailure(body, args ={status: -1})
-      halt failureResponse(body, args)
+    def halt_failure(body, status=-1)
+      failure_response(body, status)
+      halt
     end
 
     class << self
@@ -211,14 +203,14 @@ module Jetra
       end
 
       def before(&block)
-        addFilter(:before, &block)
+        add_filter(:before, &block)
       end
 
       def after(&block)
-        addFilter(:after, &block)
+        add_filter(:after, &block)
       end
 
-      def addFilter(type, &block)
+      def add_filter(type, &block)
         @filters[type] << compile!(&block)
       end
 
@@ -252,14 +244,14 @@ module Jetra
 
       def inherited(subclass)
 
-        subclass.routes = copyRoutes
-        subclass.filters = copyFilters
-        subclass.errors = copyErrors
+        subclass.routes = copy_routes
+        subclass.filters = copy_filters
+        subclass.errors = copy_errors
 
         super
       end
 
-      def copyRoutes
+      def copy_routes
         newRoutes = {}
         @routes.each do |key, value|
           newRoutes[key] = value
@@ -267,7 +259,7 @@ module Jetra
         newRoutes
       end
 
-      def copyFilters
+      def copy_filters
         newFilters = {}
         @filters.each do |key, values|
           newValues = []
@@ -279,7 +271,7 @@ module Jetra
         newFilters
       end
 
-      def copyErrors
+      def copy_errors
         newErrors = {}
         @errors.each do |key, values|
           newValues = []
@@ -310,12 +302,16 @@ module Jetra
     @errors         = {}
 
     error do |boom|
+
+      boommsg = "#{boom.class} - #{boom.message}"
+
       if boom.class == Jetra::NotFoundException
         trace = []
       else
         trace = boom.backtrace
+        trace.unshift boommsg
       end
-      response.body = {msg: "#{boom.class} - #{boom.message}", class: boom.class.to_s, route: request.route, params: params, trace: trace}
+      response.body = {msg: boommsg, class: boom.class.to_s, route: request.route, params: params, trace: trace}
       halt
     end
 

data/lib/jetra/middleware/validater.rb

@@ -13,16 +13,16 @@ module Jetra
 
         if !params.kind_of?(Hash)
           response = Jetra::Response.new
-          response.status = 0
+          response.status = -1
           response.body = {msg: "Jetra::Middleware::Validater: params type miss match. excepted Hash, got #{params.class.to_s}"}
         else
           response = @app.call(route, params)
           if !response.status.kind_of?(Integer)
-            response.status = 0
+            response.status = -1
             response.body = {msg: "Jetra::Middleware::Validater: response.status type miss match. excepted Integer, got #{response.status.class.to_s}"}
           else
             if !response.body.kind_of?(Hash)
-              response.status = 0
+              response.status = -1
               response.body = {msg: "Jetra::Middleware::Validater: response.body type miss match. excepted Hash, got #{response.body.class.to_s}"}
             end
           end

data/lib/jetra/version.rb

@@ -1,5 +1,5 @@
 module Jetra
 
-  Version = "1.0.4"
+  Version = "1.1.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetra
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeffrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies: []
 description: micro DSL
 email:
@@ -18,6 +18,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jetra.rb
+- lib/jetra/adapter/grpc.rb
+- lib/jetra/adapter/grpc/jetra_pb.rb
+- lib/jetra/adapter/grpc/jetra_services_pb.rb
 - lib/jetra/adapter/rack.rb
 - lib/jetra/adapter/thrift.rb
 - lib/jetra/adapter/thrift/jetra_constants.rb
@@ -26,7 +29,6 @@ files:
 - lib/jetra/application.rb
 - lib/jetra/base.rb
 - lib/jetra/builder.rb
-- lib/jetra/client/thrift.rb
 - lib/jetra/combiner.rb
 - lib/jetra/middleware/sample.rb
 - lib/jetra/middleware/validater.rb
@@ -51,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: make it easy to write micro service

data/lib/jetra/client/thrift.rb

@@ -1,26 +0,0 @@
-#用于封装基于jetra的thrift接口客户端，方便使用方调用
-
-module Jetra
-
-  class ThriftClient
-
-    def initialize(thriftService, availableMethods)
-
-      @thriftService = thriftService
-
-      #方法列表是由使用方通过参数配置的。
-      availableMethods.each do |methodName|
-        add_client_method(methodName)
-      end
-
-    end
-
-    def add_client_method(methodName)
-      define_singleton_method(methodName) do |params={}|
-        @thriftService.call(methodName, params)
-      end
-    end
-
-  end
-
-end