jetra 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1841c50b2435c1f93d9282553d527b31d6799ed2a90701b4c3dad2cf614e1aa0
-  data.tar.gz: dbafef64109519c9ea4adf70dbea208349ab18ba2855b346fdaedfb16eb33fd3
+  metadata.gz: 70c48ffb4371d9cf9311b1c1a8a2c57e8726f9ba1ac1d98a33e75b212621110f
+  data.tar.gz: 3920ca597c20574c9576cf9f483d6123af507f311faf59bce068f765ec14a930
 SHA512:
-  metadata.gz: 3d6af2c6ed57fd5aa5270a807fdfc720335a4b717873ea396f1fcea7a58ec802be8f4cffa40811a955a078563033d6e0b449760fdfb8cd96241dd2d585c0e0e4
-  data.tar.gz: 519e259d4550d4523b1373c455637489205c5e570210f0d38b9b1889a3372eaf4bd76f47ec356361fce70808cf485058b192e6c1c83e22934358d4b462c60e61
+  metadata.gz: bf0b5a6239b0fdbfcb31a86529f2c54e9f08dd48022f16d32bcd22b2e8b27555defcaf7cca980d69d9895179cc08aac15f8cdb8fd217be3c42b6825aec62b818
+  data.tar.gz: 24fde8d26c56b7be2ada5d76ac9de2eee8a10542a14c77793f6eda068ddc01e6029288044284912576bb6bf158646d3a5cd34be01e170f69d18d1b5ebf02e1db

data/lib/jetra/adapter/grpc.rb

@@ -4,91 +4,68 @@ require 'grpc'
 require "jetra/adapter/grpc/jetra_pb"
 require "jetra/adapter/grpc/jetra_services_pb"
 
+require "google/protobuf/well_known_types"
+
 require 'json'
 
 module Jetra
 
-    class GrpcAdapter < Jetra::Grpc::Interface::Service
-
-        def initialize(app, &custom_block)
-            
-            @app = app
-
-            @custom_block = custom_block
-        end
+    module Grpc
 
-        def call(request, _unused_call)
+        class Adapter < Interface::Service
 
-            if @custom_block
-                @custom_block.call(request)
+            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
+    
+                res = @app.call(request.route, request.params, request.headers, request.body)
+    
+                anyBody = Google::Protobuf::Any.new
+                anyBody.pack(res.body)
+    
+                response = Response.new
+                response.status = res.status
+                response.body = anyBody
+                response
             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
+    
+        class Server
+    
+            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
-
-        # 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)
+    
+        class Client
+    
+            def initialize(host_and_port)
+                @client = Interface::Stub.new(host_and_port, :this_channel_is_insecure)
+            end
+    
+            def call(request)
+                @client.call(request)
+            end
+    
         end
-
     end
-
 end

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

@@ -3,22 +3,26 @@
 
 require 'google/protobuf'
 
+require 'google/protobuf/any_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("jetra.proto", :syntax => :proto3) do
-    add_message "jetra.grpc.JetraRequest" do
+    add_message "jetra.grpc.Request" do
       optional :route, :string, 1
-      optional :params, :string, 2
+      map :params, :string, :string, 2
+      map :headers, :string, :string, 3
+      optional :body, :message, 4, "google.protobuf.Any"
     end
-    add_message "jetra.grpc.JetraResponse" do
+    add_message "jetra.grpc.Response" do
       optional :status, :int32, 1
-      optional :body, :string, 2
+      optional :body, :message, 2, "google.protobuf.Any"
+      map :headers, :string, :string, 3
     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
+    Request = Google::Protobuf::DescriptorPool.generated_pool.lookup("jetra.grpc.Request").msgclass
+    Response = Google::Protobuf::DescriptorPool.generated_pool.lookup("jetra.grpc.Response").msgclass
   end
 end

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

@@ -15,7 +15,7 @@ module Jetra
         self.unmarshal_class_method = :decode
         self.service_name = 'jetra.grpc.Interface'
 
-        rpc :Call, JetraRequest, JetraResponse
+        rpc :Call, Request, Response
       end
 
       Stub = Service.rpc_stub_class

data/lib/jetra/adapter/rack.rb

@@ -20,19 +20,17 @@ module Jetra
 
       request = Rack::Request.new(env)
 
-      params = indifferent_params(request.params)
-
-      if @custom_block
-        @custom_block.call(request, params)
-      end
-
       route = request.path_info
       route.chop! if (char=route[-1]) and char=='/' # ignore last '/' char
       route[0] = '' if route[0]=="/" #remove first '/' char
 
-      sym_route = route.to_sym
+      params = indifferent_params(request.params)
+
+      if @custom_block
+        @custom_block.call(route, params)
+      end
 
-      res = @app.call(sym_route, params)
+      res = @app.call(route, params)
 
       result = {}
       result[:status] = res.status

data/lib/jetra/adapter/thrift.rb

@@ -15,22 +15,19 @@ module Jetra
       @app = app
 
       @custom_block = custom_block
-
     end
 
     def call(request)
 
-      if @custom_block
-        @custom_block.call(request)
-      end
-
       route = request.route || ""
       
       params = parse_params(request.params)
 
-      sym_route = route.to_sym
+      if @custom_block
+        @custom_block.call(route, params)
+      end
 
-      res = @app.call(sym_route, params)
+      res = @app.call(route, params)
 
       response = Thrift::Response.new
       response.status = res.status

data/lib/jetra/base.rb

@@ -8,21 +8,24 @@ module Jetra
 
   class Request
 
-    attr_accessor :route, :params
+    attr_accessor :route, :params, :headers, :body
 
-    def initialize(route, params)
+    def initialize(route=nil, params=nil, headers=nil, body=nil)
       @route = route || ""
-      @params = params || {}
+      @params = params
+      @headers = headers
+      @body = body
     end
   end
 
   class Response
     
-    attr_accessor :status, :body
+    attr_accessor :status, :body, :headers
 
-    def initialize(status=-1, body="")
+    def initialize(status=nil, body=nil, headers=nil)
       @status = status.to_i
       @body = body
+      @headers = headers
     end
 
     def finish
@@ -32,18 +35,22 @@ module Jetra
 
   class Base
 
+    Settings = {}
+    Settings[:env] = "development"
+
     attr_accessor :request, :response, :params
 
-    def call(route, params)
-      dup.call!(route, params)
+    def call(route=nil, params=nil, headers=nil, body=nil)
+      request = Request.new(route, params, headers, body)
+      dup.call!(request)
     end
 
-    def call!(route, params)
+    def call!(request)
 
-      @request  = Request.new(route, params)
+      @request = request
       @response = Response.new
 
-      @params   = indifferent_params(@request.params)
+      @params   = request.params
 
       invoke { dispatch! }
 
@@ -54,23 +61,6 @@ module Jetra
       self.class
     end
 
-    def indifferent_params(object)
-      case object
-      when Hash
-        newHash = indifferent_hash
-        object.each { |key, value| newHash[key] = indifferent_params(value) }
-        newHash
-      when Array
-        object.map { |item| indifferent_params(item) }
-      else
-        object
-      end
-    end
-
-    def indifferent_hash
-      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
-    end
-
     def invoke
       res = catch(Halt) { yield }
 
@@ -198,8 +188,8 @@ module Jetra
         @prototype ||= new
       end
 
-      def call(route, params={})
-        prototype.call(route, params)
+      def call(route=nil, params=nil, headers=nil, body=nil)
+        prototype.call(route, params, headers, body)
       end
 
       def before(&block)
@@ -214,7 +204,8 @@ module Jetra
         @filters[type] << compile!(&block)
       end
 
-      def route(symbol, &block)
+      def route(string, &block)
+        symbol = string.to_sym
         block ||= Proc.new { method(symbol).call }
         @routes[symbol] = compile!(&block)
       end
@@ -303,6 +294,8 @@ module Jetra
 
     error do |boom|
 
+      raise boom #TODO 因为服务类型不同，错误返回就不同，没法统一默认异常返回结果
+
       boommsg = "#{boom.class} - #{boom.message}"
 
       if boom.class == Jetra::NotFoundException

data/lib/jetra/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetra
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeffrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-10-23 00:00:00.000000000 Z
 dependencies: []
 description: micro DSL
 email: