percentable 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f62e2dfea488d68900ce02255064e9867dbfe31
-  data.tar.gz: 192c0d35012684af94024a3c38259506b250cf2f
+  metadata.gz: 30af2373167d55dbd2f96944fd5bafe439dc14ca
+  data.tar.gz: 66c3fe0061956d3096a1cb28b516373312faa0fb
 SHA512:
-  metadata.gz: b3f3b813b2305202c9976d14756a5788cdfc8bdfee4ce5fe336cbfdeba791409c52f25409f49a1ac65ae772bf782a2a78625d1769a5fecf3d5a0d04b0d47ef91
-  data.tar.gz: 71570d45df1f1c58d5701419546fed51bb5e8cf9c4f6deda17a08c8c500e0f0c89a0274fbe2d3d7e4fdb9d4dfdcda881d42d640a2bb0808383b3528bde7b70ab
+  metadata.gz: a8454c1a18c17be86d22f630396ac9098063d91503c5dea17fa496adfd11a28a9cc0b0d6071c4d979f2ecb0340ae3ae7c7268ac65aa5b08ab11b5199aa1aad7b
+  data.tar.gz: 21957a0eba7b4820487d65185c4c28bf485d8a55c0a4d0c7f13216e10679f3bf873afdf849c3e91d87024835900e1b5b8986ea5822257021b9d72275631bafd5

data/lib/percentable/percent.rb

@@ -37,11 +37,13 @@ module Percentable
     end
 
     def * other
-      case other
-      when Percent
+      if other.is_a? Percent
         self.class.new(to_f * other.value)
+      elsif other.respond_to? :coerce
+        a, b = other.coerce(self)
+        a * b
       else
-        self.class.new(value * other.to_f)
+        raise TypeError, "#{other.class} can't be coerced into Percent"
       end
     end
 
@@ -70,12 +72,7 @@ module Percentable
     end
 
     def coerce other
-      case other
-      when Numeric
-        [CoercedPercent.new(self), other]
-      else
-        fail TypeError, "#{self.class} can't be coerced into #{other.class}"
-      end
+      [CoercedPercent.new(self), other]
     end
   end
 end

data/lib/percentable/version.rb

@@ -1,3 +1,3 @@
 module Percentable
-  VERSION = "1.0.2"
+  VERSION = "1.1.2"
 end

data/percentable.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "money"
 end

data/spec/lib/percentable/percent_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'bigdecimal'
 require 'percentable'
+require 'money'
 
 describe Percentable::Percent do
   subject { Percentable::Percent.new(value) }
@@ -92,14 +93,6 @@ describe Percentable::Percent do
   end
 
   describe '#coerce' do
-    context 'when other is non numeric' do
-      let(:other) { 'string' }
-
-      it 'should raise a TypeError' do
-        expect { subject.coerce(other) }.to raise_error TypeError
-      end
-    end
-
     context 'math' do
       let(:value) { 50 }
 
@@ -223,24 +216,39 @@ describe Percentable::Percent do
       end
     end
 
-    context 'multiplying anything else' do
+    context 'multiplying something that responds to coerce' do
       let(:other_thing) { double }
-      let(:percent) { subject.class.new(20) }
+      let(:value) { 20 }
 
-      context 'responds to to_f' do
-        before { allow(other_thing).to receive(:to_f).and_return 1.0 }
+      before { allow(other_thing).to receive(:respond_to?).with(:to_f).and_return(false) }
+      before { allow(other_thing).to receive(:respond_to?).with(:coerce).and_return(true) }
 
-        it "should return the float value times the percent" do
-          expect(percent * other_thing).to eq subject.class.new(20)
-        end
+      it 'should call coerce on the other object' do
+        expect(other_thing).to receive(:coerce).with(subject).and_return([0, 1])
+        subject * other_thing
       end
 
-      context 'does not respond to to_f' do
-        before { allow(other_thing).to receive(:to_f).and_raise(NoMethodError) }
+      it 'should multiply the things that are returned from coerce' do
+        expect(other_thing).to receive(:coerce).with(subject).and_return([0, 1])
+        expect(subject * other_thing).to eq 0 * 1
+      end
+    end
 
-        it "should raise a no method error" do
-          expect { percent * other_thing }.to raise_error(NoMethodError)
-        end
+    context 'multiplying against Money' do
+      let(:value) { 50 }
+      let(:money) { Money.new(100) }
+
+      it "should return 50% of the money" do
+        expect(subject * money).to eq Money.new(50)
+      end
+    end
+
+    context "multiplying against an Integer" do
+      let(:value) { 50 }
+      let(:integer) { 10 }
+
+      it "should return 50% of the number" do
+        expect(subject * integer).to eq 5
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percentable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Eric Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: money
+  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: Small gem to make working with percents easier. Includes methods to make
   selected rails attributes return percents.
 email: