struggle 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdb993b1ce68adc13aa2e499e50e0de4db0ea1b
-  data.tar.gz: c5fca3e0ee7f9c69ed7bb882c956ce76325e5565
+  metadata.gz: f5eb5f6370a1a078d7a442b66eb13db0b6795db1
+  data.tar.gz: 4955078a8cc2c544df6788c4a8853a476a52714e
 SHA512:
-  metadata.gz: a53cf016e4b54544e7cf781447039bdff818b55974c5b292c46acfb1ff307ebea27f4b82f3e36c545b473d4c03bd7649ed1261473dfee2feccc84bb549ad3796
-  data.tar.gz: 0622bb965c35fd4ceffe173974cc663f5826499002357f1bf6dfcdcb2e44c01be9ad570554914d4f8ebebf3641377c34cf302182099249e0c9c1d7ce1078a8e3
+  metadata.gz: 6e66a8266eb32e1d37f33d112c8158264f2ac664945c3dcc5ce1a80fc98af0738a6288802ea3a414b092e6fd72d1eacafc57dc13cc162baaee7daa8a0ab7c34d
+  data.tar.gz: e4899226fcbce66804a2bbf22e0aa6c40fd4577962cb7e499857d8e75df2ef1e2ea1685c7538c46818716b15b929214000d12079157ba101783c213e28bd51b9

data/lib/{struggle/pay_gateway.rb → pay/jd_gateway.rb}

@@ -1,7 +1,5 @@
-module Struggle
-  class PayGateway
-    require 'net/https'
-    require 'uri'
+module Pay
+  class JDGateway
     URL_UTF8 = "https://pay3.chinabank.com.cn/PayGate?encoding=UTF-8"
     URL = "https://pay3.chinabank.com.cn"
 
@@ -17,7 +15,7 @@ module Struggle
           'v_url' => v_url,
           'key' => key,
           'v_md5info' => v_md5info,
-	  'remark1' => remark1,
+          'remark1' => remark1,
           'remark2' => "[url:=#{remark2}]"
       }
       parameter.each do |key, val|

data/lib/pay.rb

@@ -0,0 +1,8 @@
+module Pay
+end
+begin
+  require 'rails'
+rescue LoadError
+  #do nothing
+end
+require 'pay/jd_gateway'

data/lib/struggle/{cipher.rb → aes.rb}

@@ -1,5 +1,5 @@
 module Struggle
-  class Cipher
+  class Aes
     require 'openssl'
     def self.encrypt(data, key ,iv)
       cipher = OpenSSL::Cipher::AES.new(256, :CBC)
@@ -9,7 +9,7 @@ module Struggle
       Base64.encode64(cipher.update(data) + cipher.final)
     end
 
-    def self.decipher(data, key ,iv)
+    def self.decrypt(data, key ,iv)
       decipher = OpenSSL::Cipher::AES.new(256, :CBC)
       decipher.decrypt
       decipher.key = key

data/lib/struggle/{vcode.rb → code.rb}

@@ -1,18 +1,18 @@
 #first gem 'rmagick'
 module Struggle
-  class Vcode
+  class Code
     #controller
     #def getcode
-    #  vcode = Vcode.getvcode
-    #  session[:code]=vcode[:code]
-    #  send_data vcode[:img], content_type: 'image/jpeg', disposition: 'inline'
+    #  code = Code.getcode
+    #  session[:code]=code[:code]
+    #  send_data code[:img], content_type: 'image/jpeg', disposition: 'inline'
     #end
     #view
     # <img src="/getcode">
-    #Vcode.getvcode(90,40,24)
+    #Code.getcode(90,40,24)
     #w宽，h高，fontsize字体大小
     #返回json类型
-    def self.getvcode(w=90, h=40, fontsize=24)
+    def self.getcode(w=90, h=40, fontsize=24)
       #创建画布
       img = Magick::Image.new(w, h) {
         self.background_color = 'white'

data/lib/struggle/concerns/string_extend.rb

@@ -1,18 +1,18 @@
 module Struggle
   module StringExtend
-    def html_clear
+    def htmlClear
       self.gsub(/<script.*?<\/script>/, "").gsub(/<iframe.*?<\/iframe>/, "")
     end
 
-    def ischinese
+    def isCn
       (self=~/[\u4e00-\u9fa5]/).nil? ? false : true
     end
 
-    def iscn_zn_num
+    def isCnOrEn
       (self=~/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/).nil? ? false : true
     end
 
-    def truncate_u(length = 30, truncate_string = "...")
+    def truncate(length = 30, truncate_string = "...")
       l=0
       char_array=self.unpack("U*")
       char_array.each_with_index do |c, i|

data/lib/struggle/{func.rb → http.rb}

@@ -1,5 +1,5 @@
 module Struggle
-  class Func
+  class Http
     require 'net/http'
     require 'net/https'
     require 'uri'

data/lib/struggle/logistic.rb

@@ -6,17 +6,17 @@ module Struggle
     URL = "http://api.kuaidi100.com/api"
     URL_loophold = "http://www.kuaidi100.com/query"
 
-    def self.send_by_free(id, com, nu, show="json", muti=1, order="desc")
-      respond = Func.get(URL, {'id' => id, 'com' => com, 'nu' => nu, 'show' => show, 'muti' => muti, 'order' => order})
+    def self.send(id, com, nu, show="json", muti=1, order="desc")
+      respond = Http.get(URL, {'id' => id, 'com' => com, 'nu' => nu, 'show' => show, 'muti' => muti, 'order' => order})
       puts respond.body
       return respond.body.blank? ? nil : JSON.parse(respond.body)
     end
 
-
-    def self.send_by_loophold(type, postid)
-      respond = Func.post(URL_loophold, {'type' => type, 'postid' => postid})
+    def self.sendByLoophold(type, postid)
+      respond = Http.post(URL_loophold, {'type' => type, 'postid' => postid})
       return respond.body.blank? ? nil : JSON.parse(respond.body)
     end
+
     Company = {"anxindakuaixi" => "安信达", "huitongkuaidi" => "汇通快运", "baifudongfang" => "百福东方", "bht" => "BHT", "bangsongwuliu" => "邦送物流",
                "coe" => "中国东方（COE）", "chuanxiwuliu" => "传喜物流", "datianwuliu" => "大田物流",
                "debangwuliu" => "德邦物流","dpex" => "DPEX", "dhl" => "DHL-中国件", "dsukuaidi" => "D速快递", "disifang" => "递四方",

data/lib/struggle/sms.rb

@@ -5,7 +5,7 @@ module Struggle
     require 'uri'
 
     def Sms.send(uid, pwd, mobile, content)
-      response = Func.post(URL, {'ac' => "send", 'uid' => uid, 'pwd' => pwd, 'mobile' => mobile, 'content' => content})
+      response = Http.post(URL, {'ac' => "send", 'uid' => uid, 'pwd' => pwd, 'mobile' => mobile, 'content' => content})
       return response.body=="100"
     end
   end

data/lib/struggle.rb

@@ -6,14 +6,13 @@ rescue LoadError
   #do nothing
 end
 require 'struggle/tfile'
-require 'struggle/func'
+require 'struggle/http'
 require 'struggle/logistic'
 require 'struggle/pager'
-require 'struggle/pay_gateway'
 require 'struggle/sms'
 require 'struggle/tmagick'
-require 'struggle/vcode'
-require 'struggle/cipher'
+require 'struggle/code'
+require 'struggle/aes'
 require 'struggle/concerns/string_extend'
 require 'struggle/concerns/int_extend'
 String.send :include, Struggle::StringExtend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - lean
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: vcode,tfile,pager,func,logistic,pay_gateway,tmagick,class_extend,cipher;
+description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -46,19 +46,20 @@ extra_rdoc_files:
 - README.md
 files:
 - README.md
+- lib/pay.rb
+- lib/pay/jd_gateway.rb
 - lib/struggle.rb
-- lib/struggle/cipher.rb
+- lib/struggle/aes.rb
+- lib/struggle/code.rb
 - lib/struggle/concerns/int_extend.rb
 - lib/struggle/concerns/string_extend.rb
 - lib/struggle/font/font.ttf
-- lib/struggle/func.rb
+- lib/struggle/http.rb
 - lib/struggle/logistic.rb
 - lib/struggle/pager.rb
-- lib/struggle/pay_gateway.rb
 - lib/struggle/sms.rb
 - lib/struggle/tfile.rb
 - lib/struggle/tmagick.rb
-- lib/struggle/vcode.rb
 homepage: http://rubygems.org/gems/struggle
 licenses:
 - struggle