unp_smart 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e6fab91beaa21a5e9be24293bac4c0acfb9602
-  data.tar.gz: bd661d9892db68861023319c1cc4c076723f6a23
+  metadata.gz: 1363bec36e89b6ac13f1344f8124c66b3a301197
+  data.tar.gz: ea06b3ab4d19feb6f1b1be5bc8f5a3b6add0f8de
 SHA512:
-  metadata.gz: e37e4ec501319ca55e096570066e5725fbdd3653a413d4173dc7f8115d540aa4beb70abf0c563f48dafc810556551972bffa559ab5b2e44c87c4be9f0954bb59
-  data.tar.gz: 03c261effb0338e21e13a9bd401774ca4eb9b5c715c660728bb17ae2197af7ac1e2abddbdb28d4ab1f2f8335bfe8a584e57d2c837b404ae23c01c9e60fc04483
+  metadata.gz: 22a20c9bcd929eb47c40e15bf58f4909c5b17f35474bf5bd2ccba036b6b6f0653d6abf861edcd1ec66f9466750eb868ee9e7bb53cf122d7e5673f952ce0dc20a
+  data.tar.gz: 934a89bcc5fd2b0d118dbb6a5dce4390bc749dbe2dbb78e652292e714b32e620301c9485f13494145fa256f7bb16dc0f88f331883c41559f6d3a5271fa20bb27

data/.gitignore

@@ -29,3 +29,4 @@ config/secrets.yml
 /vendor/assets/bower_components
 *.bowerrc
 bower.json
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    unp_smart (0.0.1)
+    unp_smart (0.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ```
 development:
-  account: '000000'
+  account: ''
   secret_key: ''
   server: 'https://data.unionpaysmart.com'
   debug: true
@@ -41,6 +41,7 @@ development:
 
 ## 使用
 
+### 在项目中使用
 ```
 UnpSmart.get  path,params,&block
 
@@ -64,9 +65,30 @@ UnpSmart.get '/merchant/queryName',{mName: '巴黎春天'}
 * 第二个为请求的内容，如果失败为失败信息
 
 
+### 在终端中使用
+
+为了方便用户使用或调试，还提供了命令行的工具，按如下方式执行
+```
+unpsmart [get/post] api_path key1 value1 key2 value2 [...]
+```
+
+前面的get或post可以省略，默认为get如
+
+```
+unpsmart get merchant/queryName mName 巴黎春天
+```
+
+参数按key value传递即可，如果使用终端并且当前目录没有config/unp_smart.yml文件，程序会尝试加载用户目录下的.unp_smart.yml，如果没有您可以新建一个
+
+```
+curl https://raw.githubusercontent.com/unpsmart/ruby-sdk/master/config/unp_smart.yml > ~/.unp_smart.yml
+```
+
+然后编辑这个文件即可
+
 ## Contributing
 
-1. Fork it ( https://github.com/unpsmart/unp_smart/fork )
+1. Fork it ( https://github.com/unpsmart/ruby-sdk/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/unpsmart

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+def invoke_api http_method,api_path,params={}
+  require 'unp_smart'
+  puts "invoke api:#{http_method},#{api_path},#{params}"
+  if http_method == 'get'
+    result = UnpSmart.get api_path,params
+  else
+    result = UnpSmart.post api_path,params
+  end
+  
+  puts "\n"
+  puts "-"*50
+  puts result
+  puts "-"*50
+end
+
+if ARGV.length >0
+  http_method = ARGV.shift
+  if %w{get post}.include?(http_method)
+    api_path = ARGV.shift
+  else
+    api_path = http_method
+    http_method = 'get'    
+  end 
+  
+  unless ARGV.length%2 == 0
+    puts "Args is missed!!You should give me even values"    
+    exit!
+  end
+  
+  params = {}
+  ARGV.each_slice(2) do |item| 
+    params[item[0]] = item[1]
+  end
+  begin  
+    invoke_api http_method,api_path,params
+  rescue => e
+    puts "invoke api error,got:#{e}"
+  end
+else
+  puts "Usage:\n\tunpsmart [get/post] api_path key1 value1 key2 value2 [...]"
+end
+

data/config/unp_smart.yml

@@ -1,7 +1,7 @@
 development:
-  account: '000000'
+  account: ''
   secret_key: ''
-  server: 'http://192.168.88.105:9999'
+  server: 'https://data.unionpaysmart.com'
   debug: true
   verbose: false
   raw_response: true

data/lib/unp_smart/unp_smart_method.rb

@@ -18,6 +18,7 @@ module UnpSmart
   
     def _invoke_api http_method,api,params={}
       log "request api:#{api},params:#{params}"
+      raise 'api is not allowed blank!' if api.blank?
       
       @api = api
       @params = params
@@ -26,7 +27,8 @@ module UnpSmart
       @config = {} if @config.nil?
       @verbose = get_variable :verbose
       
-      raise 'api is not allowed blank!' if api.blank?    
+      @api = "/#{@api}" unless @api.start_with?("/")
+      
       account = get_variable :account
       log "account:", account if @verbose
       raise 'account is not allowed blank!' if account.blank?
@@ -44,7 +46,7 @@ module UnpSmart
     
       extracted_params[:sign] =  sign_params extracted_params,secret_key
 
-      request_url = "#{get_variable :server}#{api}?#{extracted_params.map{|key,value| "#{key}=#{CGI.escape value.nil? ? "" : value.to_s}"}.join("&")}"
+      request_url = "#{get_variable :server}#{@api}?#{extracted_params.map{|key,value| "#{key}=#{CGI.escape value.nil? ? "" : value.to_s}"}.join("&")}"
     
       log "request:",request_url if @debug
     
@@ -60,7 +62,7 @@ module UnpSmart
         yield return_response
       else
         if get_variable(:raw_response)
-          log "return raw response" if @debug
+          log "return raw response" if @verbose
           return_response
         else     
           log "parse result" 
@@ -90,11 +92,21 @@ module UnpSmart
   
     def load_config
       log "loading config"
-      @config ||= YAML.load_file("#{app_root}/config/unp_smart.yml")[current_env]
+      path = "#{app_root}/config/unp_smart.yml"
+      unless File.exist?(path)
+        path = "#{File.expand_path('~')}/.unp_smart.yml"
+        log "try use home config #{path}" if @verbose
+        
+        unless File.exist?(path)
+          log "can't load config,will use env or params config"
+          return
+        end
+      end
+      log "config file path",path
+      @config ||= YAML.load_file(path)[current_env]
       log "config:#{@config}" if @verbose
-    rescue => e
-      @config = {}
-      log "load config error:#{e.inspect}"
+    # rescue => e
+      # log "load config error:#{e.inspect}"
     end
     
     private
@@ -113,8 +125,7 @@ module UnpSmart
     end
   
     def get_variable_from_config key
-      @config
-      @config[key.to_s]
+      @config[key.to_s] if @config.present?
     end
   
     def log *msg

data/lib/unp_smart/version.rb

@@ -1,3 +1,3 @@
 module UnpSmart
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/unp_smart.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = ['unpsmart']#spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unp_smart
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Xu
@@ -83,7 +83,8 @@ dependencies:
 description: UnionpaySmart SDK for Ruby
 email:
 - martin.xus@gmail.com
-executables: []
+executables:
+- unpsmart
 extensions: []
 extra_rdoc_files: []
 files:
@@ -93,6 +94,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/unpsmart
 - config/unp_smart.yml
 - lib/unp_smart.rb
 - lib/unp_smart/unp_smart_method.rb