pdf_watermark 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ceda149c41dbf7b66cd7bba37971ab21c8b6e8
-  data.tar.gz: 6235870366f989ccbd9292e4475b55373ee208b5
+  metadata.gz: 46599b8f4b91af1c163d275ca81427a998be6c98
+  data.tar.gz: 569d552420e51a16afaf2ae9ae89b7fe750e2337
 SHA512:
-  metadata.gz: 8e83967df208855745451bce6b8a712005944a53bf287bd698918941fda150205d3fffcb1ffae65a480679d0c75c603f94555d45e95ca5a7f88f3f2075630aca
-  data.tar.gz: f436fd5ee503d665eb9b9cf61b6e5ad4e0db881cbccc01bdbca3d024a6f02d5ac237edc5dafbe394f35041adc0ef437f48c86cccfb8be9d0f0c26e88d567e493
+  metadata.gz: f6d478b9f211a103a287cd8421350c20ab8af50243e8b47f9a64264db8e18e18bccbc51dd353c931bbf8109fe3d063d281787d298cfa4dfb4b1444fcda843bdc
+  data.tar.gz: 3b4778e4e272633c19c51fc44deed4535f8b311436a95d1faa60c683d791ac3adce778df1382cdab90396bc2707de0e71079a46162e10d1d5b4aa9ed5cf15488

data/lib/pdf_watermark.rb

@@ -6,21 +6,22 @@ module PdfWatermark
   LIB_DIR = File.dirname(File.realpath(__FILE__))
   BASEDIR = File.join(LIB_DIR, '..')
   FONT_DIR = File.join(LIB_DIR, '..', 'fonts')
-  MAX_FONT_SIZE= 75
   REPEAT_X_OFFSET = 80
   REPEAT_Y_OFFSET = 80
 
   def self.watermark(mark_string, source, destination = nil, options: {})
     default={
       angle: :diagonal,
-      margin: [50, 50, 50, 50],
+      margin: [10, 10, 10, 10],
       font: "#{FONT_DIR}/SourceHanSansSC-Regular.ttf",
-      font_size: 12,
+      font_size: '12px',
       font_color: "999999",
       transparent: 0.2,
       align: :left,
       valign: :center,
-      mode: :fill
+      mode: :fill,
+      max_font_size: 50,
+      min_font_size: 15,
     }
     options = default.merge(options)
 

data/lib/pdf_watermark/version.rb

@@ -1,3 +1,3 @@
 module PdfWatermark
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/pdf_watermark/water_mark.rb

@@ -10,6 +10,16 @@ module PdfWatermark
       @angle = options[:angle] == :diagonal ? rad_to_degree(Math.atan(@content_height.to_f/@content_width.to_f)) : options[:angle]
       @mark_string = mark_string
       @font_size = @options[:font_size]
+      if @font_size.is_a?(String)
+        if @font_size =~ /(\d+[.]?\d*)%/
+          @font_size = ($1.to_f / 100) * @content_width
+          @font_size = [@font_size, @options[:max_font_size]].min
+          @font_size = [@font_size, @options[:min_font_size]].max
+        else
+          @font_size = @font_size.to_i
+        end
+      end
+
       @font = @options[:font]
       @x = @options[:x] || 0
       @y = @options[:y] || @content_height
@@ -37,7 +47,7 @@ module PdfWatermark
       else
         @max_text_width = (@content_height/Math.sin(rad)).abs
       end
-      @font_size ||= calculated_font_size(@mark_string, MAX_FONT_SIZE, @max_text_width)
+      @font_size ||= calculated_font_size(@mark_string, @options[:max_font_size], @max_text_width)
 
       font(@options[:font]) do
         bounding_box([@x, @y], width: @content_width, height: @content_height) do
@@ -63,10 +73,12 @@ module PdfWatermark
           box_width = text_width(@mark_string, @font_size)
           temp_y = @y
           indent = false
+          offset_x = box_width + [3 * @font_size, REPEAT_X_OFFSET].max
+          offset_y = box_height + [3 * @font_size, REPEAT_Y_OFFSET].max
           bounding_box([@x, @y], width: @content_width, height: @content_height) do
             while temp_y > 0 do
               rotate @angle, origin: [@content_width/2, @content_height/2] do
-                temp_x = indent ? ((box_width + REPEAT_X_OFFSET) / 2) : 0
+                temp_x = indent ? (offset_x / 2.0) : 0
                 while temp_x <= @content_width
                   formatted_text_box(
                     [{ text: @mark_string, color: @options[:font_color] }],
@@ -75,10 +87,10 @@ module PdfWatermark
                     align: @options[:align], valign: @options[:valign],
                     size: @font_size,
                   )
-                  temp_x += box_width + REPEAT_X_OFFSET
+                  temp_x += offset_x
                 end
               end
-              temp_y -= box_height + REPEAT_Y_OFFSET
+              temp_y -= offset_y
               indent = !indent
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdf_watermark
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - bruce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -145,9 +145,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- fonts/NotoSansSC-Regular.ttf
 - fonts/SourceHanSansSC-Regular.ttf
-- fonts/wqyzenhei.ttf
 - lib/pdf_watermark.rb
 - lib/pdf_watermark/version.rb
 - lib/pdf_watermark/water_mark.rb