vector2d 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bb10792ca5679d63353bdef7fe70e7d8536857
-  data.tar.gz: 54765d086661047a0f994c097ceaf4d1e1bb4177
+  metadata.gz: 682557f0f29ae91579f654ea0d158b294f34842a
+  data.tar.gz: 3c06461f5a55f84d40c2d9a6ccaeb2c588180b5e
 SHA512:
-  metadata.gz: ef5cd08262c55704ac738f773f04a65c3028553c561c994b4f6e35a84b7cf1b8b628785518c0ce4f469c75d1b55edd7f2b5482cc794765d094ce93dcea53e9bb
-  data.tar.gz: 4e668d7c16c6ed462501a9381d83b8cf1b1df3a7903f9d6a4d753006cb591ce2bf20e2392783d722b7a332780da79c793266cd4fd2b8976a395b08f1cf721912
+  metadata.gz: be219090e10f35d43eee02aafb26008dac0763cc206d748e51169eff6f5d208a8afbb058e489f150584828ee2b58abb665595514bec5562d12fbe2f5ae69ed6a
+  data.tar.gz: 46aba4ea456801fe4cf7403a431ef3a754424623004faec67b7c9290042af806dbd8195c6c67bcd70d9f01560228793a8938a5e9474e1c292eb35dd99946551f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vector2d (1.1.1)
+    vector2d (1.1.2)
 
 GEM
   remote: http://rubygems.org/

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/lib/vector2d/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 class Vector2d
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/vector2d.rb

@@ -29,10 +29,16 @@ class Vector2d
       elsif args[0].kind_of?(Vector2d)
         args = [args[0].x, args[0].y]
       elsif args[0].kind_of?(Hash)
-        args[0] = args[0][:x]  if args[0][:x]
-        args[0] = args[0]["x"] if args[0]["x"]
-        args[1] = args[0][:y]  if args[0][:y]
-        args[1] = args[0]["y"] if args[0]["y"]
+        if args[0].has_key?(:y)
+          args[1] = args[0][:y]
+        elsif args[0].has_key?("y")
+          args[1] = args[0]["y"]
+        end
+        if args[0].has_key?(:x)
+          args[0] = args[0][:x]
+        elsif args[0].has_key?("x")
+          args[0] = args[0]["x"]
+        end
       else
         args = [args[0], args[0]]
       end
@@ -81,6 +87,7 @@ class Vector2d
   end
 
   def normalized?
+    self.length == 1.0
   end
 
   # Rounds coordinates to nearest integer.
@@ -150,7 +157,7 @@ class Vector2d
   # sets the length under the given value. Nothing is done if
   # the vector is already shorter.
   def truncate(max)
-    length = Math.min(max, length)
+    self.length = [max, self.length].min
     self
   end
 
@@ -178,7 +185,7 @@ class Vector2d
 
   # cross product of two vectors
   def self.cross_product(vector1, vector2)
-    @x * vector2.y - @y * vector2.x
+    vector1.x * vector2.y - vector1.y * vector2.x
   end
 
   # dot product of two vectors

data/spec/lib/vector2d_spec.rb

@@ -0,0 +1,323 @@
+require 'spec_helper'
+
+describe Vector2d do
+  subject(:vector) { Vector2d.new(2, 3) }
+
+  shared_examples "a vector constructor" do |x, y|
+    it "receives the x and y properties" do
+      expect(subject.x).to eq(x)
+      expect(subject.y).to eq(y)
+    end
+  end
+
+  describe "new" do
+    context "with two arguments, fixnum" do
+      subject(:vector) { Vector2d.new(1, 2) }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+
+    context "with two arguments, float" do
+      subject(:vector) { Vector2d.new(1.0, 2.0) }
+      it_behaves_like "a vector constructor", [1.0, 2.0]
+    end
+
+    context "with string argument, fixnum" do
+      subject(:vector) { Vector2d.new("1x2") }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+
+    context "with string argument, float" do
+      subject(:vector) { Vector2d.new("1.0x2.0") }
+      it_behaves_like "a vector constructor", [1.0, 2.0]
+    end
+
+    context "with array argument" do
+      subject(:vector) { Vector2d.new([1, 2]) }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+
+    context "with hash argument, symbol keys" do
+      subject(:vector) { Vector2d.new({:x => 1, :y => 2}) }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+
+    context "with hash argument, string keys" do
+      subject(:vector) { Vector2d.new({'x' => 1, 'y' => 2}) }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+
+    context "with vector argument" do
+      subject(:vector) { Vector2d.new(Vector2d.new(1, 2)) }
+      it_behaves_like "a vector constructor", [1, 2]
+    end
+  end
+
+  describe ".cross_product" do
+    let(:v1) { Vector2d.new(2, 3) }
+    let(:v2) { Vector2d.new(4, 5) }
+    it "calculates the cross product between two vectors" do
+      expect(Vector2d.cross_product(v1, v2)).to be_within(0.0001).of(-2.0)
+    end
+  end
+
+  describe ".dot_product" do
+    let(:v1) { Vector2d.new(2, 3) }
+    let(:v2) { Vector2d.new(4, 5) }
+    it "calculates the dot product between two vectors" do
+      expect(Vector2d.dot_product(v1, v2)).to be_within(0.0001).of(23.0)
+    end
+  end
+
+  describe ".angle_between" do
+    let(:v1) { Vector2d.new(2, 3) }
+    let(:v2) { Vector2d.new(4, 5) }
+    it "calculates the angle between two vectors" do
+      expect(Vector2d.angle_between(v1, v2)).to be_within(0.0001).of(0.0867)
+    end
+  end
+
+  describe "#==" do
+    subject { vector == comp }
+
+    context "with both arguments equal" do
+      let(:comp) { Vector2d.new(2, 3) }
+      it { should be_true }
+    end
+
+    context "with x differing" do
+      let(:comp) { Vector2d.new(3, 3) }
+      it { should be_false }
+    end
+
+    context "with y differing" do
+      let(:comp) { Vector2d.new(2, 4) }
+      it { should be_false }
+    end
+  end
+
+  describe "#to_s" do
+    it "renders a string" do
+      expect(vector.to_s).to eq('2.0x3.0')
+    end
+  end
+
+  describe "#length" do
+    it "calculates the length" do
+      expect(vector.length).to be_within(0.0001).of(3.6055)
+    end
+  end
+
+  describe "#length_squared" do
+    it "calculates the squared length" do
+      expect(vector.length_squared).to be_within(0.0001).of(13.0)
+    end
+  end
+
+  describe "#length=" do
+    it "modifies the vector length" do
+      vector.length = 2.0
+      expect(vector.length).to be_within(0.0001).of(2.0)
+      expect(vector.x).to be_within(0.0001).of(1.1094)
+      expect(vector.y).to be_within(0.0001).of(1.6641)
+    end
+  end
+
+  describe "#normalize" do
+    it "normalizes the vector" do
+      expect(vector.normalize.x).to be_within(0.0001).of(0.5547)
+      expect(vector.normalize.y).to be_within(0.0001).of(0.8320)
+    end
+  end
+
+  describe "#normalize!" do
+    it "normalizes the vector in place" do
+      vector.normalize!
+      expect(vector).to eq(vector.normalize)
+    end
+  end
+
+  describe "#round" do
+    subject(:vector) { Vector2d.new(2.3, 3.6) }
+    it "rounds the vector" do
+      expect(vector.round).to eq(Vector2d.new(2, 4))
+    end
+  end
+
+  describe "#round!" do
+    subject(:vector) { Vector2d.new(2.3, 3.6) }
+    it "rounds the vector in place" do
+      vector.round!
+      expect(vector).to eq(Vector2d.new(2, 4))
+    end
+  end
+
+  describe "*" do
+    context "with vector" do
+      subject(:vector) { Vector2d.new(2, 3) * Vector2d.new(3, 4) }
+      it "multiplies the vectors" do
+        expect(vector).to eq(Vector2d.new(6, 12))
+      end
+    end
+    context "with number" do
+      subject(:vector) { Vector2d.new(2, 3) * 3 }
+      it "multiplies both members" do
+        expect(vector).to eq(Vector2d.new(6, 9))
+      end
+    end
+  end
+
+  describe "/" do
+    context "with vector" do
+      subject(:vector) { Vector2d.new(6, 12) / Vector2d.new(2, 3) }
+      it "divides the vectors" do
+        expect(vector).to eq(Vector2d.new(3, 4))
+      end
+    end
+    context "with number" do
+      subject(:vector) { Vector2d.new(6, 12) / 3 }
+      it "divides both members" do
+        expect(vector).to eq(Vector2d.new(2, 4))
+      end
+    end
+  end
+
+  describe "+" do
+    context "with vector" do
+      subject(:vector) { Vector2d.new(2, 3) + Vector2d.new(3, 4) }
+      it "adds the vectors" do
+        expect(vector).to eq(Vector2d.new(5, 7))
+      end
+    end
+    context "with number" do
+      subject(:vector) { Vector2d.new(2, 3) + 2 }
+      it "adds to both members" do
+        expect(vector).to eq(Vector2d.new(4, 5))
+      end
+    end
+  end
+
+  describe "-" do
+    context "with vector" do
+      subject(:vector) { Vector2d.new(3, 5) - Vector2d.new(1, 2) }
+      it "subtracts the vectors" do
+        expect(vector).to eq(Vector2d.new(2, 3))
+      end
+    end
+    context "with number" do
+      subject(:vector) { Vector2d.new(2, 3) - 2 }
+      it "subtracts from both members" do
+        expect(vector).to eq(Vector2d.new(0, 1))
+      end
+    end
+  end
+
+  describe "#perpendicular" do
+    it "returns a perpendicular vector" do
+      expect(vector.perpendicular).to eq(Vector2d.new(-3, 2))
+    end
+  end
+
+  describe "#distance" do
+    let(:comp) { Vector2d.new(3, 4) }
+    it "returns the distance between two vectors" do
+      expect(vector.distance(comp)).to be_within(0.0001).of(1.4142)
+    end
+  end
+
+  describe "#distance_sq" do
+    let(:comp) { Vector2d.new(5, 6) }
+    it "returns the squared distance between two vectors" do
+      expect(vector.distance_sq(comp)).to be_within(0.0001).of(18.0)
+    end
+  end
+
+  describe "#angle" do
+    it "returns the angle" do
+      expect(vector.angle).to be_within(0.0001).of(0.9827)
+    end
+  end
+
+  describe "#truncate" do
+    context "when argument is longer than length" do
+      let(:arg) { 5.0 }
+      it "does not change the length" do
+        expect(vector.truncate(arg).length).to be_within(0.0001).of(3.6055)
+      end
+    end
+    context "when argument is shorter than length" do
+      let(:arg) { 2.5 }
+      it "changes the length" do
+        expect(vector.truncate(arg).length).to be_within(0.0001).of(arg)
+      end
+    end
+  end
+
+  describe "#reverse" do
+    it "reverses the vector" do
+      expect(vector.reverse).to eq(Vector2d.new(-2, -3))
+    end
+  end
+
+  describe "#cross_product" do
+    let(:comp) { Vector2d.new(3, 4) }
+    it "calulates the cross product" do
+      expect(vector.cross_product(comp)).to eq(Vector2d.cross_product(vector, comp))
+    end
+  end
+
+  describe "#dot_product" do
+    let(:comp) { Vector2d.new(3, 4) }
+    it "calulates the dot product" do
+      expect(vector.dot_product(comp)).to eq(Vector2d.dot_product(vector, comp))
+    end
+  end
+
+  describe "#angle_between" do
+    let(:comp) { Vector2d.new(3, 4) }
+    it "calculates the angle between vectors" do
+      expect(vector.angle_between(comp)).to eq(Vector2d.angle_between(vector, comp))
+    end
+  end
+
+  describe "#contrain_both" do
+    let(:original) { Vector2d.new(300, 300) }
+    subject(:vector) { original.constrain_both(comp) }
+
+    context "when scaling by height" do
+      let(:comp) { Vector2d.new(200, 150) }
+      it "should fit within the other vector" do
+        expect(vector.x).to be_within(0.0001).of(150)
+        expect(vector.y).to be_within(0.0001).of(150)
+      end
+    end
+
+    context "when scaling by width" do
+      let(:comp) { Vector2d.new(150, 200) }
+      it "should fit within the other vector" do
+        expect(vector.x).to be_within(0.0001).of(150)
+        expect(vector.y).to be_within(0.0001).of(150)
+      end
+    end
+  end
+
+  describe "#contrain_one" do
+    let(:original) { Vector2d.new(300, 300) }
+    subject(:vector) { original.constrain_one(comp) }
+
+    context "when width is largest" do
+      let(:comp) { Vector2d.new(200, 150) }
+      it "should be the same width" do
+        expect(vector.x).to be_within(0.0001).of(200)
+        expect(vector.y).to be_within(0.0001).of(200)
+      end
+    end
+
+    context "when height is largest" do
+      let(:comp) { Vector2d.new(150, 200) }
+      it "should be the same height" do
+        expect(vector.x).to be_within(0.0001).of(200)
+        expect(vector.y).to be_within(0.0001).of(200)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'vector2d'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vector2d
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -55,6 +55,8 @@ files:
 - VERSION
 - lib/vector2d.rb
 - lib/vector2d/version.rb
+- spec/lib/vector2d_spec.rb
+- spec/spec_helper.rb
 - vector2d.gemspec
 homepage: http://github.com/elektronaut/vector2d
 licenses:
@@ -80,4 +82,6 @@ rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Library for handling two-dimensional vectors
-test_files: []
+test_files:
+- spec/lib/vector2d_spec.rb
+- spec/spec_helper.rb