acts-as-func 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881d7e02d3968146667c37d42c95aad5c198b1a7
-  data.tar.gz: b2878951754db45c4595bff3775f32639ff3cbd1
+  metadata.gz: db0ad53c3c6a33cbaf082ae3128e43cec098616e
+  data.tar.gz: c8aa81b95916f4878fe38ff82d528ec767866d6b
 SHA512:
-  metadata.gz: 2c14592be91a6d3d7efdff25279ee88f8f3dfef8b5002c95b2e3aa600f0f6886a76badd8281e74558c28f61062e77c3badf5bc71970fdc98eccec75f854cf606
-  data.tar.gz: 7f83275357fca904fb95b84666d4c69e65c68e7985c222e8438393b086f579c56d44d26ce699a8c9def248ac05ca51a50ee5be0ace468b5f4714635b44d30e54
+  metadata.gz: 77b7cf71e835fac8400e91228d179b2cde6b56b3e0953dce8ad74ea1395eac157a5a4796e00e17056e33a7e5b1e99f3b34da5aa8820436ee20711ad23694253c
+  data.tar.gz: a00ddde5f9d706ac0b7d7547e085ce625a533585499aced788d8b94048a93ae257e5d52c20d68ea9319cdb0f00446f2c41ba69b816e3c7576225828e8414cb86

data/lib/tmagick.rb

@@ -1,37 +1,43 @@
 class Tmagick
-  class << self
-    #write image to image
-    #img1=>"/home/www/1.jpg"
-    #img1=>"/home/www/water.png"
-    #x=>top left
-    #y=>top right
-    #newimg=>"/home/www/new.jpg"
-    def w_image(img1, img2, x, y, newimg=nil)
-      img=Magick::Image.read(img1).first
-      img2=Magick::Image.read(img2).first
-      img.composite!(img2, x, y, Magick::OverCompositeOp)
-      newimg = newimg.blank? ? img1 : newimg
-      img.write(newimg)
+  #画图类
+  #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|
+      @pushimg.composite!(Magick::Image.read(img[:img]).first, img[:x], img[:y], Magick::OverCompositeOp)
     end
+    return self
+  end
 
-    #write text to image
-    #img1=>"/home/www/1.jpg"
-    #fontobjs is fontobj's arrary; fontobj=>{text: "aaaaaaaaa",color: "#000000",font: "simsun.ttc'",size: 20,weight: 100, x: 0, y: 0}
-    #x=>top left
-    #y=>top right
-    #newimg=>"/home/www/new.jpg"
-    def w_text(img1, fontobjs, newimg=nil)
-      img = Magick::Image.read(img1).first
-      fontobjs.each do |fontobj|
-        copyright = Magick::Draw.new
-        copyright.font = fontobj[:font]
-        copyright.pointsize = fontobj[:size]
-        copyright.font_weight = fontobj[:weight]
-        copyright.fill = fontobj[:color]
-        copyright.annotate(img, 0, 0, fontobj[:x], fontobj[:y]+12, fontobj[:text])
-      end
-      newimg = newimg.blank? ? img1 : newimg
-      img.write(newimg)
+  #图片上写字
+  #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|
+      copyright = Magick::Draw.new
+      copyright.font = text[:font]
+      copyright.pointsize = text[:size]
+      copyright.font_weight = text[:weight]
+      copyright.fill = text[:color]
+      copyright.annotate(@pushimg, 0, 0, text[:x], text[:y]+12, text[:text])
     end
+    return self
+  end
+
+  #写出操作
+  def write
+    @pushimg.write(@poppath)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-func
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - lean
@@ -33,17 +33,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: acts-as-func!