RpgTools 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3f130c934c707bd10c9c4a03de612c2ec9cb3a
-  data.tar.gz: c117b0d8d94df410795a708ddcdc4e824b95db70
+  metadata.gz: e037b7e017f13328353e5ace03a8e1b632277562
+  data.tar.gz: ef936dccbdcc627153014df1e9fcda723a1ee063
 SHA512:
-  metadata.gz: f04383af8b7a1a029e69d31c17ab30691b348859ac4b9aba8f55f0ccfa10594001e0a2d50f0c17898e4b5314ca992f5f3baa87895ee298cbf77a7d08ed266386
-  data.tar.gz: 1b73e37885c303ab106dfadbede1a7d4189df0c63ac4430219a697f593d88475d2448633d6b9ff8734351ecf1ddab1083cbf77529c523ae202890e3dfb042d41
+  metadata.gz: be88a1803c9d1b098a6c7741f868329f3730a7dcc52470fc5af37bb595285816285c9bc63a4527f442cec3de3319f99c7015da0da1c40b45333c0c050b3e870a
+  data.tar.gz: 9f494f144a2187090ff63371463fcc4910ebe8ee031606e9fc7f1ce670630139c0c3d08281021805aa86eaa7a9b4bafc331d2c087037395a50a6a0a00f4943a0

data/lib/rpg_tools/coin.rb

@@ -3,18 +3,30 @@ module RpgTools
     attr_accessor :value, :flips, :heads, :tails
 
     def initialize
-      @value = nil
-      @flips = 0
-      @heads = 0
-      @tails = 0
+      @value, @flips, @heads, @tails = nil, 0, 0, 0
     end
 
     def flip
       @flips += 1
       @value = rand(2) == 1 ? 'Heads' : 'Tails'
-      @heads += 1 if @value == 'Heads'
-      @tails += 1 if @value == 'Tails'
+      save_result
       @value
     end
+    alias_method :flip!, :flip
+
+    private
+
+    def save_result
+      @heads += 1 if heads?
+      @tails += 1 if tails?
+    end
+
+    def heads?
+      @value == 'Heads'
+    end
+
+    def tails?
+      @value == 'Tails'
+    end
   end
 end

data/lib/rpg_tools/dice.rb

@@ -3,39 +3,38 @@ module RpgTools
     attr_accessor :base, :sides, :value, :type, :rolls, :bonus, :malus
 
     def initialize(base)
-      @base  = base
-      base_check
+      @base  = base.upcase
+      @type  = fudge_dice? ? 'Fudge' : 'Standard'
       @value = nil
-      @type  = (@base =~ /^.[fF]$/).nil? ? 'Standard' : 'Fudge'
-      @sides = @type == 'Fudge' ? 3 : base.gsub(/^./, '').to_i
-      sides_check
+      @sides = fudge_dice? ? 3 : base.gsub(/^./, '').to_i
       @rolls = 0
-      set_modifiers if @type == 'Standard'
+
+      dice_validity_check
+      set_modifiers_and_clean_base unless fudge_dice?
     end
 
     def roll
-      return fudge_roll      if @type == 'Fudge'
-      return standard_roll   if @bonus.nil? && @malus.nil?
-      return roll_with_bonus if @malus.nil?
-      return roll_with_malus if @bonus.nil?
+      @rolls += 1
+
+      fudge_dice? ? fudge_roll : standard_roll
     end
+    alias_method :roll!, :roll
 
     private
 
+    def dice_validity_check
+      sides_check
+      base_check
+    end
+
     def modifier_check
-      unless @base.gsub(/^[dD]{1}[fF]?\d+|[+-]\d+/, '').empty?
+      if (@base =~ /^[D]\d+[+-]?\d*/).nil?
         raise ArgumentError.new("You can only use + or - as modifiers.")
       end
     end
 
-    def set_modifiers
-      modifier_check
-      @bonus = (@base =~ /[Dd]\d+\+(\d+)/).nil? ? nil : @base.gsub(/[Dd]\d+\+/, '').to_i
-      @malus = (@base =~ /[Dd]\d+\-(\d+)/).nil? ? nil : @base.gsub(/[Dd]\d+\-/, '').to_i
-    end
-
     def base_check
-      unless ['d', 'D', 'f', 'F'].include?(@base[0])
+      unless standard_dice? || fudge_dice?
         raise ArgumentError.new("You can only create strandard and fudge dices.")
       end
     end
@@ -46,24 +45,28 @@ module RpgTools
       end
     end
 
+    def set_modifiers_and_clean_base
+      modifier_check
+
+      @bonus = @base.gsub(/[D]\d+\+/, '').to_i
+      @malus = @base.gsub(/[D]\d+\-/, '').to_i
+      @base.gsub!(/[+-]\d+/ , '')
+    end
+
     def fudge_roll
-      @rolls += 1
       @value = (rand(1..3) - 2)
     end
 
     def standard_roll
-      @rolls += 1
-      @value = rand(1..@sides)
+      @value = rand(1..@sides) + @bonus - @malus
     end
 
-    def roll_with_bonus
-      @rolls += 1
-      @value = rand(1..@sides) + @bonus
+    def fudge_dice?
+      @base == 'DF'
     end
 
-    def roll_with_malus
-      @rolls += 1
-      @value = rand(1..@sides) - @malus
+    def standard_dice?
+      @base.gsub(/^D\d*[+-]?[\d]+$/, '').empty?
     end
   end
 end

data/lib/rpg_tools/dice_bag.rb

@@ -3,26 +3,18 @@ module RpgTools
     attr_accessor :base, :dices, :rolls, :set, :total
 
     def initialize(base)
-      @base  = base
-      @dices = set_bag_content(@base.gsub(/[dD].+/, '').to_i)
+      @base  = base.upcase
+      @dices = set_bag_content(@base.gsub(/[D].+/, '').to_i)
       @rolls = 0
-      @set   = nil
+      @set   = []
       @total = 0
     end
 
     def roll
-      @dices.each do |dice|
-        dice.roll
-      end
-
-      @set =  [].tap do |response|
-                @dices.each do |dice|
-                  response << dice.value
-                end
-              end
-      @total = @set.inject{ |sum, x| sum + x }
-      @set
+      @set = roll_dices_set
+      calculate_total_and_show_set
     end
+    alias_method :roll!, :roll
 
     private
 
@@ -34,11 +26,27 @@ module RpgTools
 
     def set_bag_content(dice_number)
       empty_bag_check(dice_number)
+
       [].tap do |bag|
-        dice_number.times do |dice|
+        dice_number.times do
           bag << Dice.new(@base.gsub(/^\d+/, ''))
         end
       end
     end
+
+    def roll_dices_set
+      @dices.each do |dice|
+        dice.roll
+      end
+
+      @dices.each_with_object([]) do |dice, response|
+        response << dice.value
+      end
+    end
+
+    def calculate_total_and_show_set
+      @total = @set.inject{ |sum, x| sum + x }
+      @set
+    end
   end
 end

data/lib/rpg_tools/playing_card_deck.rb

@@ -11,18 +11,24 @@ module RpgTools
 
     def card
       @card_picks += 1
-      if @type == 52
-        @value = joker_pick_check == true ? 'Joker' : standard_card
-      else
-        @value = standard_card
-      end
+
+      @value =
+        if @type == 52
+          joker_picked? ? 'Joker' : standard_card
+        else
+          standard_card
+        end
     end
 
     def hand
       [].tap do |hand|
         until hand.count == 5
           card = standard_card
-          hand << card unless hand.include?(card) || hand.count('Joker') == 2
+
+          unless hand.include?(card) || hand.count('Joker') == 2
+            hand << card
+            @card_picks += 1
+          end
         end
       end
     end
@@ -35,7 +41,7 @@ module RpgTools
       end
     end
 
-    def joker_pick_check
+    def joker_picked?
       [0, 1].include?((0..54).to_a.sample(1).first)
     end
 
@@ -52,7 +58,6 @@ module RpgTools
     end
 
     def standard_card
-      @card_picks += 1
       @value = [number, color].join(' of ')
     end
   end

data/rpg_tools.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = %q{RpgTools}
-  s.version     = '0.4.2'
+  s.version     = '0.4.3'
   s.author      = 'Yohan Piron'
   s.email       = 'yinfei84@gmail.com'
-  s.date        = %q{2015-03-04}
-  s.summary     = %q{RpgTools is a toolbox for tabletop games and RPGs}
+  s.date        = '2015-08-03'
+  s.summary     = 'RpgTools is a toolbox for tabletop games and RPGs'
   s.description = 'RpgTools gives you tools for your RPGs : dices, coins, cards...'
   s.homepage    = 'https://github.com/Yinfei/rpg_tools.git'
   s.license     = 'MIT'

data/spec/dice_spec.rb

@@ -35,4 +35,10 @@ describe RpgTools::Dice do
   it "doesn't create a dice with an odd symbol" do
     expect { described_class.new('d6%2') }.to raise_error(ArgumentError)
   end
+
+  it "doesn't create very odd dices" do
+    expect { described_class.new('dDOGE') }.to raise_error(ArgumentError)
+    expect { described_class.new('dfoo') }.to raise_error(ArgumentError)
+    expect { described_class.new('foobarbaz') }.to raise_error(ArgumentError)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RpgTools
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yohan Piron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake