primetable 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b551e9d0b8a425d4dc3407990b2ad72b0ab9fcd
-  data.tar.gz: a74717ad8a2bd24eea4f4bf7924368ce7201684d
+  metadata.gz: 4e4fdef3ffbcb9081acc3d8e952ddc2b051f45e4
+  data.tar.gz: 5275d7f2f6cb434dc85f57ad0487936f7909f04b
 SHA512:
-  metadata.gz: 9b0a8cd6ec45dc22101cab9b71053672ef25f58cf147cf162cd028235e26cb38378b158f528f5f7de792d3fcc7c410231b8aabc249948e0cc0ea0dd9407cb92f
-  data.tar.gz: 0062b4553ddf9dc66a5f7310f214385ae7fde825096eef444f6490238e32cab10e66ed9d9f357e957bb1cd6b9c7156206edc007d2889a75ab32f569381c305dd
+  metadata.gz: d920a6a7aae34af4caaaedf1d3b3c59ab8eb10fe64ff8541b3f391e50396cc8ed0a418c8fd4d7b69963067eadabb043700089c4385fb591709da1402560f386e
+  data.tar.gz: 384eaf56ff8a025a59cd1990073f421000089b974b31358e3de60532771af11560cd066edecef1cbf6f4cdff79dd110ec0ccd98ac57cddfa9322c2aed323c8ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    primetable (0.3.0)
+    primetable (0.3.1)
       awesome_print (~> 1.6, >= 1.6.1)
       formatador (~> 0.2, >= 0.2.5)
       therubyracer (~> 0.12, >= 0.12.2)
@@ -10,9 +10,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     awesome_print (1.6.1)
+    coderay (1.1.0)
     diff-lcs (1.2.5)
     formatador (0.2.5)
     libv8 (3.16.14.13)
+    method_source (0.8.2)
+    pry (0.10.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (10.4.2)
     ref (2.0.0)
     rspec (3.4.0)
@@ -28,6 +34,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.0)
+    slop (3.6.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
@@ -38,6 +45,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   primetable!
+  pry
   rake (~> 10.4, >= 10.4.2)
   rspec (~> 3.4, >= 3.4.0)
 

data/lib/primetable/version.rb

@@ -1,3 +1,3 @@
 class PrimeTable
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/primetable.rb

@@ -4,8 +4,8 @@ Dir["#{File.dirname(__FILE__)}/primetable/**/*.rb"].each { |f| require(f) }
 # This is needed for load_primes method, which loads data from a file.
 require "yaml"
 
-# I'll probably remove this later, but it's my interim table display solution.
-require "awesome_print"
+# This is used in the display_table method to...um, display the table ;-)
+require "formatador"
 
 # So, just for fun, I'm going to write my Ruby prime generation method and a few others as
 # wrappers for some JS functionality I've already written. We'll test as usual. Perhaps, if
@@ -22,7 +22,6 @@ class PrimeTable
 
     # This is only for testing, I'm unlikely to implement a command-line flag for this
     unless suppress_output
-
       puts "PrimeTable is running..."
     end
 
@@ -136,13 +135,19 @@ class PrimeTable
 
   end
 
-  # The plan is to use Formatador to make this display nicely. For now, I'm just dumping the data,
-  # and making it slightly less lame with awesome_print.
+  # Use Formatador to make this display nicely.
   def display_table(table)
-
-    # Not much to see here. But I expect to be able to justify a comment soon enough.
-    ap table
-
+    columns = table.shift
+    table_data = table.map do |products|
+      row_hash = Hash.new
+      columns.each_with_index do |label, index|
+        key = (columns[index] || '')
+        row_hash[key] = products[index]
+      end
+      row_hash
+    end
+    # Note that we override the default string sort by passing a block with an integer sort
+    Formatador.display_table(table_data){ |x, y| x.to_i <=> y.to_i }
   end
 
 end

data/primetable.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", '~> 10.4', '>= 10.4.2'
   spec.add_development_dependency "rspec", '~> 3.4', '>= 3.4.0'
+  spec.add_development_dependency "pry"
 end

data/spec/primetable_spec.rb

@@ -21,6 +21,31 @@ describe PrimeTable do
                                              [19,38,57,95,133,209,247,323,361,437,551],
                                              [23,46,69,115,161,253,299,391,437,529,667],
                                              [29,58,87,145,203,319,377,493,551,667,841]]
+    @expected_table_display_first_ten = "
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  |    | 2  | 3  | 5   | 7   | 11  | 13  | 17  | 19  | 23  | 29  |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 2  | 4  | 6  | 10  | 14  | 22  | 26  | 34  | 38  | 46  | 58  |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 3  | 6  | 9  | 15  | 21  | 33  | 39  | 51  | 57  | 69  | 87  |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 5  | 10 | 15 | 25  | 35  | 55  | 65  | 85  | 95  | 115 | 145 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 7  | 14 | 21 | 35  | 49  | 77  | 91  | 119 | 133 | 161 | 203 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 11 | 22 | 33 | 55  | 77  | 121 | 143 | 187 | 209 | 253 | 319 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 13 | 26 | 39 | 65  | 91  | 143 | 169 | 221 | 247 | 299 | 377 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 17 | 34 | 51 | 85  | 119 | 187 | 221 | 289 | 323 | 391 | 493 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 19 | 38 | 57 | 95  | 133 | 209 | 247 | 323 | 361 | 437 | 551 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 23 | 46 | 69 | 115 | 161 | 253 | 299 | 391 | 437 | 529 | 667 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+
+  | 29 | 58 | 87 | 145 | 203 | 319 | 377 | 493 | 551 | 667 | 841 |
+  +----+----+----+-----+-----+-----+-----+-----+-----+-----+-----+"
+
   end
 
   it 'has a version number' do
@@ -75,4 +100,8 @@ describe PrimeTable do
     expect(test_instance.primes).to eq(@expected_first_ten_primes)
     expect(test_instance.table).to eq(@expected_table_with_first_ten_primes)
   end
+  
+  it "displays the table properly for the first ten primes" do
+    expect(`primetable`).to include(@expected_table_display_first_ten)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: primetable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Day Davis Waterbury
@@ -124,6 +124,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: Displays the products of N primes in a table format. Optionally uses
   generated primes or precalculated.
 email: