doraemon 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6525d668d265446b3581c604163d8c9920c511f5
-  data.tar.gz: 0f77daf6ec70676072986d3fe585577f17ff3220
+  metadata.gz: f4584162c612105d9192e8293f9366d1629586a1
+  data.tar.gz: db0536b103961c1b0c560601664f4bc9e1f06047
 SHA512:
-  metadata.gz: 0fc82b02d2b71f29f0b196cdd0bd9c56ef78d27f1ff40b9351db5eeaf45bcc8652670dbb4dbd735a5aef5f11eb5414604c69cf693fcc5f6d4f87abb5ebfc194f
-  data.tar.gz: d7211e89f0c49007f24137a156d9570c8dc292996c92531d6f202c5b81fd8add53f508106f0a3550b3bee047da14e22ca9316101346ed2345e3a68763308463c
+  metadata.gz: '0483de11155a3cc361c23648e6790b19d2534d339e0c072133a27257f9e441cf5ec82b47e9f6c4fb23f93d205eb3631b53edea76826b3662233a367a3eb8bd5d'
+  data.tar.gz: 867456d477ae53fd923b330299e697fd971e7fabd95cab9de8f0866b0f854b6a2cef9de9f95e0e1e5aa90bb9172c26aff8775d7c7031dba34a04265d58bee26c

data/exe/doraemon

@@ -14,10 +14,8 @@ argv = CLAide::ARGV.new(ARGV)
 port = argv.option('port', 4000)
 root = File.expand_path(argv.option('root', Dir.pwd))
 
-api_manager = Doraemon::APIManager.new(root)
-
 proxy_server = Doraemon::ProxyServer.new(port.to_i, root)
-proxy_server.start api_manager.load_api
+proxy_server.start
 
 http_server = Doraemon::HTTPServer.new(port.to_i+1, root)
 http_server.start

data/lib/doraemon.rb

@@ -3,7 +3,6 @@ require 'doraemon/version'
 module Doraemon
   
   require 'doraemon/utils/date'
-  require 'doraemon/api_manager'
   require 'doraemon/http_server'
   require 'doraemon/proxy_server'
 

data/lib/doraemon/proxy_server.rb

@@ -11,7 +11,7 @@ module Doraemon
       @root = root
     end
 
-    def start(api_list)
+    def start()
       
       Cert.generate_cert
 
@@ -28,15 +28,30 @@ module Doraemon
       
       _session.on_response do |_req, _resp|
 
-        if api_list.include?(_req.path)
+        puts "-----------------------------------------------------------------"
+        puts "  - URI: #{_req.request_uri}"
 
-          puts "- - - > #{_req.path}"
+        name = _req.path
+        if name.start_with?('/')
+          name = name[1, name.size - 1]
+        end
+        name = name.gsub('_', '__').gsub('/', '_')
+
+        _api_path = nil
+        for ext in [".rb", ".json", ".api"] do
+          path = File.join(@root, "#{name}#{ext}")
+          if File.exist?(path)
+            _api_path = path
+            break
+          end
+        end
+
+        _params = begin JSON.parse(_req.body) rescue _req.body end
+        _result = begin JSON.parse(_resp.body) rescue {} end
 
-          _params = begin JSON.parse(_req.body) rescue _req.body end
-          _result = begin JSON.parse(_resp.body) rescue {} end
+        if _api_path
 
           begin
-            _api_path = File.join(@root, api_list[_req.path])
             _result = eval(File.read(_api_path)) if File.exist?(_api_path)
           rescue
             _result = {
@@ -44,15 +59,48 @@ module Doraemon
               "msg": "#{_req.path} 处理错误"
             }
           end
-          
+
           _resp.status = 200
           _resp.body = _result.to_json
           _resp.header['content-length'] = _resp.body.bytesize
-          _resp.header['content-type'] = 'application/json;charset=UTF-8'
-          
-          puts "#{JSON.pretty_generate(_result)}\n\n"
+          _resp.header['content-type'] = 'application/json; charset=utf-8'
+
         end
         
+        print_req_body = false
+        print_resp_body = false
+        req_content_type = _req.header['content-type']
+        ["text", "json"].each do | t |
+          if req_content_type.class == Array
+            req_content_type.each do | tt |
+              if tt.downcase.index(t) != nil
+                print_req_body = true
+              end
+            end
+          end
+          if _resp.header['content-type'].downcase.index(t) != nil
+            print_resp_body = true
+          end
+        end
+
+        if print_req_body
+          puts "  - Request: #{_req.body}\n"
+        else
+          if _req.body.class != NilClass
+            puts "  - Response: <#{_req.body.length}>"
+          end
+        end
+
+        if print_resp_body
+          puts "  - Response: #{_resp.body}\n" if print_resp_body
+        else
+          if _resp.body.class != NilClass
+            puts "  - Response: <#{_resp.header['content-type']}>, size #{_resp.body.length}"
+          end
+        end
+
+        puts "\n"
+
       end
       
       _session.start

data/lib/doraemon/version.rb

@@ -1,3 +1,3 @@
 module Doraemon
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doraemon
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - zhuoyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,6 @@ files:
 - README.md
 - exe/doraemon
 - lib/doraemon.rb
-- lib/doraemon/api_manager.rb
 - lib/doraemon/http_server.rb
 - lib/doraemon/proxy_server.rb
 - lib/doraemon/res/image_source.json

data/lib/doraemon/api_manager.rb

@@ -1,29 +0,0 @@
-module Doraemon
-
-  class APIManager
-
-    def initialize(root = Dir.pwd)
-      @root = root
-    end
-
-    def load_api
-
-      accept_exts = [".rb", ".json", ".api"]
-
-      api_list = {}
-
-      Dir.foreach(@root) do |filename|
-        next if !accept_exts.include? File.extname(filename).downcase
-        api_name = "/#{File.basename(filename, '.*')}".tr('_', '/')
-        api_name = api_name.gsub('//', '_')
-        api_list[api_name] = filename
-        puts "#{api_name}  =>  #{filename}"
-      end
-
-      return api_list
-
-    end
-
-  end
-
-end