struggle 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eed13f75451e0fd49c798b83dc03571562b6214177b0145b282361ba9284e3a
-  data.tar.gz: d5ca75d4fed7a3b5bb540c4defc2857517270966b198c86be8b761863f275b16
+  metadata.gz: 68c73cd94c1c59fa35c654b3a8e34e1eebadc85848c4a824d0bfea84c28f3b4a
+  data.tar.gz: 7c9d858424575dd1a3941fc789be19bdd49ecd771d4b0db23cc2c982626914c5
 SHA512:
-  metadata.gz: 87563c4c6cd9350c061a5afca3beefcf6ec414e32acdd8a2a53c875253720e19cabc1f4097bb5386ec02e89efd0cb7a791b2c7cce113d3b098fa5182ac2e4c4f
-  data.tar.gz: 1de164ba9a53f52aae43c29558a9f9753afd80e859264a0ce5ce895cb5cfc983102d036f02c157099911ef1b60c24479880687207384b3a12d15c7c470e35a9d
+  metadata.gz: 48b6d35fabde53bdecc7be29a4922929faf808207420099b3bbf51c10193847f77daa2f45d6c77adb28abed8ab45feb74545b36a1878158c3533dda834dc1154
+  data.tar.gz: 8ea213b12d513422f7ff181c40d0f7e01b99a709072fbdecb42ce4b476dfc07ec2d33dfd5ae5d25739d2fb88a709ac2e23320eb97eb9499cbf829b81ec332dd0

data/lib/struggle.rb

@@ -20,7 +20,7 @@ require 'struggle/concerns/string_extend'
 require 'struggle/concerns/int_extend'
 require 'struggle/concerns/decimal_extend'
 require 'struggle/concerns/time_extend'
-require 'struggle/concerns/timestamps_format'
+require 'struggle/concerns/model_extend'
 require "struggle/ftp_tool"
 require "struggle/translate"
 require "struggle/zip_tool"
@@ -28,7 +28,7 @@ require 'struggle/sql'
 require 'struggle/backup'
 require 'pay/jd_gateway'
 
-ActiveRecord::Base.send :include, Struggle::TimestampsFormat
+ActiveRecord::Base.send :include, Struggle::ModelExtend
 String.send :include, Struggle::StringExtend
 Integer.send :include, Struggle::IntExtend
 Numeric.send :include, Struggle::DecimalExtend

data/lib/struggle/concerns/model_extend.rb

@@ -0,0 +1,47 @@
+require 'active_support/concern'
+module Struggle
+  module ModelExtend
+    extend ActiveSupport::Concern
+
+    included do
+      # created_at  updated_at 删除 '+0800'
+      # 删除集合中的created_at和updated_at的'+0800'
+      scope :to_hash, -> do
+        objs = []
+        each do |obj|
+          objs << obj.to_hash
+        end
+        objs
+      end
+
+      def to_hash
+        obj = self.serializable_hash
+        obj.each do |k, v|
+          if v.class == ActiveSupport::TimeWithZone
+            obj[k] = v.localtime.to_s(:db)
+          end
+        end
+        obj
+      end
+
+      def upload_crop_image(field, image, x, y, w, h)
+        filepath = "uploads/#{self.class.table_name}/#{Time.now.to_date.strftime("%Y%m%d")}"
+        file = Struggle::Tfile.imagecropupload(image, "#{Rails.root}/public/#{filepath}/","jpg|bmp|gif|ico|pcx|jpeg|tif|png", 0, 2000, x, y, w, h)
+        self[field.to_sym] = file[:state] ? "#{filepath}/#{file[:result]}" : ""
+      end
+
+      def delete_image(field)
+        unless self[field.to_sym].blank?
+          begin
+            File.delete("#{Rails.root}/public/#{self[field.to_sym]}")
+          rescue
+            puts "#{$!}"
+          end
+        end
+      end
+    end
+
+    module ClassMethods
+    end
+  end
+end

data/lib/struggle/tfile.rb

@@ -51,22 +51,21 @@ module Struggle
     end
 
     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
-      #   filename = Time.now.strftime("%Y%m%d%h%m%s")<<rand(99999).to_s<<file_for
-      #   file = filepath+filename
-      # end
-      # filename
-      filepath+filestream.original_filename
+      file_for = Tfile.file_format(filestream.original_filename)
+      filename = Digest::SHA1.hexdigest(SecureRandom.urlsafe_base64.to_s)<<file_for
+      file = filepath+filename
+      while File.exist?(file) do
+        filename = Digest::SHA1.hexdigest(SecureRandom.urlsafe_base64.to_s)<<file_for
+        file = filepath+filename
+      end
+      filename
     end
 
     def Tfile.file_format(filename)
       /\.[^\.]+$/.match(filename)[0]
     end
 
-    def Tfile.imageupload(imgfile, filepath="", rule="jpg|jpeg", minsize=0, maxsize=2000, w=0, h=0)
+    def Tfile.imageupload(imgfile, filepath="", rule="jpg|bmp|gif|ico|pcx|jpeg|tif|png", minsize=0, maxsize=2000, w=0, h=0)
       result = Tfile.rule_validata(imgfile, rule, minsize, maxsize)
       if result[:state]
         sname = Tfile.getname(imgfile, filepath)
@@ -102,5 +101,38 @@ module Struggle
       newimg = img.resize_to_fill(w, h)
       newimg.write(imagepath)
     end
+
+    def Tfile.imagecropupload(imgfile, filepath="", rule="jpg|bmp|gif|ico|pcx|jpeg|tif|png", minsize=0, maxsize=2000, x=0, y=0, w=0, h=0)
+      result = Tfile.rule_validata(imgfile, rule, minsize, maxsize)
+      if result[:state]
+        sname = Tfile.getname(imgfile, filepath)
+        begin
+          unless Dir::exist?(filepath)
+            unless system("mkdir -p #{filepath}")
+              return {state: false, result: "目录创建失败，请于管理员联系"}
+            end
+          end
+          File.open(filepath+sname, "wb") do |f|
+            f.write(imgfile.read)
+          end
+          Tfile.crop(filepath + sname, x, y, w, h)
+          return {state: true, result: sname}
+        rescue
+          return {state: false, result: "写入图片失败：#{$!}"}
+        end
+      else
+        return {state: false, result: result[:message]}
+      end
+    end
+
+    def Tfile.crop(imagepath, x, y, w, h)
+      img = Magick::Image.read(imagepath)[0]
+      if w==0 || h==0
+        w=img.columns
+        h=img.rows
+      end
+      newimg = img.crop(x, y, w, h)
+      newimg.write(imagepath)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - lean
@@ -100,9 +100,9 @@ files:
 - lib/struggle/code.rb
 - lib/struggle/concerns/decimal_extend.rb
 - lib/struggle/concerns/int_extend.rb
+- lib/struggle/concerns/model_extend.rb
 - lib/struggle/concerns/string_extend.rb
 - lib/struggle/concerns/time_extend.rb
-- lib/struggle/concerns/timestamps_format.rb
 - lib/struggle/font/ARIALNBI.TTF
 - lib/struggle/font/font.ttf
 - lib/struggle/ftp_tool.rb
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: struggle!

data/lib/struggle/concerns/timestamps_format.rb

@@ -1,31 +0,0 @@
-require 'active_support/concern'
-module Struggle
-  module TimestampsFormat
-    extend ActiveSupport::Concern
-
-    included do
-      # created_at  updated_at 删除 '+0800'
-      # 删除集合中的created_at和updated_at的'+0800'
-      scope :to_hash, -> do
-        objs = []
-        each do |obj|
-          objs << obj.to_hash
-        end
-        objs
-      end
-
-      def to_hash
-        obj = self.serializable_hash
-        obj.each do |k, v|
-          if v.class == ActiveSupport::TimeWithZone
-            obj[k] = v.localtime.to_s(:db)
-          end
-        end
-        obj
-      end
-    end
-
-    module ClassMethods
-    end
-  end
-end