eratostene_sieve 0.0.2.alpha → 0.0.3.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6edb9c9553a06662f98c90901bdc323831423427
-  data.tar.gz: 76139cf48925688f2c9621163cde64ea43e9b221
+  metadata.gz: 0968ea56db9e0e5e32a726c2faf90326d9c780d9
+  data.tar.gz: bab8a48045c05cb77de647297d3b84f67ba8aee6
 SHA512:
-  metadata.gz: bb5f3e4dead3a00a16ff958d159332e392470ff514506da411e69ab2548eec128599d0fcd45b3dfda8461bd74058b9ea00a92961b17eff03dc349a922555b69d
-  data.tar.gz: 72169fb765deae71d8140b565edc9b6e16fcdbb9947f0e76e0d15cae23f3d6ff690c70c3a8969c7676b8883e08c28dc2353e6555a444209c47c7ecfa669c3e46
+  metadata.gz: f5d7e505f928f970759e7671617e2bbd3e4689b57ebc2df879e3e2f638a58c9ee78372f29e425d67e30301b4df5131a2bfe01ae25bfa96ef8b76ab13977eed0b
+  data.tar.gz: ee3e9b34b08b2e9f8e0ac4ceb7edb8e27a46ec08534ae7b8f0641835937a10c68ddb5d95822fd67f997b04e354291f2fb3cd2acb8274782f41c4c5231542d323

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.3
+
+* Renames .prime_serie into .enumerator.
+* Adds .serie class method.
+
 ## v0.0.2
 
 * Fixes prime generation.

data/README.md

@@ -4,10 +4,17 @@ This gem provides you a set of minimal utility functions to manage prime numbers
 
 ## Changelog
 
-  - **1.0.0**: initial release. It provides just these class functions:
+  - **0.0.3**:
+
+    - Renames .prime_serie into .enumerator.
+    - Adds .serie class method.
+
+  - **0.0.2**: Fix .prime_serie.
+
+  - **0.0.1**: initial release. It provides just these class functions:
 
     - `nth_prime(n)` : retun the nth prime number.
-    - `prime_serie`  : return an enumerator over the prime serie.
+    - `enumerator`  : return an enumerator over the prime serie.
 
 ## Installation
 
@@ -34,11 +41,15 @@ Or install it yourself as:
     # nth_prime(n) example
     EratosterneSieve.nth_prime(10) # => 29
 
-    # prime_serie example
-    enumerator = EratosteneSieve.prime_serie
+    # enumerator example
+    enumerator = EratosteneSieve.enumerator
     serie = []
     (0..9).each { |i| serie << enumerator.next }
-    puts serie # => [1, 2, 3, 5, 7, 11, 13, 17, 19, 23]
+    puts serie # => [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
+
+    # serie example
+    serie = EratosteneSieve.serie(:from => 1, :up_to => 10)
+    puts serie # => [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
 
 ## Contributing
 

data/lib/eratostene_sieve/version.rb

@@ -1,4 +1,4 @@
 # Defines lib version constant.
 module EratosteneSieve
-  VERSION = '0.0.2.alpha'
+  VERSION = '0.0.3.alpha'
 end

data/lib/eratostene_sieve.rb

@@ -3,13 +3,13 @@ require 'eratostene_sieve/railtie' if defined? Rails
 
 # Utility to get:
 # - nth_prime(n): the nth prime number.
-# - prime_serie: an enumerator on prime number serie.
+# - enumerator: an enumerator on prime number serie.
 module EratosteneSieve
   Inf = 1.0 / 0.0
 
   def self.nth_prime(index)
-    return first_primes[index] if index < first_primes.size
-    counter = first_primes.size - 1
+    return first_primes[index - 1] if index <= first_primes.size
+    counter = first_primes.size
     ((first_primes.last + 2)..Inf).step(2) do |candidate|
       (2..((candidate**0.5).to_i)).each do |m|
         break if candidate % m == 0
@@ -19,11 +19,11 @@ module EratosteneSieve
     end
   end
 
-  def self.prime_serie
+  def self.enumerator
     Enumerator.new do |y|
-      a = 1
-      b = 2
-      index = 2
+      a = 2
+      b = 3
+      index = 3
       loop do
         y << a
         a, b = b, nth_prime(index)
@@ -32,9 +32,24 @@ module EratosteneSieve
     end
   end
 
+  def self.serie(options = {})
+    from = options[:from] || 1
+    up_to = options[:up_to] || 10
+    fail "from option must be an integer, given #{from}." unless from.is_a?(Integer)
+    fail "up_to option must be an integer, given #{up_to}." unless up_to.is_a?(Integer)
+    fail "from option must be > 0, given #{from}." if from < 1
+    serie = []
+    enumerator = EratosteneSieve.enumerator
+    lowest_index = from < up_to ? from : up_to
+    (lowest_index - 1).times { enumerator.next }
+    ((from - up_to).abs + 1).times { serie << enumerator.next }
+    serie.reverse! if from > up_to
+    serie
+  end
+
   private
 
   def self.first_primes
-    @first_primes ||= [1, 2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
+    @first_primes ||= [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31]
   end
 end

data/spec/eratostene_sieve_spec.rb

@@ -16,12 +16,46 @@ describe EratosteneSieve do
     end
   end
 
-  describe '.prime_serie' do
+  describe '.enumerator' do
     it 'should return ' do
-      enumerator = EratosteneSieve.prime_serie
+      enumerator = EratosteneSieve.enumerator
       serie = []
       (0..9).each { |i| serie << enumerator.next }
-      serie.should == [1, 2, 3, 5, 7, 11, 13, 17, 19, 23]
+      serie.should == [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
+    end
+  end
+
+  describe '.serie' do
+    it 'should return the first 10 primes if no argument is given' do
+      serie = EratosteneSieve.serie
+      serie.should == [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
+    end
+
+    it 'should return the serie of primes from x to y if :from => x, :up_to => y options are given' do
+      serie = EratosteneSieve.serie(:from => 5, :up_to => 10)
+      serie.should == [11, 13, 17, 19, 23, 29]
+    end
+
+    it 'should fail if :from is not an Integer' do
+      lambda{
+        EratosteneSieve.serie(:from => 'a', :up_to => 10)
+      }.should raise_error
+    end
+
+    it 'should fail if :up_to is not an Integer' do
+      lambda{
+        EratosteneSieve.serie(:from => 1, :up_to => :error)
+      }.should raise_error
+    end
+
+    it 'should fail if :from < 1' do
+      lambda{
+        EratosteneSieve.serie(:from => 0, :up_to => 10)
+      }.should raise_error
+    end
+
+    it 'should give a reversed array of the serie if :from > :up_to' do
+      EratosteneSieve.serie(:from => 10, :up_to => 1).should == EratosteneSieve.serie(:from => 1, :up_to => 10).reverse
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eratostene_sieve
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
 platform: ruby
 authors:
 - Andrea Salicetti