perfect-shape 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd9bf6e78e556604f5a9ff5b26e7b952ca8c61424aac789238c2d5d8961b1c8
-  data.tar.gz: a76a11a91632b22a3b3b136d55ded17ba17b10b940de7186c912bf5cb0642cc7
+  metadata.gz: c42cbc601c834a3f5f5b22a270885329c3bfbac8379f4e978d0a8499a7b5b958
+  data.tar.gz: 7aa4083ba8bbededcd7a50058b82482d605cf772f92065a5aa7a435173e2b997
 SHA512:
-  metadata.gz: 54ca03287c4efe1f2a88ab8ad9a3372c29313460f433be17e7300428ea34264d6fcfbd3bc54dedb3953959295a97669e89553fa450f04ab62e99779638501826
-  data.tar.gz: 4c254bfaa37c9d4254ec2df488a0989a580c5907594b992be1d024d3ddda1f790b5340e3f9205214454f167400b9af182d4ad71cf913336203af411a13d220e6
+  metadata.gz: 29684cca244b520035eccc0539da8d8747794c746ea6995f984c745175b4cb8cfbb116ff7a678b6841a81022b8391d0a88d0546334725eab21620c659650fc87
+  data.tar.gz: 4803503efdee68e4f97b16f36277f13e266a6bdc4f48dde4b3bc41568f48a7e764ccb5af24ec7fde4a358cdd5fc4e35ecb5a45a4a473042e6b647f7a9d5a5064

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 1.0.8
+
+- Fix issue with a closed path crashing in `Path#contain?` if the first basic shape is a point array instead of a `PerfectShape::Point` object
+
+## 1.0.7
+
+- Support constructing `PerfectShape::Path` without a point at the beginning
+- Support `first_point` method on all shapes to return first point in a shape
+- Fix issue in using `Path#contain?` with `outline: true` when `line_to_complex_shapes: true` and path starts with a `Line` instead of a point.
+
 ## 1.0.6
 
 - Fix issue with `Path#contain?` algorithm not working correclty when `Path` contains non-basic shapes because `shapes.count` is checked instead of `basic_shapes.count`

data/README.md

@@ -1,8 +1,10 @@
-# Perfect Shape 1.0.6
+# Perfect Shape 1.0.8
 ## Geometric Algorithms
 [![Gem Version](https://badge.fury.io/rb/perfect-shape.svg)](http://badge.fury.io/rb/perfect-shape)
 [![Test](https://github.com/AndyObtiva/perfect-shape/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/perfect-shape/actions/workflows/ruby.yml)
 
+([Used by Fukuoka 2022 Special Award Winning Glimmer DSL for LibUI Ruby Desktop Development GUI Library](https://github.com/AndyObtiva/glimmer-dsl-libui))
+
 [`PerfectShape`](https://rubygems.org/gems/perfect-shape) is a collection of pure Ruby geometric algorithms that are mostly useful for GUI (Graphical User Interface) manipulation like checking viewport rectangle intersection or containment of a mouse click [point](#perfectshapepoint) in popular geometry shapes such as [rectangle](#perfectshaperectangle), [square](#perfectshapesquare), [arc](#perfectshapearc) (open, chord, and pie), [ellipse](#perfectshapeellipse), [circle](#perfectshapecircle), [polygon](#perfectshapepolygon), and [paths](#perfectshapepath) containing [lines](#perfectshapeline), [quadratic bézier curves](#perfectshapequadraticbeziercurve), and [cubic bezier curves](#perfectshapecubicbeziercurve), potentially with [affine transforms](#perfectshapeaffinetransform) applied like translation, scale, rotation, shear/skew, and inversion (including both the [Ray Casting Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Ray_casting_algorithm), aka [Even-odd Rule](https://en.wikipedia.org/wiki/Even%E2%80%93odd_rule), and the [Winding Number Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Winding_number_algorithm), aka [Nonzero Rule](https://en.wikipedia.org/wiki/Nonzero-rule)).
 
 Additionally, [`PerfectShape::Math`](#perfectshapemath) contains some purely mathematical algorithms, like [IEEE 754-1985 Remainder](https://en.wikipedia.org/wiki/IEEE_754-1985).
@@ -14,13 +16,13 @@ To ensure accuracy and precision, this library does all its mathematical operati
 Run:
 
 ```
-gem install perfect-shape -v 1.0.6
+gem install perfect-shape -v 1.0.8
 ```
 
 Or include in Bundler `Gemfile`:
 
 ```ruby
-gem 'perfect-shape', '~> 1.0.6'
+gem 'perfect-shape', '~> 1.0.8'
 ```
 
 And, run:
@@ -68,6 +70,7 @@ Module
 - `#y`: top-left y
 - `#min_x`: min x (x by default)
 - `#min_y`: min y (y by default)
+- `#first_point`: first point for shape including this module (always assumes top-left corner)
 
 ### `PerfectShape::RectangularShape`
 
@@ -96,6 +99,7 @@ Module
 - `#min_y`: min y of all points
 - `#max_x`: max x of all points
 - `#max_y`: max y of all points
+- `#first_point`: first point for shape including this module
 
 ### `PerfectShape::AffineTransform`
 

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.8

data/lib/perfect_shape/multi_point.rb

@@ -55,6 +55,10 @@ module PerfectShape
       @points
     end
     
+    def first_point
+      points.first.to_a
+    end
+    
     def min_x
       points.map(&:first).min
     end

data/lib/perfect_shape/path.rb

@@ -64,14 +64,20 @@ module PerfectShape
     
     def points
       the_points = []
-      basic_shapes.each do |shape|
+      basic_shapes.each_with_index do |shape, i|
         case shape
         when Point
           the_points << shape.to_a
         when Array
           the_points << shape.map {|n| BigDecimal(n.to_s)}
         when Line
-          the_points << shape.points.last.to_a
+          if i == 0
+            shape.points.each do |point|
+              the_points << point.to_a
+            end
+          else
+            the_points << shape.points.last.to_a
+          end
         when QuadraticBezierCurve
           shape.points.each do |point|
             the_points << point.to_a
@@ -82,7 +88,11 @@ module PerfectShape
           end
         end
       end
-      the_points << basic_shapes.first.to_a if closed?
+      if closed?
+        first_basic_shape = basic_shapes.first
+        closing_point = first_basic_shape.is_a?(Array) ? first_basic_shape : first_basic_shape.first_point
+        the_points << closing_point
+      end
       the_points
     end
     
@@ -91,14 +101,14 @@ module PerfectShape
     end
     
     def drawing_types
-      the_drawing_shapes = basic_shapes.map do |shape|
+      the_drawing_shapes = basic_shapes.each_with_index.flat_map do |shape, i|
         case shape
         when Point
           :move_to
         when Array
           :move_to
         when Line
-          :line_to
+          (i == 0) ? [:move_to, :line_to] : :line_to
         when QuadraticBezierCurve
           :quad_to
         when CubicBezierCurve
@@ -245,7 +255,8 @@ module PerfectShape
     # added to represent the line connecting the last point to the first
     def disconnected_shapes
       # TODO it seems basic_shapes.first should always return a point, but there is a case with CompositeShape that results in a line (shape) not point returned
-      initial_point = start_point = basic_shapes.first.to_a.map {|n| BigDecimal(n.to_s)}
+      first_point = basic_shapes.first.is_a?(Array) ? basic_shapes.first : basic_shapes.first.first_point
+      initial_point = start_point = first_point.map {|n| BigDecimal(n.to_s)}
       final_point = nil
       the_disconnected_shapes = basic_shapes.drop(1).map do |shape|
         case shape
@@ -389,9 +400,10 @@ module PerfectShape
     # decomposed from complex shapes like Arc, Ellipse, and Circle by calling their `#to_path_shapes` method
     def basic_shapes
       the_shapes = []
-      @shapes.each do |shape|
+      @shapes.each_with_index do |shape, i|
         if shape.respond_to?(:to_path_shapes)
           shape_basic_shapes = shape.to_path_shapes
+          the_shapes << shape.first_point if i == 0
           if @line_to_complex_shapes
             first_basic_shape = shape_basic_shapes.shift
             new_first_basic_shape = PerfectShape::Line.new(points: [first_basic_shape.to_a])

data/lib/perfect_shape/point_location.rb

@@ -31,6 +31,10 @@ module PerfectShape
       self.y = y
     end
     
+    def first_point
+      [x, y]
+    end
+    
     # Sets x, normalizing to BigDecimal
     def x=(value)
       @x = BigDecimal(value.to_s)

data/perfect-shape.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: perfect-shape 1.0.6 ruby lib
+# stub: perfect-shape 1.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "perfect-shape".freeze
-  s.version = "1.0.6"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2022-11-05"
+  s.date = "2023-05-27"
   s.description = "Perfect Shape is a collection of pure Ruby geometric algorithms that are mostly useful for GUI manipulation like checking viewport rectangle intersection or containment of a mouse click point in popular geometry shapes such as rectangle, square, arc (open, chord, and pie), ellipse, circle, polygon, and paths containing lines, quadratic b\u00E9zier curves, and cubic bezier curves, potentially with affine transforms applied like translation, scale, rotation, shear/skew, and inversion (including both the Ray Casting Algorithm, aka Even-odd Rule, and the Winding Number Algorithm, aka Nonzero Rule). Additionally, it contains some purely mathematical algorithms like IEEEremainder (also known as IEEE-754 remainder).".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/AndyObtiva/perfect-shape".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.16".freeze
+  s.rubygems_version = "3.3.1".freeze
   s.summary = "Perfect Shape - Geometric Algorithms".freeze
 
   if s.respond_to? :specification_version then
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_development_dependency(%q<minitest>.freeze, ["~> 5.14.4"])
+    s.add_development_dependency(%q<minitest-focus>.freeze, ["~> 1.3.1"])
     s.add_development_dependency(%q<puts_debuggerer>.freeze, ["~> 0.13.1"])
     s.add_development_dependency(%q<rake-tui>.freeze, ["> 0"])
   else
@@ -68,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_dependency(%q<minitest>.freeze, ["~> 5.14.4"])
+    s.add_dependency(%q<minitest-focus>.freeze, ["~> 1.3.1"])
     s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.13.1"])
     s.add_dependency(%q<rake-tui>.freeze, ["> 0"])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfect-shape
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-05 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.14.4
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: puts_debuggerer
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.3.1
 signing_key:
 specification_version: 4
 summary: Perfect Shape - Geometric Algorithms