hazard 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ae47cda73390cc30cd6d81a594879a0f142308
-  data.tar.gz: 7eb73440367d32076ddbef3b9d2ded4ecb772fe5
+  metadata.gz: 95dbcf77daa7235693220c74d60b47e42ab3e635
+  data.tar.gz: 062155ee83ebdddb008e8c7f6f133b4c4d8292bf
 SHA512:
-  metadata.gz: 7678295f955f7d2ddc157951b5da6d91746092eaf4f6eaad5c10dfbba7b19505bc676aa3d0baef9be415804e2ee5427d78802d45965ba486d94459d4453ada2d
-  data.tar.gz: 9c000fc08c2bd6debd467784dd728cd106f87958add39c9d8ab28d4b51d24a3f65930e22b55c9d80dee3e3f6b5f77a865b6a427a966552f3cf51da717ac976bb
+  metadata.gz: 8b77918372e932a63734eabf940a5c06fd6a5263df7f9290c26b88a7ee18f80dbdc004d1aa341b96e5c07d3ec864460cf1a8509338af9a76fd7272f3bfbf54b2
+  data.tar.gz: da19de999a0edcead798d6ffb9716154fbde19288bcda76219dff6edacb7bf9750a0dbc3d8421ad418a3144ac4cf3ef62e3510f1342c139d186f9bf6bee84249

data/.travis.yml

@@ -14,6 +14,7 @@ rvm:
   - 2.2
   - 2.1
   - 2.0
+  - 1.9
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/README.md

@@ -16,8 +16,9 @@ Hazard is a very simple dice library for ruby that allows you to :
     1. [Roll multiple dice](#roll-multiple-dice)
 1. [Advanced Usage](#advanced-usage)
     1. [Roll dice and get the details](#roll-dice-and-get-the-details)
+    1. [Roll dice from string input](#roll-dice-from-string-input)    
     1. [Some real cases](#some-real-cases)
-1. [Weighted Tables](#weighted-Tables)
+1. [Weighted Tables](#weighted-tables)
     1. [If you have the weights](#if-you-have-the-weights)
     1. [If you don't have the weights (or are to lazy to get them)](#if-you-dont-have-the-weights-or-are-to-lazy-to-get-them)
     1. [Saving and loading](#saving-and-loading)    
@@ -27,7 +28,7 @@ Hazard is a very simple dice library for ruby that allows you to :
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'hazard'
+gem 'hazard', '~> 1.2.0'
 ```
 
 And then execute:
@@ -116,6 +117,16 @@ Examples :
     >> Hazard.s2d6
     => #<RolledDice:0x007f62e55a0010 @rolls=[1, 6], @result=7>
     
+### Roll dice from string input
+
+    >> Hazard.from_string( 's<m>d<n>' )    # where m and n are numbers
+    => Roll m n-sided dice and return a RolledDice object
+
+Examples : 
+         
+    >> Hazard.from_string( 'r2d6' )
+    => 3     
+        
 ### Some real cases
          
 Assuming you are playing DD Next

data/hazard.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
 
+  spec.required_ruby_version = '>= 1.9'
+
 end

data/lib/hazard/version.rb

@@ -1,3 +1,3 @@
 class Hazard
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/hazard.rb

@@ -4,10 +4,18 @@ require_relative 'weighted_table'
 class Hazard
 
   def self.method_missing( method_name )
-
     # Transform the method_name to string
     method_name = method_name.to_s
+    self.roll_dice( method_name )
+  end
+
+  def self.from_string( dice_string )
+    roll_dice( dice_string )
+  end
+
+  private
 
+  def self.roll_dice( method_name )
     # Parse the method name to get how many dice and what size of dice was required
     dice_match = method_name.to_s.match( /(d|r|m|s)?(\d*)d(\d+)/ )
     # Raise an error if match fail
@@ -32,7 +40,6 @@ class Hazard
 
     # Return a RolledDice otherwise
     RolledDice.new( rolls )
-
   end
 
 end

data/lib/weighted_table.rb

@@ -62,15 +62,6 @@ class WeightedTable
     raise 'Rand not in key range'
   end
 
-  # Load a WeightedTable with data
-  # Data format must be : [ data, data, data ]
-  # Example : [ :foo, :foo, :bar ]
-  #
-  # @return [WeightedTable] the current WeightedTable
-  def from_flat_table( table )
-    from_weighted_table( table.group_by{ |e| e }.map{ |k, v| [ v.count, k ] } )
-  end
-
   # Save the table to a file
   # @param filename [String] the filename where to save the table
   def to_file( filename )

data/test/hazard_test.rb

@@ -18,4 +18,21 @@ class HazardTest < Minitest::Test
 
   end
 
+  def test_dice_from_string
+
+    Kernel.stubs( :rand ).returns( 6 )
+
+    assert_equal 6, Hazard.from_string( 'd6' )
+
+    assert_equal 12, Hazard.from_string( 'r2d6' )
+    assert_equal 12, Hazard.from_string( '_2d6' )
+    assert_equal 12, Hazard.from_string( 'm2d6' )
+    assert_equal 12, Hazard.from_string( 'd2d6' )
+    assert_equal 18, Hazard.from_string( 'd3d6' )
+
+    assert_equal RolledDice.new([6, 6 ] ), Hazard.from_string( 's2d6' )
+
+  end
+
+
 end

data/test/weighted_table_test.rb

@@ -39,24 +39,38 @@ class HazardTest < Minitest::Test
     assert_equal :bar, WeightedTable.from_flat_table(  [ :foo, :foo, :foo, :bar ] ).sample
 
     Kernel.stubs( :rand ).returns( 5 )
-    assert_raises do
+    assert_raises 'Rand not in key range' do
       WeightedTable.from_weighted_table []
     end
-    assert_raises do
+    assert_raises 'Rand not in key range' do
       WeightedTable.from_flat_table []
     end
   end
 
-  def test_statistics
+  def test_three_element_table
+
+    Kernel.stubs( :rand ).returns( 1 )
+    assert_equal :foo, WeightedTable.from_weighted_table( [ [ 3, :foo ], [ 1, :bar ], [ 1, :foobar ] ] ).sample
+    assert_equal :foo, WeightedTable.from_flat_table(  [ :foo, :foo, :foo, :bar, :foobar ] ).sample
+
+    Kernel.stubs( :rand ).returns( 5 )
+    assert_equal :foobar, WeightedTable.from_weighted_table( [ [ 3, :foo ], [ 1, :bar ], [ 1, :foobar ] ] ).sample
+    assert_equal :foobar, WeightedTable.from_flat_table(  [ :foo, :foo, :foo, :bar, :foobar ] ).sample
+
+  end
 
+  def test_statistics
     wt = WeightedTable.from_weighted_table [ [ 2, :foo ], [ 1, :bar ] ]
     results = { foo: 0, bar: 0 }
-    1.upto(100).each do
+
+    rounds = 1000
+
+    1.upto(rounds).each do
       results[ wt.sample ] += 1
     end
 
-    assert_in_delta 0.33, (results[:bar]*0.01), 0.1
-    assert_in_delta 0.66, (results[:foo]*0.01), 0.1
+    assert_in_delta 0.33, (results[:bar].to_f/rounds), 0.1
+    assert_in_delta 0.66, (results[:foo].to_f/rounds), 0.1
   end
 
   def test_save_and_load

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hazard
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Cédric ZUGER
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="