ruby-geometry 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceb19ba1fb790c21207f0d8b7543b64676e8c4d0
-  data.tar.gz: c69308a99ef8aee203bdad69478e0b2108f7fea1
+  metadata.gz: f47c93644dd21704742df40e87355eb35ebb61a9
+  data.tar.gz: 6d9b2f81291fd61de1d3d5cdc110fde153681065
 SHA512:
-  metadata.gz: e4c5e0981ef218e99c704aefbf9410e2fe2c62dd1a650a790fd2fd6b4194869c46f77154242a444ff335960853cbc1a86f0225964bdaf884a23922f87966a9e7
-  data.tar.gz: 326038ae5819fa77e6986a78eb5b04b6eee0a4ff66e89d0b483fd426bb42965a5d700f201552299bcb6a0b96677168f06a0cac36487bcfb11d3ca31aca2c9a8e
+  metadata.gz: a9eebbfbd51ceb989571d5506f43e0f50bc37a2fe1788e4d8af093eca4603cf40f255a86677b4b76c20a5949fda8aa958111b9b9a40c9d2ad5548e2362db0d6d
+  data.tar.gz: 1bb0cea637ba52b1dd40dbaea8484af7050684bc979d04c49285d5e5004cd341dc23d6613bfed00c88eb2b4c56cbe5c755fe8e174893d7a15efc95b002541cfc

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+Changelog
+=========
+
+### 0.5.0
+
+* Added `Line#distance_to(point)`, `Segment#distance_to(point)`
+* Added `Polygon#area`
+* Added `Point.advance_by(vector)`
+* Switched to Ruby 2.0 as a default Ruby version to support
+* Switched from obsolete Test::Unit to Minitest

data/README.md

@@ -28,47 +28,51 @@ Defined geometry objects
 Already implemented algorithms
 ==============================
 
-  * Do segments overlap? { Segments#overlaps? }
+  * Area of convex polygon `Polygon#area`
 
-  * Do segments lie on one line? { Segment#lies_on_one_line_with? }
+  * Distance from point to a line or segment `Line#distance_to(point)`, `Segment#distance_to(point)`
 
-  * Do segments intersect? { Segment#intersects_with? }
+  * Do segments overlap? `Segments#overlaps?`
 
-  * Segments intersection point { Segment#intersection_point_with }
+  * Do segments lie on one line? `Segment#lies_on_one_line_with?`
 
-  * Does segment contain given point?  { Segment#contains_point? }
+  * Do segments intersect? `Segment#intersects_with?`
 
-  * Are segments parallel? { Segment#parallel_to? }
+  * Segments intersection point `Segment#intersection_point_with`
 
-  * Are vectors collinear? { Vector#collinear_with? }
+  * Does segment contain given point?  `Segment#contains_point?`
 
-  * Vectors cross product (outer product, vector product) { Vector#cross_product }
+  * Are segments parallel? `Segment#parallel_to?`
 
-  * Vectors scalar product (inner product, dot product) { Vector#scalar_product }
+  * Are vectors collinear? `Vector#collinear_with?`
 
-  * Segment length { Segment#length }
+  * Vectors cross product (outer product, vector product) `Vector#cross_product`
 
-  * Vector modulus { Vector#modulus }
+  * Vectors scalar product (inner product, dot product) `Vector#scalar_product`
 
-  * Trivial vector arithmetics: summation, subtraction, vector-number multiplication { Vector#+(vector); Vector#-(vector); Vector#*(numeric) }
+  * Segment length `Segment#length`
 
-  * Euclid distance { Geometry#distance }
+  * Vector modulus `Vector#modulus`
 
-  * Line slope { Line#slope }
+  * Trivial vector arithmetics: summation, subtraction, vector-number multiplication `Vector#+(vector); Vector#-(vector); Vector#*(numeric)`
 
-  * Y-intercept of a line { Line#y_intercept }
+  * Euclid distance `Geometry#distance`
 
-  * X-intercept of a line { Line#x_intercept }
+  * Line slope `Line#slope`
 
-  * Are lines parallel? { Line#parallel_to? }
+  * Y-intercept of a line `Line#y_intercept`
 
-  * What x-value do lines intersect at? { Line#intersect_x }
+  * X-intercept of a line `Line#x_intercept`
 
-  * What is the angle between two lines? { Line#angle_to }
+  * Are lines parallel? `Line#parallel_to?`
 
-  * Rectangular bounds of polygon { Polygon#bounding_box }   
-  
-  * Does polygon contain a given point? { Polygon#contains? }
+  * What x-value do lines intersect at? `Line#intersect_x`
+
+  * What is the angle between two lines? `Line#angle_to`
+
+  * Rectangular bounds of polygon `Polygon#bounding_box`
+
+  * Does polygon contain a given point? `Polygon#contains?`
 
 
 Coming up
@@ -76,9 +80,7 @@ Coming up
 
   * Is polygon self-intersecting?
 
-  * Area of polygon
-
-  * Is polygon convex?  
+  * Is polygon convex?
 
   * Do polygons intersect?
 
@@ -86,7 +88,5 @@ Coming up
 
   * Do circles intersect?
 
-  * Area of circle
-  
 
 Copyright (c) 2008 Daniel Vartanov, released under the MIT license

data/lib/geometry.rb

@@ -1,18 +1,18 @@
 require "active_support/core_ext/module/delegation"
 require "memoist"
 
-require 'point'
-require 'segment'
-require 'vector'
-require 'polygon'
-require 'line'
-require 'bounding_box'
-require 'algorithms/point_in_polygon'
+require 'geometry/point'
+require 'geometry/segment'
+require 'geometry/vector'
+require 'geometry/polygon'
+require 'geometry/line'
+require 'geometry/bounding_box'
+require 'geometry/algorithms/point_in_polygon'
 
 module Geometry
   include Math
   extend Math
-  
+
   def distance(point1, point2)
     hypot point1.x - point2.x, point1.y - point2.y
   end

data/lib/{algorithms → geometry/algorithms}/point_in_polygon.rb

@@ -43,7 +43,7 @@ module Geometry
     end
 
     def good_ray?(ray)
-      edges.none? { |edge| edge.parallel_to?(ray) } && vertices.none? { |vertex| ray.contains_point?(vertex) }
+      edges.none? { |edge| !edge.length.zero? && edge.parallel_to?(ray) } && vertices.none? { |vertex| ray.contains_point?(vertex) }
     end
     
     def intersection_count(ray)

data/lib/{line.rb → geometry/line.rb}

@@ -89,5 +89,9 @@ module Geometry
 
       (((x2-x1)*(y1-y0))-((x1-x0)*(y2-y1))).abs/Math.sqrt((x2-x1)**2+(y2-y1)**2)
     end
+
+    def length
+      point1.distance_to(point2)
+    end
   end
 end

data/lib/{point.rb → geometry/point.rb}

@@ -15,6 +15,10 @@ module Geometry
     def advance_by(vector)
       Point x + vector.x, y + vector.y
     end
+
+    def distance_to(point)
+      Geometry.distance(self, point)
+    end
   end
 end
 

data/lib/{segment.rb → geometry/segment.rb}

@@ -71,6 +71,8 @@ module Geometry
       p1 = point1.to_vector
       p2 = point2.to_vector
 
+      return Geometry.distance(q, p1) if p1 == p2
+
       u = p2 - p1
       v = q - p1
 

data/ruby-geometry.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ruby-geometry"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.author = ["Daniel Vartanov"]
   s.email = ["dan@vartanov.net"]
   s.homepage = "http://github.com/DanielVartanov/ruby-geometry"

data/test/line/length_test.rb

@@ -0,0 +1,16 @@
+require 'minitest/autorun'
+require 'geometry'
+
+class SlopeTest < MiniTest::Unit::TestCase
+  include Geometry
+
+  def test_length
+    point1 = Point.new(0, 0)
+    point2 = Point.new(3, 4)
+    line = Line.new(point1, point2)
+    assert_equal 5, point1.distance_to(point2)
+    assert_equal 5, line.length
+  end
+
+end
+

data/test/point/distance_to_test.rb

@@ -0,0 +1,43 @@
+require 'minitest/autorun'
+require 'geometry'
+
+class DistanceToTest < MiniTest::Unit::TestCase
+  include Geometry
+
+  # Distance in whole number
+  def test_distance_to_point2
+    point1 = Point.new(0, 0)
+    point2 = Point.new(3, 4)
+    assert_equal 5, point1.distance_to(point2)
+  end
+
+  # Distance in decimal
+  # point 2 is right up
+  def test_distance_to_point_right_up
+    point1 = Point.new(0, 0)
+    point2 = Point.new(1, 1)
+    assert_equal Math.sqrt(2), point1.distance_to(point2)
+  end
+
+  # Point 2 is left up
+  def test_distance_to_point_left_up
+    point1 = Point.new(3, 0)
+    point2 = Point.new(0, 4)
+    assert_equal 5, point1.distance_to(point2)
+  end
+
+  # Point 2 is right below
+  def test_distance_to_point_right_below
+    point1 = Point.new(0, 4)
+    point2 = Point.new(3, 0)
+    assert_equal 5, point1.distance_to(point2)
+  end
+
+  # Point 2 is left below
+  def test_distance_to_point_left_below
+    point1 = Point.new(3, 4)
+    point2 = Point.new(0, 0)
+    assert_equal 5, point1.distance_to(point2)
+  end
+
+end

data/test/segment/distance_to_test.rb

@@ -28,4 +28,10 @@ class DistanceToTest < MiniTest::Unit::TestCase
     assert_equal 1, segment.distance_to(point)
   end
 
-end
+  def test_distance_to_point_segment
+    segment = Segment.new_by_arrays([0, 1], [0, 1])
+    point = Point.new(1, 1)
+    assert_equal 1, segment.distance_to(point)
+  end
+
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ruby-geometry
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniel Vartanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: 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: minitest
   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: 
@@ -87,22 +87,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - TODO
-- lib/algorithms/point_in_polygon.rb
-- lib/bounding_box.rb
-- lib/comparison_with_precision.rb
 - lib/geometry.rb
-- lib/line.rb
-- lib/point.rb
-- lib/polygon.rb
-- lib/segment.rb
-- lib/vector.rb
+- lib/geometry/algorithms/point_in_polygon.rb
+- lib/geometry/bounding_box.rb
+- lib/geometry/comparison_with_precision.rb
+- lib/geometry/line.rb
+- lib/geometry/point.rb
+- lib/geometry/polygon.rb
+- lib/geometry/segment.rb
+- lib/geometry/vector.rb
 - ruby-geometry.gemspec
 - test/bounding_box/contains_test.rb
 - test/geometry/distance_test.rb
@@ -111,12 +112,14 @@ files:
 - test/line/horizontal_test.rb
 - test/line/initialize_test.rb
 - test/line/intersect_x_test.rb
+- test/line/length_test.rb
 - test/line/parallel_to_test.rb
 - test/line/slope_test.rb
 - test/line/vertical_test.rb
 - test/line/x_intercept_test.rb
 - test/line/y_intercept_test.rb
 - test/point/advance_by_test.rb
+- test/point/distance_to_test.rb
 - test/point/equals_test.rb
 - test/point/initialize_test.rb
 - test/polygon/bounding_box_test.rb
@@ -150,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Implementation of basic 2D geometry algorithms in Ruby
@@ -172,12 +175,14 @@ test_files:
 - test/line/horizontal_test.rb
 - test/line/initialize_test.rb
 - test/line/intersect_x_test.rb
+- test/line/length_test.rb
 - test/line/parallel_to_test.rb
 - test/line/slope_test.rb
 - test/line/vertical_test.rb
 - test/line/x_intercept_test.rb
 - test/line/y_intercept_test.rb
 - test/point/advance_by_test.rb
+- test/point/distance_to_test.rb
 - test/point/equals_test.rb
 - test/point/initialize_test.rb
 - test/polygon/bounding_box_test.rb