jetra 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2a37d746863b2076fd043a0561b673caea40e3
-  data.tar.gz: 8a0fb45d82a95c46ed9f24173625bb817d3a3c94
+  metadata.gz: b57cb07162126a3b98c207192feb0d11aa99d2a9
+  data.tar.gz: c49c37e2682d0d3c4dd44df5caed680ea555574e
 SHA512:
-  metadata.gz: 3c106b9c11254e4d03c24a6425b06fd9755874c7cad4076b018845427f22ca1c52d3ccf75fb43499d6c92502214415bbea9653021f64ec4755159702378ce116
-  data.tar.gz: b38d6d356c2cc54d2fe1370a34bff21e1ea887ca10cbc5b253a4ea92db933fe25a012df616d91a0e3e9181d917d8594cefe67fa25b3ded4050cf4d6786387828
+  metadata.gz: a6652e95eda371af3a81a84858d3d3672f29243d4f92cc01eb89716fb671eadf5516be3fc05358969d2d6b065497f513207f5b8261eed20c09ffa7acecd6b8d8
+  data.tar.gz: c0b6d6b7afb037679a2a41a501e8d232680bdb3ceff55da2aa38b8ddc7c3aec5659aa8b8d2e4c396fe20ae9e595425545714e833bd8a91571875aeb580fa3650

data/lib/jetra/adapter/rack.rb

@@ -24,18 +24,18 @@ module Jetra
 
       request = Rack::Request.new(env)
 
-      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(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
+
       if @routes.include?(sym_route)
         res = @app.call(sym_route, params)
       else

data/lib/jetra/adapter/thrift.rb

@@ -0,0 +1,79 @@
+
+require 'thrift'
+
+require "jetra/adapter/thrift/jetra_types"
+require "jetra/adapter/thrift/jetra_constants"
+require "jetra/adapter/thrift/service"
+
+require "set"
+require 'json'
+
+module Jetra
+
+  class ThriftAdapter
+
+    def initialize(app, &custom_block)
+      @app = app
+
+      @routes = Set.new
+      @app.routes.each_key do |route|
+        @routes << route
+      end
+
+      @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 @routes.include?(sym_route)
+        res = @app.call(sym_route, params)
+      else
+        params[:route] = route
+        res = @app.call(:not_found, params)
+      end
+
+      response = Thrift::Response.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
+
+end

data/lib/jetra/adapter/thrift/jetra_constants.rb

@@ -0,0 +1,10 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+module Jetra
+  module Thrift
+  end
+end

data/lib/jetra/adapter/thrift/jetra_types.rb

@@ -0,0 +1,46 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+module Jetra
+  module Thrift
+    class Request
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      ROUTE = 1
+      PARAMS = 2
+
+      FIELDS = {
+        ROUTE => {:type => ::Thrift::Types::STRING, :name => 'route'},
+        PARAMS => {:type => ::Thrift::Types::STRING, :name => 'params'}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+    class Response
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      STATUS = 1
+      BODY = 2
+
+      FIELDS = {
+        STATUS => {:type => ::Thrift::Types::I32, :name => 'status'},
+        BODY => {:type => ::Thrift::Types::STRING, :name => 'body'}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+  end
+end

data/lib/jetra/adapter/thrift/service.rb

@@ -0,0 +1,81 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+module Jetra
+  module Thrift
+
+    module Service
+      
+      class Client
+        include ::Thrift::Client
+
+        def call(request)
+          send_call(request)
+          return recv_call()
+        end
+
+        def send_call(request)
+          send_message('call', Call_args, :request => request)
+        end
+
+        def recv_call()
+          result = receive_message(Call_result)
+          return result.success unless result.success.nil?
+          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'call failed: unknown result')
+        end
+
+      end
+
+      class Processor
+        include ::Thrift::Processor
+
+        def process_call(seqid, iprot, oprot)
+          args = read_args(iprot, Call_args)
+          result = Call_result.new()
+          result.success = @handler.call(args.request)
+          write_result(result, oprot, 'call', seqid)
+        end
+
+      end
+
+      # HELPER FUNCTIONS AND STRUCTURES
+
+      class Call_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        REQUEST = 1
+
+        FIELDS = {
+          REQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'request', :class => ::Jetra::Thrift::Request}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Call_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        SUCCESS = 0
+
+        FIELDS = {
+          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Jetra::Thrift::Response}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+    end
+
+  end
+end

data/lib/jetra/client/thrift.rb

@@ -0,0 +1,26 @@
+#用于封装基于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

data/lib/jetra/version.rb

@@ -1,5 +1,5 @@
 module Jetra
 
-  Version = "1.0.2"
+  Version = "1.0.3"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jetra
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jeffrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies: []
 description: micro DSL
 email:
@@ -19,9 +19,14 @@ extra_rdoc_files: []
 files:
 - lib/jetra.rb
 - lib/jetra/adapter/rack.rb
+- lib/jetra/adapter/thrift.rb
+- lib/jetra/adapter/thrift/jetra_constants.rb
+- lib/jetra/adapter/thrift/jetra_types.rb
+- lib/jetra/adapter/thrift/service.rb
 - 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
@@ -46,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: make it easy to write micro service