scarf 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77612c75d65fee88ee919647a380bcce491fe3e0
-  data.tar.gz: 65f8017c98365138bd71bc6f30f9a6887a7a7d18
+SHA256:
+  metadata.gz: 35752b488c66f0c6531356f863c482aa726fd701d00d26f4d6fbb063629553cf
+  data.tar.gz: 5657738a866479e6ee540f184491244aaa9559673a630293383fbbb73c23cb0d
 SHA512:
-  metadata.gz: 9b550ced796548c5c26c11d095506f4ce5aadf5deeacf69fe84ff6e37151b0117b56d8ecb0657ce6a9fc5afcab86af846465eb7aea5d40aa1a88ded1a514c7e9
-  data.tar.gz: a106f0b75fcd42547d52867c27436508697d37692d08708a803adda2b8240c1291c14b9b51144a214687fd025a057e95c69baa08cefd7572754ead637146d162
+  metadata.gz: 05a05ebd174085dd060904e16703b89fedd974ef79c2a77a6dc7cd5739b07504f6024b8f21fdb22d63121b3b11b1896fd7a75cd614091de781b42f0022277a78
+  data.tar.gz: 5776353197f6e6e09e290b2141a100cf3086a58aa7b68851b4f7aef904bf0a69f0140d5e76300abcef05b74a05116730656be252d14412cd2c74e1725b6f9819

data/lib/scarf/identicon.rb

@@ -17,56 +17,54 @@ module Scarf
       [10, 2, 12, 10],
       [0, 2, 10, 0],
       [],
-    ]
+    ].freeze
 
-    CENTER_PATCHES = [0, 4, 8, 15]
+    CENTER_PATCHES = [0, 4, 8, 15].freeze
     PATCH_SIZE = 5
 
     attr_reader :code
 
     def initialize(str = '', opt = {})
-      case opt[:type]
+      @code = case opt[:type]
         when :code
-          @code = str.to_i
+          str.to_i
         when :ip
-          @code = Identicon.ip2code str
+          Identicon.ip2code str
         else
-          @code = Identicon.calc_code str.to_s
+          Identicon.calc_code str.to_s
       end
 
       @decode = decode @code
 
-      if opt[:size]
-        @scale = opt[:size].to_f / (PATCH_SIZE * 3)
+      @scale = if opt[:size]
+        opt[:size].to_f / (PATCH_SIZE * 3)
       else
-        @scale = opt[:scale] || 1
+        opt[:scale] || 1
       end
 
       @image_lib = ImageSVG
-
-      @transparent = !!opt[:transparent] &&
-        [ImageRmagick, ImageSVG].include?(@image_lib)
+      @transparent = opt[:transparent]
       @patch_width = PATCH_SIZE * @scale
-      @image = @image_lib.new(@patch_width * 3, @patch_width * 3,
-        :transparent => @transparent)
+      @image = @image_lib.new(@patch_width * 3, @patch_width * 3, transparent: @transparent)
       @back_color = @image.color 255, 255, 255
       @fore_color = opt[:color] || @image.color(@decode[:red], @decode[:green], @decode[:blue])
+
       render
     end
 
     def decode(code)
       {
-        :center_type => (code & 0x3),
-        :center_invert => (((code >> 2) & 0x01) != 0),
-        :corner_type => ((code >> 3) & 0x0f),
-        :corner_invert => (((code >> 7) & 0x01) != 0),
-        :corner_turn => ((code >> 8) & 0x03),
-        :side_type => ((code >> 10) & 0x0f),
-        :side_invert => (((code >> 14) & 0x01) != 0),
-        :side_turn => ((code >> 15) & 0x03),
-        :red => (((code >> 16) & 0x01f) << 3),
-        :green => (((code >> 21) & 0x01f) << 3),
-        :blue => (((code >> 27) & 0x01f) << 3),
+        center_type: (code & 0x3),
+        center_invert: (((code >> 2) & 0x01) != 0),
+        corner_type: ((code >> 3) & 0x0f),
+        corner_invert: (((code >> 7) & 0x01) != 0),
+        corner_turn: ((code >> 8) & 0x03),
+        side_type: ((code >> 10) & 0x0f),
+        side_invert: (((code >> 14) & 0x01) != 0),
+        side_turn: ((code >> 15) & 0x03),
+        red: (((code >> 16) & 0x01f) << 3),
+        green: (((code >> 21) & 0x01f) << 3),
+        blue: (((code >> 27) & 0x01f) << 3),
       }
     end
 
@@ -75,18 +73,14 @@ module Scarf
       side = [[1, 0], [2, 1], [1, 2], [0, 1]]
       corner = [[0, 0], [2, 0], [2, 2], [0, 2]]
 
-      draw_patches(center, CENTER_PATCHES[@decode[:center_type]],
-        0, @decode[:center_invert])
-      draw_patches(side, @decode[:side_type],
-        @decode[:side_turn], @decode[:side_invert])
-      draw_patches(corner, @decode[:corner_type],
-        @decode[:corner_turn], @decode[:corner_invert])
+      draw_patches(center, CENTER_PATCHES[@decode[:center_type]], 0, @decode[:center_invert])
+      draw_patches(side, @decode[:side_type], @decode[:side_turn], @decode[:side_invert])
+      draw_patches(corner, @decode[:corner_type], @decode[:corner_turn], @decode[:corner_invert])
     end
 
     def draw_patches(list, patch, turn, invert)
       list.each do |i|
-        draw(:x => i[0], :y => i[1], :patch => patch,
-          :turn => turn, :invert => invert)
+        draw(x: i[0], y: i[1], patch: patch, turn: turn, invert: invert)
         turn += 1
       end
     end
@@ -97,37 +91,22 @@ module Scarf
       patch = opt[:patch] % PATCHES.size
       turn = opt[:turn] % 4
 
-      if opt[:invert]
-        fore, back = @back_color, @fore_color
+      fore, back = if opt[:invert]
+        [@back_color, @fore_color]
       else
-        fore, back = @fore_color, @back_color
+        [@fore_color, @back_color]
       end
 
-      offset = (@image_lib == Scarf::ImageSVG) ? 0 : 1
+      offset = @image_lib == Scarf::ImageSVG ? 0 : 1
 
-      if !(@transparent && back == @back_color)
-        @image.fill_rect(x, y, x + @patch_width - offset,
-          y + @patch_width - offset, back)
+      unless @transparent && back == @back_color
+        @image.fill_rect(
+          x, y, x + @patch_width - offset,
+          y + @patch_width - offset, back
+        )
       end
 
-      points = []
-      PATCHES[patch].each do |pt|
-        dx = pt % PATCH_SIZE
-        dy = pt / PATCH_SIZE
-        len = @patch_width - offset
-        px = dx.to_f / (PATCH_SIZE - 1) * len
-        py = dy.to_f / (PATCH_SIZE - 1) * len
-
-        case turn
-          when 1
-            px, py = len - py, px
-          when 2
-            px, py = len - px, len - py
-          when 3
-            px, py = py, len - px
-        end
-        points << [x + px, y + py]
-      end
+      points = compute_points(offset, patch, turn, x, y)
 
       if @transparent
         if fore == @back_color
@@ -162,15 +141,39 @@ module Scarf
     end
 
     def self.extract_code(list)
-      if list.respond_to?(:getbyte)
-        tmp = [list.getbyte(0) << 24, list.getbyte(1) << 16,
-          list.getbyte(2) << 8, list.getbyte(3)]
+      tmp = if list.respond_to?(:getbyte)
+        [list.getbyte(0) << 24, list.getbyte(1) << 16, list.getbyte(2) << 8, list.getbyte(3)]
       else
-        tmp = [list[0].to_i << 24, list[1].to_i << 16,
-          list[2].to_i << 8, list[3].to_i]
+        [list[0].to_i << 24, list[1].to_i << 16, list[2].to_i << 8, list[3].to_i]
       end
+
       tmp.inject(0) do |r, i|
-        r | ((i[31] == 1) ? -(i & 0x7fffffff) : i)
+        r | (i[31] == 1 ? -(i & 0x7fffffff) : i)
+      end
+    end
+
+    private
+
+    def compute_points(offset, patch, turn, x, y)
+      PATCHES[patch].map do |pt|
+        dx = pt % PATCH_SIZE
+        dy = pt / PATCH_SIZE
+        len = @patch_width - offset
+        px = dx.to_f / (PATCH_SIZE - 1) * len
+        py = dy.to_f / (PATCH_SIZE - 1) * len
+
+        px, py = case turn
+          when 1
+            [len - py, px]
+          when 2
+            [len - px, len - py]
+          when 3
+            [py, len - px]
+          else
+            [px, py]
+        end
+
+        [x + px, y + py]
       end
     end
   end

data/lib/scarf/initial_avatar.rb

@@ -12,7 +12,7 @@ module Scarf
       <<~WRAPPER.gsub(/$\s+/, '').strip
         <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 100 100">
           #{background}
-          <text fill="#{foreground_fill}" font-size="50" font-family="#{quoted_fonts}" x="50" y="50" text-anchor="middle" alignment-baseline="central">#{initials}</text>
+          <text fill="#{foreground_fill}" font-size="42" font-family="#{quoted_fonts}" x="50" y="54" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle">#{initials}</text>
         </svg>
       WRAPPER
     end

data/lib/scarf/version.rb

@@ -1,3 +1,3 @@
 module Scarf
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scarf
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Hari Gopal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A Ruby library for generating initial avatars and identicons.
 email: mail@harigopal.in
 executables: []
@@ -85,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby library for generating initial avatars and identicons.