xi_wechat_corp 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e816780236b5dc5a5fe6626e42f122339718979b
-  data.tar.gz: f2a650a4f354967c9e0263352525cc1b5e658363
+  metadata.gz: beaff6e4d5ef6eaa878a785b55d4fb0741f85bb5
+  data.tar.gz: 635c19daf807474e610d21e0cb4209636ff0e47c
 SHA512:
-  metadata.gz: b1aa2f0f400e1cdb262519fb5c7f228ead12211ac9c78a69c7f9b0f605a853898a24d2232f61c6e61ea788be25d6949f62972a699cb9ee6e22166c1c69537bb1
-  data.tar.gz: 96dde77fd40f2a4405d847be95a33722bc8cfb0b212495a3b9dcb41e9f1e08c0c3b6873238c0f4b268b3be347c2622066b11a967110c30da7a81accff99f6f3e
+  metadata.gz: 502dc58825e9407ad5a6adfeefefd3a052ac8fd9bad969ed966f22b7289e1a348f0ffba990cf5660f0c235c92d5dc5284cc43b5d60a8110660471c06f0f9dbdb
+  data.tar.gz: d2eeb6f2e12b3b1ea658dfc58de0245b7297674fc0c817c4333cd7f491b4ea76e3ea448ca315e90ed4feb6bb8e33130d3737e1eebdcad6a1e75697b5a784b720

data/bin/xi_wechat_corp_send_text

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'xi_wechat_corp/api/cli'
+
+puts 'Input JSON Body Below (Ctrl+D to send request):' if $stdin.tty?
+text = $stdin.read
+ARGV.unshift text
+ARGV.unshift '--text'
+
+XiWechatCorp::API::CLI.new.run(ARGV)

data/lib/xi_wechat_corp/api/cli.rb

@@ -3,6 +3,7 @@ require 'optparse'
 require 'xi_wechat_corp/version'
 require 'xi_wechat_corp/api/connection'
 require 'rack/utils'
+require 'multi_json'
 
 module XiWechatCorp
   module API
@@ -29,14 +30,10 @@ module XiWechatCorp
       def run(args)
         options = verify(parse(args))
         conn = establish_connection(options)
-        if options[:method] == 'post'
-          if options[:input].tty?
-            puts 'Input JSON Body Below (Ctrl+D to send request):'
-          end
-          puts conn.post(options[:path], options[:input].read).body
-        else
-          puts conn.get(options[:path], options[:params]).body
-        end
+        puts MultiJson.load(conn.send(options[:method], options[:path], options[:params]).body).inspect
+      rescue MultiJson::ParseError => e
+        $stderr.puts 'BAD JSON: ' + e.message
+        exit 1
       rescue SystemCallError => e
         $stderr.puts 'ERROR: ' + e.message
         exit e.errno
@@ -73,17 +70,18 @@ using `--access-token'.
         options = {
           corp_id: ENV['XI_WECHAT_CORP_ID'],
           secret: ENV['XI_WECHAT_CORP_SECRET'],
-          input: $stdin,
           path: nil,
           method: 'post',
-          params: {}
-        }
+          json: [],
+          query: []
+        } 
 
         opt_parser = OptionParser.new do |opts|
           opts.banner = <<-BANNER
 Usage: xi_wechat_corp_api [options]
 
  POST: xi_wechat_corp_api [options] PATH FILE
+       xi_wechat_corp_api [options] PATH KEY=VALUE ['NEST[KEY]'=VALUE]...
        xi_wechat_corp_api [options] PATH JSON
   GET: xi_wechat_corp_api [options] --get PATH KEY=VALUE [KEY=VALUE]...
           BANNER
@@ -115,21 +113,25 @@ Usage: xi_wechat_corp_api [options]
             options[:path] = path if path
           end
 
-          opts.on('-g', '--get PATH', 'Send GET request') do |path|
+          opts.on('-g', '--get [PATH]', 'Send GET request') do |path|
             options[:method] = 'get'
-            options[:path] = path
+            options[:path] = path if path
           end
 
           opts.on('-j', '--json JSON', 'JSON body for POST request') do |json|
-            options[:input] = StringIO.new(json)
+            options[:json] << StringIO.new(json)
           end
 
-          opts.on('-q', '--query QUERY', 'QUERY string for GET request') do |query|
-            options[:params].merge! Rack::Utils.parse_nested_query(query)
+          opts.on('-q', '--query QUERY', 'QUERY string such as a=10&b[nested]=10, it will be converted to JSON for POST') do |query|
+            options[:query] << query.strip if query && query.strip.size > 0
           end
 
           opts.on('-f', '--file FILE', 'FILE contains the JSON to be send via POST') do |f|
-            options[:input] = File.open(f) if f != '-'
+            options[:json] << (f != '-' ? File.open(f) : $stdin)
+          end
+
+          opts.on('-t', '--text CONTENT', 'Set text[content] for text message') do |content|
+            options[:query] << "text[content]=#{content.gsub('%', '%25').gsub('&', '%26')}"
           end
 
           opts.separator ''
@@ -150,24 +152,51 @@ Usage: xi_wechat_corp_api [options]
         opt_parser.parse!(args)
         return options if args.empty?
 
-        case options[:method]
-        when 'post'
-          if args.size > 2
-            $stderr.puts 'Two many positional arguments'
-            exit 1
-          end
-          options[:path] = args.first if args.size == 2
-          arg = args.last.strip
+        if options[:path].nil?
+          options[:path] = args.shift
+        end
+
+        args.each do |arg|
+          arg = arg.strip
           if arg[0] == '{'
-            options[:input] = StringIO.new(args.first)
-          elsif arg != '-'
-            options[:input] = File.open(arg)
+            options[:json] << StringIO.new(arg)
+          elsif arg == '-'
+            options[:json] << $stdin
+          elsif !File.exists?(arg) && arg.include?('=')
+            options[:query] << arg
+          else
+            options[:json] << File.open(arg)
           end
-        when 'get'
-          options[:params].merge! Rack::Utils.parse_nested_query(args.join('&'))
         end
 
-        options
+        if options[:query].empty?
+          params = {}
+        else
+          params = Rack::Utils.parse_nested_query(options[:query].join('&'))
+        end
+
+        options[:json].each do |input|
+          params = deep_merge(params, read_json(input))
+        end
+
+        options.merge(params: params)
+      end
+
+      def read_json(input)
+        if input.tty?
+          puts 'Input JSON Body Below (Ctrl+D to send request):'
+        end
+        MultiJson.load(input.read)
+      end
+
+      def deep_merge(a, b)
+        a.merge(b) do |key, oldval, newval|
+          if oldval.is_a?(Hash) && newval.is_a?(Hash)
+            deep_merge(oldval, newval)
+          else
+            newval
+          end
+        end
       end
     end
   end

data/lib/xi_wechat_corp/version.rb

@@ -1,3 +1,3 @@
 module XiWechatCorp
-  VERSION = '1.2.2'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xi_wechat_corp
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Ian Yang
@@ -169,6 +169,7 @@ email:
 - ian@3pjgames.com
 executables:
 - xi_wechat_corp_api
+- xi_wechat_corp_send_text
 extensions: []
 extra_rdoc_files: []
 files:
@@ -178,6 +179,7 @@ files:
 - README.md
 - Rakefile
 - bin/xi_wechat_corp_api
+- bin/xi_wechat_corp_send_text
 - lib/xi_wechat_corp.rb
 - lib/xi_wechat_corp/aes_crypt.rb
 - lib/xi_wechat_corp/api.rb