leangem 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69b806d26a5ac227c062e8d817db9bfb34e5bf6d
-  data.tar.gz: 78cb720698ccc39aa5f09bd6e169298d40cc83fa
+  metadata.gz: 888190a3bf33554cc5c8a68ad0cd1258f9480ad2
+  data.tar.gz: f797196b103cc32d7f60c52aa7323a7c38f7aa7a
 SHA512:
-  metadata.gz: 16adf7e99ec23d203406038a69a716267d8c6f73b8b754905dbe83c361b798844206e7d1bd7d96123c2a949c93ceb3df72b4a9e01c256af587384a09983390d8
-  data.tar.gz: 1ccb94c1e16b14198657c6cdb5879225326c28af88c45de1c741097824adc024af1583ad9a33e2f83d82c63be61d6ebf2035f3a6bee9f1dea95d1d7728a06765
+  metadata.gz: 3403d4bcb39fcb50652ff090f942fcf31e305d99504467c824ad2199d0f3bf7e05846018c53de37c34e4ce9265ea994b8efa52e188dba8e7c37ba5c52d6a4bed
+  data.tar.gz: ba659fdca50238e1753acf8c4396ae806b4038c61c09adbafe3eca9afd81db76f5f88f8597f18f24f8365c5c9a4c6a1c80a2b47f19bf64100cc916186fdbeba9

data/lib/fileupload.rb

@@ -1,49 +1,96 @@
 class Fileupload
-  def initialize(filepath="",min=1,max=4000)
-    @filepath=filepath
-    @message=""
-    @minsize =min*1024
-    @maxsize=max*1024
-  end
-
-  def upload(file)
-    if self.img_validata(file)
-      sname = self.getname(file.original_filename)
-      File.open(@filepath+sname, "wb") do |f|
-        f.write(file.read)
+  #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 Fileupload.upload(file, filepath="", rule="jpg|xls", minsize=1, maxsize=4000)
+    result = Fileupload.rule_validata(file, rule, minsize, maxsize)
+    if result[:state]
+      sname = Fileupload.getname(file.original_filename, filepath)
+      begin
+        unless Dir::exist?(filepath)
+          Dir.mkdir(filepath)
+        end
+        File.open(filepath+sname, "wb") do |f|
+          f.write(file.read)
+        end
+      rescue
+        return {state: false, result: "写入文件失败：#{$!}"}
       end
-      sname
+      return {state: true, result: sname}
+    else
+      return {state: false, result: result[:message]}
     end
   end
 
-  #大小限制，类型限制，都放进模型层中。
-  def img_validata(file)
-    img_for = /\.(f4v|mp4|mp3)+$/.match(file.original_filename)
-    if img_for.nil? || img_for.blank?
-      @message="错误：影音文件格式不对，只允许上传f4v,mp4,mp3格式！\\n"
-      return false
+  #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 Fileupload.rule_validata(file, rule, minsize, maxsize)
+    rule_for = eval("/\.(#{rule})+$/").match(file.original_filename)
+    if rule_for.nil? || rule_for.blank?
+      return {state: false, message: "错误：文件格式不对，只允许上传#{rule}格式！\\n"}
     end
-    if file.size<@minsize || file.size>@maxsize
-      @message="错误：影音文件大小错误，只允许#{@minsize}kb~#{@maxsize}kb！\\n"
-      return false
+    if file.size<minsize*1024 || file.size>maxsize*1024
+      return {state: false, message: "错误：文件大小错误，只允许#{minsize}kb~#{maxsize}kb！\\n"}
     end
-    return true
-  end
-
-  #错误提示
-  def message
-    @message
+    return {state: true}
   end
 
-  #保证名称不重复
-  def getname(filestream)
-    img_for = filestream[filestream.length-4, 4]
-    filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<img_for
-    file = @filepath+filename
+  #get new file's name
+  #params:filestream->file stream file name,filepath->file save path
+  #return:new file's name
+  def Fileupload.getname(filestream, filepath)
+    file_for = Fileupload.file_format(filestream)
+    filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
+    file = filepath+filename
     while File.exist?(file) do
-      filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<img_for
-      file = @filepath+filename
+      filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
+      file = filepath+filename
     end
     filename
   end
+
+  #get file format
+  #params: filename->file's name
+  #return: file format '.jpg','.exe'
+  def Fileupload.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 Fileupload.imageupload(imgfile, filepath="", rule="jpg|jpeg", minsize=0, maxsize=2000, w=0, h=0)
+    result = Fileupload.rule_validata(imgfile, rule, minsize, maxsize)
+    if result[:state]
+      sname = Fileupload.getname(imgfile.original_filename, filepath)
+      begin
+        unless Dir::exist?(filepath)
+          Dir.mkdir(filepath)
+        end
+        File.open(filepath+sname, "wb") do |f|
+          f.write(imgfile.read)
+        end
+      rescue
+        return {state: false, result: "写入图片失败：#{$!}"}
+      end
+      Fileupload.resize(filepath + sname, w, h)
+      return {state: true, result: sname}
+    else
+      return {state: false, result: result[:message]}
+    end
+  end
+
+  #image resize
+  #params: imagepath-> image file path; w-> new image width; h-> new image height
+  def Fileupload.resize(imagepath, w, h)
+    img = Magick::Image.read(imagepath)[0]
+    if w==0 || h==0
+      w=img.columns
+      h=img.rows
+    end
+    newimg = img.resize_to_fill(w, h)
+    newimg.write(imagepath)
+  end
+
 end

data/lib/pay_gateway.rb

@@ -11,7 +11,7 @@ class PayGateway
   #   v_mid：商户编号
   #   key：商户md5密钥
   #   v_url：支付成功后跳转的页面
-  #   remark2：异步订单状态地址,remark2 = "[url:=http://domain/chinabank/AutoReceive.aspx]"格式必须是[url:=xxx]
+  #   remark2：异步订单状态地址
   #   v_oid：订单编号
   #   v_amount：订单金额
   #   v_moneytype：支付货币类型
@@ -28,15 +28,6 @@ class PayGateway
   # 功能：自动验证结果
   # 参数：
   # params参数
-  #  v_oid = Request["v_oid"];
-  #  v_pstatus = Request["v_pstatus"];
-  #  v_pstring = Request["v_pstring"];
-  #  v_pmode = Request["v_pmode"];
-  #  v_md5str = Request["v_md5str"];
-  #  v_amount = Request["v_amount"];
-  #  v_moneytype = Request["v_moneytype"];
-  #  remark1 = Request["remark1"];
-  #  remark2 = Request["remark2"];
   # key商户的md5密钥
   # 返回：如果支付成功返回订单号，否则返回nil
   def self.receive(params,key)

data/lib/vcode.rb

@@ -1,6 +1,6 @@
 #首先 gem 'rmagick'
 class Vcode
-  #控制器
+  #controller
   #def getcode
   #  vcode = Vcode.getvcode
   #  session[:code]=vcode[:code]

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: leangem
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2010-04-28 00:00:00.000000000 Z
 dependencies: []
-description: vcode,fileupload,pager,imageupload,func,pay_gateway
+description: vcode,fileupload,pager,func,pay_gateway
 email: leanv@sina.com
 executables: []
 extensions: []
@@ -18,7 +18,6 @@ extra_rdoc_files: []
 files:
 - lib/fileupload.rb
 - lib/func.rb
-- lib/imageupload.rb
 - lib/pager.rb
 - lib/pay_gateway.rb
 - lib/vcode.rb
@@ -42,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: leangem!

data/lib/imageupload.rb

@@ -1,107 +0,0 @@
-class Imageupload
-  #初始化
-  #临时路径
-  #图片路径
-  #清理垃圾,=0不清理
-  def initialize(minsize=10, maxsize=400, snappath="app/assets/images/snap/", imagepath="app/assets/images/upload/", cleartime=10, bigpath="app/assets/images/upload/")
-    @minsize = minsize*1024
-    @maxsize = maxsize*1024
-    @snappath = snappath
-    @imagepath = imagepath
-    @cleartime = cleartime
-    @bigpath = bigpath
-    @message=""
-  end
-
-  #忽略高宽就是自定义大小，传原图到临时空间
-  def upload(imgfile, rw=0, rh=0, dw=0, dh=0)
-    if self.img_validata(imgfile)
-      sname = self.getname(imgfile.original_filename)
-      imgpath = rw==0 || rh==0 ? @snappath+sname : @imagepath+sname
-      File.open(imgpath, "wb") do |f|
-        f.write(imgfile.read)
-      end
-      if @cleartime>0
-        self.clearsnap(sname)
-      end
-      if rw==0 || rh==0
-        return sname
-      else
-        self.resize(rw, rh, sname, dw, dh)
-      end
-    end
-  end
-
-  #自定义剪裁缩放
-  def reimage(x, y, w, h, rw, rh, pname)
-    imgsnap = @snappath+pname
-    imgp = @imagepath+pname
-    img = Magick::Image.read(imgsnap)[0]
-    if w==0 || h==0
-      rc = img.resize(rw, rh)
-      rc.write(imgp)
-    else
-      chopped = img.crop(x, y, w, h)
-      rc = chopped.resize(rw, rh)
-      rc.write(imgp)
-    end
-    File.delete(imgsnap)
-  end
-
-  #错误提示
-  def message
-    @message
-  end
-
-  #固定剪裁缩放
-  def resize(rw, rh, imgname, dw, dh)
-    img = Magick::Image.read(@imagepath+imgname)[0]
-    newimg = img.resize_to_fill(rw, rh)
-    newimg.write(@imagepath+imgname)
-    if dw!=0 && dh !=0
-      name= imgname[0, imgname.length-4]
-      format= imgname[imgname.length-4, 4]
-      bigimg=img.resize_to_fill(dw, dh)
-      bigimg.write(@bigpath+name+"b"+format)
-    end
-  end
-
-  #大小限制，类型限制，都放进模型层中。
-  def img_validata(img_file)
-
-    img_for = /\.(jpg|gif|GIF|png|jpeg|bmp|BMP|JPG|JPEG|PNG)+$/.match(img_file.original_filename)
-    if img_for.nil? || img_for.blank?
-      @message="错误：图片格式不对，只允许上传jpg,gif,png,bmp,jpeg格式！\\n"
-      return false
-    end
-    if img_file.size<@minsize || img_file.size>@maxsize
-      @message="错误：图片大小错误，只允许#{@minsize}kb~#{@maxsize}kb！\\n"
-      return false
-    end
-    return true
-  end
-
-  #保证名称不重复
-  def getname(img_file)
-    img_for = img_file[img_file.length-4, 4]
-    filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<img_for
-    file = @imagepath+filename
-    while File.exist?(file) do
-      filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<img_for
-      file = @imagepath+filename
-    end
-    filename
-  end
-
-  #删除原图
-  def clearsnap(snapname)
-    Thread.new do
-      snapimg = @snappath+snapname
-      sleep @cleartime
-      if File.exist?(snapimg)
-        File.delete(snapimg)
-      end
-      Thread.current.kill
-    end
-  end
-end