Merge branch 'release/v1.0.5'

Author: janlindblom

Rakefile

@@ -1,10 +1,49 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "rake/version_task"
 require "bundler/gem_tasks"
+#require "rubygems"
+#require "rubygems/package_task"
 require "rspec/core/rake_task"
 require "yard"
 require "yard/rake/yardoc_task"
+require "quadtree"
 
 RSpec::Core::RakeTask.new(:spec)
 
+spec = Gem::Specification.new do |s|
+  s.name          = "quadtree"
+  s.version       = Quadtree::VERSION
+  s.authors       = ["Jan Lindblom"]
+  s.email         = ["janlindblom@fastmail.fm"]
+
+  s.summary       = %q{Quadtrees in Ruby.}
+  s.homepage      = "https://bitbucket.org/janlindblom/ruby-quadtree"
+  s.license       = "MIT"
+
+  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|.editorconfig|.travis.yml|bitbucket-pipelines.yml|.rspec|.gitignore)/})
+  end
+  s.bindir        = "exe"
+  s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 2.4.0'
+
+  s.add_development_dependency "bundler", "~> 1.14"
+  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "pry", "~> 0.11"
+  s.add_development_dependency "yard", "~> 0.9"
+  s.add_runtime_dependency "version", "~> 1.1"
+end
+
+Rake::VersionTask.new do |task|
+  task.with_gemspec = spec
+  task.with_git = false
+end
+
 YARD::Rake::YardocTask.new do |t|
   t.files   = ['lib/**/*.rb']
   t.stats_options = ['--list-undoc']

VERSION

@@ -0,0 +1 @@
+1.0.5

bin/console

@@ -3,5 +3,13 @@
 require "bundler/setup"
 require "quadtree"
 
+def create_random_point
+  Quadtree::Point.new(-100.0 + SecureRandom.random_number(200.0),
+                      -100.0 + SecureRandom.random_number(200.0))
+end
+
+@getaboden = Quadtree::Point.new(19.8470050, 60.3747940)
+@mattssons = Quadtree::Point.new(19.9895930, 60.2302620)
+
 require "pry"
 Pry.start

lib/quadtree.rb

@@ -1,5 +1,8 @@
+require "version"
 require "quadtree/version"
 
+require "quadtree/unknown_type_error"
+
 require "quadtree/point"
 require "quadtree/axis_aligned_bounding_box"
 require "quadtree/quadtree"
@@ -8,5 +11,4 @@
 #
 # @author Jan Lindblom <janlindblom@fastmail.fm>
 module Quadtree
-
 end

lib/quadtree/point.rb

@@ -3,25 +3,29 @@ module Quadtree
     class Point
 
       # The X coordinate of this instance.
-      # @return [Float] X coordinate.
+      # @return [Float, Integer] X coordinate.
       attr_accessor :x
 
       # The Y coordinate of this instance.
-      # @return [Float] Y coordinate.
+      # @return [Float, Integer] Y coordinate.
       attr_accessor :y
 
       # Optional payload attached to this instance.
       # @return [Object] payload attached to this instance.
       attr_accessor :data
 
-      # @param x [Float, Numeric] X coordinate.
-      # @param y [Float, Numeric] Y coordinate.
+      # @param x [Float, Integer] X coordinate.
+      # @param y [Float, Integer] Y coordinate.
       # @param data [Object] payload payload attached to this instance
       #   (optional).
+      # @raise [UnknownTypeError] if one or more input parameters (+x+ and +y+)
+      #   has the wrong type.
       def initialize(x, y, data=nil)
-        @x = x.to_f
-        @y = y.to_f
-        @data = data unless data.nil?
+
+        self.x = get_typed_numeric(x)
+        self.y = get_typed_numeric(y)
+
+        self.data = data unless data.nil?
       end
 
       # This will calculate distance to another {Point}, given that they are
@@ -67,5 +71,37 @@ def haversine_distance_to(other)
         # d = R ⋅ c
         return r * c
       end
+
+      private
+
+      def get_typed_numeric(any_input)
+        typed_output = nil
+        # Try integer first since float will parse integers too
+        return get_integer(any_input) unless get_integer(any_input).nil?
+        # Try Float next
+        return get_float(any_input) unless get_float(any_input).nil?
+
+        raise UnknownTypeError.new "Unknown type for parameter: #{any_input.class}"
+
+        #typed_output
+      end
+
+      def get_integer(any_input)
+        return Integer(any_input) if any_input.is_a? String
+        return any_input if any_input.is_a? Integer
+
+        nil
+      rescue
+        nil
+      end
+
+      def get_float(any_input)
+        return Float(any_input) if any_input.is_a? String
+        return any_input if any_input.is_a? Float
+
+        nil
+      rescue
+        nil
+      end
     end
 end

lib/quadtree/unknown_type_error.rb

@@ -0,0 +1,7 @@
+module Quadtree
+  # An error for unknown types.
+  # @since 1.0.5
+  class UnknownTypeError < StandardError
+
+  end
+end

lib/quadtree/version.rb

@@ -1,4 +1,5 @@
+require "version"
+
 module Quadtree
-  # Current version
-  VERSION = "1.0.4"
+  is_versioned
 end

quadtree.gemspec

@@ -1,28 +1,47 @@
+# -*- encoding: utf-8 -*-
+# stub: quadtree 1.0.5 ruby lib
 
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "quadtree/version"
+Gem::Specification.new do |s|
+  s.name = "quadtree".freeze
+  s.version = "1.0.5"
 
-Gem::Specification.new do |spec|
-  spec.name          = "quadtree"
-  spec.version       = Quadtree::VERSION
-  spec.authors       = ["Jan Lindblom"]
-  spec.email         = ["jan.lindblom@mittmedia.se"]
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Jan Lindblom".freeze]
+  s.bindir = "exe".freeze
+  s.date = "2018-04-03"
+  s.email = ["janlindblom@fastmail.fm".freeze]
+  s.files = [".editorconfig".freeze, ".gitignore".freeze, ".rspec".freeze, ".travis.yml".freeze, "CODE_OF_CONDUCT.md".freeze, "Gemfile".freeze, "LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/console".freeze, "bin/setup".freeze, "bitbucket-pipelines.yml".freeze, "lib/quadtree.rb".freeze, "lib/quadtree/axis_aligned_bounding_box.rb".freeze, "lib/quadtree/point.rb".freeze, "lib/quadtree/quadtree.rb".freeze, "lib/quadtree/unknown_type_error.rb".freeze, "lib/quadtree/version.rb".freeze, "quadtree.gemspec".freeze]
+  s.homepage = "https://bitbucket.org/janlindblom/ruby-quadtree".freeze
+  s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0".freeze)
+  s.rubygems_version = "2.6.13".freeze
+  s.summary = "Quadtrees in Ruby.".freeze
 
-  spec.summary       = %q{Quadtrees in Ruby.}
-  spec.homepage      = "https://bitbucket.org/janlindblom/ruby-quadtree"
-  spec.license       = "MIT"
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.14"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 10.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_development_dependency(%q<pry>.freeze, ["~> 0.11"])
+      s.add_development_dependency(%q<yard>.freeze, ["~> 0.9"])
+      s.add_runtime_dependency(%q<version>.freeze, ["~> 1.1"])
+    else
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.14"])
+      s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_dependency(%q<pry>.freeze, ["~> 0.11"])
+      s.add_dependency(%q<yard>.freeze, ["~> 0.9"])
+      s.add_dependency(%q<version>.freeze, ["~> 1.1"])
+    end
+  else
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.14"])
+    s.add_dependency(%q<rake>.freeze, ["~> 10.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+    s.add_dependency(%q<pry>.freeze, ["~> 0.11"])
+    s.add_dependency(%q<yard>.freeze, ["~> 0.9"])
+    s.add_dependency(%q<version>.freeze, ["~> 1.1"])
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.11"
-  spec.add_development_dependency "yard", "~> 0.9"
 end

spec/quadtree_point_spec.rb

@@ -3,6 +3,7 @@
 RSpec.describe Quadtree::Point do
   before :all do
     @point = create_random_point
+    @integer_point = create_random_integer_point
     @getaboden = create_point_getaboden
     @mattssons = create_point_mattssons
   end
@@ -14,10 +15,12 @@
 
   it "has an X coordinate" do
     expect(@point.x).to be_a Float
+    expect(@integer_point.x).to be_a Integer
   end
 
   it "has a Y coordinate" do
     expect(@point.y).to be_a Float
+    expect(@integer_point.y).to be_a Integer
   end
 
   it "can carry a payload" do

spec/spec_helper.rb

@@ -7,6 +7,11 @@ def create_random_point
                       -100.0 + SecureRandom.random_number(200.0))
 end
 
+def create_random_integer_point
+  Quadtree::Point.new((-100.0 + SecureRandom.random_number(200.0)).to_i,
+                      (-100.0 + SecureRandom.random_number(200.0)).to_i)
+end
+
 def create_point_getaboden
   Quadtree::Point.new(19.8470050, 60.3747940)
 end