continued_fractions 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20796325ed2f95282a02bd81c21b78fd95c21d31
-  data.tar.gz: c0ea003c4ec0d7f2109e7a3084147aedf2b2975a
+SHA256:
+  metadata.gz: 6e470cce2d4c42db6d51b74ebb62cd551cf91142e63bd18345bca3b222fc5eb3
+  data.tar.gz: af28baf19c09d53d4143629061266773ef9506f0fb5672acb68d0e2cf7c66f94
 SHA512:
-  metadata.gz: f00f4c5449144a099abcd4a0f01a04c3302724f4246af9d766f8168767fdf71b6409af806601a4a58889bd60d71bc12ade5ecf49a2f252cf89e924f3d174f4c4
-  data.tar.gz: 7b84d72a3c6a4648fce6a5e3db00ff760e901e0ec1e0386a577148a119055c9ac77468e7cbf8129d532e3e6f9fdb671030428987543585f6238036c53131d4da
+  metadata.gz: 14403e28b7828dd596491b97a676ad5bf3a6c2e11bceadcd636cdef637ba6cc6ea6dc5d5c455de15a87bf03f6f2b8d55f7619b7ab73442b4cf7e530f07a0a819
+  data.tar.gz: 2740a521fb624d61b58e9b62e7f3f48bc9b6bc53b58caa65a1a0ef92c7d938e7c6c8f95b099e90ca814cb6e6b4a3a699f591909ef6cb8f3b5831a7f49dd58825

data/lib/continued_fractions.rb

@@ -113,7 +113,7 @@ class ContinuedFraction
     num = nil
     prec = nil
     case n
-    when Fixnum, Integer
+    when Float, Integer, Rational
       num = n
       prec = limit
     when ContinuedFraction

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), "/../spec_helper")
 
 describe ContinuedFraction do
-  let(:cf) { described_class.new(number,10) }
+  let(:cf) { described_class.new(number, 10) }
   let(:number) { rand }
 
   describe '#convergents' do
@@ -12,7 +12,7 @@ describe ContinuedFraction do
     context 'with irrational numbers' do
       it "accurately calculates the convergents" do
         # First 10 convergents of PI are...
-        convs = ['3/1', '22/7', '333/106', '355/113', '103993/33102', '104348/33215', '208341/66317', '312689/99532', '833719/265381', '1146408/364913'].map(&:to_r)
+        convs = [3/1r, 22/7r, 333/106r, 355/113r, 103993/33102r, 104348/33215r, 208341/66317r, 312689/99532r, 833719/265381r, 1146408/364913r]
         cf = described_class.new(Math::PI,10)
         expect((cf.convergents_as_rationals - convs)).to be_empty
       end
@@ -38,7 +38,7 @@ describe ContinuedFraction do
       end
     
       it 'calculates the convergents' do
-        convs = [ '1/1', '3/2' ].map(&:to_r)
+        convs = [ 1/1r, 3/2r ]
         expect(described_class.new(1.5, 10).convergents_as_rationals - convs).to be_empty
       end
     end
@@ -51,54 +51,20 @@ describe ContinuedFraction do
   end
 
   describe 'operators' do
+    let(:cf2) { described_class.new(rand, 20) }
+
+    %i{+ - * /}.each do |op|
+      describe "#{op}" do
+        [3, 3.0, 3/1r, described_class.new(rand, 20)].each do |rhs|
+          it "#{rhs.class.name} operates on the right-hand side and returns a ContinuedFraction" do
+            expect(cf.send(op, rhs)).to be_kind_of(ContinuedFraction)
+          end
+        end
 
-    it "assigns the resulting continued fraction of a binary operation the max limit of the two operands" do
-      c = described_class.new(rand,20)
-      result = cf + c
-      expect(result.limit).to eq [cf.limit,c.limit].max
-    end
-
-    describe '+' do
-      it "adds a number on the right-hand-side with a continued fraction and returns a continued fraction" do
-        expect((cf + 3)).to be_kind_of(ContinuedFraction)
-      end
-
-      it "adds a continued fraction with another continued fraction and returns a continued fraction" do
-        c = described_class.new(rand,20)
-        expect((cf + c)).to be_kind_of(ContinuedFraction)
-      end
-    end
-
-    describe '-' do
-      it "subtracts a number on the right-hand-side from a continued fraction and returns a continued fraction" do
-        expect((cf - 3)).to be_kind_of(ContinuedFraction)
-      end
-
-      it "subtracts a continued fraction with another continued fraction and returns a continued fraction" do
-        c = described_class.new(rand,20)
-        expect((cf - c)).to be_kind_of(ContinuedFraction)
-      end
-    end
-
-    describe '*' do
-      it "multiplies a number on the right-hand-side with a continued fraction and returns a continued fraction" do
-        expect((cf * 3)).to be_kind_of(ContinuedFraction)
-      end
-
-      it "multiplies a continued fraction with another continued fraction and returns a continued fraction" do
-        c = described_class.new(rand,20)
-        expect((cf * c)).to be_kind_of(ContinuedFraction)
-      end
-    end
-
-    describe '/' do
-      it "divides a number on the right-hand-side with a continued fraction and returns a continued fraction" do
-        expect((cf / 3)).to be_kind_of(ContinuedFraction)
-      end
-
-      it "divides a continued fraction with another continued fraction and returns a continued fraction" do
-        c = described_class.new(rand,20)
-        expect((cf / c)).to be_kind_of(ContinuedFraction)
+        it "Assigns the max limit of the two operands" do
+          result = cf.send(op, cf2)
+          expect(result.limit).to eq [cf.limit, cf2.limit].max
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Jose Hales-Garcia
@@ -65,8 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubyforge_project: continued_fractions
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate continued fractions