struggle 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c49188e67e6a0fc4175d8b84e0146d0110e92f
-  data.tar.gz: 9120205f88375a50882ac5378fd76ea21bc8965f
+  metadata.gz: 23e470f3375c4dc58c63564566e7b97a65647be4
+  data.tar.gz: 40f7f904b6c227aa19503d9971c28495685a91c3
 SHA512:
-  metadata.gz: 09f33bea4800221b29fb18fb453e299af1efb0cf4cfbc088de1000cfe8ed761fcf4193eb2f5f245e8477dd94df6fcbd32f620036ccc80b7100fbf0f4f00af3f4
-  data.tar.gz: d16353ea833ed39f5fb0663921c34510c7403545ee9a2e03e606393e1db9c6001db48fee7761a5350e4f391985d6069fa1fe9fc72029cb475b55c5e19444c1b9
+  metadata.gz: 855102cceafc8b208bf9bf860fa27718434c46b335861d9483320cb1d3ced42873f2c035dc06331d5bc3a2c23e7bbe43d6ff944dc06a70d78b7000f5021c9adb
+  data.tar.gz: 11aa7245292514b711339245a98ea8d4140119df70f60d9b6d0f81dbe10fec6c99abbe3f5c39dd9ddbc9b05e84b7e782503335615ad9d6b861af047f1ca8bbf2

data/lib/struggle/concerns/int_extend.rb

@@ -0,0 +1,38 @@
+module Struggle
+  module IntExtend
+    def uppercase
+      cstr = ["零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"]
+      cn_nums1 = ["元", "拾", "佰", "仟", "萬", "拾", "佰", "仟", "億", "拾", "佰", "仟"]
+      cn_nums2 = ['分', '角']
+      s = ""
+      array = self.to_s.split(".")
+      p h = array[0].to_s.split(//)
+      ai = h.count
+      h.each_with_index do |a, j|
+        s+=cstr[a.to_i]+cn_nums1[ai-1]
+        ai=ai-1
+      end
+      p h1 = array[1].to_s.split(//)
+      aj = h1.count
+      h1.each_with_index do |o, p|
+        s+=cstr[o.to_i]+cn_nums2[aj-1]
+        aj=aj-1
+      end
+      rstr = ""
+      rstr=s.gsub("拾零", "拾")
+      rstr=rstr.gsub("零拾", "零");
+      rstr=rstr.gsub("零佰", "零");
+      rstr=rstr.gsub("零仟", "零");
+      rstr=rstr.gsub("零萬", "萬");
+      for i in 1..6 do
+        rstr=rstr.gsub("零零", "零");
+        rstr=rstr.gsub("零萬", "零");
+        rstr=rstr.gsub("零億", "億");
+        rstr=rstr.gsub("零零", "零");
+      end
+      rstr=rstr.gsub("零角", "零");
+      rstr=rstr.gsub("零分", "");
+      rstr=rstr.gsub("零元", "");
+    end
+  end
+end

data/lib/struggle/concerns/string_extend.rb

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

data/lib/struggle/func.rb

@@ -1,78 +1,8 @@
 module Struggle
   class Func
-    # 判断是否含有中文
-    def self.ischinese(temp)
-      (temp=~/[\u4e00-\u9fa5]/).nil? ? false : true
-    end
-
-    # 判断是否只含有中英文，数字和下划线
-    def self.iscn_zn_num(temp)
-      (temp=~/^[\u4e00-\u9fa5_a-zA-Z0-9]+$/).nil? ? false : true
-    end
-
-    # 格式化时间
-    def self.formattime(time)
-      time.strftime("%Y-%m-%d %H:%M:%S")
-    end
-
-    # 限制文字长度
-    def self.truncate_u(text, length = 30, truncate_string = "...")
-      l=0
-      char_array=text.unpack("U*")
-      char_array.each_with_index do |c, i|
-        l = l+ (c<127 ? 0.5 : 1)
-        if l>=length
-          return char_array[0..i].pack("U*")+(i<char_array.length-1 ? truncate_string : "")
-        end
-      end
-      return text
-    end
-
-    # 金额大写小转换
-    def self.uppercase(nums)
-      cstr = ["零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"]
-      cn_nums1 = ["元", "拾", "佰", "仟", "萬", "拾", "佰", "仟", "億", "拾", "佰", "仟"]
-      cn_nums2 = ['分', '角']
-      s = ""
-      # 整数部分
-      array = nums.to_s.split(".")
-      p h = array[0].to_s.split(//)
-      ai = h.count
-      h.each_with_index do |a, j|
-        s+=cstr[a.to_i]+cn_nums1[ai-1]
-        ai=ai-1
-      end
-      # 小数部分
-      p h1 = array[1].to_s.split(//)
-      aj = h1.count
-      h1.each_with_index do |o, p|
-        s+=cstr[o.to_i]+cn_nums2[aj-1]
-        aj=aj-1
-      end
-      rstr = ""
-      rstr=s.gsub("拾零", "拾")
-      rstr=rstr.gsub("零拾", "零");
-      rstr=rstr.gsub("零佰", "零");
-      rstr=rstr.gsub("零仟", "零");
-      rstr=rstr.gsub("零萬", "萬");
-      for i in 1..6 do
-        rstr=rstr.gsub("零零", "零");
-        rstr=rstr.gsub("零萬", "零");
-        rstr=rstr.gsub("零億", "億");
-        rstr=rstr.gsub("零零", "零");
-      end
-      rstr=rstr.gsub("零角", "零");
-      rstr=rstr.gsub("零分", "");
-      rstr=rstr.gsub("零元", "");
-    end
-
     require 'net/http'
     require 'net/https'
     require 'uri'
-
-    # get请求
-    # 参数url：网址，params：参数，header：请求头json类型如：{'Accept' => 'application/json', 'X-Requested-With' => 'XMLHttpRequest'}
-    # 返回response对象，response.code 状态200/304/404;response.body 内容
     def self.get(url, params=nil, header=nil)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
@@ -86,10 +16,6 @@ module Struggle
       end
       http.request(request)
     end
-
-    # post请求
-    # 参数url：网址，params：参数，header：请求头json类型如：{'Accept' => 'application/json', 'X-Requested-With' => 'XMLHttpRequest'}
-    # 返回response对象，response.code 状态200/304/404;response.body 内容
     def self.post(url, params=nil, header=nil)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)

data/lib/struggle/logistic.rb

@@ -5,66 +5,14 @@ module Struggle
     require 'json'
     URL = "http://api.kuaidi100.com/api"
     URL_loophold = "http://www.kuaidi100.com/query"
-    # 快递100免费物流码接口
-    # 参数：
-    # id	 String	是	身份授权key，请 快递查询接口 进行申请（大小写敏感）
-    # com	String	是	要查询的快递公司代码，不支持中文，对应的公司代码见
-    # nu	 String	是	要查询的快递单号，请勿带特殊符号，不支持中文（大小写不敏感）
-    # show	 String	是	返回类型：
-    # 0：返回json字符串，
-    # 1：返回xml对象，
-    # 2：返回html对象，
-    # 3：返回text文本。
-    # 如果不填，默认返回json字符串。
-    # muti	 String	是	返回信息数量：
-    # 1:返回多行完整的信息，
-    # 0:只返回一行信息。
-    # 不填默认返回多行。
-    # order	 String	是	排序：
-    # desc：按时间由新到旧排列，
-    # asc：按时间由旧到新排列。
-    # 不填默认返回倒序（大小写不敏感）
-    # 返回：json格式数据
-    # com	物流公司编号
-    # nu	物流单号
-    # time	每条跟踪信息的时间
-    # context	每条跟综信息的描述
-    # state	快递单当前的状态 ：　
-    # 0：在途，即货物处于运输过程中；
-    # 1：揽件，货物已由快递公司揽收并且产生了第一条跟踪信息；
-    # 2：疑难，货物寄送过程出了问题；
-    # 3：签收，收件人已签收；
-    # 4：退签，即货物由于用户拒签、超区等原因退回，而且发件人已经签收；
-    # 5：派件，即快递正在进行同城派件；
-    # 6：退回，货物正处于退回发件人的途中；
-    # 该状态还在不断完善中，若您有更多的参数需求，欢迎发邮件至 kuaidi@kingdee.com 提出。
-    # status	查询结果状态：
-    # 0：物流单暂无结果，
-    # 1：查询成功，
-    # 2：接口出现异常，
+
     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})
       puts respond.body
       return respond.body.blank? ? nil : JSON.parse(respond.body)
     end
 
-    # 快递100免费物流码接口
-    # 参数：
-    # type: 物流公司
-    # postid： 物流码
-    #返回结果实例：json类型
-    #{"message":"ok","nu":"200093247451","ischeck":"1","com":"yuantong","status":"200","condition":"F00","state":"3",
-    # "data":
-    # [{"time":"2015-04-15 09:09:56","context":"客户 签收人 : 张 已签收","ftime":"2015-04-15 09:09:56"},
-    # {"time":"2015-04-15 09:03:00","context":"山东省潍坊市潍城区十笏园分部公司派件人 : 邹辉 派件中 派件员电话","ftime":"2015-04-15 09:03:00"},
-    # {"time":"2015-04-14 09:09:16","context":"山东省潍坊市潍城区十笏园分部公司 失败签收录入 于明鑫","ftime":"2015-04-14 09:09:16"},
-    # {"time":"2015-04-14 09:03:59","context":"山东省潍坊市潍城区十笏园分部公司派件人 : 邹辉 派件中 派件员电话","ftime":"2015-04-14 09:03:59"},
-    # {"time":"2015-04-14 07:15:57","context":"快件到达 山东省潍坊市潍城区十笏园分部公司","ftime":"2015-04-14 07:15:57"},
-    # {"time":"2015-04-14 05:50:25","context":"山东省潍坊市公司 已发出,下一站 山东省潍坊市潍城区十笏园分部","ftime":"2015-04-14 05:50:25"},
-    # {"time":"2015-04-14 04:07:09","context":"潍坊转运中心公司 已发出,下一站 山东省潍坊市","ftime":"2015-04-14 04:07:09"},
-    # {"time":"2015-04-11 19:30:06","context":"浙江省金华市义乌市凌云公司 已打包,发往下一站 潍坊转运中心","ftime":"2015-04-11 19:30:06"},
-    # {"time":"2015-04-11 17:58:41","context":"浙江省金华市义乌市凌云公司 已揽收","ftime":"2015-04-11 17:58:41"}]
-    # }
+
     def self.send_by_loophold(type, postid)
       respond = Func.post(URL_loophold, {'type' => type, 'postid' => postid})
       return respond.body.blank? ? nil : JSON.parse(respond.body)

data/lib/struggle/pay_gateway.rb

@@ -1,21 +1,10 @@
-#gemfile中加入 gem 'iconv'
 module Struggle
   class PayGateway
     require 'net/https'
     require 'uri'
-    # 支付接口地址
     URL_UTF8 = "https://pay3.chinabank.com.cn/PayGate?encoding=UTF-8"
-    # 图片和css文件地址
     URL = "https://pay3.chinabank.com.cn"
-    # 功能：网银在线，网管支付;
-    # 参数：
-    #   v_mid：商户编号
-    #   key：商户md5密钥
-    #   v_url：支付成功后跳转的页面
-    #   remark2：异步订单状态地址
-    #   v_oid：订单编号
-    #   v_amount：订单金额
-    #   v_moneytype：支付货币类型
+
     def self.pay(v_mid, key, v_url, remark2, v_oid, v_amount, v_moneytype = "CNY")
       v_md5info = Digest::MD5.hexdigest(v_amount.to_s + v_moneytype + v_oid + v_mid + v_url + key).upcase
       html = '<html><head></head><body>'
@@ -37,19 +26,12 @@ module Struggle
       html += '</body></html>'
     end
 
-    # 功能：自动验证结果
-    # 参数：
-    # params参数
-    # key商户的md5密钥
-    # 返回：如果支付成功返回订单号，否则返回nil
     def self.receive(params, key)
       v_oid = params["v_oid"]
       v_pstatus = params["v_pstatus"]
-      v_md5str = params["v_md5str"] #该参数的MD5字符串的顺序为：v_oid，v_pstatus，v_amount，v_moneytype，key
+      v_md5str = params["v_md5str"]
       v_amount = params["v_amount"]
       v_moneytype = params["v_moneytype"]
-      # 20（表示支付成功）
-      # 30（表示支付失败）
       if v_pstatus=="20" && v_md5str==Digest::MD5.hexdigest(v_oid+v_pstatus+v_amount+v_moneytype+key).upcase
         return {state: true, code: params["v_oid"], amount: v_amount}
       else

data/lib/struggle/tfile.rb

@@ -1,8 +1,5 @@
 module Struggle
   class Tfile
-    #file upload
-    #params: file->file stream,filepath->file save path,rule->can upload file format("jpg|xls")，minsize and maxsize->minsize<file's size<maxsize
-    #return: {state: true, result: "new filename"} or {state: false, result: "error message"}
     def Tfile.upload(file, filepath="", rule="jpg|xls", minsize=1, maxsize=4000)
       result = Tfile.rule_validata(file, rule, minsize, maxsize)
       if result[:state]
@@ -25,10 +22,6 @@ module Struggle
       end
     end
 
-    #file unpack(before unpack run `sudo apt-get install unzip unrar -y` || insert gemfile)
-    #file->file path
-    #path->unpacked path
-    #return->true, false, nil. nil not cmd
     def Tfile.unpack(file, path)
       format = Tfile.file_format(file)
       cmd = ""
@@ -42,9 +35,6 @@ module Struggle
       system cmd
     end
 
-    #validate file
-    #params:file->file stream，rule->can upload file format，minsize<file's size<maxsize
-    #return:{state: true} or return {state: false, message: "error message"}
     def Tfile.rule_validata(file, rule, minsize, maxsize)
       rule_for = Tfile.filename_validata(file, rule)
       unless rule_for
@@ -56,16 +46,10 @@ module Struggle
       return {state: true}
     end
 
-    #validate file format
-    #params: file-> file stream; rule-> validate rule ("jpg|xls")
-    #return: validate result -> true | false
     def Tfile.filename_validata(file, rule)
       !eval("/\.(#{rule})+$/").match(file.original_filename).blank?
     end
 
-    #get new file's name
-    #params:filestream->file stream file name,filepath->file save path
-    #return:new file's name
     def Tfile.getname(filestream, filepath)
       file_for = Tfile.file_format(filestream.original_filename)
       filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
@@ -77,16 +61,10 @@ module Struggle
       filename
     end
 
-    #get file format
-    #params: filename->file's name
-    #return: file format '.jpg','.exe'
     def Tfile.file_format(filename)
       /\.[^\.]+$/.match(filename)[0]
     end
 
-    #image upload
-    #params: file->file stream; filepath->file save path; rule->can upload file format("jpg|xls"); minsize and maxsize->minsize<file's size<maxsize;  w->new image width, h->new image height
-    #return: {state: true, result: "new filename"} or {state: false, result: "error message"}
     def Tfile.imageupload(imgfile, filepath="", rule="jpg|jpeg", minsize=0, maxsize=2000, w=0, h=0)
       result = Tfile.rule_validata(imgfile, rule, minsize, maxsize)
       if result[:state]
@@ -110,15 +88,10 @@ module Struggle
       end
     end
 
-    #delete dir
-    #params: dir-> dir path
-    #return true or false
     def Tfile.rmdir(dir)
       system("rm -rf #{dir}")
     end
 
-    #image resize
-    #params: imagepath-> image file path; w-> new image width; h-> new image height
     def Tfile.resize(imagepath, w, h)
       img = Magick::Image.read(imagepath)[0]
       if w==0 || h==0

data/lib/struggle/tmagick.rb

@@ -1,17 +1,10 @@
 module Struggle
   class Tmagick
-    #画图类
-    #img->底图 "#{Rails.root}/public/images/1.jpg"
-    #newimg->处理完保存的地址 save img handle path example->"#{Rails.root}/public/images/new.jpg"
-    #example-> Tmagick.new("1.jpg","public/n.jpg").images(images),texts(texts).images(imgs).write
     def initialize(img, newimg=nil)
       @pushimg = Magick::Image.read(img).first
       @poppath = newimg.blank? ? img : newimg
     end
 
-    #图片叠加和水印
-    #images->多图片叠加，数组，在一个图片上画多个图片; image=>{img: "1.jpg", x: 0, y: 0}，img要画的图片地址，xy画的左顶点位置
-    #return->成功返回当前对象，失败返回nil
     def images(images)
       return nil if images.blank?
       images.each do |img|
@@ -21,10 +14,6 @@ module Struggle
       return self
     end
 
-    #图片上写字
-    #fontobjs 文字数组; fontobj=>{text: "aaaaaaaaa",color: "#000000",font: "simsun.ttc'",size: 20,weight: 100, x: 0, y: 0}
-    #   text文字内容，color颜色，font字体，size大小，weight粗细，xy画的左顶点位置
-    #return-》成功返回当前对象，失败返回nil
     def texts(texts)
       return nil if texts.blank?
       texts.each do |text|
@@ -38,13 +27,11 @@ module Struggle
       return self
     end
 
-    #重定义图片大小
     def resize(new_width, new_height)
       @pushimg = Magick::Image.read(@pushimg).first.resize_to_fit(new_width, new_height)
       @pushimg.blank? ? nil : self
     end
 
-    #写出操作
     def write
       @pushimg.write(@poppath)
     end

data/lib/struggle/vcode.rb

@@ -1,19 +1,6 @@
-#first gem 'rmagick'
 module Struggle
   class Vcode
-    #controller
-    #def getcode
-    #  vcode = Vcode.getvcode
-    #  session[:code]=vcode[:code]
-    #  send_data vcode[:img], content_type: 'image/jpeg', disposition: 'inline'
-    #end
-    #view
-    # <img src="/getcode">
-    #Vcode.getvcode(90,40,24)
-    #w宽，h高，fontsize字体大小
-    #返回json类型
     def self.getvcode(w=90, h=40, fontsize=24)
-      #创建画布
       img = Magick::Image.new(w, h) {
         self.background_color = 'white'
         self.format="JPG"
@@ -22,26 +9,20 @@ module Struggle
       text.pointsize = fontsize
       text.kerning = -1
       text.fill('blue')
-      #随机文字
       code=""
       4.times { code << (97 + rand(26)).chr }
-      #设置文字
       text.text(rand(w/2-5), h/2-5+ rand(h/2), code)
-      #随机直线
       for i in 1..rand(4)
-        text.line(rand(w), rand(h), rand(w), rand(h)) #直线
+        text.line(rand(w), rand(h), rand(w), rand(h))
       end
       text.fill('blue')
-      #燥点
       for i in 1..280
         text.point(rand(w), rand(h))
       end
       text.draw(img)
-      #模糊
       img = img.sketch(0, 10, 50)
       #扭曲
       img = img.wave(5.5, 50)
-      #返回图片数据流
       {img: img.to_blob, code: code}
     end
   end

data/lib/struggle.rb

@@ -15,3 +15,4 @@ require 'struggle/tmagick'
 require 'struggle/vcode'
 require 'struggle/concerns/string_extend'
 String.send :include, StringExtend
+Integer.send :include, IntExtend

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - lean
@@ -47,6 +47,7 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/struggle.rb
+- lib/struggle/concerns/int_extend.rb
 - lib/struggle/concerns/string_extend.rb
 - lib/struggle/func.rb
 - lib/struggle/logistic.rb
@@ -56,7 +57,6 @@ files:
 - lib/struggle/tfile.rb
 - lib/struggle/tmagick.rb
 - lib/struggle/vcode.rb
-- struggle.gemspec
 homepage: http://rubygems.org/gems/struggle
 licenses:
 - struggle

data/struggle.gemspec

@@ -1,16 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = 'struggle'
-  s.version     = '1.6.0'
-  s.date        = '2015-08-21'
-  s.summary     = "struggle!"
-  s.description = "vcode,tfile,pager,func,logistic,pay_gateway,tmagick,class_extend;"
-  s.authors     = ["lean"]
-  s.email       = '54850915@qq.com' 
-  s.files       = `git ls-files`.split("\n")
-  s.extra_rdoc_files = ['README.md']
-  #s.require_paths = ['lib']
-  s.add_development_dependency 'iconv', ['>= 0']
-  s.add_development_dependency 'rmagick', ['>= 0']
-  s.homepage    = 'http://rubygems.org/gems/struggle'
-  s.license     = 'struggle'
-end