geo_pattern 1.4.0 → 1.6.0

data/lib/geo_pattern/structure_generators/tessellation_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class TessellationGenerator < BaseGenerator
@@ -7,30 +9,30 @@ module GeoPattern
 
       def after_initialize
         # 3.4.6.4 semi-regular tessellation
-        @side_length     = map(hex_val(0, 1), 0, 15, 5, 40)
-        @hex_height      = side_length * Math.sqrt(3)
-        @hex_width       = side_length * 2
+        @side_length = map(hex_val(0, 1), 0, 15, 5, 40)
+        @hex_height = side_length * Math.sqrt(3)
+        @hex_width = side_length * 2
         @triangle_height = side_length / 2 * Math.sqrt(3)
-        @triangle        = build_rotated_triangle_shape(side_length, triangle_height)
-        @tile_width      = side_length * 3 + triangle_height * 2
-        @tile_height     = (hex_height * 2) + (side_length * 2)
+        @triangle = build_rotated_triangle_shape(side_length, triangle_height)
+        @tile_width = side_length * 3 + triangle_height * 2
+        @tile_height = (hex_height * 2) + (side_length * 2)
 
         self.height = tile_height
-        self.width  = tile_width
+        self.width = tile_width
       end
 
       def generate_structure
-        for i in 0..19
-          val     = hex_val(i, 1)
+        20.times do |i|
+          val = hex_val(i, 1)
           opacity = opacity(val)
-          fill    = fill_color(val)
+          fill = fill_color(val)
 
-          styles  = {
-            'stroke'         => stroke_color,
-            'stroke-opacity' => stroke_opacity,
-            'fill'           => fill,
-            'fill-opacity'   => opacity,
-            'stroke-width'   => 1
+          styles = {
+            "stroke" => stroke_color,
+            "stroke-opacity" => stroke_opacity,
+            "fill" => fill,
+            "fill-opacity" => opacity,
+            "stroke-width" => 1
           }
 
           case i
@@ -47,47 +49,47 @@ module GeoPattern
           when 3 # center / bottom square
             svg.rect(hex_width / 2 + triangle_height, hex_height * 1.5 + side_length, side_length, side_length, styles)
           when 4 # left top / bottom triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{side_length / 2}, #{-side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2})"))
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{side_length / 2}, #{tile_height - -side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(1, -1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{side_length / 2}, #{-side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2})"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{side_length / 2}, #{tile_height - -side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(1, -1)"))
           when 5 # right top / bottom triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width - side_length / 2}, #{-side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(-1, 1)"))
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width - side_length / 2}, #{tile_height + side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(-1, -1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width - side_length / 2}, #{-side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(-1, 1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width - side_length / 2}, #{tile_height + side_length / 2}) rotate(0, #{side_length / 2}, #{triangle_height / 2}) scale(-1, -1)"))
           when 6 # center / top / right triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width / 2 + side_length / 2}, #{hex_height / 2})"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width / 2 + side_length / 2}, #{hex_height / 2})"))
           when 7 # center / top / left triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width - tile_width / 2 - side_length / 2}, #{hex_height / 2}) scale(-1, 1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width - tile_width / 2 - side_length / 2}, #{hex_height / 2}) scale(-1, 1)"))
           when 8 # center / bottom / right triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width / 2 + side_length / 2}, #{tile_height - hex_height / 2}) scale(1, -1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width / 2 + side_length / 2}, #{tile_height - hex_height / 2}) scale(1, -1)"))
           when 9 # center / bottom / left triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width - tile_width / 2 - side_length / 2}, #{tile_height - hex_height / 2}) scale(-1, -1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width - tile_width / 2 - side_length / 2}, #{tile_height - hex_height / 2}) scale(-1, -1)"))
           when 10 # left / middle triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{side_length / 2}, #{tile_height / 2 - side_length / 2})"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{side_length / 2}, #{tile_height / 2 - side_length / 2})"))
           when 11 # right / middle triangle
-            svg.polyline(triangle, styles.merge('transform' => "translate(#{tile_width - side_length / 2}, #{tile_height / 2 - side_length / 2}) scale(-1, 1)"))
+            svg.polyline(triangle, styles.merge("transform" => "translate(#{tile_width - side_length / 2}, #{tile_height / 2 - side_length / 2}) scale(-1, 1)"))
           when 12 # left / top square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "translate(#{side_length / 2}, #{side_length / 2}) rotate(-30, 0, 0)"))
+              styles.merge("transform" => "translate(#{side_length / 2}, #{side_length / 2}) rotate(-30, 0, 0)"))
           when 13 # right / top square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(-1, 1) translate(#{-tile_width + side_length / 2}, #{side_length / 2}) rotate(-30, 0, 0)"))
+              styles.merge("transform" => "scale(-1, 1) translate(#{-tile_width + side_length / 2}, #{side_length / 2}) rotate(-30, 0, 0)"))
           when 14 # left / center-top square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "translate(#{side_length / 2}, #{tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
+              styles.merge("transform" => "translate(#{side_length / 2}, #{tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
           when 15 # right / center-top square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(-1, 1) translate(#{-tile_width + side_length / 2}, #{tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
+              styles.merge("transform" => "scale(-1, 1) translate(#{-tile_width + side_length / 2}, #{tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
           when 16 # left / center-top square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(1, -1) translate(#{side_length / 2}, #{-tile_height + tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
+              styles.merge("transform" => "scale(1, -1) translate(#{side_length / 2}, #{-tile_height + tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
           when 17 # right / center-bottom square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(-1, -1) translate(#{-tile_width + side_length / 2}, #{-tile_height + tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
+              styles.merge("transform" => "scale(-1, -1) translate(#{-tile_width + side_length / 2}, #{-tile_height + tile_height / 2 - side_length / 2 - side_length}) rotate(30, 0, #{side_length})"))
           when 18 # left / bottom square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(1, -1) translate(#{side_length / 2}, #{-tile_height + side_length / 2}) rotate(-30, 0, 0)"))
+              styles.merge("transform" => "scale(1, -1) translate(#{side_length / 2}, #{-tile_height + side_length / 2}) rotate(-30, 0, 0)"))
           when 19 # right / bottom square
             svg.rect(0, 0, side_length, side_length,
-                     styles.merge('transform' => "scale(-1, -1) translate(#{-tile_width + side_length / 2}, #{-tile_height + side_length / 2}) rotate(-30, 0, 0)"))
+              styles.merge("transform" => "scale(-1, -1) translate(#{-tile_width + side_length / 2}, #{-tile_height + side_length / 2}) rotate(-30, 0, 0)"))
           end
         end
 

data/lib/geo_pattern/structure_generators/triangles_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class TrianglesGenerator < BaseGenerator
@@ -6,44 +8,45 @@ module GeoPattern
       attr_reader :scale, :side_length, :triangle_height, :triangle
 
       def after_initialize
-        @scale           = hex_val(0, 1)
-        @side_length     = map(scale, 0, 15, 15, 80)
+        @scale = hex_val(0, 1)
+        @side_length = map(scale, 0, 15, 15, 80)
         @triangle_height = side_length / 2 * Math.sqrt(3)
-        @triangle        = build_triangle_shape(side_length, triangle_height)
+        @triangle = build_triangle_shape(side_length, triangle_height)
 
-        self.width  = side_length * 3
+        self.width = side_length * 3
         self.height = triangle_height * 6
       end
 
       def generate_structure
         i = 0
-        for y in 0..5
-          for x in 0..5
-            val     = hex_val(i, 1)
+        6.times do |y|
+          6.times do |x|
+            val = hex_val(i, 1)
             opacity = opacity(val)
-            fill    = fill_color(val)
+            fill = fill_color(val)
 
             styles = {
-              'fill'           => fill,
-              'fill-opacity'   => opacity,
-              'stroke'         => stroke_color,
-              'stroke-opacity' => stroke_opacity
+              "fill" => fill,
+              "fill-opacity" => opacity,
+              "stroke" => stroke_color,
+              "stroke-opacity" => stroke_opacity
             }
 
-            rotation = ''
-            if y % 2 == 0
-              rotation = x % 2 == 0 ? 180 : 0
+            rotation = if y % 2 == 0
+              (x % 2 == 0) ? 180 : 0
             else
-              rotation = x % 2 != 0 ? 180 : 0
+              (x % 2 != 0) ? 180 : 0
             end
 
             svg.polyline(triangle, styles.merge(
-                                     'transform' => "translate(#{x * side_length * 0.5 - side_length / 2}, #{triangle_height * y}) rotate(#{rotation}, #{side_length / 2}, #{triangle_height / 2})"))
+              "transform" => "translate(#{x * side_length * 0.5 - side_length / 2}, #{triangle_height * y}) rotate(#{rotation}, #{side_length / 2}, #{triangle_height / 2})"
+            ))
 
             # Add an extra one at top-right, for tiling.
-            if (x == 0)
+            if x == 0
               svg.polyline(triangle, styles.merge(
-                                       'transform' => "translate(#{6 * side_length * 0.5 - side_length / 2}, #{triangle_height * y}) rotate(#{rotation}, #{side_length / 2}, #{triangle_height / 2})"))
+                "transform" => "translate(#{6 * side_length * 0.5 - side_length / 2}, #{triangle_height * y}) rotate(#{rotation}, #{side_length / 2}, #{triangle_height / 2})"
+              ))
             end
             i += 1
           end

data/lib/geo_pattern/structure_generators/xes_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class XesGenerator < BaseGenerator
@@ -7,54 +9,59 @@ module GeoPattern
 
       def after_initialize
         @square_size = map(hex_val(0, 1), 0, 15, 10, 25)
-        @x_shape     = build_plus_shape(square_size) # rotated later
-        @x_size      = square_size * 3 * 0.943
+        @x_shape = build_plus_shape(square_size) # rotated later
+        @x_size = square_size * 3 * 0.943
 
         self.height = self.width = x_size * 3
       end
 
       def generate_structure
         i = 0
-        for y in 0..5
-          for x in 0..5
-            val     = hex_val(i, 1)
+        6.times do |y|
+          6.times do |x|
+            val = hex_val(i, 1)
             opacity = opacity(val)
-            dy      = x % 2 == 0 ? y * x_size - x_size * 0.5 : y * x_size - x_size * 0.5 + x_size / 4
-            fill    = fill_color(val)
+            dy = (x % 2 == 0) ? y * x_size - x_size * 0.5 : y * x_size - x_size * 0.5 + x_size / 4
+            fill = fill_color(val)
 
             styles = {
-              'fill'  => fill,
-              'style' => {
-                'opacity' => opacity
+              "fill" => fill,
+              "style" => {
+                "opacity" => opacity
               }
             }
 
             svg.group(x_shape, styles.merge(
-                                 'transform' => "translate(#{x * x_size / 2 - x_size / 2},#{dy - y * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"))
+              "transform" => "translate(#{x * x_size / 2 - x_size / 2},#{dy - y * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"
+            ))
 
             # Add an extra column on the right for tiling.
-            if (x == 0)
+            if x == 0
               svg.group(x_shape, styles.merge(
-                                   'transform' => "translate(#{6 * x_size / 2 - x_size / 2},#{dy - y * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"))
+                "transform" => "translate(#{6 * x_size / 2 - x_size / 2},#{dy - y * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"
+              ))
             end
 
             # Add an extra row on the bottom that matches the first row, for tiling.
-            if (y == 0)
-              dy = x % 2 == 0 ? 6 * x_size - x_size / 2 : 6 * x_size - x_size / 2 + x_size / 4
+            if y == 0
+              dy = (x % 2 == 0) ? 6 * x_size - x_size / 2 : 6 * x_size - x_size / 2 + x_size / 4
               svg.group(x_shape, styles.merge(
-                                   'transform' => "translate(#{x * x_size / 2 - x_size / 2},#{dy - 6 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"))
+                "transform" => "translate(#{x * x_size / 2 - x_size / 2},#{dy - 6 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"
+              ))
             end
 
             # These can hang off the bottom, so put a row at the top for tiling.
-            if (y == 5)
+            if y == 5
               svg.group(x_shape, styles.merge(
-                                   'transform' => "translate(#{x * x_size / 2 - x_size / 2},#{dy - 11 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"))
+                "transform" => "translate(#{x * x_size / 2 - x_size / 2},#{dy - 11 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"
+              ))
             end
 
             # Add an extra one at top-right and bottom-right, for tiling.
             if x == 0 && y == 0
               svg.group(x_shape, styles.merge(
-                                   'transform' => "translate(#{6 * x_size / 2 - x_size / 2},#{dy - 6 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"))
+                "transform" => "translate(#{6 * x_size / 2 - x_size / 2},#{dy - 6 * x_size / 2}) rotate(45, #{x_size / 2}, #{x_size / 2})"
+              ))
             end
             i += 1
           end

data/lib/geo_pattern/svg_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   class SvgImage
     include Comparable
@@ -11,9 +13,9 @@ module GeoPattern
     attr_reader :height, :width
 
     def initialize
-      @width      = 100
-      @height     = 100
-      @svg_string = ''
+      @width = 100
+      @height = 100
+      @svg_string = +""
     end
 
     def width=(width)
@@ -37,7 +39,7 @@ module GeoPattern
     end
 
     def svg_closer
-      '</svg>'
+      "</svg>"
     end
 
     def to_s
@@ -70,16 +72,16 @@ module GeoPattern
 
     def group(elements, args = {})
       svg_string << %(<g #{write_args(args)}>)
-      elements.each { |e| eval e }
+      elements.each { |e| eval e } # rubocop:disable Security/Eval
       svg_string << %(</g>)
     end
 
     def write_args(args)
-      str = ''
-      args.each do|key, value|
+      str = +""
+      args.each do |key, value|
         if value.is_a?(Hash)
           str << %(#{key}=")
-          value.each do|k, v|
+          value.each do |k, v|
             str << %(#{k}:#{v};)
           end
           str << %(" )

data/lib/geo_pattern/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
-  VERSION = '1.4.0'
+  VERSION = "1.6.0"
 end

data/lib/geo_pattern.rb

@@ -1,56 +1,58 @@
-require 'base64'
-require 'digest/sha1'
-require 'color'
-require 'forwardable'
-
-require 'geo_pattern/version'
-
-require 'geo_pattern/roles/named_generator'
-require 'geo_pattern/roles/comparable_metadata'
-
-require 'geo_pattern/errors'
-require 'geo_pattern/color'
-require 'geo_pattern/svg_image'
-require 'geo_pattern/pattern_helpers'
-require 'geo_pattern/helpers'
-require 'geo_pattern/pattern_store'
-require 'geo_pattern/pattern_validator'
-require 'geo_pattern/pattern_sieve'
-require 'geo_pattern/pattern'
-require 'geo_pattern/seed'
-require 'geo_pattern/pattern_preset'
-require 'geo_pattern/color_preset'
-
-require 'geo_pattern/structure'
-require 'geo_pattern/background'
-
-require 'geo_pattern/color_generators/simple_generator'
-require 'geo_pattern/color_generators/base_color_generator'
-
-require 'geo_pattern/background_generators/solid_generator'
-
-require 'geo_pattern/structure_generators/base_generator'
-require 'geo_pattern/structure_generators/chevrons_generator'
-require 'geo_pattern/structure_generators/concentric_circles_generator'
-require 'geo_pattern/structure_generators/diamonds_generator'
-require 'geo_pattern/structure_generators/hexagons_generator'
-require 'geo_pattern/structure_generators/mosaic_squares_generator'
-require 'geo_pattern/structure_generators/nested_squares_generator'
-require 'geo_pattern/structure_generators/octagons_generator'
-require 'geo_pattern/structure_generators/overlapping_circles_generator'
-require 'geo_pattern/structure_generators/overlapping_rings_generator'
-require 'geo_pattern/structure_generators/plaid_generator'
-require 'geo_pattern/structure_generators/plus_signs_generator'
-require 'geo_pattern/structure_generators/sine_waves_generator'
-require 'geo_pattern/structure_generators/squares_generator'
-require 'geo_pattern/structure_generators/tessellation_generator'
-require 'geo_pattern/structure_generators/triangles_generator'
-require 'geo_pattern/structure_generators/xes_generator'
-
-require 'geo_pattern/pattern_generator'
+# frozen_string_literal: true
+
+require "base64"
+require "digest/sha1"
+require "color"
+require "forwardable"
+
+require "geo_pattern/version"
+
+require "geo_pattern/roles/named_generator"
+require "geo_pattern/roles/comparable_metadata"
+
+require "geo_pattern/errors"
+require "geo_pattern/color"
+require "geo_pattern/svg_image"
+require "geo_pattern/pattern_helpers"
+require "geo_pattern/helpers"
+require "geo_pattern/pattern_store"
+require "geo_pattern/pattern_validator"
+require "geo_pattern/pattern_sieve"
+require "geo_pattern/pattern"
+require "geo_pattern/seed"
+require "geo_pattern/pattern_preset"
+require "geo_pattern/color_preset"
+
+require "geo_pattern/structure"
+require "geo_pattern/background"
+
+require "geo_pattern/color_generators/simple_generator"
+require "geo_pattern/color_generators/base_color_generator"
+
+require "geo_pattern/background_generators/solid_generator"
+
+require "geo_pattern/structure_generators/base_generator"
+require "geo_pattern/structure_generators/chevrons_generator"
+require "geo_pattern/structure_generators/concentric_circles_generator"
+require "geo_pattern/structure_generators/diamonds_generator"
+require "geo_pattern/structure_generators/hexagons_generator"
+require "geo_pattern/structure_generators/mosaic_squares_generator"
+require "geo_pattern/structure_generators/nested_squares_generator"
+require "geo_pattern/structure_generators/octagons_generator"
+require "geo_pattern/structure_generators/overlapping_circles_generator"
+require "geo_pattern/structure_generators/overlapping_rings_generator"
+require "geo_pattern/structure_generators/plaid_generator"
+require "geo_pattern/structure_generators/plus_signs_generator"
+require "geo_pattern/structure_generators/sine_waves_generator"
+require "geo_pattern/structure_generators/squares_generator"
+require "geo_pattern/structure_generators/tessellation_generator"
+require "geo_pattern/structure_generators/triangles_generator"
+require "geo_pattern/structure_generators/xes_generator"
+
+require "geo_pattern/pattern_generator"
 
 module GeoPattern
   def self.generate(string = Time.now, opts = {})
-    GeoPattern::PatternGenerator.new(string.to_s, opts).generate
+    GeoPattern::PatternGenerator.new(string.to_s, **opts).generate
   end
 end