rodders 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/FixedOdds.rb

@@ -11,14 +11,16 @@ class FixedOdds
 
   # creates a new FixedOdds from a string which can be in fractional, 
   # moneyline or decimal format
+  # @note strings like '5' are parsed as decimal odds, not as being
+  # equivalent to '5/1'
   # @param [String] odds the odds in fractional, moneyline or decimal form
   # @return [FixedOdds]
   def FixedOdds.from_s(odds)
     case
-    when FixedOdds.fractional_odds?(odds) then FixedOdds.fractional_odds odds
-    when FixedOdds.moneyline_odds?(odds)  then FixedOdds.moneyline_odds odds
-    when FixedOdds.decimal_odds?(odds)    then FixedOdds.decimal_odds odds
-    else                                  raise ArgumentError, %{could not parse "#{odds}"}
+    when self.fractional_odds?(odds) then self.fractional_odds odds
+    when self.moneyline_odds?(odds)  then self.moneyline_odds odds
+    when self.decimal_odds?(odds)    then self.decimal_odds odds
+    else                             raise ArgumentError, %{could not parse "#{odds}"}
     end
   end
 
@@ -55,7 +57,7 @@ class FixedOdds
   # @param [String] fractional odds in fractional form
   # @return (see FixedOdds.from_s)
   def FixedOdds.fractional_odds(fractional)
-    raise %{could not parse "#{fractional}" as fractional odds} unless FixedOdds.fractional_odds?(fractional)
+    raise %{could not parse "#{fractional}" as fractional odds} unless self.fractional_odds?(fractional)
     return new(Rational('1/1')) if fractional == 'evens' || fractional == 'even money' 
     if /(?<numerator>\d+)(\/|-to-)(?<denominator>\d+)/ =~ fractional then r = Rational("#{numerator}/#{denominator}") end
     r = r.reciprocal if fractional.end_with? ' on'
@@ -71,10 +73,11 @@ class FixedOdds
   # creates a new FixedOdds from moneyline form. Examples are
   # * +400
   # * -500
+  # @note (see #from_s)
   # @param [String] moneyline odds in moneyline form
   # @return (see FixedOdds.from_s)
   def FixedOdds.moneyline_odds(moneyline)
-    raise %{could not parse "#{moneyline}" as moneyline odds} unless FixedOdds.moneyline_odds?(moneyline)
+    raise %{could not parse "#{moneyline}" as moneyline odds} unless self.moneyline_odds?(moneyline)
     sign = moneyline[0]
     if sign == '+' then new(Rational("#{moneyline}/100"))
     else                new(Rational("100/#{moneyline.to_i.magnitude}"))
@@ -87,15 +90,15 @@ class FixedOdds
   # @param [String] decimal odds in decimal form
   # @return (see FixedOdds.from_s)
   def FixedOdds.decimal_odds(decimal)
-    raise %{could not parse "#{decimal}" as decimal odds} unless FixedOdds.decimal_odds?(decimal)
+    raise %{could not parse "#{decimal}" as decimal odds} unless self.decimal_odds?(decimal)
     new(Rational(decimal.to_f - 1))
   end
 
   # calculates the profit won on a winning bet
-  # @param [String] stake the stake
+  # @param [Money] stake the stake
   # @return [Money] the profit
   def profit_on_winning_stake(stake)
-    stake.to_money * @fractional_odds
+    stake * @fractional_odds
   end
 
   # calculates the total return on a winning bet
@@ -103,15 +106,15 @@ class FixedOdds
   # @param (see #profit_on_winning_stake)
   # @return [Money] the total winnings
   def total_return_on_winning_stake(stake)
-    profit_on_winning_stake(stake) + stake.to_money
+    profit_on_winning_stake(stake) + stake
   end
 
   # calculates the magnitude of the stake needed to
   # win the specified amount in profit
-  # @param [String] win the desired profit
+  # @param [Money] win the desired profit
   # @return [Money] the stake required to realise that profit on a winning bet
   def stake_needed_to_win win
-    win.to_money / @fractional_odds
+    win / @fractional_odds
   end
 
   # string representation in fractional form like '4/1'
@@ -129,7 +132,7 @@ class FixedOdds
   # string representation in moneyline form
   # @return [String] moneyline form representation
   def to_s_moneyline
-    integral_number_with_sign_regex = "%+d"
+    integral_number_with_sign_regex = '%+d'
 
     if @fractional_odds > 1.0
       integral_number_with_sign_regex % (fractional_odds * 100).to_i
@@ -141,17 +144,29 @@ class FixedOdds
   # string representation in decimal form
   # @return [String] decimal form representation
   def to_s_decimal
-    "%g" % (fractional_odds + 1)
+    '%g' % (fractional_odds + 1)
   end
 
-  # equality method
-  def ==(other)
-    other.fractional_odds == @fractional_odds
-  end
+  protected
 
-  # low odds are those which pay out the most money
-  # on a winning bet and vice-versa
-  def <=>(other)
-    other.fractional_odds <=> @fractional_odds
-  end
+    # equality method
+    def ==(other)
+      other.fractional_odds == @fractional_odds
+    end
+
+    # low odds are those which pay out the most money
+    # on a winning bet and vice-versa
+    def <=>(other)
+      other.fractional_odds <=> @fractional_odds
+    end
 end
+
+class Rational
+  # calculates the reciprocal
+  # @example
+  #   Rational(2/3).reciprocal #=> Rational(3/2)
+  # @return [Rational] the reciprocal
+  def reciprocal
+    1 / self
+  end
+end

data/rodders.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rodders"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2011-11-10"
+  s.date = "2011-12-11"
   s.description = "Converts between fractional, decimal and moneyline odds for betting and gambling. Calculates how much can be won on a given stake."
   s.email = "nigel-lowry@ultra.eclipse.co.uk"
   s.extra_rdoc_files = [
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/FixedOdds.rb",
     "lib/MutuallyExclusiveCollection.rb",
-    "lib/Rational.rb",
     "rodders.gemspec",
     "spec/FixedOdds_spec.rb",
     "spec/MutuallyExclusiveCollection_spec.rb",
@@ -37,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/nigel-lowry/rodders"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.12"
   s.summary = "Fixed odds betting library"
 
   if s.respond_to? :specification_version then

data/spec/FixedOdds_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "FixedOdds" do
@@ -5,10 +6,10 @@ describe "FixedOdds" do
   describe "fractional_odds factory" do
     it "should raise error if not fractional odds" do
       expect {
-        FixedOdds.fractional_odds '-400'
+        FixedOdds.fractional_odds '5'
       }.to raise_error(
         RuntimeError,
-        /could not parse "-400" as fractional odds/
+        /could not parse "5" as fractional odds/
       )  
     end
 
@@ -100,26 +101,26 @@ describe "FixedOdds" do
     end
 
     describe "positive figures" do
-      it "should treat '+400' as meaning winning $400 on a $100 bet" do
+      it "should treat '+400' as meaning winning £400 on a £100 bet" do
         plus400 = FixedOdds.moneyline_odds('+400')
-        plus400.profit_on_winning_stake('$100').should == '$400'
+        plus400.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(400, :GBP)
       end
 
-      it "should treat +100 as meaning winning $100 on a $100 bet" do
+      it "should treat +100 as meaning winning £100 on a £100 bet" do
         plus100 = FixedOdds.moneyline_odds('+100')
-        plus100.profit_on_winning_stake('$100').should == '$100'
+        plus100.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(100, :GBP)
       end
     end
 
     describe "negative figures" do
-      it "should treat '-400' as meaning you need to wager $400 to win $100" do
+      it "should treat '-400' as meaning you need to wager £400 to win £100" do
         minus400 = FixedOdds.moneyline_odds('-400')
-        minus400.profit_on_winning_stake('$400').should == '$100'
+        minus400.profit_on_winning_stake(Money.from_fixnum(400, :GBP)).should == Money.from_fixnum(100, :GBP)
       end
 
-      it "should treat '-100' as meaning you need to wager $100 to win $100 (which is identical to '+100')" do
+      it "should treat '-100' as meaning you need to wager £100 to win £100 (which is identical to '+100')" do
         minus100 = FixedOdds.moneyline_odds('-100')
-        minus100.profit_on_winning_stake('$100').should == '$100'
+        minus100.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(100, :GBP)
       end
     end
   end
@@ -134,19 +135,19 @@ describe "FixedOdds" do
       )  
     end
 
-    it "should treat '2' as meaning you have to wager $100 to win $100" do
+    it "should treat '2' as meaning you have to wager £100 to win £100" do
       d2 = FixedOdds.decimal_odds('2')
-      d2.profit_on_winning_stake('$100').should == '$100'
+      d2.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(100, :GBP)
     end
 
-    it "should treat '5' as meaning you have to wager $100 to win $400" do
+    it "should treat '5' as meaning you have to wager £100 to win £400" do
       d5 = FixedOdds.decimal_odds('5')
-      d5.profit_on_winning_stake('$100').should == '$400'
+      d5.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(400, :GBP)
     end
 
-    it "should treat '1.25' as meaning yo have to wager $400 to win $100" do
+    it "should treat '1.25' as meaning yo have to wager £400 to win £100" do
       d1_25 = FixedOdds.decimal_odds('1.25')
-      d1_25.profit_on_winning_stake('$400').should == '$100'
+      d1_25.profit_on_winning_stake(Money.from_fixnum(400, :GBP)).should == Money.from_fixnum(100, :GBP)
     end
   end
 
@@ -224,8 +225,11 @@ describe "FixedOdds" do
     end
 
     describe "decimal odds" do
-      it "should parse integral odds" do
-        FixedOdds.from_s('2').should == FixedOdds.decimal_odds('2')
+      it "should parse integral odds of '2' as decimal odds, not as fractional odds of '2/1'" do
+        decimal_odds_2 = FixedOdds.from_s('2')
+
+        decimal_odds_2.should == FixedOdds.decimal_odds('2')
+        decimal_odds_2.should_not == FixedOdds.fractional_odds('2/1')
       end
 
       it "should parse floating-point odds" do
@@ -345,38 +349,38 @@ describe "FixedOdds" do
   end
 
   describe "#profit_on_winning_stake" do
-    it "should return a profit of $400 on a $100 stake on a 4/1 bet" do 
+    it "should return a profit of £400 on a £100 stake on a 4/1 bet" do 
       fourToOne = FixedOdds.fractional_odds '4/1'
-      fourToOne.profit_on_winning_stake('$100').should == '$400'
+      fourToOne.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(400, :GBP)
     end
 
-    it "should return a profit of $25 on a $110 stake with a 1/4 bet" do
+    it "should return a profit of £25 on a £100 stake with a 1/4 bet" do
       oneToFour = FixedOdds.fractional_odds '1/4'
-      oneToFour.profit_on_winning_stake('$100').should == '$25'
+      oneToFour.profit_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(25, :GBP)
     end
   end
 
   describe "#total_return_on_winning_stake" do
-    it "should show that the full amount back on a winning 4/1 bet with a $100 stake is $500" do
+    it "should show that the full amount back on a winning 4/1 bet with a £100 stake is £500" do
       fourToOne = FixedOdds.fractional_odds '4/1'
-      fourToOne.total_return_on_winning_stake('$100').should == '$500'
+      fourToOne.total_return_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(500, :GBP)
     end
 
-    it "should show that the full amount back on a winning 1/4 bet with a $100 stake is $125" do
+    it "should show that the full amount back on a winning 1/4 bet with a £100 stake is £125" do
       oneToFour = FixedOdds.fractional_odds '1/4'
-      oneToFour.total_return_on_winning_stake('$100').should == '$125'
+      oneToFour.total_return_on_winning_stake(Money.from_fixnum(100, :GBP)).should == Money.from_fixnum(125, :GBP)
     end
   end
 
   describe "#stake_needed_to_win" do
-    it "should be $1 on a 1/1 to win $1" do
+    it "should be £1 on a 1/1 to win £1" do
       oneToOne = FixedOdds.fractional_odds '1/1'
-      oneToOne.stake_needed_to_win('$1').should == '$1'
+      oneToOne.stake_needed_to_win(Money.from_fixnum(1, :GBP)).should == Money.from_fixnum(1, :GBP)
     end
 
-    it "should be $100 on 4/1 to win $400" do
+    it "should be £100 on 4/1 to win £400" do
       fourToOne = FixedOdds.fractional_odds '4/1'
-      fourToOne.stake_needed_to_win('$400').should == '$100'
+      fourToOne.stake_needed_to_win(Money.from_fixnum(400, :GBP)).should == Money.from_fixnum(100, :GBP)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodders
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-12-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70129203448100 !ruby/object:Gem::Requirement
+  requirement: &70347044732340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129203448100
+  version_requirements: *70347044732340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129203447620 !ruby/object:Gem::Requirement
+  requirement: &70347044731860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70129203447620
+  version_requirements: *70347044731860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70129203447120 !ruby/object:Gem::Requirement
+  requirement: &70347044731320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70129203447120
+  version_requirements: *70347044731320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70129203446600 !ruby/object:Gem::Requirement
+  requirement: &70347044730800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70129203446600
+  version_requirements: *70347044730800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70129203446080 !ruby/object:Gem::Requirement
+  requirement: &70347044730320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70129203446080
+  version_requirements: *70347044730320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70129203445560 !ruby/object:Gem::Requirement
+  requirement: &70347044729800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129203445560
+  version_requirements: *70347044729800
 description: Converts between fractional, decimal and moneyline odds for betting and
   gambling. Calculates how much can be won on a given stake.
 email: nigel-lowry@ultra.eclipse.co.uk
@@ -96,7 +96,6 @@ files:
 - VERSION
 - lib/FixedOdds.rb
 - lib/MutuallyExclusiveCollection.rb
-- lib/Rational.rb
 - rodders.gemspec
 - spec/FixedOdds_spec.rb
 - spec/MutuallyExclusiveCollection_spec.rb
@@ -117,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3008378059454965337
+      hash: 2781179272829975536
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Fixed odds betting library

data/lib/Rational.rb

@@ -1,9 +0,0 @@
-class Rational
-  # calculates the reciprocal
-  # @example
-  #   Rational(2/3).reciprocal #=> Rational(3/2)
-  # @return [Rational] the reciprocal
-  def reciprocal
-    1 / self
-  end
-end