tabletop 0.2.1 → 0.3.0

data/spec/randomizers_spec.rb

@@ -2,16 +2,25 @@ require 'spec_helper'
 
 module Tabletop
   describe Die do
-    
     before :each do
-      @d6_2 = Die.new(6, 2)
-      @d6_3 = Die.new(6, 3)
+      @d6_2 = Die.new(value: 2)
+      @d6_3 = Die.new(value: 3)
     end
-    
+
+    describe ".new_from_string" do
+      it "expects a string in the format 'n/o', where n and o are integers" do
+        d = Die.new_from_string('4/5')
+        d.value.should == 4
+        d.sides.should == 5
+        expect {Die.new_from_string('10')}.to raise_error(ArgumentError)
+        expect {Die.new_from_string(4/5)}.to raise_error(ArgumentError)
+      end
+    end
+
     describe "#sides" do
       it "can be accessed" do
         (2..10).each do |i|
-          Die.new(i).sides.should == i
+          Die.new(sides: i).sides.should == i
         end
       end
       
@@ -20,15 +29,16 @@ module Tabletop
       end
       
       it "cannot be 1 or less" do
-        expect { Die.new(0) }.to raise_error(ArgumentError)
-        expect { Die.new(1) }.to raise_error(ArgumentError)
-        expect { Die.new(-5) }.to raise_error(ArgumentError)
+        expect { Die.new(sides: 0) }.to raise_error(ArgumentError)
+        expect { Die.new(sides: 1) }.to raise_error(ArgumentError)
+        expect { Die.new(sides: -5) }.to raise_error(ArgumentError)
       end
       
-      it "cannot be a non-integer" do
-        expect { Die.new(0.1) }.to raise_error(ArgumentError)
-        expect { Die.new(5.7694) }.to raise_error(ArgumentError)
-        expect { Die.new("foof") }.to raise_error(ArgumentError)
+      it "is cast as an integer" do
+        expect { Die.new(sides: 0.1) }.to raise_error(ArgumentError)
+        Die.new(sides: 5.7694).sides.should == 5
+        Die.new(sides: "10").sides.should == 10
+        expect { Die.new(sides: "foof") }.to raise_error(ArgumentError)
       end
     end
     
@@ -36,31 +46,35 @@ module Tabletop
       it "should be random on instantiation by default" do 
         Random.srand(10)
         Die.new.value.should == 2
-        Die.new(10).value.should == 5
-        Die.new(50).value.should == 16
+        Die.new(sides: 10).value.should == 5
+        Die.new(sides: 50, value: nil).value.should == 16
       end
       
       it "can be set to a given value on instantiation" do
-        Die.new(6, 5).value.should == 5
-        Die.new(10, 2).value.should == 2
+        Die.new(value: 5).value.should == 5
+        Die.new(sides: 10, value: 2).value.should == 2
       end
       
-      it "cannot be a non-integer" do
-        expect { Die.new(0.1) }.to raise_error(ArgumentError)
-        expect { Die.new(5.7694) }.to raise_error(ArgumentError)
-        expect { Die.new("foof") }.to raise_error(ArgumentError)
+      it "is cast as an integer" do
+        expect { Die.new(value: []) }.to raise_error(TypeError)
+        Die.new(value: 5.7694).value.should == 5
+        expect { Die.new(value: "foof")}.to raise_error(ArgumentError)
       end
     end
     
     describe "#value=" do
-      it "can only be set to an integer i, where 0 < i <= sides" do
-        d = Die.new
-        lambda { d.value = 0 }.should raise_error(ArgumentError)
-        lambda { d.value = -5 }.should raise_error(ArgumentError)
-        lambda { d.value = 7 }.should raise_error(ArgumentError)
-        d = Die.new(10)
-        d.value = 7
-        lambda { d.value = 22 }.should raise_error(ArgumentError)
+      it "can only be set to i, where 0 < i <= sides" do
+        [4, 6, 10].each do |type|
+          d = Die.new(sides: type)
+          -10.upto(15).each do |v|
+            if v < 1 or v > type
+              lambda { d.value = v }.should raise_error(ArgumentError)
+            else
+              d.value = v
+              d.value.should == v
+            end
+          end
+        end
       end
     end
     
@@ -69,9 +83,9 @@ module Tabletop
         Random.srand(10)
       end
       
-      context "six sides" do
+      context "a die with six sides" do
         before(:each) do
-          @d6 = Die.new #=> 2
+          @d6 = Die.new
         end
         
         it "should return a random result between 1 and @sides" do
@@ -91,7 +105,7 @@ module Tabletop
     describe "#to_str" do      
       it "should tell you the die's value" do
         5.times do
-          d = Die.new(rand(10)+3)
+          d = Die.new(sides: rand(10)+3)
           "#{d}".should == "[#{d.value}]/d#{d.sides}"
         end
       end
@@ -131,41 +145,38 @@ module Tabletop
     
     describe "#value" do
       it "can be set on instantiation" do
-        FudgeDie.new(1).value.should == 1
-        FudgeDie.new(0).value.should == 0
-        FudgeDie.new(-1).value.should == -1
+        [-1, 0, 1].each do |v|
+          FudgeDie.new(value:v).value.should == v
+        end
       end
       
       it "is randomly rolled if not set" do
         @fudge.value.should == 0
       end
-      
-      it "can only be one of either -1, 0, or 1" do
-        [-1, 0, 1].each do |v|
-          FudgeDie.new(v)
-        end
-        expect {FudgeDie.new(2)}.to raise_error(ArgumentError)
-        expect {FudgeDie.new(0.6)}.to raise_error(ArgumentError)
-        expect {FudgeDie.new("5")}.to raise_error(ArgumentError)
+
+      it "can only be -1, 0 or 1" do
+        expect {FudgeDie.new(value:2)}.to raise_error(ArgumentError)
+        expect {FudgeDie.new(value:"-5")}.to raise_error(ArgumentError)
       end
     end
     
     describe "#value=" do
-      it "cannot be set to anything but -1, 0, or 1" do
-        expect {@fudge.value = 2}.to raise_error(ArgumentError)
-        expect {@fudge.value = 0.6}.to raise_error(ArgumentError)
-        expect {@fudge.value = "5"}.to raise_error(ArgumentError)
+      it "can be set to -1, 0, or 1" do
         [-1, 0, 1].each do |v|
           @fudge.value = v
         end
       end
+      it "cannot be set to anything else" do
+        expect {@fudge.value = 2}.to raise_error(ArgumentError)
+        expect {@fudge.value = "-5"}.to raise_error(ArgumentError)
+      end
     end
     
     describe "#to_s" do
       it "should return cute little dice with symbols" do
-        FudgeDie.new(1).to_s.should == "[+]"
-        FudgeDie.new(0).to_s.should == "[ ]"
-        FudgeDie.new(-1).to_s.should == "[-]"
+        FudgeDie.new(value:1).to_s.should == "[+]"
+        FudgeDie.new(value:0).to_s.should == "[ ]"
+        FudgeDie.new(value:-1).to_s.should == "[-]"
       end
     end
   end
@@ -183,27 +194,36 @@ module Tabletop
       end
       
       it "can't be anything else" do
-        expect {subject.value = "a thing"}.to raise_error(ArgumentError)
-        expect {subject.value = 2}.to raise_error(ArgumentError)
+        expect {subject.value = "2"}.to raise_error(ArgumentError)
+        expect {subject.value = -1.6}.to raise_error(ArgumentError)
+      end
+    end
+
+    describe "heads?" do
+      it "is true if #value is 1" do
+        Coin.new(value:1).heads?.should be_true
+        Coin.new(value:0).heads?.should be_false
+      end
+    end
+
+    describe "tails?" do
+      it "is true if #value is 0" do
+        Coin.new(value:0).tails?.should be_true
+        Coin.new(value:1).tails?.should be_false
       end
     end
     
     describe "#flip" do
       it {subject.flip.should be_instance_of(Coin)}
       it "should alias roll" do
-        mock(subject).roll
+        subject.should_receive(:roll)
         subject.flip
-        # I have to use implicit expectations, because the below code doesn't
-        # work in rspec2
-        #stub(subject).roll
-        #subject.flip
-        #subject.should have_received.roll
       end
     end
     
     describe "#to_s" do
-      it {Coin.new(1).to_s.should == "(+)"}
-      it {Coin.new(0).to_s.should == "( )"}
+      it {Coin.new(value:1).to_s.should == "(+)"}
+      it {Coin.new(value:0).to_s.should == "( )"}
     end
   end
 end

data/spec/roll_spec.rb

@@ -32,11 +32,12 @@ module Tabletop
               under_fire.roll
             end
             if under_fire.pool.sum + cool + mod >= 10
-              effect = "You do it"
+              effect = ["You do it"]
             elsif under_fire.pool.sum + cool + mod >= 7
-              effect = "You flinch, hesitate, or stall"
+              effect = ["You flinch, hesitate, or stall"]
             end
-            under_fire.effects.should == [under_fire.pool.sum + cool + mod, effect]
+            under_fire.result.should == under_fire.pool.sum + cool + mod
+            under_fire.effects.should == effect
           end
         end
       end
@@ -67,15 +68,16 @@ module Tabletop
         it "can count successes" do
           @exalted.roll(:pool=>10)
           10.times do
-            @exalted.effects.should == [count_successes(@exalted.pool), nil]
+            @exalted.result.should == count_successes(@exalted.pool)
+            @exalted.effects.should ==nil
           end
         end
         
         it "can determine success" do
           (1..10).each do |i|
             @exalted.roll(:pool=>6, :difficulty=>i)
-            effect = (count_successes(@exalted.pool) >= i) ? "Success" : nil
-            @exalted.effects.should == [count_successes(@exalted.pool), effect]
+            effect = (count_successes(@exalted.pool) >= i) ? ["Success"] : nil
+            @exalted.effects.should == effect
           end
         end
       end
@@ -99,20 +101,19 @@ module Tabletop
           equals 1, "Rock Paper Scissors", rps
           equals 2, "JanKenPon", jkp 
         }
-        a, b, c = fist_game.roll.effects
+        a, b = fist_game.roll.effects
         
-        [1,2].include?(a).should be_true
+        [1,2].include?(fist_game.result).should be_true
         
-        if a == 1
-          b.should == "Rock Paper Scissors"
+        if fist_game.result == 1
+          a.should == "Rock Paper Scissors"
         else
-          b.should == "JanKenPon"
+          a.should == "JanKenPon"
         end
         
-        [1,2,3].include?(c[0]).should be_true
-        
-        b[1].should be_instance_of(String)
-        
+        b.should be_instance_of(Array)
+        b.length.should == 1
+        b[0].should be_instance_of(String)
       end
       before :each do
         ill_fortune = Roll.new(1.d10) do
@@ -149,10 +150,10 @@ module Tabletop
       it "can compose multiple nested results" do
         20.times do
           @childhood_event.roll
-          if @childhood_event.effects[0] >= 9
-            @childhood_event.effects.length.should == 4
-          else
+          if @childhood_event.result >= 9
             @childhood_event.effects.length.should == 3
+          else
+            @childhood_event.effects.length.should == 2
           end
         end
       end

data/spec/spec_helper.rb

@@ -12,8 +12,4 @@ require 'tabletop'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.mock_framework = :rr
-end
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/token_spec.rb

@@ -42,14 +42,14 @@ module Tabletop
           end
         end
         
-        it "does not accept non-integers" do
-          expect { subject.add(0.1) }.to raise_error(ArgumentError)
+        it "casts arguments to integers" do
+          subject.add(3.5)
+          subject.count.should == 4
+          expect { subject.add(Object) }.to raise_error(ArgumentError)
         end
         
-        it "does not accept arguments < 1" do
-          expect { subject.add(0) }.to raise_error(ArgumentError)
+        it "does not accept arguments < 0" do
           expect { subject.add(-1) }.to raise_error(ArgumentError)
-          subject.add(1)
         end
       end
     end
@@ -69,14 +69,15 @@ module Tabletop
           end
         end
         
-        it "does not accept non-integers" do
-          expect { subject.remove(0.1) }.to raise_error(ArgumentError)
+        it "casts arguments to integers" do
+          subject.count = 2
+          subject.remove(Math::E)
+          subject.count.should == 0
+          expect { subject.remove(Object) }.to raise_error(ArgumentError)
         end
         
-        it "does not accept arguments < 1" do
-          expect { subject.remove(0) }.to raise_error(ArgumentError)
+        it "does not accept arguments < 0" do
           expect { subject.remove(-1) }.to raise_error(ArgumentError)
-          subject.remove(1)
         end
         
         it "raises an error when trying to remove too many" do
@@ -110,12 +111,70 @@ module Tabletop
         end
       end
       it "doesn't move any tokens if :to isn't a TokenStack" do
-        expect {@a.move(1, :to => [])}.to raise_error(
-          ArgumentError,
-          /target is Array, not TokenStack/)
+        expect {@a.move(1, :to => [])}.to raise_error ArgumentError
+        @a.count.should == 1
+      end
+      it "doesn't move any tokens if no :to option is passed" do
+        expect {@a.move(1)}.to raise_error ArgumentError
+        @a.count.should == 1
+      end
+      it "doesn't move any tokens if there aren't enough tokens to move" do
+        expect {@a.move(2, :to => @b)}.to raise_error NotEnoughTokensError
         @a.count.should == 1
         @b.count.should == 1
       end
     end
+
+    context "with a maximum set" do
+      describe "#max" do
+        it "can be set on instantiation" do
+          2.upto(5) do |v|
+            s = TokenStack.new(1, max: v)
+            s.max.should == v
+          end
+        end
+      end
+      describe "#count=" do
+        it "cannot be set higher than the current maximum" do
+          2.upto(5) do |v|
+            s = TokenStack.new(1, max: v)
+            s.count = v
+            expect{s.count = v+1}.should raise_error ExceedMaxTokensError 
+          end
+        end
+      end
+      describe "#add" do
+        it "cannot go above the maximum" do
+          s = TokenStack.new(1, max: 1)
+          expect{s.add(1)}.should raise_error ExceedMaxTokensError
+          s.max = 5
+          s.add(1)
+          expect{s.add(5)}.should raise_error ExceedMaxTokensError
+        end
+        it "knows to round down decimals" do
+          subject.max = 2
+          subject.add(1.8)
+        end
+      end
+      describe "#refresh" do
+        it "sets the count to the maximum" do
+          2.upto(5) do |v|
+            s = TokenStack.new(1, max: v)
+            s.refresh
+            s.count.should == v
+          end
+        end
+      end
+    end
+    context "with no maximum set" do
+      describe "#max" do
+        it {subject.max.should be_nil}
+      end
+      describe "#refresh" do
+        it "pretends it doesn't exist" do
+          expect{subject.refresh}.should raise_error NoMethodError
+        end
+      end
+    end
   end
 end

data/tabletop.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors = ['Nick Novitski']
   s.email = 'nicknovitski@gmail.com'
   s.homepage = 'http://github.com/njay/tabletop'
-  s.summary = 'A Ruby DSL for role-playing games' 
+  s.summary = 'An RPG and tabletop game library'
   s.description = 'Tabletop aims to provide a simple way of describing, automating and tracking the tools and tasks involved in "analog" games, determining results from the motions and properties of various dice and chips.'
   s.extra_rdoc_files = [
     'LICENSE',

metadata

@@ -2,7 +2,7 @@
 name: tabletop
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nick Novitski
@@ -123,6 +123,7 @@ files:
 - doc/Tabletop.html
 - Gemfile
 - lib/fixnum.rb
+- lib/tabletop/condition.rb
 - lib/tabletop/pool.rb
 - lib/tabletop/randomizers.rb
 - lib/tabletop/roll.rb
@@ -132,6 +133,7 @@ files:
 - LICENSE
 - Rakefile
 - README.markdown
+- spec/condition_spec.rb
 - spec/fixnum_spec.rb
 - spec/pool_spec.rb
 - spec/randomizers_spec.rb
@@ -153,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4463756612085784934
+      hash: 302190484113960974
       segments: 
       - 0
       version: "0"
@@ -166,11 +168,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A Ruby DSL for role-playing games
+summary: An RPG and tabletop game library
 test_files: 
+- spec/condition_spec.rb
 - spec/fixnum_spec.rb
 - spec/pool_spec.rb
 - spec/randomizers_spec.rb