diceroller 0.0.2 → 0.0.3

data/.gitignore

@@ -1,2 +1,3 @@
 *.swp
+*.swo
 pkg/*

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm: 
+  - 1.9.3
+
+script: bundle exec rspec

data/README.txt

@@ -5,4 +5,12 @@ Currently it supports the following:
 - Creating a new roll with dice of one size and a number of dice
 - Rerolling all dice of a certain value
 - Exploding all dice of a certain value (this creates a die with a value of original roll + the value of another die)
-  This makes it possible to roll a 16 on a ten-sided die
+  This makes it possible to roll a 16 on a ten-sided die (for those systems that need to support this mechanic)
+
+CONTRIBUTION GUIDELINES:
+
+I want 'em.
+
+I'd love to talk with you about building the right specs and the right API. I'm available as
+twitter - emonical 
+email - solrane.altari@gmail.com (though this is subject to change)

data/lib/diceroller.rb

@@ -1 +1 @@
-require 'roll'
+require 'roller/roll'

data/lib/roller/die.rb

@@ -0,0 +1,19 @@
+class Die
+  attr_reader :value
+
+  def initialize(value)
+    @value = value 
+  end
+
+  def ==(other_die)
+    if other_die.respond_to?(:value)
+      @value == other_die.value
+    else
+      @value == other_die
+    end
+  end
+
+  def +(other_die)
+    Die.new(@value + other_die.value)
+  end
+end

data/lib/roller/roll.rb

@@ -0,0 +1,54 @@
+require_relative 'die' 
+require_relative 'ruleset/base_ruleset'
+
+class Roll
+  include Enumerable
+
+  attr_reader :dice
+
+  def initialize(num_of_dice, options = {})
+    @options = default_options.merge(options)
+    @rand_generator = @options[:rand_generator]
+    @dice = roll(num_of_dice)
+    unless @options[:ruleset].nil?
+      self.extend(@options[:ruleset])
+    end
+  end
+
+  def size
+    @dice.count
+  end
+
+  def ==(other)
+    @dice == other
+  end
+
+  private
+
+  def each
+    @dice.each { |die| yield die }
+  end
+
+  def default_options
+    { :die_size => 10, :rand_generator => Random, :ruleset => Ruleset::BaseRuleset}
+  end
+
+  def roll(number)
+    number.times.collect { roll_die }
+  end
+
+  def roll_die
+    Die.new(@rand_generator.rand(@options[:die_size]))
+  end
+
+  def each_die_that_matches(values)
+    @dice.map! do |die|
+      last_die = die
+      while values.any? { |value| last_die == value }
+        die, last_die = yield(die)
+        last_die = (last_die.nil? && die) || last_die
+      end
+      die
+    end
+  end
+end

data/lib/roller/ruleset/base_ruleset.rb

@@ -0,0 +1,16 @@
+module Ruleset
+  module BaseRuleset
+    def reroll(*values)
+      each_die_that_matches(values) { roll_die }
+      self
+    end
+
+    def explode(*values)
+      each_die_that_matches(values) do |die| 
+        last_die = roll_die
+        [die + last_die, last_die] 
+      end
+      self
+    end
+  end
+end

data/lib/roller/version.rb

@@ -1,3 +1,3 @@
 module Roller
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/{roll_spec.rb → roller/base_ruleset_spec.rb}

@@ -1,82 +1,50 @@
 require 'rspec'
-require 'roll'
-
-describe Roll do
+require 'roller/roll'
 
+describe "roll with base ruleset" do
   let(:rand_generator) do
     rand_generator = double('rand_gen').as_null_object
     rand_generator.stub(:rand).and_return(1,2,3,4,5,6,7,8,9,10)
     rand_generator
   end
 
-  before(:each) do
-    unless Roll.respond_to?(:size)
-      class Roll
-        def size
-          @dice.count
-        end
-      end
-    end
-  end
-
-  describe "roll" do
-    it "should have <parameters> elements" do
-      roll = Roll.new(2, rand_generator)
-      roll.should have(2).items
-    end
-
-    it "returns a list of numbers" do
-      roll = Roll.new(10, rand_generator)
-      roll.should == [1,2,3,4,5,6,7,8,9,10]
-    end
+  let(:mock_obj_hash) { Hash[:rand_generator, rand_generator] }
 
-    it "calls Random once for each call" do
-      Random.should_receive(:rand).exactly(5)
-      roll = Roll.new(5)
-    end
-
-    it "calls Random with default value of 10 when no options provided" do
-      Random.should_receive(:rand).with(10).exactly(5)
-      roll = Roll.new(5)
-    end
-  end
-
-  describe "reroll" do
+  describe "rerolls" do
     it "rerolls all dice that match the parameter" do
-      roll = Roll.new(5, rand_generator)
+      roll = Roll.new(5, mock_obj_hash)
       roll.reroll(3).should == [1,2,6,4,5]
     end
 
     it "rerolls all dice that match any of the parameters" do
-      roll = Roll.new(5, rand_generator)
+      roll = Roll.new(5, mock_obj_hash)
       roll.reroll(3,4).should == [1,2,6,7,5]
     end
 
     it "applies until it can't" do
       rand_generator = double('rand_gen').as_null_object
       rand_generator.stub(:rand).and_return(1,1,1,4)
-      roll = Roll.new(1, rand_generator)
+      roll = Roll.new(1, Hash[:rand_generator, rand_generator])
       roll.reroll(1).should == [4]
     end
   end
 
   describe "explode" do
     it "adds die to the result of all dice that match the parameter" do
-      roll = Roll.new(5, rand_generator)
+      roll = Roll.new(5, mock_obj_hash)
       roll.explode(3).should == [1,2,9,4,5]
     end
 
     it "adds die to the result of all dice that match any of the parameters" do
-      roll = Roll.new(5, rand_generator)
+      roll = Roll.new(5, mock_obj_hash)
       roll.explode(3,4).should == [1,2,9,11,5]
     end
 
     it "applies until it can't" do
       rand_generator = double('rand_gen').as_null_object
       rand_generator.stub(:rand).and_return(10,10,10,9)
-      roll = Roll.new(1, rand_generator)
+      roll = Roll.new(1, Hash[:rand_generator, rand_generator])
       roll.explode(10).should == [39]
     end
   end
-
 end

data/spec/roller/roll_spec.rb

@@ -0,0 +1,47 @@
+require 'rspec'
+require 'roller/roll' 
+
+describe Roll do
+  let(:rand_generator) do
+    rand_generator = double('rand_gen').as_null_object
+    rand_generator.stub(:rand).and_return(1,2,3,4,5,6,7,8,9,10)
+    rand_generator
+  end
+
+  let(:mock_obj_hash) { Hash[:rand_generator, rand_generator] }
+  
+  describe "by default" do
+    it "uses the base ruleset" do
+      roll = Roll.new(1)
+      roll.is_a?(Ruleset::BaseRuleset).should be_true
+    end
+  end
+
+  describe "roll" do
+    it "should have <parameters> elements" do
+      roll = Roll.new(2, mock_obj_hash)
+      roll.should have(2).items
+    end
+
+    it "returns a list of numbers" do
+      roll = Roll.new(10, mock_obj_hash)
+      roll.should == [1,2,3,4,5,6,7,8,9,10]
+    end
+
+    it "calls Random once for each call" do
+      Random.should_receive(:rand).exactly(5)
+      roll = Roll.new(5)
+    end
+
+    it "calls Random with default value of 10 when no options provided" do
+      Random.should_receive(:rand).with(10).exactly(5)
+      roll = Roll.new(5)
+    end
+
+    it "calls Random with specified value if options provided" do
+      options = { :die_size => 8, :rand_generator => Random }
+      Random.should_receive(:rand).with(8).exactly(5)
+      roll = Roll.new(5, options)
+    end
+  end
+end

metadata

@@ -1,78 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: diceroller
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Edward Monical-Vuylsteke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id001
-description: |-
-  A dice rolling gem that provides an effective
-                       and hopefully extensible API to meet the extensive
-                       needs of the roleplaying game community
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+description: ! "A dice rolling gem that provides an effective\n                     and
+  hopefully extensible API to meet the extensive\n                     needs of the
+  roleplaying game community"
+email:
 - solrane.altari@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.txt
 - Rakefile
 - lib/diceroller.rb
-- lib/roll.rb
+- lib/roller/die.rb
+- lib/roller/roll.rb
+- lib/roller/ruleset/base_ruleset.rb
 - lib/roller/version.rb
 - roller.gemspec
-- spec/roll_spec.rb
+- spec/roller/base_ruleset_spec.rb
+- spec/roller/roll_spec.rb
 homepage: https://github.com/emonical/roller
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dice roller for roleplaying games
 test_files: []
-

data/lib/roll.rb

@@ -1,48 +0,0 @@
-class Roll
-  include Enumerable
-
-  def initialize(num_of_dice, options = { :die_size => 10, :rand_generator => Random})
-    @options = options
-    @rand_generator = @options[:rand_generator]
-    @dice = roll(num_of_dice)
-  end
-
-  def reroll(*values)
-    each_die_that_matches(values) { roll_die }
-    self
-  end
-
-  def explode(*values)
-    each_die_that_matches(values) { |die| last_die = roll_die; [die + last_die, last_die] }
-    self
-  end
-
-  def ==(other)
-    @dice == other
-  end
-
-  def each
-    @dice.each { |die| yield die }
-  end
-
-  private
-
-  def roll(number)
-    number.times.collect { roll_die } 
-  end
-
-  def roll_die
-    @rand_generator.rand(@options[:die_size])
-  end
-
-  def each_die_that_matches(values)
-    @dice.map! do |die|
-      last_die = die
-      while values.any? { |value| value == last_die}
-        die, last_die = yield(die)
-        last_die = (last_die.nil? && die) || last_die
-      end
-      die
-    end
-  end
-end