geo_pattern 1.4.0 → 1.6.0

data/lib/geo_pattern/pattern_store.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 module GeoPattern
-  # rubocop:disable Style/ConstantName
-  ChevronPattern            = :chevrons
-  ConcentricCirclesPattern  = :concentric_circles
-  DiamondPattern            = :diamonds
-  HexagonPattern            = :hexagons
-  MosaicSquaresPattern      = :mosaic_squares
-  NestedSquaresPattern      = :nested_squares
-  OctagonPattern            = :octagons
+  # rubocop:disable Naming/ConstantName
+  ChevronPattern = :chevrons
+  ConcentricCirclesPattern = :concentric_circles
+  DiamondPattern = :diamonds
+  HexagonPattern = :hexagons
+  MosaicSquaresPattern = :mosaic_squares
+  NestedSquaresPattern = :nested_squares
+  OctagonPattern = :octagons
   OverlappingCirclesPattern = :overlapping_circles
-  OverlappingRingsPattern   = :overlapping_rings
-  PlaidPattern              = :plaid
-  PlusSignPattern           = :plus_signs
-  SineWavePattern           = :sine_waves
-  SquarePattern             = :squares
-  TessellationPattern       = :tessellation
-  TrianglePattern           = :triangles
-  XesPattern                = :xes
-  # rubocop:enable Style/ConstantName
+  OverlappingRingsPattern = :overlapping_rings
+  PlaidPattern = :plaid
+  PlusSignPattern = :plus_signs
+  SineWavePattern = :sine_waves
+  SquarePattern = :squares
+  TessellationPattern = :tessellation
+  TrianglePattern = :triangles
+  XesPattern = :xes
+  # rubocop:enable Naming/ConstantName
 
   class PatternStore
     private
@@ -47,7 +49,7 @@ module GeoPattern
     end
 
     def [](pattern)
-      $stderr.puts 'String pattern references are deprecated as of 1.3.0' if pattern.is_a?(String)
+      warn "String pattern references are deprecated as of 1.3.0" if pattern.is_a?(String)
 
       store[pattern.to_s.to_sym]
     end

data/lib/geo_pattern/pattern_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   class PatternValidator
     private
@@ -11,9 +13,9 @@ module GeoPattern
     end
 
     def validate(requested_patterns)
-      message = "Error: At least one of the requested patterns \"#{requested_patterns.join(', ')}\" is invalid"
+      message = "Error: At least one of the requested patterns \"#{requested_patterns.join(", ")}\" is invalid"
 
-      fail InvalidPatternError, message unless valid?(requested_patterns)
+      raise InvalidPatternError, message unless valid?(requested_patterns)
 
       self
     end

data/lib/geo_pattern/rake_task.rb

@@ -1,6 +1,8 @@
-require 'rake'
-require 'rake/tasklib'
-require 'logger'
+# frozen_string_literal: true
+
+require "rake"
+require "rake/tasklib"
+require "logger"
 
 module GeoPattern
   # Rake Task
@@ -47,7 +49,7 @@ module GeoPattern
     def initialize(opts = {}, &task_block)
       @options = {
         description: nil,
-        name: GeoPattern::Helpers.underscore(self.class.to_s.split(/::/).slice(-2..-1).join(':').gsub(/Task$/, '')),
+        name: GeoPattern::Helpers.underscore(self.class.to_s.split("::").slice(-2..-1).join(":").gsub(/Task$/, "")),
         arguments: [],
         logger: ::Logger.new($stderr),
         working_directory: Dir.getwd
@@ -55,31 +57,31 @@ module GeoPattern
 
       before_initialize
 
-      fail ArgumentError, :description if @options[:description].nil?
+      raise ArgumentError, :description if @options[:description].nil?
 
-      @description       = @options[:description]
-      @task_arguments    = Array(@options[:arguments])
-      @task_block        = task_block
-      @logger            = @options[:logger]
+      @description = @options[:description]
+      @task_arguments = Array(@options[:arguments])
+      @task_block = task_block
+      @logger = @options[:logger]
       @working_directory = @options[:working_directory]
-      @name              = @options[:name]
+      @name = @options[:name]
 
       after_initialize
 
       define_task
     end
 
-    private
-
     # Run code after initialize
-    def after_initialize; end
+    def after_initialize
+    end
 
     # Run code before initialize
-    def before_initialize; end
+    def before_initialize
+    end
 
     # Define task
     def define_task
-      desc description unless ::Rake.application.last_comment
+      desc description unless ::Rake.application.last_description
 
       task name, *task_arguments do |_, task_args|
         RakeFileUtils.__send__(:verbose, verbose) do
@@ -90,7 +92,8 @@ module GeoPattern
     end
 
     # Run code if task is executed
-    def run_task(_verbose); end
+    def run_task(_verbose)
+    end
 
     public
 

data/lib/geo_pattern/roles/comparable_metadata.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   # Roles
   module Roles
@@ -21,7 +23,7 @@ module GeoPattern
         # Define comparators
         def def_comparators(*methods)
           methods.flatten.each do |m|
-            define_method "#{m}?".to_sym do |value|
+            define_method :"#{m}?" do |value|
               return true if value.nil? && public_send(m)
               return true if value == public_send(m)
 

data/lib/geo_pattern/roles/named_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module Roles
     module NamedGenerator
@@ -6,7 +8,7 @@ module GeoPattern
       end
 
       def name
-        Helpers.underscore(Helpers.demodulize(self.class).gsub(/Generator/, '')).to_sym
+        Helpers.underscore(Helpers.demodulize(self.class).gsub("Generator", "")).to_sym
       end
     end
   end

data/lib/geo_pattern/seed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   class Seed
     private

data/lib/geo_pattern/structure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   class Structure
     include Roles::ComparableMetadata
@@ -9,15 +11,15 @@ module GeoPattern
     def_delegators :@preset, :fill_color_dark, :fill_color_light, :stroke_color, :stroke_opacity, :opacity_min, :opacity_max
 
     def initialize(options)
-      @image     = options[:image]
-      @preset    = options[:preset]
-      @name      = options[:name]
+      @image = options[:image]
+      @preset = options[:preset]
+      @name = options[:name]
       @generator = options[:generator]
 
-      fail ArgumentError, 'Argument name is missing' if @name.nil?
-      fail ArgumentError, 'Argument image is missing' if @image.nil?
-      fail ArgumentError, 'Argument preset is missing' if @preset.nil?
-      fail ArgumentError, 'Argument generator is missing' if @generator.nil?
+      raise ArgumentError, "Argument name is missing" if @name.nil?
+      raise ArgumentError, "Argument image is missing" if @image.nil?
+      raise ArgumentError, "Argument preset is missing" if @preset.nil?
+      raise ArgumentError, "Argument generator is missing" if @generator.nil?
     end
 
     def_comparators :name, :fill_color_dark, :fill_color_light, :stroke_color, :stroke_opacity, :opacity_min, :opacity_max

data/lib/geo_pattern/structure_generators/base_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class BaseGenerator
@@ -11,19 +13,19 @@ module GeoPattern
       public
 
       def initialize(seed, preset, svg = SvgImage.new)
-        @svg    = svg
-        @seed   = seed
+        @svg = svg
+        @seed = seed
         @preset = preset
 
-        @fill_color_dark  = @preset.fill_color_dark
+        @fill_color_dark = @preset.fill_color_dark
         @fill_color_light = @preset.fill_color_light
-        @stroke_color     = @preset.stroke_color
-        @stroke_opacity   = @preset.stroke_opacity
-        @opacity_min      = @preset.opacity_min
-        @opacity_max      = @preset.opacity_max
+        @stroke_color = @preset.stroke_color
+        @stroke_opacity = @preset.stroke_opacity
+        @opacity_min = @preset.opacity_min
+        @opacity_max = @preset.opacity_max
 
         @height = 100
-        @width  = 100
+        @width = 100
 
         after_initialize
       end
@@ -31,8 +33,8 @@ module GeoPattern
       def generate(pattern)
         pattern.structure = Structure.new(image: svg_image, preset: preset, generator: self.class, name: name)
 
-        pattern.height    = height
-        pattern.width     = width
+        pattern.height = height
+        pattern.width = width
 
         self
       end
@@ -43,17 +45,18 @@ module GeoPattern
       def svg_image
         image = generate_structure
         image.height = height
-        image.width  = width
+        image.width = width
 
         image
       end
 
       # Hook for generators
-      def after_initialize; end
+      def after_initialize
+      end
 
       # Generate the structure
       def generate_structure
-        fail NotImplementedError
+        raise NotImplementedError
       end
 
       def hex_val(index, len)
@@ -61,7 +64,7 @@ module GeoPattern
       end
 
       def fill_color(val)
-        (val.even?) ? fill_color_light : fill_color_dark
+        val.even? ? fill_color_light : fill_color_dark
       end
 
       def opacity(val)

data/lib/geo_pattern/structure_generators/chevrons_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class ChevronsGenerator < BaseGenerator
@@ -6,35 +8,35 @@ module GeoPattern
       attr_reader :chevron_height, :chevron_width, :chevron
 
       def after_initialize
-        @chevron_width  = map(hex_val(0, 1), 0, 15, 30, 80)
+        @chevron_width = map(hex_val(0, 1), 0, 15, 30, 80)
         @chevron_height = map(hex_val(0, 1), 0, 15, 30, 80)
-        @chevron        = build_chevron_shape(chevron_width, chevron_height)
+        @chevron = build_chevron_shape(chevron_width, chevron_height)
 
         self.height = chevron_height * 6 * 0.66
-        self.width  = chevron_width * 6
+        self.width = chevron_width * 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)
-
-            styles  = {
-              'stroke'         => stroke_color,
-              'stroke-opacity' => stroke_opacity,
-              'fill'           => fill,
-              'fill-opacity'   => opacity,
-              'stroke-width'   => 1
+            fill = fill_color(val)
+
+            styles = {
+              "stroke" => stroke_color,
+              "stroke-opacity" => stroke_opacity,
+              "fill" => fill,
+              "fill-opacity" => opacity,
+              "stroke-width" => 1
             }
 
-            svg.group(chevron, styles.merge('transform' => "translate(#{x * chevron_width},#{y * chevron_height * 0.66 - chevron_height / 2})"))
+            svg.group(chevron, styles.merge("transform" => "translate(#{x * chevron_width},#{y * chevron_height * 0.66 - chevron_height / 2})"))
 
             # Add an extra row at the end that matches the first row, for tiling.
-            if (y == 0)
-              svg.group(chevron, styles.merge('transform' => "translate(#{x * chevron_width},#{6 * chevron_height * 0.66 - chevron_height / 2})"))
+            if y == 0
+              svg.group(chevron, styles.merge("transform" => "translate(#{x * chevron_width},#{6 * chevron_height * 0.66 - chevron_height / 2})"))
             end
             i += 1
           end

data/lib/geo_pattern/structure_generators/concentric_circles_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class ConcentricCirclesGenerator < BaseGenerator
@@ -6,8 +8,8 @@ module GeoPattern
       attr_reader :scale, :ring_size, :stroke_width
 
       def after_initialize
-        @scale        = hex_val(0, 1)
-        @ring_size    = map(scale, 0, 15, 10, 60)
+        @scale = hex_val(0, 1)
+        @ring_size = map(scale, 0, 15, 10, 60)
         @stroke_width = ring_size / 5
 
         self.width = self.height = (ring_size + stroke_width) * 6
@@ -15,35 +17,35 @@ module GeoPattern
 
       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)
 
             svg.circle(
               x * ring_size + x * stroke_width + (ring_size + stroke_width) / 2,
               y * ring_size + y * stroke_width + (ring_size + stroke_width) / 2,
               ring_size / 2,
-              'fill'   => 'none',
-              'stroke' => fill,
-              'style'  => {
-                'opacity' => opacity,
-                'stroke-width' => "#{stroke_width}px"
+              "fill" => "none",
+              "stroke" => fill,
+              "style" => {
+                "opacity" => opacity,
+                "stroke-width" => "#{stroke_width}px"
               }
-              )
+            )
 
-            val     = hex_val(39 - i, 1)
+            val = hex_val(39 - i, 1)
             opacity = opacity(val)
-            fill    = fill_color(val)
+            fill = fill_color(val)
 
             svg.circle(
               x * ring_size + x * stroke_width + (ring_size + stroke_width) / 2,
               y * ring_size + y * stroke_width + (ring_size + stroke_width) / 2,
               ring_size / 4,
-              'fill'         => fill,
-              'fill-opacity' => opacity
-              )
+              "fill" => fill,
+              "fill-opacity" => opacity
+            )
 
             i += 1
           end

data/lib/geo_pattern/structure_generators/diamonds_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class DiamondsGenerator < BaseGenerator
@@ -6,50 +8,54 @@ module GeoPattern
       attr_reader :diamond_height, :diamond_width, :diamond
 
       def after_initialize
-        @diamond_width  = map(hex_val(0, 1), 0, 15, 10, 50)
+        @diamond_width = map(hex_val(0, 1), 0, 15, 10, 50)
         @diamond_height = map(hex_val(1, 1), 0, 15, 10, 50)
-        @diamond        = build_diamond_shape(diamond_width, diamond_height)
+        @diamond = build_diamond_shape(diamond_width, diamond_height)
 
         self.height = diamond_height * 3
-        self.width  = diamond_width * 6
+        self.width = diamond_width * 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
             }
 
             dx = (y % 2 == 0) ? 0 : diamond_width / 2
 
             svg.polyline(diamond, styles.merge(
-                                    'transform' => "translate(#{x * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * y - diamond_height / 2})"))
+              "transform" => "translate(#{x * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * y - diamond_height / 2})"
+            ))
 
             # Add an extra one at top-right, for tiling.
-            if (x == 0)
+            if x == 0
               svg.polyline(diamond, styles.merge(
-                                      'transform' => "translate(#{6 * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * y - diamond_height / 2})"))
+                "transform" => "translate(#{6 * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * y - diamond_height / 2})"
+              ))
             end
 
             # Add an extra row at the end that matches the first row, for tiling.
-            if (y == 0)
+            if y == 0
               svg.polyline(diamond, styles.merge(
-                                      'transform' => "translate(#{x * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * 6 - diamond_height / 2})"))
+                "transform" => "translate(#{x * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * 6 - diamond_height / 2})"
+              ))
             end
 
             # Add an extra one at bottom-right, for tiling.
             if x == 0 && y == 0
               svg.polyline(diamond, styles.merge(
-                                      'transform' => "translate(#{6 * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * 6 - diamond_height / 2})"))
+                "transform" => "translate(#{6 * diamond_width - diamond_width / 2 + dx}, #{diamond_height / 2 * 6 - diamond_height / 2})"
+              ))
             end
             i += 1
           end

data/lib/geo_pattern/structure_generators/hexagons_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GeoPattern
   module StructureGenerators
     class HexagonsGenerator < BaseGenerator
@@ -6,48 +8,48 @@ module GeoPattern
       attr_reader :scale, :side_length, :hex_height, :hex_width, :hex
 
       def after_initialize
-        @scale       = hex_val(0, 1)
+        @scale = hex_val(0, 1)
         @side_length = map(scale, 0, 15, 8, 60)
-        @hex_height  = side_length * Math.sqrt(3)
-        @hex_width   = side_length * 2
-        @hex         = build_hexagon_shape(side_length)
+        @hex_height = side_length * Math.sqrt(3)
+        @hex_width = side_length * 2
+        @hex = build_hexagon_shape(side_length)
 
-        self.width  = hex_width * 3 + side_length * 3
+        self.width = hex_width * 3 + side_length * 3
         self.height = hex_height * 6
       end
 
       def generate_structure
         i = 0
-        for y in 0..5
-          for x in 0..5
-            val     = hex_val(i, 1)
-            dy      = x % 2 == 0 ? y * hex_height : y * hex_height + hex_height / 2
+        6.times do |y|
+          6.times do |x|
+            val = hex_val(i, 1)
+            dy = (x % 2 == 0) ? y * hex_height : y * hex_height + hex_height / 2
             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
             }
 
-            svg.polyline(hex, styles.merge('transform' => "translate(#{x * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
+            svg.polyline(hex, styles.merge("transform" => "translate(#{x * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
 
             # Add an extra one at top-right, for tiling.
-            if (x == 0)
-              svg.polyline(hex, styles.merge('transform' => "translate(#{6 * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
+            if x == 0
+              svg.polyline(hex, styles.merge("transform" => "translate(#{6 * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
             end
 
             # Add an extra row at the end that matches the first row, for tiling.
-            if (y == 0)
-              dy = x % 2 == 0 ? 6 * hex_height : 6 * hex_height + hex_height / 2
-              svg.polyline(hex, styles.merge('transform' => "translate(#{x * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
+            if y == 0
+              dy = (x % 2 == 0) ? 6 * hex_height : 6 * hex_height + hex_height / 2
+              svg.polyline(hex, styles.merge("transform" => "translate(#{x * side_length * 1.5 - hex_width / 2}, #{dy - hex_height / 2})"))
             end
 
             # Add an extra one at bottom-right, for tiling.
             if x == 0 && y == 0
-              svg.polyline(hex, styles.merge('transform' => "translate(#{6 * side_length * 1.5 - hex_width / 2}, #{5 * hex_height + hex_height / 2})"))
+              svg.polyline(hex, styles.merge("transform" => "translate(#{6 * side_length * 1.5 - hex_width / 2}, #{5 * hex_height + hex_height / 2})"))
             end
             i += 1
           end
@@ -56,8 +58,8 @@ module GeoPattern
         svg
       end
 
-      def build_hexagon_shape(sideLength)
-        c = sideLength
+      def build_hexagon_shape(side_length)
+        c = side_length
         a = c / 2
         b = Math.sin(60 * Math::PI / 180) * c
         "0,#{b},#{a},0,#{a + c},0,#{2 * c},#{b},#{a + c},#{2 * b},#{a},#{2 * b},0,#{b}"