monsterid 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b70b638dc77e81b18130ee84c99622d7b672ebe5
-  data.tar.gz: cdf780b925ce81508d0c7f94da3172ddc6726c7a
+SHA256:
+  metadata.gz: 244ae4b3aae8ef433d3258aa77852dc093187b2869be99268579948577b78830
+  data.tar.gz: d2b8a65efaf21e61c8c8c3112450d718b258eaa214dcc2ea96718612d3bd9453
 SHA512:
-  metadata.gz: b0913884f584389ef6e4ef73c6c21b837bd2843310209b9d33faa3ce74d9499d4753f5fff841b76d712e84cdda27e57ee88ab0489ce86f585d74b13699f9b740
-  data.tar.gz: 97a52426c835a05a2c5a55001829b50b17274845b9268e59bc68efa15b95d337316794a5d45edbdf8ef3c212009dec9f98cc25b2f454bc9540acd1f68504dd28
+  metadata.gz: dcd9716d34441fc4f06fbe5ed4b9b494eef7630bf5961b9379e1a0070da54827d7e7c844e17ef08583c4a5d3a5900d56b529c724096dc7681a5cc0994debe37d
+  data.tar.gz: 1aace8a281450f025377171e522cb272fec4e58b07c9973389a7e429d43246a7e6283b53934d36e1c2fbdfa08cc398799e0564e266ddcb18fd45a4e00f2530ae

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.2:
+  - Dependency bumps due to security issues
+  - Rubocop style fixes
+  - String freeze
+
 0.4.0:
   - Depend on ChunkyPNG, not OilyPNG, thus not requiring a C extension
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/lib/monsterid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load oily_png if available, otherwise default to pure ruby chunky_png
 begin
   require 'oily_png'
@@ -15,112 +17,110 @@ class MonsterID
     'legs_4.png', 'legs_S8.png', 'legs_S11.png', 'mouth_5.png',
     'mouth_8.png', 'mouth_S1.png', 'mouth_S3.png', 'mouth_2.png',
     'eyes_13.png', 'legs_S13.png', 'mouth_S7.png'
-  ]
+  ].freeze
   BODY_COLOR_PARTS = [
     'arms_S8.png', 'legs_S5.png',
     'mouth_S5.png', 'mouth_S4.png'
-  ]
+  ].freeze
   SPECIFIC_COLOR_PARTS = {
-    'arms_S2.png'  => [0, 200],
-    'hair_S6.png'  => [0, 200],
-    'mouth_9.png'  => [0, 200],
-    'mouth_6.png'  => [0, 200],
+    'arms_S2.png' => [0, 200],
+    'hair_S6.png' => [0, 200],
+    'mouth_9.png' => [0, 200],
+    'mouth_6.png' => [0, 200],
     'mouth_S2.png' => [0, 200]
-  }
-  
+  }.freeze
+
   PARTS = {
-    :arms  => [
+    arms: [
       'arms_1.png', 'arms_2.png', 'arms_3.png', 'arms_4.png', 'arms_5.png',
       'arms_S1.png', 'arms_S2.png', 'arms_S3.png', 'arms_S4.png', 'arms_S5.png',
       'arms_S6.png', 'arms_S7.png', 'arms_S8.png', 'arms_S9.png'
     ],
-    :body  => [
+    body: [
       'body_1.png', 'body_2.png', 'body_3.png', 'body_4.png', 'body_5.png',
       'body_6.png', 'body_7.png', 'body_8.png', 'body_9.png', 'body_10.png',
       'body_11.png', 'body_12.png', 'body_13.png', 'body_14.png', 'body_15.png',
       'body_S1.png', 'body_S2.png', 'body_S3.png', 'body_S4.png', 'body_S5.png'
     ],
-    :eyes  => [
+    eyes: [
       'eyes_1.png', 'eyes_2.png', 'eyes_3.png', 'eyes_4.png', 'eyes_5.png',
       'eyes_6.png', 'eyes_7.png', 'eyes_8.png', 'eyes_9.png', 'eyes_10.png',
       'eyes_11.png', 'eyes_12.png', 'eyes_13.png', 'eyes_14.png', 'eyes_15.png',
       'eyes_S1.png', 'eyes_S2.png', 'eyes_S3.png', 'eyes_S4.png', 'eyes_S5.png'
     ],
-    :hair  => [
+    hair: [
       'hair_1.png', 'hair_2.png', 'hair_3.png', 'hair_4.png', 'hair_5.png',
       'hair_S1.png', 'hair_S2.png', 'hair_S3.png', 'hair_S4.png', 'hair_S5.png',
       'hair_S6.png', 'hair_S7.png'
     ],
-    :legs  => [
+    legs: [
       'legs_1.png', 'legs_2.png', 'legs_3.png', 'legs_4.png', 'legs_5.png',
       'legs_S1.png', 'legs_S10.png', 'legs_S11.png', 'legs_S12.png',
-      'legs_S13.png', 'legs_S2.png', 'legs_S3.png', 'legs_S4.png', 
+      'legs_S13.png', 'legs_S2.png', 'legs_S3.png', 'legs_S4.png',
       'legs_S5.png', 'legs_S6.png', 'legs_S7.png', 'legs_S8.png', 'legs_S9.png'
     ],
-    :mouth => [
+    mouth: [
       'mouth_1.png', 'mouth_2.png', 'mouth_3.png', 'mouth_4.png', 'mouth_5.png',
       'mouth_6.png', 'mouth_7.png', 'mouth_8.png', 'mouth_9.png', 'mouth_10.png',
       'mouth_S1.png', 'mouth_S2.png', 'mouth_S3.png', 'mouth_S4.png', 'mouth_S5.png',
       'mouth_S6.png', 'mouth_S7.png'
     ]
-  }
-  
+  }.freeze
+
   # Remove body 12 for now, doesn't look good
-  PARTS[:body].delete( 'body_12.png' )
-  
+  PARTS[:body].delete('body_12.png')
+
   # Test color set [hue, sat]
   COLORS = [
     [8, 255], [160, 64], [8, 127], [184, 255],
     [24, 191], [208, 191], [40, 255], [208, 64],
     [48, 64], [248, 191], [72, 127], [272, 64],
     [128, 255], [312, 191], [160, 255], [336, 255]
-  ]
-  
+  ].freeze
+
   def initialize(seed, size = 120)
     @id = Digest::SHA1.hexdigest seed.to_s
-    
+
     parts = {
-      :legs  => {
-        :part => PARTS[:legs ][@id[0, 2].hex % PARTS[:legs ].length],
-        :color => COLORS[@id[2, 2].hex % COLORS.length]
+      legs: {
+        part: PARTS[:legs][@id[0, 2].hex % PARTS[:legs].length],
+        color: COLORS[@id[2, 2].hex % COLORS.length]
       },
-      :hair  => {
-        :part => PARTS[:hair ][@id[4, 2].hex % PARTS[:hair ].length],
-        :color => COLORS[@id[6, 2].hex % COLORS.length]
+      hair: {
+        part: PARTS[:hair][@id[4, 2].hex % PARTS[:hair].length],
+        color: COLORS[@id[6, 2].hex % COLORS.length]
       },
-      :arms  => { 
-        :part => PARTS[:arms ][@id[8, 2].hex % PARTS[:arms ].length],
-        :color => COLORS[@id[10, 2].hex % COLORS.length]
+      arms: {
+        part: PARTS[:arms][@id[8, 2].hex % PARTS[:arms].length],
+        color: COLORS[@id[10, 2].hex % COLORS.length]
       },
-      :body  => {
-        :part => PARTS[:body ][@id[12, 2].hex % PARTS[:body ].length],
-        :color => COLORS[@id[14, 2].hex % COLORS.length]
+      body: {
+        part: PARTS[:body][@id[12, 2].hex % PARTS[:body].length],
+        color: COLORS[@id[14, 2].hex % COLORS.length]
       },
-      :eyes  => {
-        :part => PARTS[:eyes ][@id[16, 2].hex % PARTS[:eyes ].length],
-        :color => COLORS[@id[18, 2].hex % COLORS.length]
+      eyes: {
+        part: PARTS[:eyes][@id[16, 2].hex % PARTS[:eyes].length],
+        color: COLORS[@id[18, 2].hex % COLORS.length]
       },
-      :mouth => {
-        :part => PARTS[:mouth][@id[20, 2].hex % PARTS[:mouth].length],
-        :color => COLORS[@id[22, 2].hex % COLORS.length]
+      mouth: {
+        part: PARTS[:mouth][@id[20, 2].hex % PARTS[:mouth].length],
+        color: COLORS[@id[22, 2].hex % COLORS.length]
       }
     }
-    
+
     @monster = ChunkyPNG::Image.new(120, 120, ChunkyPNG::Color::TRANSPARENT)
-    
+
     parts.each do |_, part|
       path = File.join(File.dirname(__FILE__), 'parts', part[:part])
       partimg = ChunkyPNG::Image.from_file(path)
-      
+
       if BODY_COLOR_PARTS.include? part[:part]
         part[:color] = parts[:body][:color]
       elsif SPECIFIC_COLOR_PARTS.include? part[:part]
         part[:color] = SPECIFIC_COLOR_PARTS[part[:part]]
       end
-      
-      unless WHITE_PARTS.include? part[:part]
-        partimg = colorise(partimg, part[:color][0], part[:color][1])
-      end
+
+      partimg = colorise(partimg, part[:color][0], part[:color][1]) unless WHITE_PARTS.include? part[:part]
 
       @monster.compose!(partimg)
     end
@@ -139,30 +139,24 @@ class MonsterID
   def to_datastream
     @monster.to_datastream
   end
-  
-  def id
-    @id
-  end
+
+  attr_reader :id
 
   def to_data_url
     @monster.to_data_url
   end
-  
+
   def inspect
     "#<#{self.class.name}:#{object_id} id: #{@id}>"
   end
 
   private
 
-  def colorise(img, hue, sat = 255)
-    sat = sat.to_f / 255 # ChunkyPNG uses sat from 0.0 to 1.0
+  def colorise(img, h, s = 255)
+    s = s.to_f / 255 # ChunkyPNG uses sat from 0.0 to 1.0
 
     img.pixels.map! do |px|
-      h, s, v, a = ChunkyPNG::Color.to_hsv(px, true)
-
-      h = hue
-      s = sat
-
+      _, _, v, a = ChunkyPNG::Color.to_hsv(px, true)
       ChunkyPNG::Color.from_hsv(h, s, v, a)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monsterid
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Knut Aldrin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.1
+        version: '1.14'
 description: Port/rework of the php script, with new monsters snatched from the WP
   plugin
 email: knutaldrin@gmail.com
@@ -178,7 +172,7 @@ homepage: https://github.com/knutaldrin/monsterid
 licenses:
 - CC-BY-4.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,16 +180,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Generates tiny little monsters to discern users.
 test_files: []