struggle 1.4.3 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3234fb48390ef6765003f0f93ec05346fe7c3e
-  data.tar.gz: e08effef3119d9d165ea364debf2e06de60f4c1a
+  metadata.gz: 956bbcdc489c15f0599b1a6a4702b79724850b4e
+  data.tar.gz: 302ccf32d2892df12c185e801c3a5d76faf96323
 SHA512:
-  metadata.gz: 66ba574a945f1a82a9a76ff0a4ec5480a45a9e42c5c8ae47706d3546b1c8e21b21d6ba45dd46aad1fc268a2839e2d54d86a949849f6eed6271db88a62b692b8e
-  data.tar.gz: 0438399a7095fbe4f41b2bf1d78884822320c09da49e6d9936d4f5a656d9cc7f8dc0eb0fc8bab29ab0e38fb1a8aeeb006853ec8b44871b4dce2fabf79d2e9a51
+  metadata.gz: 8d82cc833c79ca70a4451f966ee8dbff370b3133d81ff4f11632e849c227c69e7069bcec5d2b764a23163bf43c7e1b076581be0543c10b7cb33cc27b9a060622
+  data.tar.gz: fbed4c8b69d9d1a19608f7aaf62083e03dae766f29793d0e50a90182cad6433f7e13ae86372a93e7e43068f1e70aa0ad72d7b802e9fc660da941b0f1a75897c3

data/lib/struggle/{fileupload.rb → tfile.rb}

@@ -1,12 +1,12 @@
 module Struggle
-  class Fileupload
+  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 Fileupload.upload(file, filepath="", rule="jpg|xls", minsize=1, maxsize=4000)
-      result = Fileupload.rule_validata(file, rule, minsize, maxsize)
+    def Tfile.upload(file, filepath="", rule="jpg|xls", minsize=1, maxsize=4000)
+      result = Tfile.rule_validata(file, rule, minsize, maxsize)
       if result[:state]
-        sname = Fileupload.getname(file, filepath)
+        sname = Tfile.getname(file, filepath)
         begin
           unless Dir::exist?(filepath)
             unless system("mkdir -p #{filepath}")
@@ -25,11 +25,42 @@ module Struggle
       end
     end
 
+    #before unpack init
+    def Tfile.unpack_init
+      soft = ""
+      if system("unzip").nil?
+        soft += "unzip "
+      elsif system("unrar").nil?
+        soft += "unrar "
+      elsif system("tar").nil?
+        soft += "tar "
+      end
+      unless soft.blank?
+        system("sudo apt-get install #{soft}")
+      end
+    end
+    #file unpack
+    #file->file path
+    #path->unpacked path
+    #return->true, false, nil. nil not cmd
+    def Tfile.unpack(file, path)
+      format = Tfile.file_format(file)
+      cmd = ""
+      if format==".gz" || format==".bz2" || format==".tar"
+        cmd="tar -zxvf #{file} -C #{path}"
+      elsif format==".zip"
+        cmd="unzip #{file} -d #{path}"
+      elsif format==".rar"
+        cmd="unrar e #{file} #{path}"
+      end
+      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 Fileupload.rule_validata(file, rule, minsize, maxsize)
-      rule_for = Fileupload.filename_validata(file, rule)
+    def Tfile.rule_validata(file, rule, minsize, maxsize)
+      rule_for = Tfile.filename_validata(file, rule)
       unless rule_for
         return {state: false, message: "错误：文件格式不对，只允许上传#{rule}格式！\\n"}
       end
@@ -42,15 +73,15 @@ module Struggle
     #validate file format
     #params: file-> file stream; rule-> validate rule ("jpg|xls")
     #return: validate result -> true | false
-    def Fileupload.filename_validata(file, rule)
+    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 Fileupload.getname(filestream, filepath)
-      file_for = Fileupload.file_format(filestream.original_filename)
+    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
       file = filepath+filename
       while File.exist?(file) do
@@ -63,17 +94,17 @@ module Struggle
     #get file format
     #params: filename->file's name
     #return: file format '.jpg','.exe'
-    def Fileupload.file_format(filename)
+    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 Fileupload.imageupload(imgfile, filepath="", rule="jpg|jpeg", minsize=0, maxsize=2000, w=0, h=0)
-      result = Fileupload.rule_validata(imgfile, rule, minsize, maxsize)
+    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]
-        sname = Fileupload.getname(imgfile, filepath)
+        sname = Tfile.getname(imgfile, filepath)
         begin
           unless Dir::exist?(filepath)
             unless system("mkdir -p #{filepath}")
@@ -83,7 +114,7 @@ module Struggle
           File.open(filepath+sname, "wb") do |f|
             f.write(imgfile.read)
           end
-          Fileupload.resize(filepath + sname, w, h)
+          Tfile.resize(filepath + sname, w, h)
           return {state: true, result: sname}
         rescue
           return {state: false, result: "写入图片失败：#{$!}"}
@@ -96,13 +127,13 @@ module Struggle
     #delete dir
     #params: dir-> dir path
     #return true or false
-    def Fileupload.rmdir(dir)
+    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 Fileupload.resize(imagepath, w, h)
+    def Tfile.resize(imagepath, w, h)
       img = Magick::Image.read(imagepath)[0]
       if w==0 || h==0
         w=img.columns

data/lib/struggle.rb

@@ -5,7 +5,7 @@ begin
 rescue LoadError
   #do nothing
 end
-require 'struggle/fileupload'
+require 'struggle/tfile'
 require 'struggle/func'
 require 'struggle/logistic'
 require 'struggle/pager'

data/struggle.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name        = 'struggle'
-  s.version     = '1.4.3'
-  s.date        = '2015-07-28'
+  s.version     = '1.4.5'
+  s.date        = '2015-07-31'
   s.summary     = "struggle!"
-  s.description = "vcode,fileupload,pager,func,logistic,pay_gateway,tmagick,html_extend;"
+  s.description = "vcode,tfile,pager,func,logistic,pay_gateway,tmagick,html_extend;"
   s.authors     = ["lean"]
   s.email       = '54850915@qq.com' 
   s.files       = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
@@ -38,7 +38,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: vcode,fileupload,pager,func,logistic,pay_gateway,tmagick,html_extend;
+description: vcode,tfile,pager,func,logistic,pay_gateway,tmagick,html_extend;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -47,13 +47,13 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/struggle.rb
-- lib/struggle/fileupload.rb
 - lib/struggle/func.rb
 - lib/struggle/html_extend.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
 - struggle.gemspec