fizzbuzzer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da58d7c29be8ab792904f6568b0accce17d2cf3c
-  data.tar.gz: 414323b0ae95450d79aa2d0da5be1c065470e57e
+  metadata.gz: 257500b27fdf676a85d3671553510fcde0ec2fa3
+  data.tar.gz: 69812a749e44213e790167fb8b925391ea85317f
 SHA512:
-  metadata.gz: 4c75335ebca864f1d72568312fb813b53b16ef46fc79c01f3331bea11ce8b4fed9cc06ee17d10630986f135a919d1e84868c32de8845b5115ba63369b2a9aaf3
-  data.tar.gz: 86134a7767428e28906ce3539714265b8f7910c3a0ead9928dfa39e16288117e78993e67c499f4b56ee1379b50737561c0f4e1c72f70e1277737bab9e48aaac4
+  metadata.gz: 3eeb4670da60daa491e639286d11804329eee875f11847ee11d94a95a897ea2dffc2c01e625517bbca732e0f0896375e667f0b08daf04a38619d1176feb1a86d
+  data.tar.gz: 6116a56553ef18c25dda8ef1cd0903bf8206fc340dac31f5fea980824ac1e4e02138a6f91221cd3dccf667cf7376d3e68d031678ee32088e450f65c74eedaeda

data/Manifest.txt

@@ -6,5 +6,6 @@ bin/fizzbuzz
 lib/fizzbuzzer.rb
 lib/fizzbuzzer/version.rb
 test/helper.rb
+test/test_driven.rb
 test/test_fizzbuzz.rb
 test/test_version.rb

data/README.md

@@ -182,28 +182,27 @@ end
 
 ``` ruby
 class Fizznum
-  attr_accessor :num
 
-  def initialize(num)
-    self.num = num
+  def initialize(n)
+    @n = n
   end
 
-  def fizzbuzz?() num % 3 == 0 && num % 5 == 0;  end
-  def fizz?()     num % 3 == 0;  end
-  def buzz?()     num % 5 == 0;  end
+  def fizzbuzz?() @n % 3 == 0 && @n % 5 == 0;  end
+  def fizz?()     @n % 3 == 0;  end
+  def buzz?()     @n % 5 == 0;  end
 
-  def to_s
+  def val
     if    fizzbuzz? then "FizzBuzz"
     elsif fizz?     then "Fizz"
     elsif buzz?     then "Buzz"
-    else  num.to_s
+    else  @n
     end
   end
 
 end
 
 def fizzbuzz
-  (1..100).map{ |n| Fizznum.new(n).to_s }
+  (1..100).map{ |n| Fizznum.new(n).val }
 end
 ```
 
@@ -308,34 +307,34 @@ end
 ```
 
 
-
-## Pattern Matching with Noaidi
+## Poor Man's (Do-It-Yourself) Pattern Matching
 
 ``` ruby
-require "noaidi"
-
 def fizzbuzz
   (1..100).map do |n|
-    Noaidi.match [n % 3, n % 5] do |m|
-      m.(0, 0)           { "FizzBuzz" }
-      m.(0, Fixnum)      { "Fizz" }
-      m.(Fixnum, 0)      { "Buzz" }
-      m.(Fixnum, Fixnum) { n }
+    case [n % 3 == 0, n % 5 == 0]
+    when [true, true]    then "FizzBuzz"
+    when [true, false]   then "Fizz"
+    when [false, true]   then "Buzz"
+    else n
     end
   end
 end
 ```
 
-## Poor Man's (Do-It-Yourself) Pattern Matching
+
+## Pattern Matching with Noaidi
 
 ``` ruby
+require "noaidi"
+
 def fizzbuzz
   (1..100).map do |n|
-    case [n % 3, n % 5].map {|remainder| remainder.zero? }
-    when [true, true]    then "FizzBuzz"
-    when [true, false]   then "Fizz"
-    when [false, true]   then "Buzz"
-    else n
+    Noaidi.match [n % 3, n % 5] do |m|
+      m.(0, 0)           { "FizzBuzz" }
+      m.(0, Fixnum)      { "Fizz" }
+      m.(Fixnum, 0)      { "Buzz" }
+      m.(Fixnum, Fixnum) { n }
     end
   end
 end
@@ -349,21 +348,21 @@ require "dry-matcher"
 
 FizzBuzz = Dry::Matcher.new(
   fizzbuzz: Dry::Matcher::Case.new(
-              match: -> value { value % 3 == 0 && value % 5 == 0 },
+              match: -> value { value[0] == 0 && value[1] == 0 },
               resolve: -> value { "FizzBuzz" } ),
   fizz:     Dry::Matcher::Case.new(
-              match: -> value { value % 3 == 0 },
+              match: -> value { value[0] == 0 },
               resolve: -> value { "Fizz" } ),
   buzz:     Dry::Matcher::Case.new(
-              match: -> value { value % 5 == 0 },
+              match: -> value { value[1] == 0 },
               resolve: -> value { "Buzz" } ),
   other:    Dry::Matcher::Case.new(
               match: -> value { true },
-              resolve: -> value { value } ))
+              resolve: -> value { value[2] } ))
 
 def fizzbuzz
   (1..100).map do |n|
-    FizzBuzz.(n) do |m|
+    FizzBuzz.([n % 3, n % 5, n]) do |m|
       m.fizzbuzz { |v| v }
       m.fizz     { |v| v }
       m.buzz     { |v| v }
@@ -374,26 +373,99 @@ end
 ```
 
 
-## Rotate / No Conditionals
+## Test Driven Development (TDD)
 
 ``` ruby
-def fizzbuzz
-  fizzy = [1,0,0]
-  buzzy = [1,0,0,0,0]
+describe FizzBuzz do
+  before do
+    @result = fizzbuzz
+  end
 
-  (1..100).map do |n|
-     fizzy.rotate!
-     buzzy.rotate!
-     result = n.to_s * (1 - (fizzy[0] | buzzy[0]))
-     result << "Fizz" * fizzy[0]
-     result << "Buzz" * buzzy[0]
-     result
+  it "returns 'Fizz' for multiples of 3" do
+    @result[3-1].must_equal "Fizz"
+  end
+
+  it "returns 'Buzz' for multiples of 5" do
+    @result[5-1].must_equal "Buzz"
+  end
+
+  it "returns 'FizzBuzz' for multiples of 3 and 5" do
+    @result[15-1].must_equal "FizzBuzz"
+  end
+
+  it "returns the passed number if not a multiple of 3 or 5" do
+    @result[1-1].must_equal 1
+  end
+end
+```
+
+Or use asserts for testing:
+
+``` ruby
+class TestFizzBuzz < Minitest::Test
+
+  def setup
+    @result = fizzbuzz
+  end
+
+  def test_fizz_multiples_of_3
+    assert_equal "Fizz", @result[3-1]
+  end
+
+  def test_buzz_for_multiples_of_5
+    assert_equal "Buzz", @result[5-1]
+  end
+
+  def test_fizzbuzz_for_multiples_of_3_and_5
+    assert_equal "FizzBuzz", @result[15-1]
+  end
+
+  def test_number_if_not_multiple_of_3_or_5
+    assert_equal 1, @result[1-1]
+  end
+
+end
+```
+
+And here's another fizzbuzz algorithm using a classic `for` loop:
+
+``` ruby
+def fizzbuzz
+  result = []
+  for n in 1..100 do
+    result << if     n % 3 == 0 && n % 5 == 0 then "FizzBuzz"
+              elsif  n % 3 == 0               then "Fizz"
+              elsif  n % 5 == 0               then "Buzz"
+              else   n  
+              end
   end
+  result
 end
 ```
 
-Contributed by [John Schank](https://github.com/jschank).
+Or use an all-in-one assert as used
+for testing all the fizzbuzz algorithms :-) in this repo:
 
+``` ruby
+FIZZBUZZES_1_TO_100 =
+  [1, 2, "Fizz", 4, "Buzz", "Fizz", 7, 8, "Fizz", "Buzz", 11, "Fizz", 13, 14,
+  "FizzBuzz", 16, 17, "Fizz", 19, "Buzz", "Fizz", 22, 23, "Fizz", "Buzz", 26,
+  "Fizz", 28, 29, "FizzBuzz", 31, 32, "Fizz", 34, "Buzz", "Fizz", 37, 38,
+  "Fizz", "Buzz", 41, "Fizz", 43, 44, "FizzBuzz", 46, 47, "Fizz", 49, "Buzz",
+  "Fizz", 52, 53, "Fizz", "Buzz", 56, "Fizz", 58, 59, "FizzBuzz", 61, 62,
+  "Fizz", 64, "Buzz", "Fizz", 67, 68, "Fizz", "Buzz", 71, "Fizz", 73, 74,
+  "FizzBuzz", 76, 77, "Fizz", 79, "Buzz", "Fizz", 82, 83, "Fizz", "Buzz", 86,
+  "Fizz", 88, 89, "FizzBuzz", 91, 92, "Fizz", 94, "Buzz", "Fizz", 97, 98,
+  "Fizz", "Buzz"]
+
+class TestFizzBuzz < Minitest::Test
+
+  def test_fizzbuzz
+    assert_equal FIZZBUZZES_1_TO_100, fizzbuzz
+  end
+
+end
+```
 
 
 ## With Parameterization

data/lib/fizzbuzzer.rb

@@ -107,27 +107,25 @@ end
 
 module V4
 class Fizznum
-  attr_accessor :num
-
-  def initialize(num)
-    self.num = num
+  def initialize(n)
+    @n = n
   end
 
-  def fizzbuzz?() num % 3 == 0 && num % 5 == 0;  end
-  def fizz?()     num % 3 == 0;  end
-  def buzz?()     num % 5 == 0;  end
+  def fizzbuzz?() @n % 3 == 0 && @n % 5 == 0;  end
+  def fizz?()     @n % 3 == 0;  end
+  def buzz?()     @n % 5 == 0;  end
 
-  def to_s
+  def val
     if    fizzbuzz? then "FizzBuzz"
     elsif fizz?     then "Fizz"
     elsif buzz?     then "Buzz"
-    else  num.to_s
+    else  @n
     end
   end
 end
 
 def fizzbuzz
-  (1..100).map{ |n| Fizznum.new(n).to_s }
+  (1..100).map{ |n| Fizznum.new(n).val }
 end
 end
 
@@ -239,6 +237,20 @@ end
 
 
 module V8
+  def fizzbuzz
+    (1..100).map do |n|
+      case [n % 3 == 0, n % 5 == 0]
+      when [true, true]    then "FizzBuzz"
+      when [true, false]   then "Fizz"
+      when [false, true]   then "Buzz"
+      else n
+      end
+    end
+  end
+end
+
+
+module V9
 require "noaidi"
 
 def fizzbuzz
@@ -254,40 +266,26 @@ end
 end
 
 
-module V9
-  def fizzbuzz
-    (1..100).map do |n|
-      case [n % 3, n % 5].map {|remainder| remainder.zero? }
-      when [true, true]    then "FizzBuzz"
-      when [true, false]   then "Fizz"
-      when [false, true]   then "Buzz"
-      else n
-      end
-    end
-  end
-end
-
-
 module V10
 require "dry-matcher"
 
 FizzBuzz = Dry::Matcher.new(
   fizzbuzz: Dry::Matcher::Case.new(
-              match: -> value { value % 3 == 0 && value % 5 == 0 },
+              match: -> value { value[0] == 0 && value[1] == 0 },
               resolve: -> value { "FizzBuzz" } ),
   fizz:     Dry::Matcher::Case.new(
-              match: -> value { value % 3 == 0 },
+              match: -> value { value[0] == 0 },
               resolve: -> value { "Fizz" } ),
   buzz:     Dry::Matcher::Case.new(
-              match: -> value { value % 5 == 0 },
+              match: -> value { value[1] == 0 },
               resolve: -> value { "Buzz" } ),
   other:    Dry::Matcher::Case.new(
               match: -> value { true },
-              resolve: -> value { value } ))
+              resolve: -> value { value[2] } ))
 
 def fizzbuzz
   (1..100).map do |n|
-    FizzBuzz.(n) do |m|
+    FizzBuzz.([n % 3, n % 5, n]) do |m|
       m.fizzbuzz { |v| v }
       m.fizz     { |v| v }
       m.buzz     { |v| v }
@@ -298,21 +296,20 @@ end
 end
 
 
-module V11
-def fizzbuzz
-  fizzy = [1,0,0]
-  buzzy = [1,0,0,0,0]
 
-  (1..100).map do |n|
-     fizzy.rotate!
-     buzzy.rotate!
-     result = n.to_s * (1 - (fizzy[0] | buzzy[0]))
-     result << "Fizz" * fizzy[0]
-     result << "Buzz" * buzzy[0]
-     result
+module V11
+  def fizzbuzz
+    result = []
+    for n in 1..100 do
+      result << if     n % 3 == 0 && n % 5 == 0 then "FizzBuzz"
+                elsif  n % 3 == 0               then "Fizz"
+                elsif  n % 5 == 0               then "Buzz"
+                else   n
+                end
+    end
+    result
   end
 end
-end
 
 
 module V12a

data/lib/fizzbuzzer/version.rb

@@ -4,7 +4,7 @@
 module FizzBuzzer
 
   MAJOR = 1
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/test_driven.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_driven.rb
+
+
+require 'helper'
+
+
+describe FizzBuzz do
+
+  include FizzBuzzer::V11   ##  add (include) fizzbuzz method using algorithm V11
+
+  before do
+    @result = fizzbuzz
+  end
+
+  it "returns 'Fizz' for multiples of 3" do
+    @result[3-1].must_equal "Fizz"
+  end
+
+  it "returns 'Buzz' for multiples of 5" do
+    @result[5-1].must_equal "Buzz"
+  end
+
+  it "returns 'FizzBuzz' for multiples of 3 and 5" do
+    @result[15-1].must_equal "FizzBuzz"
+  end
+
+  it "returns the passed number if not a multiple of 3 or 5" do
+    @result[1-1].must_equal 1
+  end
+end
+
+
+
+class TestFizzBuzz < Minitest::Test
+
+  include FizzBuzzer::V11   ##  add (include) fizzbuzz method using algorithm V11
+
+  def setup
+    @result = fizzbuzz
+  end
+
+  def test_fizz_multiples_of_3
+    assert_equal "Fizz", @result[3-1]
+  end
+
+  def test_buzz_for_multiples_of_5
+    assert_equal "Buzz", @result[5-1]
+  end
+
+  def test_fizzbuzz_for_multiples_of_3_and_5
+    assert_equal "FizzBuzz", @result[15-1]
+  end
+
+  def test_number_if_not_multiple_of_3_or_5
+    assert_equal 1, @result[1-1]
+  end
+end

data/test/test_fizzbuzz.rb

@@ -19,13 +19,11 @@ FIZZBUZZES_1_TO_100 =
   "Fizz", 88, 89, "FizzBuzz", 91, 92, "Fizz", 94, "Buzz", "Fizz", 97, 98,
   "Fizz", "Buzz"]
 
-## all strings version
-##   e.g. ["1", "2", "Fizz", ...]
-FIZZBUZZES_1_TO_100_V2 = FIZZBUZZES_1_TO_100.map {|value| value.to_s }
 
 
 class TestV1 < MiniTest::Test
-  include FizzBuzzer::V1
+
+  include FizzBuzzer::V1   ##  add (include) fizzbuzz method using algorithm V1
 
 def test_fizzbuzz
    assert_equal FIZZBUZZES_1_TO_100, fizzbuzz
@@ -43,13 +41,7 @@ end # class TestV1
 
       def test_fizzbuzz
         puts "running fizzbuzz #{name}..."
-        if %w[V4 V11].include? '#{name}'
-          # use all string version e.g. ["1", "2", "Fizz", ...]
-          assert_equal FIZZBUZZES_1_TO_100_V2, fizzbuzz
-        else
-          # use "mixed" tuple version e.g. [1, 2, "Fizz", ...]
-          assert_equal FIZZBUZZES_1_TO_100, fizzbuzz
-        end
+        assert_equal FIZZBUZZES_1_TO_100, fizzbuzz
       end
     end)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fizzbuzzer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: noaidi
@@ -88,6 +88,7 @@ files:
 - lib/fizzbuzzer.rb
 - lib/fizzbuzzer/version.rb
 - test/helper.rb
+- test/test_driven.rb
 - test/test_fizzbuzz.rb
 - test/test_version.rb
 homepage: https://github.com/rubylibs/fizzbuzzer