rpg_lib 1.0.0 → 1.0.1

data/lib/rpg_lib/parser/dice_parser.rb

@@ -0,0 +1,29 @@
+module RpgLib
+  module Parser
+    ##
+    # DiceParser
+    #
+    class DiceParser
+      attr_reader :parser
+
+      def initialize
+        @parser = DiceExpressionParser.new
+        @cache = {}
+      end
+
+      def parse(dice)
+        return @cache[dice] if @cache.key?(dice)
+        parse_new_dice(dice)
+      end
+
+      private
+
+      def parse_new_dice(dice)
+        tree = @parser.parse(dice)
+        raise Exception, "Parse error #{@parser.failure_reason} at offset: #{@parser.index}" if tree.nil?
+        @cache[dice] = tree
+        tree
+      end
+    end
+  end
+end

data/lib/rpg_lib/version.rb

@@ -16,5 +16,5 @@
 # along with RpgLib.  If not, see <http://www.gnu.org/licenses/>.
 
 module RpgLib
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/rpg_lib.gemspec

@@ -35,6 +35,8 @@ Gem::Specification.new do |spec|
   spec.files       = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.add_dependency 'treetop', '~> 1.6'
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'

data/spec/rpg_lib/api_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module RpgLib
+  describe Api do
+    let(:api) { Class.new { include Api }.new }
+
+    describe 'roll' do
+      it 'returns Integer' do
+        expect(api.roll('3d6')).to be_instance_of(Integer)
+      end
+
+      it 'responds in the specified range' do
+        20.times do
+          roll = api.roll('3d6')
+          expect(roll < 3).to be false
+          expect(roll > 18).to be false
+        end
+      end
+    end
+
+    describe 'roll_and_ignore' do
+      it 'returns Integer' do
+        expect(api.roll_and_ignore('3d6', 5)).to be_instance_of(Integer)
+      end
+
+      it 'response in the specified range' do
+        20.times do
+          roll = api.roll_and_ignore('3d6', 5)
+          expect(roll < 3).to be false
+          expect(roll > 18).to be false
+        end
+      end
+
+      it 'ignores a passed number' do
+        20.times do
+          roll = api.roll_and_ignore('3d6', 5)
+          expect(roll).not_to eq(5)
+        end
+      end
+
+      it 'ignores a passed range' do
+        20.times do
+          roll = api.roll_and_ignore('3d6', 6..10)
+          expect(6..10).not_to include(roll)
+        end
+      end
+
+      it 'ignores a passed roll set' do
+        evens = RollSet.new(4, 6, 8, 10, 12, 14, 16, 18)
+        20.times do
+          roll = api.roll_and_ignore('3d6', evens)
+          expect(roll).to be_odd
+        end
+      end
+    end
+
+    describe 'choose' do
+      let(:values) { [:foo, :bar, :baz, :stoo] }
+
+      it 'selects a single item from the list' do
+        10.times do
+          expect(values).to include(api.choose(values))
+        end
+      end
+    end
+  end
+end

data/spec/rpg_lib/dice_roller_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+module RpgLib
+  describe DiceRoller do
+    let(:roller) { DiceRoller.clone.instance }
+    let(:die_roller) { roller.roller }
+
+    it 'can be accessed' do
+      expect { DiceRoller.instance }.not_to raise_error
+    end
+
+    describe 'roll_die' do
+      before(:each) do
+        allow(die_roller).to receive(:roll) { 3 }
+        @value = roller.roll_die(6)
+      end
+
+      it 'defers to the roller' do
+        expect(die_roller).to have_received(:roll).with(6)
+      end
+
+      it 'relays the result' do
+        expect(@value).to eq(3)
+      end
+    end
+
+    describe 'roll' do
+      let(:parser) { roller.parser }
+      let(:tree) { double('tree') }
+
+      before(:each) do
+        allow(parser).to receive(:parse) { tree }
+        allow(tree).to receive(:eval) { 9 }
+        @value = roller.roll('3d6')
+      end
+
+      it 'defers to the parser' do
+        expect(parser).to have_received(:parse).with('3d6')
+      end
+
+      it 'evals the result from the parser' do
+        expect(tree).to have_received(:eval).with(die_roller)
+      end
+
+      it 'relays the result of eval' do
+        expect(@value).to eq(9)
+      end
+    end
+
+    describe 'roll_and_ignore' do
+      describe 'with no collision' do
+        before(:each) do
+          allow(roller).to receive(:roll) { 4 }
+          @value = roller.roll_and_ignore('d6', RollSet.new(0, 9, 100))
+        end
+
+        it 'rolls only once' do
+          expect(roller).to have_received(:roll).with('d6').once
+        end
+
+        it 'relays the roll' do
+          expect(@value).to eq(4)
+        end
+      end
+
+      describe 'with collisions' do
+        before(:each) do
+          allow(roller).to receive(:roll).and_return(1, 2, 3, 4)
+          @value = roller.roll_and_ignore('d6', RollSet.new(1..3))
+        end
+
+        it 'rolls multiple times until it finds a value that is not ignored' do
+          expect(roller).to have_received(:roll).exactly(4).times
+        end
+
+        it 'relays the roll' do
+          expect(@value).to eq(4)
+        end
+      end
+    end
+  end
+end

data/spec/rpg_lib/die_roller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+module RpgLib
+  describe DieRoller do
+    it 'can be created' do
+      expect { DieRoller.new }.not_to raise_error
+    end
+
+    describe 'roll' do
+      let(:generator) { double('generator') }
+      let(:value) { 99 }
+      let(:roller) { DieRoller.new(generator) }
+
+      before(:each) do
+        allow(generator).to receive(:rand) { value }
+        @result = roller.roll(10)
+      end
+
+      it 'defers to the generator' do
+        expect(generator).to have_received(:rand).with(1..10)
+      end
+
+      it 'relays the generated value' do
+        expect(@result).to eq(value)
+      end
+    end
+  end
+end

data/spec/rpg_lib/parser/dice_expression_nodes_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module RpgLib
+  module Parser
+    module DiceExpression
+      describe BinaryOperation do
+        it 'is touched when we parse a dice descriptor with an operator' do
+          expect(RpgLib::Parser::DiceParser.new.parse('3+4').eval(nil)).to eq(7)
+        end
+      end
+    end
+  end
+end

data/spec/rpg_lib/parser/dice_parser_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module RpgLib
+  module Parser
+    describe DiceParser do
+      it 'can be created' do
+        expect { DiceParser.new }.not_to raise_error
+      end
+
+      describe 'parse' do
+        let(:parser) { DiceParser.new }
+        let(:treetop) { parser.parser }
+        let(:tree) { double('tree') }
+
+        before(:each) do
+          allow(treetop).to receive(:parse) { tree }
+        end
+
+        describe 'uncached' do
+          before(:each) do
+            @value = parser.parse('3d6')
+          end
+
+          it 'defers to the treetop parser' do
+            expect(treetop).to have_received(:parse).with('3d6')
+          end
+
+          it 'relays the parsed tree' do
+            expect(@value).to eq(tree)
+          end
+        end
+
+        describe 'cached' do
+          before(:each) do
+            parser.parse('3d6')
+            parser.parse('3d6')
+            @value = parser.parse('3d6')
+          end
+
+          it 'uses the cached value' do
+            expect(treetop).to have_received(:parse).once
+          end
+
+          it 'relays the cached value' do
+            expect(@value).to eq(tree)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpg_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jamie Hale
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,23 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
+- grammar/dice_expression.treetop
 - lib/rpg_lib.rb
 - lib/rpg_lib/api.rb
 - lib/rpg_lib/dice_roller.rb
-- lib/rpg_lib/roll_descriptor.rb
+- lib/rpg_lib/die_roller.rb
+- lib/rpg_lib/parser/dice_expression_nodes.rb
+- lib/rpg_lib/parser/dice_expression_parser.rb
+- lib/rpg_lib/parser/dice_parser.rb
 - lib/rpg_lib/roll_set.rb
 - lib/rpg_lib/string.rb
 - lib/rpg_lib/version.rb
 - rpg_lib.gemspec
+- spec/rpg_lib/api_spec.rb
+- spec/rpg_lib/dice_roller_spec.rb
+- spec/rpg_lib/die_roller_spec.rb
+- spec/rpg_lib/parser/dice_expression_nodes_spec.rb
+- spec/rpg_lib/parser/dice_parser_spec.rb
 - spec/rpg_lib/roll_set_spec.rb
 - spec/rpg_lib/string_spec.rb
 - spec/rpg_lib_spec.rb

data/lib/rpg_lib/roll_descriptor.rb

@@ -1,54 +0,0 @@
-# Copyright 2017 Jamie Hale
-#
-# This file is part of the RpgLib gem.
-#
-# RpgLib is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# RpgLib is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with RpgLib.  If not, see <http://www.gnu.org/licenses/>.
-
-module RpgLib
-  ##
-  # RollDescriptor
-  #
-  class RollDescriptor
-    attr_reader :die, :count, :drop_lowest, :drop_highest
-
-    def initialize(match)
-      initialize_die(match)
-      initialize_count(match)
-      initialize_dropped_dice(match)
-    end
-
-    private
-
-    def initialize_die(match)
-      @die = match[2].to_i
-    end
-
-    def initialize_count(match)
-      @count = 1
-      @count = match[1].to_i unless match[1].empty?
-    end
-
-    def initialize_dropped_dice(match)
-      @drop_lowest = 0
-      @drop_highest = 0
-      if match[4] == 'dl'
-        @drop_lowest = 1
-        @drop_lowest = match[5].to_i unless match[5].empty?
-      elsif match[6] == 'dh'
-        @drop_highest = 1
-        @drop_highest = match[7].to_i unless match[7].empty?
-      end
-    end
-  end
-end