vector2d 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66f7c5a4f7dc7d945041bc94089919d161dd81f
-  data.tar.gz: 72e52f85daded8b240945fa886fb2c996baa6f3f
+  metadata.gz: c2b44fba53d35dd9b96e94e2b17075b3be510f93
+  data.tar.gz: 4acdcb759c4d3fb6fc86adf0c4a8bfafe03b17cf
 SHA512:
-  metadata.gz: 16e3e2e590a4542559859ed212df578c4ccd73d2b1e4117b9ad9a70e20b793c10b5f320d5447e03df8d661dd1bcfb7967f9e69d281ba7a96c3a97efe93ed2281
-  data.tar.gz: 7d6aa7f2dfdf2644131fd50f860e978bf4ce6afa5381c6193859bfdfcf9d1d0882641ee2fee3328bf7a3de271763670e2cdc0577274310d2f46dea55e23a8ba4
+  metadata.gz: 5310a339406432a7007e3da8e1aee32dad8eb79cf4d878e1b9abe267ba10bc1019d023ce6a98ea8728165c0cef0c0bbafc3f31da255d35258d1d2e85bce1e347
+  data.tar.gz: 01fa40750bfa9ce96d6033652c8079709a977303286fd08fff142a0088fe9ccc5f630f567ed03fd4f1f142e51518267e6b7994a9fe628c630a00a9b02930cc15

data/Gemfile.lock

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

data/lib/vector2d/fitting.rb

@@ -2,7 +2,20 @@
 
 class Vector2d
   module Fitting
-    # Returns a new vector fitting inside another vector, retaining the aspect ratio.
+
+    # Scales down the given vector unless it fits inside.
+    #
+    #   vector = Vector2d(20, 20)
+    #   vector.contain(Vector2d(10, 10)) # => Vector2d(10,10)
+    #   vector.contain(Vector2d(40, 20)) # => Vector2d(20,10)
+    #   vector.contain(Vector2d(20, 40)) # => Vector2d(10,20)
+    #
+    def contain(other)
+      v, _ = coerce(other)
+      (v.x > x || v.y > y) ? other.fit(self) : other
+    end
+
+    # Scales the vector to fit inside another vector, retaining the aspect ratio.
     #
     #   vector = Vector2d(20, 10)
     #   vector.fit(Vector2d(10, 10)) # => Vector2d(10,5)

data/lib/vector2d/version.rb

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

data/spec/lib/vector2d/fitting_spec.rb

@@ -5,6 +5,34 @@ require 'spec_helper'
 describe Vector2d::Fitting do
   let(:original) { Vector2d.new(300, 300) }
 
+  describe "#contain" do
+    subject(:vector) { original.contain(comp) }
+
+    context "when vector is smaller" do
+      let(:comp) { Vector2d.new(150, 100) }
+      it "should not change it" do
+        expect(vector.x).to eq(150)
+        expect(vector.y).to eq(100)
+      end
+    end
+
+    context "when vector is wider" do
+      let(:comp) { Vector2d.new(400, 300) }
+      it "should scale it down" do
+        expect(vector.x).to eq(300)
+        expect(vector.y).to eq(225)
+      end
+    end
+
+    context "when vector is higher" do
+      let(:comp) { Vector2d.new(300, 400) }
+      it "should scale it down" do
+        expect(vector.x).to eq(225)
+        expect(vector.y).to eq(300)
+      end
+    end
+  end
+
   describe "#fit" do
     subject(:vector) { original.fit(comp) }
 
@@ -25,7 +53,7 @@ describe Vector2d::Fitting do
     end
   end
 
-  describe "#contrain_one" do
+  describe "#fit_either" do
     let(:original) { Vector2d.new(300, 300) }
     subject(:vector) { original.fit_either(comp) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vector2d
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake