continued_fractions 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833e0f015fc2902302f744f7c1c4901b8b77e51f
-  data.tar.gz: 65ca91e63bfa5adac66a77529de915d9d3bb6145
+  metadata.gz: 20796325ed2f95282a02bd81c21b78fd95c21d31
+  data.tar.gz: c0ea003c4ec0d7f2109e7a3084147aedf2b2975a
 SHA512:
-  metadata.gz: 9267372f711ade8ce6da446a79bd8e3e869361a96f47cd16286ae5a3a22e2be848979da6e0188b959dd8dc1aaaf9de5d0b2ab539fdf65cf0a281e8a35fe73944
-  data.tar.gz: f332b7f14cef53dc9e84f1eef4eacd5bb62aac97f06e9e62ea39a3b274e48bf66e1c67d5ae853b6af2bd5102e8de45f9c91761d98ca3985e046fca8f50054946
+  metadata.gz: f00f4c5449144a099abcd4a0f01a04c3302724f4246af9d766f8168767fdf71b6409af806601a4a58889bd60d71bc12ade5ecf49a2f252cf89e924f3d174f4c4
+  data.tar.gz: 7b84d72a3c6a4648fce6a5e3db00ff760e901e0ec1e0386a577148a119055c9ac77468e7cbf8129d532e3e6f9fdb671030428987543585f6238036c53131d4da

data/Gemfile

@@ -1,11 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-# Declare your gem's dependencies in digital_measures.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
+# Specify your gem's dependencies in continued_fractions.gemspec
 gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.

data/Rakefile

@@ -1,21 +1,6 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Echoe.new('continued_fractions', '1.6.0') do |config|
-  config.summary                  = 'Generate continued fractions'
-  config.description              = 'Class for working with continued fractions'
-  
-  config.ruby_version              = ">=2.2.2"
-  config.licenses                  = 'MIT'
-  
-  config.author                   = 'Jose Hales-Garcia'
-  config.email                    = 'jolohaga@me.com'
-  config.url                      = 'http://jolohaga.github.io/continued_fractions'
-  
-  config.ignore_pattern           = ["tmp/*",".hg/*", ".pkg/*", ".git/*"]
+RSpec::Core::RakeTask.new(:spec)
 
-  config.development_dependencies = ['rspec ~>3.2.0','echoe ~>4.6.6']
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each{|ext| load ext}
+task :default => :spec

data/continued_fractions.gemspec

@@ -1,38 +1,37 @@
 # -*- encoding: utf-8 -*-
-# stub: continued_fractions 1.6.0 ruby lib
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'continued_fractions/version'
 
-Gem::Specification.new do |s|
-  s.name = "continued_fractions"
-  s.version = "1.6.0"
+Gem::Specification.new do |spec|
+  spec.name = "continued_fractions"
+  spec.version = ContinuedFractions::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Jose Hales-Garcia"]
-  s.date = "2015-05-10"
-  s.description = "Class for working with continued fractions"
-  s.email = "jolohaga@me.com"
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/continued_fractions.rb"]
-  s.files = ["CHANGELOG", "Gemfile", "History.txt", "LICENSE", "Manifest", "README.md", "Rakefile", "continued_fractions.gemspec", "lib/continued_fractions.rb", "spec/continued_fractions/continued_fraction_spec.rb", "spec/spec_helper.rb"]
-  s.homepage = "http://jolohaga.github.io/continued_fractions"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--line-numbers", "--title", "Continued_fractions", "--main", "README.md"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
-  s.rubyforge_project = "continued_fractions"
-  s.rubygems_version = "2.4.5"
-  s.summary = "Generate continued fractions"
+  spec.required_rubygems_version = Gem::Requirement.new(">= 1.2") if spec.respond_to? :required_rubygems_version=
+  spec.require_paths = ["lib"]
+  spec.authors = ["Jose Hales-Garcia"]
+  spec.date = "2016-10-26"
+  spec.description = "Class for working with continued fractions"
+  spec.email = "jolohaga@me.com"
+  spec.extra_rdoc_files = ["LICENSE", "README.md", "lib/continued_fractions.rb"]
+  spec.files = ["Gemfile", "LICENSE", "README.md", "Rakefile", "continued_fractions.gemspec", "lib/continued_fractions.rb", "spec/continued_fractions/continued_fraction_spec.rb", "spec/spec_helper.rb"]
+  spec.homepage = "http://jolohaga.github.io/continued_fractions"
+  spec.licenses = ["MIT"]
+  spec.rdoc_options = ["--line-numbers", "--title", "Continued_fractions", "--main", "README.md"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
+  spec.rubyforge_project = "continued_fractions"
+  spec.rubygems_version = "2.5.1"
+  spec.summary = "Generate continued fractions"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  if spec.respond_to? :specification_version then
+    spec.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 3.2.0"])
-      s.add_development_dependency(%q<echoe>, ["~> 4.6.6"])
+      spec.add_development_dependency(%q<rspec>, ["~> 3.2"])
     else
-      s.add_dependency(%q<rspec>, ["~> 3.2.0"])
-      s.add_dependency(%q<echoe>, ["~> 4.6.6"])
+      spec.add_dependency(%q<rspec>, ["~> 3.2"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 3.2.0"])
-    s.add_dependency(%q<echoe>, ["~> 4.6.6"])
+    spec.add_dependency(%q<rspec>, ["~> 3.2"])
   end
 end

data/lib/continued_fractions.rb

@@ -112,11 +112,11 @@ class ContinuedFraction
   def number_of(n) #:nodoc:
     num = nil
     prec = nil
-    case n.class.name
-    when "Fixnum","Integer"
+    case n
+    when Fixnum, Integer
       num = n
       prec = limit
-    when "ContinuedFraction"
+    when ContinuedFraction
       num = n.number
       prec = [n.limit,limit].max
     end
@@ -151,4 +151,4 @@ class ContinuedFraction
     conv_mat[0][0],conv_mat[1][1] = 0,0
     conv_mat
   end
-end
+end

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -3,88 +3,103 @@ require File.join(File.dirname(__FILE__), "/../spec_helper")
 describe ContinuedFraction do
   let(:cf) { described_class.new(number,10) }
   let(:number) { rand }
-  
-  it "returns an array of convergents" do
-    expect(cf.convergents).to be_kind_of(Array)
-  end
-  
-  it "preserves the number input" do
-    expect(cf.number).to eq number
-  end
-  
-  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 "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 "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 "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 "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
-  
-  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
-  
-  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
-  
-  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)
-  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
-  
-  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{|c| Rational(c)}
-      cf = described_class.new(Math::PI,10)
-      expect((cf.convergents_as_rationals - convs)).to be_empty
+
+  describe '#convergents' do
+    it "returns an array" do
+      expect(cf.convergents).to be_kind_of(Array)
     end
-    
-    it "contains convergents approaching the number" do
-      0.upto(cf.convergents.length-2) do |i|
-        convergent_rational_i_plus1, convergent_rational_i = cf.convergent_to_rational(cf.convergents[i+1]), cf.convergent_to_rational(cf.convergents[i])
-        expect(((convergent_rational_i_plus1 - cf.number).abs <= (convergent_rational_i - cf.number).abs)).to be true
+
+    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)
+        cf = described_class.new(Math::PI,10)
+        expect((cf.convergents_as_rationals - convs)).to be_empty
+      end
+
+      it "contains convergents approaching the number" do
+        0.upto(cf.convergents.length-2) do |i|
+          convergent_rational_i_plus1, convergent_rational_i = cf.convergent_to_rational(cf.convergents[i+1]), cf.convergent_to_rational(cf.convergents[i])
+          expect(((convergent_rational_i_plus1 - cf.number).abs <= (convergent_rational_i - cf.number).abs)).to be true
+        end
+      end
+
+      it "contains convergents which are expressed in lowest terms" do
+        1.upto(cf.convergents.length-1) do |i|
+          convergent_rational_i, convergent_rational_i_plus1 = cf.convergent_to_rational(cf.convergent(i)), cf.convergent_to_rational(cf.convergent(i+1))
+          expect((convergent_rational_i.numerator*convergent_rational_i_plus1.denominator - convergent_rational_i_plus1.numerator*convergent_rational_i.denominator)).to eq (-1)**(i)
+        end
       end
     end
+
+    context 'with rational numbers' do
+      it 'changes the limit to the number of convergents calculated' do
+        expect(described_class.new(1.5, 10).limit).to be 2
+      end
     
-    it "contains convergents which are expressed in lowest terms" do
-      1.upto(cf.convergents.length-1) do |i|
-        convergent_rational_i, convergent_rational_i_plus1 = cf.convergent_to_rational(cf.convergent(i)), cf.convergent_to_rational(cf.convergent(i+1))
-        expect((convergent_rational_i.numerator*convergent_rational_i_plus1.denominator - convergent_rational_i_plus1.numerator*convergent_rational_i.denominator)).to eq (-1)**(i)
+      it 'calculates the convergents' do
+        convs = [ '1/1', '3/2' ].map(&:to_r)
+        expect(described_class.new(1.5, 10).convergents_as_rationals - convs).to be_empty
       end
     end
   end
-  
-  context 'with rational numbers' do
-    it 'changes the limit to the number of convergents calculated' do
-      expect(described_class.new(1.5, 10).limit).to be 2
+
+  describe '#number' do
+    it "preserves the number input" do
+      expect(cf.number).to eq number
     end
-    
-    it 'calculates the convergents' do
-      convs = [ '1/1', '3/2' ].map{|c| Rational(c)}
-      expect(described_class.new(1.5, 10).convergents_as_rationals - convs).to be_empty
+  end
+
+  describe 'operators' do
+
+    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)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), "/../lib")
 require 'rubygems'
 require 'rspec'
-require 'continued_fractions'
+require 'continued_fractions'
+
+RSpec.configure do |config|
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+  config.formatter = :documentation
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,43 +16,25 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: echoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.6
+        version: '3.2'
 description: Class for working with continued fractions
 email: jolohaga@me.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGELOG
 - LICENSE
 - README.md
 - lib/continued_fractions.rb
 files:
-- CHANGELOG
 - Gemfile
-- History.txt
 - LICENSE
-- Manifest
 - README.md
 - Rakefile
 - continued_fractions.gemspec
@@ -84,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: continued_fractions
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate continued fractions

data/CHANGELOG

@@ -1,13 +0,0 @@
-v0.1.0 Initial release
-
-v1.1.0 Change public class representation of convergents from an array of Rationals to an array of arrays.
-
-v1.2.0 Change parameter signature of ContinuedFraction#convergents_as_rationals
-
-v1.3.0 Add binary operators: + - * /
-
-v1.4.0 Eliminate need to invoke "include ContinuedFractions"
-
-v1.5.0 Remove ContinuedFractions module; Move its methods into ContinuedFraction class
-
-v1.6.0 Handle rational numbers, finite continued fractions

data/History.txt

@@ -1,86 +0,0 @@
-=== 1.3.0 / 2011-06-10
-
-* Added binary operators: + - * / between two ContinuedFractions and a ContinuedFraction and a number (on the right-hand-side).  Returns a ContinuedFraction.
-* Added tests for operators.
-
-=== 1.2.3 / 2011-06-09
-
-* Fixed emplementation of #convergent to match its definition.
-* Added exception on #convergent to be raised when index is less than 1.
-* Added mention of ContinuedFractions#convergents_as_rationals in README
-* Changed README example.  Variable real changed to pi.
-
-=== 1.2.2 / 2010-03-27
-
-* Moved repo to Git.
-
-=== 1.2.1 / 2010-03-18
-
-* Updated README file to display change in return class of ContinuedFractions#convergents.
-
-=== 1.2.0 / 2010-03-18
-
-* Changed parameter signature of ContinuedFraction#convergents_as_rationals.  Added a nth parameter to select the length of the convergents to return.
-
-=== 1.1.0 / 2010-03-18
-
-* Changed the public class representation of convergents from an array of Rationals to an array of arrays.
-* Removed convergents_array (unnecessary since ContinuedFraction#convergents now returns an array).
-* Added ContinuedFraction#convergents_as_rationals which facilitate returning convergents as Rationals.
-* Changed names of index variables to be more descriptive.
-* Changed documentation to reflect change of class type returned by ContinuedFraction#convergents.
-* Changed tests to deal with new class type returned by ContinuedFraction#convergents.
-
-=== 0.1.12 / 2010-03-18
-
-* Added examples in the documentation.
-* Moved convergents to the Class level to make it accessible to use with any quotient array passed to it.
-
-
-=== 0.1.11 / 2010-03-16
-
-* Changed names of some variable to provide better in-code documentation.
-
-=== 0.1.10 / 2010-03-16
-
-* Improved documentation and formatting.
-
-=== 0.1.9 / 2010-03-15
-
-* Added the lowest term test.
-* Removed begin..end exception block which was hiding failing limit test.
-* Fixed limit test.
-
-=== 0.1.8 / 2010-03-15
-
-* Added Rdoc comments.
-
-=== 0.1.7 / 2010-03-15
-
-* Including spec files in distribution (forgot to add them to the manifest).
-
-=== 0.1.6 / 2010-03-15
-
-* Refactored code generating matrix that holds convergences. Renamed the method convergence_matrix.
-* In calculate_convergences, refactored multiple occurances of i-1 and i-2, assigning the values to variables at the top of the iterations.
-
-=== 0.1.5 / 2010-03-15
-
-* Minor changes to README
-* Added :nodoc: to Matrix singleton class method.
-
-=== 0.1.4 / 2010-03-15
-
-* Added Rspec files and tests.
-
-=== 0.1.3 / 2010-03-13
-
-* Changed url to the Bitbucket site.
-
-=== 0.1.2 / 2010-03-13
-
-* Fixed the documentation.
-
-=== 0.1.0 / 2010-03-13
-
-* Initial Release of ContinuedFractions

data/Manifest

@@ -1,10 +0,0 @@
-CHANGELOG
-Gemfile
-History.txt
-LICENSE
-Manifest
-README.md
-Rakefile
-lib/continued_fractions.rb
-spec/continued_fractions/continued_fraction_spec.rb
-spec/spec_helper.rb