acpc_poker_types 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac1edc74df20ff22ce321770a24c508acf29ad2
-  data.tar.gz: 7efe0248ddd843e586d9941af349282f3e001672
+  metadata.gz: 40e35c505379c352cc0acb6f0b234d556e4b1516
+  data.tar.gz: 5a2221b5957336fab744d20865019d5c382cdaff
 SHA512:
-  metadata.gz: d50024fe199e9e81ab4200b59937c83e0f24f3864265e1727632d493a865cd7880877e7892137d3e835798f024093e41734306790f9e02282f2fa40445493cfb
-  data.tar.gz: fbac09f6a3e5370e2bb96b9634de30d80b84877acf41b9f9a627f7ba1da5068d6388f0034633fc47043c3b9b263e755203ff5c37b6f5b0502d03a024957f7000
+  metadata.gz: 38c10886b2ee75492068c134f34a3b7944ea1cc842211953a2ef5fa5bd03e4d1c8c26255140c788f8f61b856d6062dd6306b57652ca5b44bc39f5bc86af3c409
+  data.tar.gz: 53e540420530a9893222f25a83c9bbdbef24f0c7125ae1501ab768ed2288c3fa97839ab30d90dcb4f04855d2176c5fc83b256a79ad93505ccc866adcf7699c8d

data/lib/acpc_poker_types/poker_action.rb

@@ -81,20 +81,20 @@ module AcpcPokerTypes
     end
 
     def validate_action!(action, given_modifier)
-      if action.to_s.match(/^([#{CONCATONATED_ACTIONS}])\s*(\d*)$/)
-      else
-        raise IllegalAction, action.to_s
-      end
-      @action, @modifier = $1, $2
+      action_string = action.to_s
+      raise IllegalAction if action_string.empty?
+      @action = action_string[0]
+      raise IllegalAction unless ACTIONS.include?(@action)
+      @modifier = action_string[1..-1] unless action_string.length < 2
 
-      if given_modifier && !@modifier.empty?
+      if given_modifier && @modifier && !@modifier.empty?
         raise(
           IllegalModification,
           "in-place modifier: #{@modifier}, explicit modifier: #{given_modifier}"
         )
       end
 
-      @modifier = if !@modifier.empty?
+      @modifier = if @modifier && !@modifier.empty?
         @modifier
       elsif given_modifier
         given_modifier

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner