magic_cloud 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7197d0ee63b2aee8e0a2a49f07477a5a6d21058a
-  data.tar.gz: 926729b0eeaf7c68409f1c8381fa76cc6687b235
+SHA256:
+  metadata.gz: 3f49646844ea8dff390b90306511424e14e24fb898a1c7ea3a48e1d0f282da62
+  data.tar.gz: b1e962c6fd8bb07cf7be250f24b189441976b881fe9393091be172ec8d670678
 SHA512:
-  metadata.gz: 4e516459c658fcba58f33ecffa361dd4bf0184de94511174e2d453cc7dbd9e65f0e344887aaa745288796aea5affcc9399b70f3ae4f9640b86f11f2e7b4722fd
-  data.tar.gz: f6d3f66ef8f70b20f6b2ad80de458f111c5dd519725c406a32cc89dd2d42169c550849f4c9ebfbc501d5d6610204cc2d822cd9e68b602eee5d684fef9ac1d606
+  metadata.gz: 9e79e0950a3f0a8c72b5ba8d8cdaa22dedc825f50a269a286bd7245635bf749ca090f843e3bf64f3634e16a1fd9164b8651f1e8dc400a874d3d7b28684f56972
+  data.tar.gz: 24e3cb62f96a6107cd5ff01c23f963db0427449bc68458d839778a98875bb954e53b81c43917aa83ca1a25bc58b6837f2fe31daf3164bdb6ff248c5218220a3d

data/README.md

@@ -12,12 +12,16 @@ Usage
 
 ```ruby
 words = [
-  [test, 50],
-  [me, 40],
-  [tenderly, 30],
+  ['test', 50],
+  ['me', 40],
+  ['tenderly', 30],
   # ....
 ]
 cloud = MagicCloud::Cloud.new(words, rotate: :free, scale: :log)
+
+# To save to file, if not redering it for a page
+img = cloud.draw(960, 600) #default height/width
+img.write('test.png')
 ```
 
 Or from command-line:
@@ -37,16 +41,16 @@ Installation
 gem install magic_cloud
 ```
 
-rmagick is requirement, and it's need compilation, so you may expect
+rmagick is requirement, and it needs compilation, so you may expect
 problems in non-compiler-friendly environment (Windows).
 
 Origins
 -------
 
-At first, it was straightforward port of [d3.layout.cloud.js](https://github.com/jasondavies/d3-cloud)
+At first, it was a straightforward port of [d3.layout.cloud.js](https://github.com/jasondavies/d3-cloud)
 by Jason Davies, which, I assume, is an implementation of Wordle algorithm.
 
-Then there was major refatoring, to make code correspond to Ruby
+Then there was major refactoring, to make code correspond to Ruby
 standards (and be understandable to poor dumb me).
 
 Then collision algorithm was rewritten from scratch.
@@ -61,7 +65,7 @@ References:
 Performance
 -----------
 
-It's reasonable for me. On my small Thinkpad E330, some 50-words cloud 
+It's reasonable for me. On my small Thinkpad E330, some 50-words cloud
 image, size 700×500, are typically generated in <3sec. It's not that cool,
 yet not too long for you to fell asleep.
 
@@ -69,17 +73,17 @@ The time of cloud making depends on words count, size of image
 (it's faster to find place for all words on larger image) and used rotation
 algorithm (vertical+horizontal words only is significantly faster - and,
 on my opinion, better looking - than "cool" free-rotated-words cloud). It
-even depends on font - dense font like Impact takes mor time to being
-layed out than sparse Tahoma.
+even depends on font - dense font like Impact takes more time to lay
+out than sparse Tahoma.
 
 Major performance eater is perfect collision detection, which Wordle-like
-cloud needs. MagicCloud for now uses really dumb algortihm with some
-not-so-dumb optimizations. You can look into 
-`lib/magic_cloud/collision_board.rb` - everything can be optimized is 
+cloud needs. MagicCloud for now uses really dumb algorithm with some
+not-so-dumb optimizations. You can look into
+`lib/magic_cloud/collision_board.rb` - everything can be optimized is
 there; especially in `CollisionBoard#collides?` method.
 
 I assume, for example, that naive rewriting of code in there as a C
-extension can help significantly.
+extension would help significantly.
 
 Another possible way is adding some smart tricks, which eliminate as much
 of pixel-by-pixel comparisons as possible (some of already made are
@@ -88,18 +92,18 @@ criss-cross intersection check, and memoizing of last crossed sprite).
 Memory effectiviness
 --------------------
 
-Basically: it's not. 
+Basically: it's not.
 
-Plain Ruby arrays are used to represent collision bitmasks (each array 
-member stand for 1 bit), so, for example, 700×500 pixel cloud will requre 
+Plain Ruby arrays are used to represent collision bitmasks (each array
+member stand for 1 bit), so, for example, 700×500 pixel cloud will requre
 collision board size `700*500` (i.e. 350k array items only for board, and
 slightly less for all sprites).
 
 It should be wise to use some packing (considering each Ruby Fixmnum can
-represent not one, but whole 32 bits). Unfortunately, all bit array 
-libraries I've tried are causing major slowdown of cloud computation. 
-With, say, 50 words we'll have literally millions of operation 
-`bitmask#[]` and `bitmask#[]=`, so, even methods 
+represent not one, but whole 32 bits). Unfortunately, all bit array
+libraries I've tried are causing major slowdown of cloud computation.
+With, say, 50 words we'll have literally millions of operation
+`bitmask#[]` and `bitmask#[]=`, so, even methods
 like `Fixnum#&` and `Fixnum#|` (typically used for bit array representation)
 are causing significant overload.
 
@@ -111,10 +115,10 @@ cloud = MagicCloud.new(words, palette: palette, rotate: rotate)
 ```
 
 * `:palette` (default is `:color20`):
-  * `:category10`, `:category20`, ... - from (d3)[https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors]
+  * `:category10`, `:category20`, ... - from [D3.js](https://github.com/d3/d3-scale/blob/master/README.md#category-scales)
   * `[array, of, colors]` - each color should be hex color, or any other RMagick color string (See "Color names at http://www.imagemagick.org/RMagick/doc/imusage.html)
   * any lambda, accepting `(word, index)` and returning color string
-  * any object, responding to `color(word, index)` - so, you can make color 
+  * any object, responding to `color(word, index)` - so, you can make color
     depend on tag text, not only on its number in tags list
 * `:rotate` - rotation algorithm:
   * `:square` (only horizontal and vertical words) - it's default
@@ -129,12 +133,13 @@ cloud = MagicCloud.new(words, palette: palette, rotate: rotate)
   * `:linear` - linear scaling (default);
   * `:log` - logarithmic scaling;
   * `:sqrt` - square root scaling;
-* `:font_family` (Impact is default).
+* `:font_family` (Impact is default, ex. Arial, Helvetica, Futura).
+* `:font` - Full path to custom font file. Overwrite `:font_family`.
 
 Current state
 -------------
 
-This library is extracted from real-life project. It should be
+This library is extracted from a real-life project. It should be
 pretty stable (apart from bugs introduced during extraction and gemification).
 
 What it really lacks for now, is thorough (or any) testing, and

data/lib/magic_cloud/bit_matrix.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module MagicCloud
   # Dead simple 2-dimensional "bit matrix", storing 1s and 0s.
   # Not memory effectife at all, but the fastest pure-Ruby solution
@@ -25,8 +26,8 @@ module MagicCloud
     end
 
     def dump
-      (0...height).map{|y|
-        (0...width).map{|x| at(x, y) ? ' ' : 'x'}.join
+      (0...height).map { |y|
+        (0...width).map { |x| at(x, y) ? ' ' : 'x' }.join
       }.join("\n")
     end
   end

data/lib/magic_cloud/canvas.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require 'RMagick'
+# frozen_string_literal: true
+
+require 'rmagick'
 
 module MagicCloud
   # Thin wrapper around RMagick, incapsulating ALL the real drawing.
@@ -9,16 +10,18 @@ module MagicCloud
   class Canvas
     def initialize(w, h, back = 'transparent')
       @width, @height = w, h
-      @internal = Magick::Image.new(w, h){|i| i.background_color =  back}
+      @internal = Magick::Image.new(w, h) { |i| i.background_color = back }
     end
 
     attr_reader :internal, :width, :height
 
     RADIANS = Math::PI / 180
 
-    def draw_text(text, options = {})
+    def draw_text(text, options = {}) # rubocop:todo Metrics/AbcSize
+      return nil if text.empty?
+
       draw = Magick::Draw.new # FIXME: is it necessary every time?
-      
+
       x = options.fetch(:x, 0)
       y = options.fetch(:y, 0)
       rotate = options.fetch(:rotate, 0)
@@ -47,16 +50,16 @@ module MagicCloud
       @internal.export_pixels(x, y, w, h, 'RGBA')
     end
 
-    # rubocop:disable TrivialAccessors
     def render
       @internal
     end
-    # rubocop:enable TrivialAccessors
 
     private
 
     def set_text_options(draw, options)
       draw.font_family = options[:font_family]
+      draw.font = options[:font] if options[:font]
+
       draw.font_weight = Magick::NormalWeight
       draw.font_style = Magick::NormalStyle
 
@@ -67,13 +70,13 @@ module MagicCloud
     end
 
     def _measure_text(draw, text, rotate)
-      metrics = draw.get_type_metrics('"' + text + 'm"')
+      metrics = draw.get_type_metrics(%("#{validate_text(text)}m"))
       w, h = rotated_metrics(metrics.width, metrics.height, rotate)
 
       Rect.new(0, 0, w, h)
     end
 
-    def rotated_metrics(w, h, degrees)
+    def rotated_metrics(w, h, degrees) # rubocop:todo Metrics/AbcSize
       radians = degrees * Math::PI / 180
 
       # FIXME: not too clear, just straightforward from d3.cloud
@@ -89,5 +92,11 @@ module MagicCloud
 
       [w, h]
     end
+
+    def validate_text(text)
+      return text +=' ' if text[-1] == '%'
+
+      text
+    end
   end
 end

data/lib/magic_cloud/cloud.rb

@@ -1,18 +1,19 @@
-# encoding: utf-8
-require_relative './rect'
-require_relative './canvas'
-require_relative './palettes'
+# frozen_string_literal: true
 
-require_relative './word'
+require_relative 'rect'
+require_relative 'canvas'
+require_relative 'palettes'
 
-require_relative './layouter'
-require_relative './spriter'
+require_relative 'word'
 
-require_relative './debug'
+require_relative 'layouter'
+require_relative 'spriter'
+
+require_relative 'debug'
 
 module MagicCloud
   # Main word-cloud class. Takes words with sizes, returns image
-  class Cloud
+  class Cloud # rubocop:todo Metrics/ClassLength
     def initialize(words, options = {})
       @words = words.sort_by(&:last).reverse
       @options = options
@@ -23,15 +24,21 @@ module MagicCloud
 
     DEFAULT_FAMILY = 'Impact'
 
-    def draw(width, height)
+    # rubocop:todo Metrics/MethodLength
+    def draw(width, height) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       # FIXME: do it in init, for specs would be happy
-      shapes = @words.each_with_index.map{|(word, size), i|
-        Word.new(
-          word,
+      shapes = @words.each_with_index.map { |(word, size), i|
+        word_options = {
           font_family: @options[:font_family] || DEFAULT_FAMILY,
           font_size: scaler.call(word, size, i),
           color: palette.call(word, i),
           rotate: rotator.call(word, i)
+        }
+        word_options[:font] = @options[:font] if @options[:font]
+
+        Word.new(
+          word,
+          word_options
         )
       }
 
@@ -44,10 +51,11 @@ module MagicCloud
       visible = layouter.layout!(shapes)
 
       canvas = Canvas.new(width, height, 'white')
-      visible.each{|sh| sh.draw(canvas)}
+      visible.each { |sh| sh.draw(canvas) }
 
       canvas.render
     end
+    # rubocop:enable Metrics/MethodLength
 
     private
 
@@ -61,11 +69,11 @@ module MagicCloud
       when Symbol
         make_const_palette(source)
       when Array
-        ->(_, index){source[index % source.size]}
+        ->(_, index) { source[index % source.size] }
       when Proc
         source
-      when ->(s){s.respond_to?(:color)}
-        ->(word, index){source.color(word, index)}
+      when ->(s) { s.respond_to?(:color) }
+        ->(word, index) { source.color(word, index) }
       else
         fail ArgumentError, "Unknown palette: #{source.inspect}"
       end
@@ -75,29 +83,29 @@ module MagicCloud
       palette = PALETTES[sym] or
         fail(ArgumentError, "Unknown palette: #{sym.inspect}")
 
-      ->(_, index){palette[index % palette.size]}
+      ->(_, index) { palette[index % palette.size] }
     end
 
     def make_rotator(source)
       case source
       when :none
-        ->(*){0}
+        ->(*) { 0 }
       when :square
-        ->(*){
+        ->(*) {
           (rand * 2).to_i * 90
         }
       when :free
-        ->(*){
+        ->(*) {
           (((rand * 6) - 3) * 30).round
         }
       when Array
-        ->(*){
+        ->(*) {
           source.sample
         }
       when Proc
         source
-      when ->(s){s.respond_to?(:rotate)}
-        ->(word, index){source.rotate(word, index)}
+      when ->(s) { s.respond_to?(:rotate) }
+        ->(word, index) { source.rotate(word, index) }
       else
         fail ArgumentError, "Unknown rotation algo: #{source.inspect}"
       end
@@ -111,27 +119,31 @@ module MagicCloud
       norm =
         case algo
         when :no
-          # no normalization, treat tag weights as font size
-          return ->(_word, size, _index){size}
+          return ->(_word, size, _index) { size }
         when :linear
-          ->(x){x}
+          ->(x) { x }
         when :log
-          ->(x){Math.log(x) / Math.log(10)}
+          ->(x) { Math.log(x) / Math.log(10) }
         when :sqrt
-          ->(x){Math.sqrt(x)}
+          ->(x) { Math.sqrt(x) }
         else
           fail ArgumentError, "Unknown scaling algo: #{algo.inspect}"
         end
-
+    
       smin = norm.call(words.map(&:last).min)
       smax = norm.call(words.map(&:last).max)
-      koeff = (FONT_MAX - FONT_MIN).to_f / (smax - smin)
-
-      ->(_word, size, _index){
-        ssize = norm.call(size)
-        ((ssize - smin).to_f * koeff + FONT_MIN).to_i
-      }
+    
+      if smin == smax
+        ->(_word, _size, _index) { FONT_MIN } # Return the minimum font size if no scaling is needed
+      else
+        koeff = (FONT_MAX - FONT_MIN).to_f / (smax - smin)
+        ->(_word, size, _index) {
+          ssize = norm.call(size)
+          ((ssize - smin).to_f * koeff + FONT_MIN).to_i
+        }
+      end
     end
+    
     # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/AbcSize
   end
 end

data/lib/magic_cloud/collision_board.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require_relative './bit_matrix'
+# frozen_string_literal: true
+
+require_relative 'bit_matrix'
 
 module MagicCloud
   # Pixel-by-pixel collision board
@@ -17,7 +18,7 @@ module MagicCloud
     attr_reader :rects, :intersections_cache
 
     def criss_cross_collision?(rect)
-      if rects.any?{|r| r.criss_cross?(rect)}
+      if rects.any? { |r| r.criss_cross?(rect) }
         Debug.stats[:criss_cross] += 1
         true
       else
@@ -25,6 +26,7 @@ module MagicCloud
       end
     end
 
+    # rubocop:disable Lint/HashCompareByIdentity -- probably should be followed, but don't have time to test it now
     def collides_previous?(shape, intersections)
       prev_idx = intersections_cache[shape.object_id]
 
@@ -52,6 +54,7 @@ module MagicCloud
 
       false
     end
+    # rubocop:enable Lint/HashCompareByIdentity
 
     def collides?(shape)
       Debug.stats[:collide_total] += 1
@@ -64,7 +67,7 @@ module MagicCloud
       return true if criss_cross_collision?(shape.rect)
 
       # then find which of placed sprites rectangles tag intersects
-      intersections = rects.map{|r| r.intersect(shape.rect)}
+      intersections = rects.map { |r| r.intersect(shape.rect) }
 
       # no need to further check: this tag is not inside any others' rectangle
       if intersections.compact.empty?

data/lib/magic_cloud/debug.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'logger'
 
@@ -15,14 +16,14 @@ module MagicCloud
     end
 
     def initialize
-      @logger = Logger.new(STDOUT).tap{|l| l.level = Logger::FATAL}
-      @stats = Hash.new{|h, k| h[k] = 0}
+      @logger = Logger.new($stdout).tap { |l| l.level = Logger::FATAL }
+      @stats = Hash.new { |h, k| h[k] = 0 }
     end
 
     attr_reader :logger, :stats
 
     def reset!
-      @stats = Hash.new{|h, k| h[k] = 0}
+      @stats = Hash.new { |h, k| h[k] = 0 }
     end
   end
 end

data/lib/magic_cloud/layouter/place.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module MagicCloud
   class Layouter
     class PlaceNotFound < RuntimeError
@@ -9,7 +10,7 @@ module MagicCloud
     # 2. at each step, shift in spiral from the previous place
     # 3. always knows, if the place "ready" for shape (empty and inside board)
     class Place
-      def initialize(layouter, shape)
+      def initialize(layouter, shape) # rubocop:todo Metrics/AbcSize
         @layouter, @shape = layouter, shape
 
         # initial position
@@ -60,10 +61,9 @@ module MagicCloud
         rectangular_spiral(step)
       end
 
-      # rubocop:disable Metrics/AbcSize
       def archimedean_spiral(size)
         e = width / height
-        ->(t){
+        ->(t) {
           t1 = t * size * 0.01
 
           [
@@ -78,7 +78,7 @@ module MagicCloud
         dx = dy * @layouter.width / @layouter.height
         x = 0
         y = 0
-        ->(t){
+        ->(t) {
           sign = t < 0 ? -1 : 1
 
           # zverok: this is original comment & code from d3.layout.cloud.js
@@ -95,7 +95,6 @@ module MagicCloud
           [x, y].map(&:round)
         }
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/magic_cloud/layouter.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require_relative './collision_board'
+# frozen_string_literal: true
+
+require_relative 'collision_board'
 
 module MagicCloud
   # Main magic of magic cloud - layouting shapes without collisions.
@@ -49,7 +50,7 @@ module MagicCloud
 
         board.add(shape)
         Debug.logger.info 'Place for %p found in %i steps (%.2f sec)' %
-          [shape, steps, Time.now-start]
+                          [shape, steps, Time.now-start]
 
         break
       end
@@ -57,11 +58,11 @@ module MagicCloud
       true
     rescue PlaceNotFound
       Debug.logger.warn 'No place for %p found in %i steps (%.2f sec)' %
-        [shape, steps, Time.now-start]
+                        [shape, steps, Time.now-start]
 
       false
     end
   end
 end
 
-require_relative './layouter/place'
+require_relative 'layouter/place'

data/lib/magic_cloud/palettes.rb

@@ -1,9 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module MagicCloud
   PALETTES = {
     # Categorical colors from d3
-    # Source: https://github.com/mbostock/d3/wiki/Ordinal-Scales#categorical-colors
-    
+    # Source: https://github.com/d3/d3-scale/blob/master/README.md#category-scales
+
     category10: %w[
       #1f77b4 #ff7f0e #2ca02c #d62728 #9467bd
       #8c564b #e377c2 #7f7f7f #bcbd22 #17becf
@@ -15,7 +16,7 @@ module MagicCloud
       #8c564b #c49c94 #e377c2 #f7b6d2 #7f7f7f
       #c7c7c7 #bcbd22 #dbdb8d #17becf #9edae5
     ],
-    
+
     category20b: %w[
       #393b79 #5254a3 #6b6ecf #9c9ede #637939
       #8ca252 #b5cf6b #cedb9c #8c6d31 #bd9e39
@@ -29,5 +30,5 @@ module MagicCloud
       #a1d99b #c7e9c0 #756bb1 #9e9ac8 #bcbddc
       #dadaeb #636363 #969696 #bdbdbd #d9d9d9
     ]
-  }
+  }.freeze
 end

data/lib/magic_cloud/rect.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module MagicCloud
   # Utility geometrical rectangle, implementing arithmetic interactions
   # with other rectangles
@@ -9,6 +10,7 @@ module MagicCloud
     end
 
     attr_accessor :x0, :y0, :x1, :y1
+
     # NB: we are trying to use instance variables instead of accessors
     #     inside this class methods, because they are called so many
     #     times that accessor overhead IS significant.
@@ -36,20 +38,18 @@ module MagicCloud
       @y0 = y
     end
 
-    # rubocop:disable Metrics/AbcSize
     def adjust!(other)
       @x0 = other.x0 if other.x0 < @x0
       @y0 = other.y0 if other.y0 < @y0
       @x1 = other.x1 if other.x1 > @x1
       @y1 = other.y1 if other.y1 > @y1
     end
-    # rubocop:enable Metrics/AbcSize
 
     def adjust(other)
-      dup.tap{|d| d.adjust!(other)}
+      dup.tap { |d| d.adjust!(other) }
     end
 
-    # rubocop:disable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
     def criss_cross?(other)
       # case 1: this one is horizontal:
       # overlaps other by x, to right and left, and goes inside it by y
@@ -60,15 +60,17 @@ module MagicCloud
         @y0 < other.y0 && @y1 > other.y1 &&
           @x0 > other.x0 && @x1 < other.x1
     end
-    # rubocop:enable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def intersect(other)
       # direct comparison is dirtier, yet significantly faster than
       # something like [@x0, other.x0].max
+      # rubocop:disable Style/MinMaxComparison
       ix0 = @x0 > other.x0 ? @x0 : other.x0
       ix1 = @x1 < other.x1 ? @x1 : other.x1
       iy0 = @y0 > other.y0 ? @y0 : other.y0
       iy1 = @y1 < other.y1 ? @y1 : other.y1
+      # rubocop:enable Style/MinMaxComparison
 
       if ix0 > ix1 || iy0 > iy1
         nil # rectangles are not intersected, in fact

data/lib/magic_cloud/shape.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module MagicCloud
   # Basic "abstract shape" class, with all primitive functionality
   # necessary for use it in Spriter and Layouter.

data/lib/magic_cloud/spriter.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require_relative './bit_matrix'
+# frozen_string_literal: true
+
+require_relative 'bit_matrix'
 
 module MagicCloud
   # Incapsulates sprite maker for any Shape, able to draw itself.
@@ -21,14 +22,14 @@ module MagicCloud
       end
 
       Debug.logger.info 'Sprites ready: %i sec, %i canvases' %
-        [Time.now - start, Debug.stats[:canvases]]
+                        [Time.now - start, Debug.stats[:canvases]]
     end
 
     private
 
     attr_reader :canvas, :cur_x, :cur_y, :row_height
 
-    def make_sprite(shape)
+    def make_sprite(shape) # rubocop:todo Metrics/AbcSize
       rect = shape.measure(canvas)
       ensure_position(rect)
 
@@ -42,10 +43,10 @@ module MagicCloud
       shift_position(rect)
 
       Debug.logger.debug 'Sprite for %p ready: %i×%i' %
-        [shape, shape.sprite.width, shape.sprite.height]
+                         [shape, shape.sprite.width, shape.sprite.height]
     end
 
-    CANVAS_SIZE = [1024, 1024]
+    CANVAS_SIZE = [1024, 1024].freeze
 
     def restart_canvas!
       Debug.stats[:canvases] += 1

data/lib/magic_cloud/version.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 # Wordle-like word cloud main module
 module MagicCloud
-  VERSION = '0.0.3' # aka Better initial layout
+  VERSION = '0.0.5' # aka 2024 update for new Rubies compatibility.
 end

data/lib/magic_cloud/word.rb

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require_relative './shape'
+# frozen_string_literal: true
+
+require_relative 'shape'
 
 module MagicCloud
   # Class representing individual word in word cloud

data/lib/magic_cloud.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 # Wordle-like word cloud main module
 module MagicCloud

data/magic_cloud.gemspec

@@ -32,9 +32,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2.2'
   
   s.add_dependency 'rmagick'
-  s.add_dependency 'slop', '~> 3.0.0' # for bin/magic_cloud options parsing
+  s.add_dependency 'slop', '~> 3.0' # for bin/magic_cloud options parsing
   
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'ruby-prof'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubygems-tasks'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_cloud
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Simple, pure-ruby library for making pretty Wordle-like clouds.
       It uses RMagick as graphic backend.
@@ -128,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Pretty word cloud maker for Ruby