rodders 3.0.1 → 3.1.0

data/Gemfile

@@ -14,3 +14,10 @@ group :development do
   gem "jeweler", "~> 1.6.4"
   gem "simplecov"
 end
+
+group :development, :test do
+  gem 'debugger'
+end
+
+gem 'activesupport'
+gem 'i18n'

data/Gemfile.lock

@@ -1,6 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    columnize (0.3.6)
+    debugger (1.1.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.2)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.2)
     diff-lcs (1.1.3)
     git (1.2.5)
     i18n (0.6.0)
@@ -32,7 +43,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1.0.0)
+  debugger
+  i18n
   jeweler (~> 1.6.4)
   money
   rspec (~> 2.9.0)

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

data/lib/fixed_odds.rb

@@ -1,4 +1,5 @@
 require 'money'
+require 'active_support/all'
 
 # Represents fixed odds used in gambling and betting. Supports fractional,
 # moneyline and decimal representations. Can calculate the profit
@@ -58,11 +59,11 @@ class FixedOdds
   # @return (see FixedOdds.from_s)
   def FixedOdds.fractional_odds fractional
     raise %{could not parse "#{fractional}" as fractional odds} unless self.fractional_odds?(fractional)
-    return new(1.to_r) if fractional == 'evens' or fractional == 'even money' 
+    return new(1.to_r) if fractional.inquiry.evens? or fractional == 'even money' 
 
     o = /(?<numerator>\d+)(\/|-to-)(?<denominator>\d+)/.match fractional
     r = Rational o[:numerator], o[:denominator]
-    r = r.reciprocal if fractional.end_with? ' on'
+    r = 1 / r if fractional.ends_with? ' on'
     new r
   end
 
@@ -80,9 +81,12 @@ class FixedOdds
   # @return (see FixedOdds.from_s)
   def 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))
+
+    case moneyline[0]
+    when '+'
+      new(Rational(moneyline, 100))
+    else
+      new(Rational(100, -moneyline.to_i))
     end
   end
 
@@ -158,14 +162,4 @@ class FixedOdds
     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/lib/mutually_exclusive_collection.rb

@@ -4,7 +4,7 @@
 class MutuallyExclusiveCollection
   # create a new collection with the given odds
   # @param [Array<FixedOdds>] mutually_exclusive_outcome_odds the odds for all the mutually exclusive outcomes
-  def initialize(mutually_exclusive_outcome_odds)
+  def initialize mutually_exclusive_outcome_odds
     @mutually_exclusive_outcome_odds = mutually_exclusive_outcome_odds.sort
   end
 
@@ -43,31 +43,27 @@ class MutuallyExclusiveCollection
   # @return [Number] the bookmaker's return rate as a percentage
   def bookmakers_return_rate
     fs = fractions
-    fs.any? ? 1 - fs.reduce(:*) / fs.reduce(:+) : 0
+    1 - fs.reduce(:*) / fs.reduce(:+) if fs.any?
   end
 
   # hash of the odds and what percentage of the total stake should go on each
   # @return [Hash<FixedOdds, Number>] hash of odds to percentages
   def percentages
-    hash = {}
-    @mutually_exclusive_outcome_odds.each {|odds| hash[odds] = 1 / odds.fractional_odds / sum_inverse_outcome }
-    hash
+    @mutually_exclusive_outcome_odds.each_with_object({}) {|odds, hash| hash[odds] = 1 / odds.fractional_odds / sum_inverse_outcome }
   end
 
   # hash of the odds and what stakes to put on each given a total stake
   # @param [Money] total_stake the money to distribute on the outcomes
   # @return [Hash<FixedOdds, Money>] hash of odds to stakes
   def stakes_for_total_stake total_stake
-    hash = {}
-    @mutually_exclusive_outcome_odds.each {|odds| hash[odds] = total_stake / odds.fractional_odds / sum_inverse_outcome }
-    hash
+    @mutually_exclusive_outcome_odds.each_with_object({}) {|odds, hash| hash[odds] = total_stake / odds.fractional_odds / sum_inverse_outcome }
   end
 
   # hash of the odds and the stakes needed to make the specified profit
   # @param (see #stakes_for_total_stake)
   # @return (see #stakes_for_total_stake)
   def stakes_for_profit desired_profit
-    stakes_for_total_stake(stake_to_profit(desired_profit))
+    stakes_for_total_stake stake_to_profit desired_profit
   end
 
   # the stake needed to win the desired profit
@@ -97,6 +93,6 @@ class MutuallyExclusiveCollection
     end
 
     def fractions
-      @mutually_exclusive_outcome_odds.collect {|o| o.fractional_odds }
+      @mutually_exclusive_outcome_odds.collect &:fractional_odds
     end
 end

data/rodders.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rodders"
-  s.version = "3.0.1"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nigel Lowry"]
-  s.date = "2012-05-12"
+  s.date = "2012-11-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 = [
@@ -36,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.23"
+  s.rubygems_version = "1.8.24"
   s.summary = "Fixed odds betting library"
 
   if s.respond_to? :specification_version then
@@ -44,26 +44,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<money>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
     else
       s.add_dependency(%q<money>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
     s.add_dependency(%q<money>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
   end
 end
 

data/spec/fixed_odds_spec.rb

@@ -16,13 +16,13 @@ describe "FixedOdds" do
     it "does not change the input string with 'against'" do
       value = '4/1 against'
       FixedOdds.fractional_odds(value)
-      value.end_with?('against').should == true
+      value.end_with?('against').should be
     end
 
     it "does not modify the input string with 'on'" do
       value = '4/1 on'
       FixedOdds.fractional_odds(value)
-      value.end_with?('on').should == true
+      value.end_with?('on').should be
     end
 
     specify { FixedOdds.fractional_odds('4/1 against').should == FixedOdds.fractional_odds('4/1') }
@@ -80,12 +80,12 @@ describe "FixedOdds" do
       )  
     end
 
-    specify { FixedOdds.moneyline_odds('+400').profit_on_stake(Money.parse '£100').should == Money.parse('£400') }
-    specify { FixedOdds.moneyline_odds('+100').profit_on_stake(Money.parse '£100').should == Money.parse('£100') }
+    specify { FixedOdds.moneyline_odds('+400').profit_on_stake('£100'.to_money).should == '£400'.to_money }
+    specify { FixedOdds.moneyline_odds('+100').profit_on_stake('£100'.to_money).should == '£100'.to_money }
 
-    specify { FixedOdds.moneyline_odds('-400').profit_on_stake(Money.parse '£400').should == Money.parse('£100') }
-    specify { FixedOdds.moneyline_odds('-100').profit_on_stake(Money.parse '£100').should == Money.parse('£100') }
-    specify { FixedOdds.moneyline_odds('+100').profit_on_stake(Money.parse '£100').should == Money.parse('£100') }
+    specify { FixedOdds.moneyline_odds('-400').profit_on_stake('£400'.to_money).should == '£100'.to_money }
+    specify { FixedOdds.moneyline_odds('-100').profit_on_stake('£100'.to_money).should == '£100'.to_money }
+    specify { FixedOdds.moneyline_odds('+100').profit_on_stake('£100'.to_money).should == '£100'.to_money }
   end
 
   describe ".decimal_odds" do
@@ -98,9 +98,9 @@ describe "FixedOdds" do
       )  
     end
 
-    specify { FixedOdds.decimal_odds('2').profit_on_stake(Money.parse '£1').should == Money.parse('£1') }
-    specify { FixedOdds.decimal_odds('5').profit_on_stake(Money.parse '£1').should == Money.parse('£4') }
-    specify { FixedOdds.decimal_odds('1.25').profit_on_stake(Money.parse '£4').should == Money.parse('£1') }
+    specify { FixedOdds.decimal_odds('2').profit_on_stake('£1'.to_money).should == '£1'.to_money }
+    specify { FixedOdds.decimal_odds('5').profit_on_stake('£1'.to_money).should == '£4'.to_money }
+    specify { FixedOdds.decimal_odds('1.25').profit_on_stake('£4'.to_money).should == '£1'.to_money }
   end
 
   describe ".from_s" do

data/spec/mutually_exclusive_collection_spec.rb

@@ -25,7 +25,7 @@ describe "MutuallyExclusiveCollection" do
       @bookmaker = MutuallyExclusiveCollection.new []
     end
 
-    specify { @bookmaker.bookmakers_return_rate.should == 0 }
+    specify { @bookmaker.bookmakers_return_rate.should be_nil }
   end
 
   context "decimal odds arbitrage" do
@@ -48,7 +48,7 @@ describe "MutuallyExclusiveCollection" do
     specify { @bookmaker1.bookmakers_return_rate.should be_within(0.0001).of(0.0534) }
     specify { @bookmaker2.bookmakers_return_rate.should be_within(0.0001).of(0.0478) }
 
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake(Money.parse '£100').should == Money.parse('£4.63') }
+    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£4.63'.to_money }
     specify { @bookmaker_vulnerable_to_arbitrage.profit_percentage.should be_within(0.001).of(0.046) }
   end
 
@@ -64,7 +64,7 @@ describe "MutuallyExclusiveCollection" do
 
     specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
     its(:profit_percentage) { should be_within(0.001).of(0.2) }
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake(Money.parse '£500').should == Money.parse('£100') }
+    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£100'.to_money }
   end
 
   context "more than two mutually exclusive events" do
@@ -96,27 +96,27 @@ describe "MutuallyExclusiveCollection" do
         total = Money.parse '£500'
         amounts = @bookmaker_vulnerable_to_arbitrage.stakes_for_total_stake total
         amounts.should have(3).items
-        amounts[@odds1].should == Money.parse('£396.14')
-        amounts[@odds2].should == Money.parse('£73.57')
-        amounts[@odds3].should == Money.parse('£30.29')
+        amounts[@odds1].should == '£396.14'.to_money
+        amounts[@odds2].should == '£73.57'.to_money
+        amounts[@odds3].should == '£30.29'.to_money
         amounts.values.reduce(:+).should == total
       end
     end
 
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake(Money.parse '£500').should == Money.parse('£14.98') }
+    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£500'.to_money).should == '£14.98'.to_money }
 
     describe "#stakes_for_profit" do
       it "gives the right amounts" do
-        amounts = @bookmaker_vulnerable_to_arbitrage.stakes_for_profit Money.parse '£750'
+        amounts = @bookmaker_vulnerable_to_arbitrage.stakes_for_profit '£750'.to_money
         amounts.should have(3).items
-        amounts[@odds1].should == Money.parse('£19833.33')
-        amounts[@odds2].should == Money.parse('£3683.33')
-        amounts[@odds3].should == Money.parse('£1516.67')
-        amounts.values.reduce(:+).should == Money.parse('£25033.33')
+        amounts[@odds1].should == '£19833.33'.to_money
+        amounts[@odds2].should == '£3683.33'.to_money
+        amounts[@odds3].should == '£1516.67'.to_money
+        amounts.values.reduce(:+).should == '£25033.33'.to_money
       end
     end
 
-    specify { @bookmaker_vulnerable_to_arbitrage.stake_to_profit(Money.parse '£750').should == Money.parse('£25033.33') }
+    specify { @bookmaker_vulnerable_to_arbitrage.stake_to_profit('£750'.to_money).should == '£25033.33'.to_money }
   end
 
   context "different events with same odds" do
@@ -128,7 +128,7 @@ describe "MutuallyExclusiveCollection" do
     end
 
     specify { @bookmaker_vulnerable_to_arbitrage.should be_arbitrageable }
-    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake(Money.parse '£100').should == Money.parse('£650') }
+    specify { @bookmaker_vulnerable_to_arbitrage.profit_on_stake('£100'.to_money).should == '£650'.to_money }
 
     describe "#percentages" do
       it "gives the percentages to put on each bet" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodders
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -146,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1158855232544155326
+      hash: 437333735277840555
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fixed odds betting library