geo_pattern 1.3.2 → 1.4.0

data/spec/svg_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-RSpec.describe SVG do
+RSpec.describe SvgImage do
   context '#<=>' do
     it 'is comparable' do
-      svg1 = SVG.new
-      svg2 = SVG.new
+      svg1 = SvgImage.new
+      svg2 = SvgImage.new
 
       expect(svg1).to eq svg2
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geo_pattern
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Jason Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color
@@ -48,54 +48,133 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- fixtures/generated_patterns/chevrons.svg
+- fixtures/generated_patterns/concentric_circles.svg
+- fixtures/generated_patterns/diamonds.svg
+- fixtures/generated_patterns/diamonds_with_base_color.svg
+- fixtures/generated_patterns/diamonds_with_color.svg
+- fixtures/generated_patterns/hexagons.svg
+- fixtures/generated_patterns/mosaic_squares.svg
+- fixtures/generated_patterns/nested_squares.svg
+- fixtures/generated_patterns/octagons.svg
+- fixtures/generated_patterns/overlapping_circles.svg
+- fixtures/generated_patterns/overlapping_rings.svg
+- fixtures/generated_patterns/plaid.svg
+- fixtures/generated_patterns/plus_signs.svg
+- fixtures/generated_patterns/sine_waves.svg
+- fixtures/generated_patterns/squares.svg
+- fixtures/generated_patterns/tessellation.svg
+- fixtures/generated_patterns/triangles.svg
+- fixtures/generated_patterns/xes.svg
 - geo_pattern.gemspec
 - lib/geo_pattern.rb
+- lib/geo_pattern/background.rb
+- lib/geo_pattern/background_generators/solid_generator.rb
+- lib/geo_pattern/color.rb
+- lib/geo_pattern/color_generators/base_color_generator.rb
+- lib/geo_pattern/color_generators/simple_generator.rb
+- lib/geo_pattern/color_preset.rb
+- lib/geo_pattern/errors.rb
+- lib/geo_pattern/geo_pattern_task.rb
 - lib/geo_pattern/helpers.rb
-- lib/geo_pattern/pattern/base_pattern.rb
-- lib/geo_pattern/pattern/chevron_pattern.rb
-- lib/geo_pattern/pattern/concentric_circles_pattern.rb
-- lib/geo_pattern/pattern/diamond_pattern.rb
-- lib/geo_pattern/pattern/hexagon_pattern.rb
-- lib/geo_pattern/pattern/mosaic_squares_pattern.rb
-- lib/geo_pattern/pattern/nested_squares_pattern.rb
-- lib/geo_pattern/pattern/octagon_pattern.rb
-- lib/geo_pattern/pattern/overlapping_circles_pattern.rb
-- lib/geo_pattern/pattern/overlapping_rings_pattern.rb
-- lib/geo_pattern/pattern/plaid_pattern.rb
-- lib/geo_pattern/pattern/plus_sign_pattern.rb
-- lib/geo_pattern/pattern/sine_wave_pattern.rb
-- lib/geo_pattern/pattern/square_pattern.rb
-- lib/geo_pattern/pattern/tessellation_pattern.rb
-- lib/geo_pattern/pattern/triangle_pattern.rb
-- lib/geo_pattern/pattern/xes_pattern.rb
+- lib/geo_pattern/pattern.rb
 - lib/geo_pattern/pattern_generator.rb
 - lib/geo_pattern/pattern_helpers.rb
-- lib/geo_pattern/svg.rb
+- lib/geo_pattern/pattern_preset.rb
+- lib/geo_pattern/pattern_sieve.rb
+- lib/geo_pattern/pattern_store.rb
+- lib/geo_pattern/pattern_validator.rb
+- lib/geo_pattern/rake_task.rb
+- lib/geo_pattern/roles/comparable_metadata.rb
+- lib/geo_pattern/roles/named_generator.rb
+- lib/geo_pattern/seed.rb
+- lib/geo_pattern/structure.rb
+- lib/geo_pattern/structure_generators/base_generator.rb
+- lib/geo_pattern/structure_generators/chevrons_generator.rb
+- lib/geo_pattern/structure_generators/concentric_circles_generator.rb
+- lib/geo_pattern/structure_generators/diamonds_generator.rb
+- lib/geo_pattern/structure_generators/hexagons_generator.rb
+- lib/geo_pattern/structure_generators/mosaic_squares_generator.rb
+- lib/geo_pattern/structure_generators/nested_squares_generator.rb
+- lib/geo_pattern/structure_generators/octagons_generator.rb
+- lib/geo_pattern/structure_generators/overlapping_circles_generator.rb
+- lib/geo_pattern/structure_generators/overlapping_rings_generator.rb
+- lib/geo_pattern/structure_generators/plaid_generator.rb
+- lib/geo_pattern/structure_generators/plus_signs_generator.rb
+- lib/geo_pattern/structure_generators/sine_waves_generator.rb
+- lib/geo_pattern/structure_generators/squares_generator.rb
+- lib/geo_pattern/structure_generators/tessellation_generator.rb
+- lib/geo_pattern/structure_generators/triangles_generator.rb
+- lib/geo_pattern/structure_generators/xes_generator.rb
+- lib/geo_pattern/svg_image.rb
 - lib/geo_pattern/version.rb
+- script/bootstrap
+- script/console
+- script/test
+- spec/background_generators/solid_generator_spec.rb
+- spec/background_spec.rb
+- spec/color_generators/base_color_generator_spec.rb
+- spec/color_generators/simple_generator_spec.rb
+- spec/color_preset_spec.rb
+- spec/color_spec.rb
 - spec/geo_pattern_spec.rb
+- spec/helpers_spec.rb
+- spec/pattern_preset_spec.rb
+- spec/pattern_sieve_spec.rb
+- spec/pattern_spec.rb
+- spec/pattern_store_spec.rb
+- spec/pattern_validator_spec.rb
+- spec/seed_spec.rb
 - spec/spec_helper.rb
+- spec/structure_generators/chevrons_generator_spec.rb
+- spec/structure_generators/concentric_circles_generator_spec.rb
+- spec/structure_generators/diamonds_generator_spec.rb
+- spec/structure_generators/hexagons_generator_spec.rb
+- spec/structure_generators/mosaic_squares_generator_spec.rb
+- spec/structure_generators/nested_squares_generator_spec.rb
+- spec/structure_generators/octagons_generator_spec.rb
+- spec/structure_generators/overlapping_circles_generator_spec.rb
+- spec/structure_generators/overlapping_rings_generator_spec.rb
+- spec/structure_generators/plaid_generator_spec.rb
+- spec/structure_generators/plus_signs_generator_spec.rb
+- spec/structure_generators/sine_waves_generator_spec.rb
+- spec/structure_generators/squares_generator_spec.rb
+- spec/structure_generators/tessellation_generator_spec.rb
+- spec/structure_generators/triangles_generator_spec.rb
+- spec/structure_generators/xes_generator_spec.rb
+- spec/structure_spec.rb
 - spec/support/aruba.rb
-- spec/support/helpers.rb
+- spec/support/helpers/fixtures.rb
+- spec/support/kernel.rb
+- spec/support/matchers/image.rb
+- spec/support/matchers/name.rb
 - spec/support/rspec.rb
+- spec/support/shared_examples/generator.rb
+- spec/support/shared_examples/pattern.rb
+- spec/support/shared_examples/pattern_name.rb
+- spec/support/shared_examples/structure.rb
 - spec/support/string.rb
 - spec/svg_spec.rb
 homepage: https://github.com/jasonlong/geo_pattern
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  Class style pattern names are deprecated as of 1.3.1
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -108,11 +187,48 @@ signing_key:
 specification_version: 4
 summary: Generate SVG beautiful patterns
 test_files:
+- spec/background_generators/solid_generator_spec.rb
+- spec/background_spec.rb
+- spec/color_generators/base_color_generator_spec.rb
+- spec/color_generators/simple_generator_spec.rb
+- spec/color_preset_spec.rb
+- spec/color_spec.rb
 - spec/geo_pattern_spec.rb
+- spec/helpers_spec.rb
+- spec/pattern_preset_spec.rb
+- spec/pattern_sieve_spec.rb
+- spec/pattern_spec.rb
+- spec/pattern_store_spec.rb
+- spec/pattern_validator_spec.rb
+- spec/seed_spec.rb
 - spec/spec_helper.rb
+- spec/structure_generators/chevrons_generator_spec.rb
+- spec/structure_generators/concentric_circles_generator_spec.rb
+- spec/structure_generators/diamonds_generator_spec.rb
+- spec/structure_generators/hexagons_generator_spec.rb
+- spec/structure_generators/mosaic_squares_generator_spec.rb
+- spec/structure_generators/nested_squares_generator_spec.rb
+- spec/structure_generators/octagons_generator_spec.rb
+- spec/structure_generators/overlapping_circles_generator_spec.rb
+- spec/structure_generators/overlapping_rings_generator_spec.rb
+- spec/structure_generators/plaid_generator_spec.rb
+- spec/structure_generators/plus_signs_generator_spec.rb
+- spec/structure_generators/sine_waves_generator_spec.rb
+- spec/structure_generators/squares_generator_spec.rb
+- spec/structure_generators/tessellation_generator_spec.rb
+- spec/structure_generators/triangles_generator_spec.rb
+- spec/structure_generators/xes_generator_spec.rb
+- spec/structure_spec.rb
 - spec/support/aruba.rb
-- spec/support/helpers.rb
+- spec/support/helpers/fixtures.rb
+- spec/support/kernel.rb
+- spec/support/matchers/image.rb
+- spec/support/matchers/name.rb
 - spec/support/rspec.rb
+- spec/support/shared_examples/generator.rb
+- spec/support/shared_examples/pattern.rb
+- spec/support/shared_examples/pattern_name.rb
+- spec/support/shared_examples/structure.rb
 - spec/support/string.rb
 - spec/svg_spec.rb
 has_rdoc: 

data/lib/geo_pattern/pattern/base_pattern.rb

@@ -1,47 +0,0 @@
-module GeoPattern
-  class BasePattern < Struct.new(:svg, :hash)
-    FILL_COLOR_DARK  = "#222"
-    FILL_COLOR_LIGHT = "#ddd"
-    STROKE_COLOR     = "#000"
-    STROKE_OPACITY   = 0.02
-    OPACITY_MIN      = 0.02
-    OPACITY_MAX      = 0.15
-
-    # Public: mutate the given `svg` object with a rendered pattern
-    #
-    # Note: this method _must_ be implemented by sub-
-    # classes.
-    #
-    # svg - the SVG container
-    #
-    # Returns a reference to the same `svg` object
-    # only this time with more patterns.
-    def render_to_svg
-      raise NotImplementedError
-    end
-
-    def hex_val(index, len)
-      PatternHelpers.hex_val(hash, index, len)
-    end
-
-    def fill_color(val)
-      (val.even?) ? FILL_COLOR_LIGHT : FILL_COLOR_DARK
-    end
-
-    def opacity(val)
-      map(val, 0, 15, OPACITY_MIN, OPACITY_MAX)
-    end
-
-    def map(value, v_min, v_max, d_min, d_max)
-      PatternHelpers.map(value, v_min, v_max, d_min, d_max)
-    end
-
-    protected
-    def build_plus_shape(square_size)
-      [
-        "rect(#{square_size},0,#{square_size},#{square_size * 3})",
-        "rect(0, #{square_size},#{square_size * 3},#{square_size})"
-      ]
-    end
-  end
-end

data/lib/geo_pattern/pattern/chevron_pattern.rb

@@ -1,45 +0,0 @@
-module GeoPattern
-  class ChevronPattern < BasePattern
-    def render_to_svg
-      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)
-
-      svg.set_width(chevron_width * 6)
-      svg.set_height(chevron_height * 6 * 0.66)
-
-      i = 0
-      for y in 0..5
-        for x in 0..5
-          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
-          }
-
-          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})"}))
-          end
-          i += 1
-        end
-      end
-    end
-
-    def build_chevron_shape(width, height)
-      e = height * 0.66
-      [
-        %Q{polyline("0,0,#{width/2},#{height-e},#{width/2},#{height},0,#{e},0,0")},
-        %Q{polyline("#{width/2},#{height-e},#{width},0,#{width},#{e},#{width/2},#{height},#{width/2},#{height-e}")}
-      ]
-    end
-  end
-end

data/lib/geo_pattern/pattern/concentric_circles_pattern.rb

@@ -1,47 +0,0 @@
-module GeoPattern
-  class ConcentricCirclesPattern < BasePattern
-    def render_to_svg
-      scale        = hex_val(0, 1)
-      ring_size    = map(scale, 0, 15, 10, 60)
-      stroke_width = ring_size / 5
-
-      svg.set_width((ring_size + stroke_width) * 6)
-      svg.set_height((ring_size + stroke_width) * 6)
-
-      i = 0
-      for y in 0..5
-        for x in 0..5
-          val     = hex_val(i, 1)
-          opacity = opacity(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"
-                    }
-                  })
-
-          val     = hex_val(39-i, 1)
-          opacity = opacity(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
-                  })
-
-          i += 1
-        end
-      end
-    end
-  end
-end

data/lib/geo_pattern/pattern/diamond_pattern.rb

@@ -1,56 +0,0 @@
-module GeoPattern
-  class DiamondPattern < BasePattern
-    def render_to_svg
-      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)
-
-      svg.set_width(diamond_width * 6)
-      svg.set_height(diamond_height * 3)
-
-      i = 0
-      for y in 0..5
-        for x in 0..5
-          val     = hex_val(i, 1)
-          opacity = opacity(val)
-          fill    = fill_color(val)
-
-          styles = {
-            "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})"}))
-
-          # Add an extra one at top-right, for tiling.
-          if (x == 0)
-            svg.polyline(diamond, styles.merge({
-              "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)
-            svg.polyline(diamond, styles.merge({
-              "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 and y == 0)
-            svg.polyline(diamond, styles.merge({
-              "transform" => "translate(#{6*diamond_width - diamond_width/2 + dx}, #{diamond_height/2*6 - diamond_height/2})"}))
-          end
-          i += 1
-        end
-      end
-    end
-
-    def build_diamond_shape(width, height)
-      "#{width/2}, 0, #{width}, #{height/2}, #{width/2}, #{height}, 0, #{height/2}"
-    end
-  end
-end

data/lib/geo_pattern/pattern/hexagon_pattern.rb

@@ -1,57 +0,0 @@
-module GeoPattern
-  class HexagonPattern < BasePattern
-    def render_to_svg
-      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)
-
-      svg.set_width((hex_width * 3) + (side_length * 3))
-      svg.set_height(hex_height * 6)
-
-      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
-          opacity = opacity(val)
-          fill    = fill_color(val)
-
-          styles = {
-            "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})"}))
-
-          # 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})"}))
-          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})"}))
-          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})"}))
-          end
-          i += 1
-        end
-      end
-    end
-
-    def build_hexagon_shape(sideLength)
-      c = sideLength
-      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}"
-    end
-  end
-end