fizz_buzz_dillonhafer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fdcf120be1e851e0ccef304c10fedce723071f
-  data.tar.gz: c3a9466cf694c527a4a0d7ef12251e491871c89b
+  metadata.gz: 2708da8f4902aa9e9b8db0f8f4ad899545c42189
+  data.tar.gz: 174dc5daa0eddaa8f417b8abca016ed71933fda2
 SHA512:
-  metadata.gz: 6f5dc55d940b29f01a49811571d4ef5555d4e7ca89a08708cc0438365e5a0f8b82b3fe5b3d2d75485d9c9b36f265a6d2266145e2e2e412a2f05fcaf199ffba7e
-  data.tar.gz: 337a43b00af7654458bf2446c3c7da378a850c57f08ef2fd8046965905e78b99f160a8c533c2104f76a2bd7001d283eda2d65398e41526660ab22f83e60aa749
+  metadata.gz: 54bb0f170cd3054920c9c0fa824707d049da810137287103875cd1f873fe4cfa6d877c3a42a8fecefe5922de3a0992f934059d805aa85bcbc3d608ad1533b57d
+  data.tar.gz: 6ba36e83e87c7a0fb3e2d394b6028476ef480d5cd831b556f5c7c6a386c6f36fe94ed977b6aeeeae97956f22a22571af4de40864ba8750f302c80a6684d398a6

data/Gemfile.lock

@@ -25,4 +25,4 @@ PLATFORMS
 
 DEPENDENCIES
   fizz_buzz_dillonhafer!
-  rspec (~> 3.1.0)
+  rspec (~> 3.1.0, >= 3.1.0)

data/fizz_buzz_dillonhafer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'fizz_buzz_dillonhafer'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.date        = '2014-10-02'
   s.summary     = "FizzBuzz Kata!"
   s.description = "FizzBuzz"

data/lib/fizz_buzz.rb

@@ -1,37 +1,35 @@
 class FizzBuzz
+  DEFINITIONS = {'3' => 'fizz', '5' => 'buzz'}
   attr_accessor :number  
 
   def initialize(number)
     @number = number
   end
 
-  def word
-    if divisible?
-      definitions[find]
-    else 
-      number
-    end
-  end
-
   def valid?
     number > 0
   end
-
-  private
-
-  def divisible?
-    valid? && !definitions[find].nil?
+  
+  def to_s
+    convert if valid?
   end
 
-  def definitions
-    {'3' => 'fizz', '5' => 'buzz', '15' => 'fizzbuzz'}
+  private
+    
+  def calculate
+    match = ""
+    %w{3 5}.each do |n|
+      match << DEFINITIONS[n] if number % n.to_i == 0
+    end
+    match
   end
 
-  def find
-    match = number
-    %w{3 5 15}.each do |n|
-      match = n if number % n.to_i == 0
+  def convert
+    result = calculate
+    if result.empty?
+      number
+    else
+      result
     end
-    match
   end
 end

data/spec/fizz_buzz_spec.rb

@@ -13,44 +13,44 @@ describe FizzBuzz, "#valid?" do
   end
 end
 
-describe FizzBuzz, "#word" do
+describe FizzBuzz, "#to_s" do
   it "returns 1 if 1 not divisible by 3, 5, or 15" do
     fizz_buzz = FizzBuzz.new(1)
-    expect(fizz_buzz.word).to eq(1)
+    expect(fizz_buzz.to_s).to eq(1)
   end
 
   it "returns 2 if 2 not divisible by 3, 5, or 15" do
     fizz_buzz = FizzBuzz.new(2)
-    expect(fizz_buzz.word).to eq(2)
+    expect(fizz_buzz.to_s).to eq(2)
   end
   
   it "returns 'fizz' if the number is divisible by 3" do
     fizz_buzz = FizzBuzz.new(3)
-    expect(fizz_buzz.word).to eq('fizz')
+    expect(fizz_buzz.to_s).to eq('fizz')
   end
 
   it "returns 4 if 4 is not divisible by 3, 5, or 15" do
     fizz_buzz = FizzBuzz.new(4)
-    expect(fizz_buzz.word).to eq(4)
+    expect(fizz_buzz.to_s).to eq(4)
   end
   
   it "returns 'buzz' if the number is divisible by 5" do    
     fizz_buzz = FizzBuzz.new(5)
-    expect(fizz_buzz.word).to eq('buzz')
+    expect(fizz_buzz.to_s).to eq('buzz')
   end
 
   it "returns 'fixx' if the number is divisible by 3" do
     fizz_buzz = FizzBuzz.new(6)
-    expect(fizz_buzz.word).to eq('fizz')
+    expect(fizz_buzz.to_s).to eq('fizz')
   end
 
   it "returns 'buzz' if the number is divisible by 5" do    
     fizz_buzz = FizzBuzz.new(10)
-    expect(fizz_buzz.word).to eq('buzz')
+    expect(fizz_buzz.to_s).to eq('buzz')
   end
 
   it "returns 'fizzbuzz' if the number is divisible by 15" do
     fizz_buzz = FizzBuzz.new(15)
-    expect(fizz_buzz.word).to eq('fizzbuzz')
+    expect(fizz_buzz.to_s).to eq('fizzbuzz')
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fizz_buzz_dillonhafer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dillon Hafer
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: FizzBuzz Kata!