xi_wechat_corp 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c109c81bff8d13daf9242207b0239b4cc09d7d32
-  data.tar.gz: 7616d63d571138f5992d03ca0171bdc6010424c9
+  metadata.gz: 4c1aa27990d8c3bc1126d1bb0834499278e13bf9
+  data.tar.gz: ff85e7794cd9ecb49222cf67026b636e743ac8e8
 SHA512:
-  metadata.gz: e20ca22e76380506c320226b3046764651e71f682528cd1d0671dc5f84242b76dcff5af0ea9899ebee76ece1a76868a4e7ddd69a6db068554b42e2c57e4fdcc3
-  data.tar.gz: e70eae4d05307646c2250414a0b109518140a2c5d9bf5b74503bdfe48e02201595f864e106fb36af49b1328f1542723f656cac3b75856ccb83f4410931bb50ee
+  metadata.gz: 2458e53ca6922f28df0b621b400464c58c6474feec8a033e9041e0b5480282832dc9cab419072e9fabfdc3a33d1f4650b3314341354b949d732eb3003cd51f32
+  data.tar.gz: 09a61afcb3804a7f58721c8c613692ca8324a2cceb9e271546124cb4cd03e17d82ee2bcb9ad4795f86f419f25dc82f764a2deb91f4ed4a09d0008999cb7f4c7b

data/bin/xi_wechat_corp_api

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'xi_wechat_corp/api/cli'
+
+XiWechatCorp::API::CLI.new.run(ARGV)

data/lib/xi_wechat_corp/api/cli.rb

@@ -0,0 +1,174 @@
+require 'fileutils'
+require 'optparse'
+require 'xi_wechat_corp/version'
+require 'xi_wechat_corp/api/connection'
+require 'rack/utils'
+
+module XiWechatCorp
+  module API
+    class CLI
+      class FileCache
+        def initialize(dir)
+          @dir = dir
+        end
+
+        def read(key) 
+          path = File.join(@dir, key)
+          if File.exists?(path)
+            File.read(key)
+          end
+        end
+
+        def write(key, value)
+          path = File.join(@dir, key)
+          FileUtils.mkdir_p(File.dirname(path))
+          File.open(path, 'w') { |f| f.write(value) }
+        end
+      end
+
+      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
+      rescue SystemCallError => e
+        $stderr.puts 'ERROR: ' + e.message
+        exit e.errno
+      rescue Faraday::ClientError => e
+        $stderr.puts 'ERROR: ' + e.message
+        $stderr.puts e.response
+        exit 2
+      rescue Faraday::Error => e
+        $stderr.puts 'ERROR: ' + e.message
+        exit 2
+      end
+
+      def establish_connection(options)
+        connection_options = {}
+        [:access_token, :corp_id, :secret].each do |key|
+          connection_options[key] = options[key] if options.key?(key)
+        end
+        Connection.new(connection_options)
+      end
+
+      def verify(options)
+        if options[:access_token].nil? && (options[:corp_id].nil? || options[:secret].nil?)
+          $stderr.puts <<-MSG
+Cannot get access token.  Set `--corp-id' and `--secret', or give the token directly
+using `--access-token'.
+          MSG
+          exit 1
+        end
+
+        options
+      end
+
+      def parse(args)
+        options = {
+          corp_id: ENV['XI_WECHAT_CORP_ID'],
+          secret: ENV['XI_WECHAT_CORP_SECRET'],
+          input: $stdin,
+          path: nil,
+          method: 'post',
+          params: {}
+        }
+
+        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 JSON
+  GET: xi_wechat_corp_api [options] --get PATH KEY=VALUE [KEY=VALUE]...
+          BANNER
+
+          opts.separator ''
+          opts.separator 'Authentication options:'
+
+          opts.on('-i', '--corp-id CORPID') do |corp_id|
+            options[:corp_id] = corp_id
+          end
+
+          opts.on('-s', '--secret SECRET') do |secret|
+            options[:secret] = secret
+          end
+
+          opts.on('-c', '--cache DIR', 'Cache access token in the directory') do |cache_dir|
+            XiWechatCorp.cache = FileCache.new(cache_dir)
+          end
+
+          opts.on('-a', '--access-token ACCESS_TOKEN', 'Use given access token') do |access_token|
+            options[:access_token] = access_token
+          end
+
+          opts.separator ''
+          opts.separator 'Request options:'
+
+          opts.on('-p', '--post [PATH]', 'Send POST request, it is default') do |path|
+            options[:method] = 'post'
+            options[:path] = path if path
+          end
+
+          opts.on('-g', '--get PATH', 'Send GET request') do |path|
+            options[:method] = 'get'
+            options[:path] = path
+          end
+
+          opts.on('-j', '--json JSON', 'JSON body for POST request') do |json|
+            options[:input] = 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)
+          end
+
+          opts.on('-f', '--file FILE', 'FILE contains the JSON to be send via POST') do |f|
+            options[:input] = File.open(f) if f != '-'
+          end
+
+          opts.separator ''
+          opts.separator 'Common options:'
+
+          opts.on_tail('-h', '--help', 'Show this message') do
+            puts opts
+            exit
+          end
+
+          # Another typical switch to print the version.
+          opts.on_tail('-v', '--version', 'Show version') do
+            puts VERSION
+            exit
+          end
+        end
+
+        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 arg[0] == '{'
+            options[:input] = StringIO.new(args.first)
+          elsif arg != '-'
+            options[:input] = File.open(arg)
+          end
+        when 'get'
+          options[:params].merge! Rack::Utils.parse_nested_query(args.join('&'))
+        end
+
+        options
+      end
+    end
+  end
+end

data/lib/xi_wechat_corp/api/connection.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'faraday_middleware'
+require 'xi_wechat_corp'
 require 'xi_wechat_corp/api/access_token'
 
 module XiWechatCorp
@@ -15,7 +16,7 @@ module XiWechatCorp
 
     class RaiseClientError < Faraday::Response::Middleware
       def parse(body)
-        raise ClientError.new(body) if body.nil? || body.key?('errcode')
+        raise ClientError.new(body) if body.nil? || (body.key?('errcode') && body['errcode'].to_i != 0)
         body
       end
     end

data/lib/xi_wechat_corp/api.rb

@@ -1,2 +1,6 @@
-require 'xi_wechat_corp/api/access_token'
-require 'xi_wechat_corp/api/connection'
+module XiWechatCorp
+  module API
+    autoload :AccessToken, 'xi_wechat_corp/api/access_token'
+    autoload :Connection, 'xi_wechat_corp/api/connection'
+  end
+end

data/lib/xi_wechat_corp/version.rb

@@ -1,3 +1,3 @@
 module XiWechatCorp
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/lib/xi_wechat_corp.rb

@@ -1,8 +1,8 @@
 require "xi_wechat_corp/version"
+require "xi_wechat_corp/api"
+require "xi_wechat_corp/callback"
 
 module XiWechatCorp
-  autoload :API, 'xi_wechat_corp/api'
-  autoload :Callback, 'xi_wechat_corp/callback'
   autoload :SHA1Signer, 'xi_wechat_corp/sha1_signer'
   autoload :AesCrypt, 'xi_wechat_corp/aes_crypt'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xi_wechat_corp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ian Yang
@@ -167,7 +167,8 @@ dependencies:
 description: Wechat Corp development toolkits
 email:
 - ian@3pjgames.com
-executables: []
+executables:
+- xi_wechat_corp_api
 extensions: []
 extra_rdoc_files: []
 files:
@@ -176,10 +177,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/xi_wechat_corp_api
 - lib/xi_wechat_corp.rb
 - lib/xi_wechat_corp/aes_crypt.rb
 - lib/xi_wechat_corp/api.rb
 - lib/xi_wechat_corp/api/access_token.rb
+- lib/xi_wechat_corp/api/cli.rb
 - lib/xi_wechat_corp/api/connection.rb
 - lib/xi_wechat_corp/callback.rb
 - lib/xi_wechat_corp/callback/config.rb