betfair 1.0.3 → 1.0.6

data/lib/betfair/version.rb

@@ -1,3 +1,3 @@
 module Betfair
-  VERSION = '1.0.3'
+  VERSION = '1.0.6'
 end

data/spec/betfair/api_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 
 module Betfair
 
+
   describe "Helper methods for mashing the data from the API - " do 
 
+    include LoginHelper
+    
     before(:all) do 
-      @bf = Betfair::API.new
-      @session_token = @bf.login('username', 'password', 82, 0, 0, nil) 
+      login()
       @helpers = Betfair::Helpers.new
     end
     
-    describe "create a hash from the get_all_markets API call"  do
+    describe "Create a hash from the get_all_markets API call"  do
       it "pulls the relevant stuff out of get_all_markets and puts it in a hash" do
         savon.expects(:get_all_markets).returns(:success)
         markets = @bf.get_all_markets(@session_token, 2)
@@ -20,7 +22,7 @@ module Betfair
       end
     end
     
-    describe "create a hash for the market details"  do
+    describe "Create a hash for the market details"  do
       it "pulls the relevant stuff out of market details and puts it in a hash" do
         savon.expects(:get_market).returns(:success)
         market = @bf.get_market(@session_token, 2, 10038633)
@@ -29,8 +31,8 @@ module Betfair
       end
     end
     
-    describe "cleans up the get market details"  do
-      it "sort the runners for each market out " do
+    describe "Cleans up the get market details"  do
+      it "sort the selections for each market out " do
         savon.expects(:get_market).returns(:success)
         market = @bf.get_market(@session_token, 2, 10038633)
         details = @helpers.details(market)
@@ -38,7 +40,7 @@ module Betfair
       end
     end
 
-    describe "get the price string for a runner"  do
+    describe "Get the price string for a selection"  do
       it "so that we can combine it together with market info" do
         savon.expects(:get_market_prices_compressed).returns(:success)
         prices = @bf.get_market_prices_compressed(@session_token, 2, 10038633)
@@ -47,8 +49,8 @@ module Betfair
       end
     end
    
-    describe "combine market details and runner prices api call"  do
-      it "combines the two api calls of get_market and get_market_prices_compressed " do
+    describe "Combine market details and selection prices api call"  do
+      it "Combines the two api calls of get_market and get_market_prices_compressed " do
         
         savon.expects(:get_market).returns(:success)
         market = @bf.get_market(@session_token, 2, 10038633)
@@ -60,60 +62,60 @@ module Betfair
         combined.should_not be_nil        
       end
     end  
-    
-    describe "set up an odds tables of all possible Betfair Odds" do
-      it "should return a hash of all possible Betfair odds with correct increments" do
-        odds_table = @helpers.odds_table
-        odds_table.should_not be_nil
-        odds_table.should be_an_instance_of(Array)
-        odds_table.count.should eq(350)
-        odds_table[256].should eq(85)
-      end
-      
-      it "should return a standard hash" do
-        betfair_odds = @helpers.set_betfair_odds(275, 0, false, false)
-        betfair_odds.should be_an_instance_of(Hash)
-        betfair_odds[:price].should eq(275)
-        betfair_odds[:prc].should eq(280)
-        betfair_odds[:increment].should eq(10)
-        betfair_odds[:pips].should eq(0)
-      end
-      
-      it "should return a standard hash with prc at 1 pip and price rounded up" do
-        betfair_odds = @helpers.set_betfair_odds(2.31, 1, true, false)
-        betfair_odds.should be_an_instance_of(Hash)
-        betfair_odds[:price].should eq(2.31)
-        betfair_odds[:prc].should eq(2.34)
-        betfair_odds[:increment].should eq(0.02)
-        betfair_odds[:pips].should eq(1)
-      end
-      
-      it "should return a standard hash with prc at 2 pip and price rounded down" do
-        betfair_odds = @helpers.set_betfair_odds(2.31, 5, false, true)
-        betfair_odds.should be_an_instance_of(Hash)
-        betfair_odds[:price].should eq(2.31)
-        betfair_odds[:prc].should eq(2.4)
-        betfair_odds[:increment].should eq(0.02)
-        betfair_odds[:pips].should eq(5)
-      end
-      
-      it "should return an even spread off odds based on the odds_table method" do
-        spread = @helpers.get_odds_spread(271, 343)
-        spread.should eq(70.0)
-        spread = @helpers.get_odds_spread(1.28, 3.43)
-        spread.should eq(2.17)
-      end
-      
-    end
-    
-    
-  end
 
+		describe "set up an odds tables of all possible Betfair Odds" do
+			it "should return a hash of all possible Betfair odds with correct increments" do
+			  odds_table = @helpers.odds_table
+			  odds_table.should_not be_nil
+			  odds_table.should be_an_instance_of(Array)
+			  odds_table.count.should eq(350)
+			  odds_table[256].should eq(85)
+			end
+
+			it "should return a standard hash" do
+			  betfair_odds = @helpers.set_betfair_odds(275, 0, false, false)
+			  betfair_odds.should be_an_instance_of(Hash)
+			  betfair_odds[:price].should eq(275)
+			  betfair_odds[:prc].should eq(280)
+			  betfair_odds[:increment].should eq(10)
+			  betfair_odds[:pips].should eq(0)
+			end
+
+			it "should return a standard hash with prc at 1 pip and price rounded up" do
+			  betfair_odds = @helpers.set_betfair_odds(2.31, 1, true, false)
+			  betfair_odds.should be_an_instance_of(Hash)
+			  betfair_odds[:price].should eq(2.31)
+			  betfair_odds[:prc].should eq(2.34)
+			  betfair_odds[:increment].should eq(0.02)
+			  betfair_odds[:pips].should eq(1)
+			end
+
+			it "should return a standard hash with prc at 2 pip and price rounded down" do
+			  betfair_odds = @helpers.set_betfair_odds(2.31, 5, false, true)
+			  betfair_odds.should be_an_instance_of(Hash)
+			  betfair_odds[:price].should eq(2.31)
+			  betfair_odds[:prc].should eq(2.4)
+			  betfair_odds[:increment].should eq(0.02)
+			  betfair_odds[:pips].should eq(5)
+			end
+
+			it "should return an even spread of odds based on the odds_table method" do
+			  spread = @helpers.get_odds_spread(271, 343)
+			  spread.should eq(70.0)
+			  spread = @helpers.get_odds_spread(1.28, 3.43)
+			  spread.should eq(2.17)
+			end
+
+		end
+
+	end
+	
   describe "Placing and cancelling bets - " do
     
+    include LoginHelper
+
     before(:all) do 
-      @bf = Betfair::API.new
-      @session_token = @bf.login('username', 'password', 82, 0, 0, nil) 
+      login()
     end
     
     describe "place bet success"  do
@@ -136,9 +138,9 @@ module Betfair
       it "should place mutliple bets on the exchange via the api" do
         savon.expects(:place_bets).returns(:success)
         bets = []
-        bets <<  { market_id: 104184109, runner_id: 58805, bet_type: 'B', price: 2.0, size: 2.0, asian_line_id: 0, 
+        bets <<  { market_id: 104184109, selection_id: 58805, bet_type: 'B', price: 2.0, size: 2.0, asian_line_id: 0, 
                   bet_category_type: 'E', bet_peristence_type: 'NONE', bsp_liability: 0 }
-        bets <<  { market_id: 104184109, runner_id: 12234, bet_type: 'L', price: 1.5, size: 2.0, asian_line_id: 0, 
+        bets <<  { market_id: 104184109, selection_id: 12234, bet_type: 'L', price: 1.5, size: 2.0, asian_line_id: 0, 
                   bet_category_type: 'E', bet_peristence_type: 'NONE', bsp_liability: 0 }
         bets = @bf.place_multiple_bets(@session_token, 1, bets)       
         bets[:bet_id].should eq('16939643915')
@@ -149,9 +151,9 @@ module Betfair
       it "should return an error message" do
         savon.expects(:place_bets).returns(:fail)
         bets = []
-        bets <<  { market_id: 104184109, runner_id: 58805, bet_type: 'B', price: 2.0, size: 2.0, asian_line_id: 0, 
+        bets <<  { market_id: 104184109, selection_id: 58805, bet_type: 'B', price: 2.0, size: 2.0, asian_line_id: 0, 
                   bet_category_type: 'E', bet_peristence_type: 'NONE', bsp_liability: 0 }  
-        bets <<  { market_id: 104184109, runner_id: 12234, bet_type: 'L', price: 1.5, size: 2.0, asian_line_id: 0, 
+        bets <<  { market_id: 104184109, selection_id: 12234, bet_type: 'L', price: 1.5, size: 2.0, asian_line_id: 0, 
                   bet_category_type: 'E', bet_peristence_type: 'NONE', bsp_liability: 0 }                
         error_code = @bf.place_multiple_bets(@session_token, 1, bets)      
         error_code[:result_code].should eq('INVALID_SIZE')
@@ -235,9 +237,11 @@ module Betfair
   end
   
   describe "Reading account details - " do
+
+    include LoginHelper
+
     before(:all) do 
-      @bf = Betfair::API.new
-      @session_token = @bf.login('username', 'password', 82, 0, 0, nil) 
+      login()
     end    
 
     describe "reading wallet contents" do
@@ -251,9 +255,10 @@ module Betfair
   
   describe "Basic read methods from the API - " do 
 
+    include LoginHelper
+
     before(:all) do 
-      @bf = Betfair::API.new
-      @session_token = @bf.login('username', 'password', 82, 0, 0, nil) 
+      login()
     end    
 
     describe "get all markets success"  do
@@ -351,6 +356,7 @@ module Betfair
         savon.expects(:keep_alive).returns(:success)
         session_token = @bf.keep_alive(@session_token)
         session_token.should eq('AXwtUFENz+/mWaatVtjUosug26+TYLYWiHPhRFRiabs=')
+        session_token.should be_success
       end
     end
     
@@ -359,6 +365,7 @@ module Betfair
         savon.expects(:keep_alive).returns(:fail)
         error_code = @bf.keep_alive(@session_token)
         error_code.should eq('NO_SESSION')
+        error_code.should_not be_success
       end
     end
 
@@ -458,4 +465,4 @@ module Betfair
 
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -8,5 +8,13 @@ RSpec.configure do |config|
   HTTPI.log = false
   Savon.log = false
   config.include Savon::Spec::Macros
-  Savon::Spec::Fixture.path = File.expand_path("../fixtures", __FILE__)
+  Savon::Spec::Fixture.path = File.expand_path('../fixtures', __FILE__)
+end
+
+module LoginHelper
+  def login( response=:success )
+    @bf = Betfair::API.new
+    savon.expects(:login).returns( response )
+    @session_token = @bf.login('username', 'password', 82, 0, 0, nil) 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: betfair
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70101392500940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70101392500940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70101392500220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101392500220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101392499420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +53,44 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101392499420
-- !ruby/object:Gem::Dependency
-  name: savon_spec
-  requirement: &70101392498480 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: savon_spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *70101392498480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 description: Gem for accessing the Betfair API.
 email:
 - lukeb@lukebyrne.com
@@ -66,16 +102,9 @@ files:
 - API Ref Doc.pdf
 - Gemfile
 - README.md
-- README_OLD
 - Rakefile
 - betfair.gemspec
-- examples/bar.rb
-- examples/foo.rb
-- examples/simplebot.log
-- examples/simplebot/README.md
-- examples/simplebot/daemonize.rb
-- examples/simplebot/monit.conf
-- examples/simplebot/simplebot.rb
+- examples/README.md
 - lib/betfair.rb
 - lib/betfair/api.rb
 - lib/betfair/version.rb
@@ -120,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3477477127880861030
+      hash: 741636228280030738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,10 +158,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3477477127880861030
+      hash: 741636228280030738
 requirements: []
 rubyforge_project: betfair
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Betfair API gem.

data/README_OLD

@@ -1,170 +0,0 @@
-BETFAIR API
-===========
-
-------------
-Installation
-------------
-
-Betfair is available through
-[Rubygems](http://rubygems.org/gems/betfair) and can be installed via:
-
-    gem install betfair
-
-OR with bundler: `gem 'betfair'` and `bundle install`
-
-------------
-Introduction
-------------
-
-    irb
-
-    require 'betfair'
-
-or from a Gemfile
-
-    gem 'betfair'
-
-    # create a client for the General API so that you can log in.
-    bf = Betfair::API.new
-
-If you want to use a proxy or turn on Savon's logging then just pass
-in like so:
-
-    # This is a local squid proxy I tunnel to from my local 
-    # machine to access the host server in UK for dev purposes.
-    proxy = 'http://localhost:8888' 
-    logging = true
-    bf = Betfair::API.new(proxy, logging)
-
-Proxies can be useful if you want to host on a cloud service such as
-Heroku, as you will be denied access to the Betfair API from the
-USA. Just proxy via a server from a country that Betfair allows, such
-as the UK.
-
-At the heart of the Betfair API is the `session_token`. In order to
-get one of these simply call:
-
-    session_token = bf.login('username', 'password', 82, 0, 0, nil)
-
-Username and Password are fairly obvious.  The `session_token` value
-you get back responds to #success? which will tell you whether login
-was successful or not.  If `session_token.success?` returns false,
-`session_token.to_s` will give you the error message.
-
-82 is the standard Product Id, you may have a different one depending
-on the level of Betfair API access that you have.
-
-You can ignore the rest and leave as is, but they refer to Vendor
-Software Id, Location Id, Ip Address as required by the Betfair API.
-
------
-Read
------
-
-    markets = 
-      bf.get_all_markets(session_token, 1, [1,3], nil, nil, nil, nil)
-
-    # We can either pull the market ID out of `markets`, or use a
-    # stored value:
-
-    market_id = 100386338
-    exchange_id = 1 # or 2 for the Australian exchange
-
-    # get_market returns a Hash with the details of the identified
-    # market, including the commission as
-    # `details[:market_base_rate]`, and information on the runners
-    # (including their ids, which you need to place a bet) as
-    # `details[:runners]`.
-    
-    details =
-      bf.get_market(session_token, exchange_id, market_id)
-
-    # This returns an encoded string with some back prices and depths
-    # for the given market.
-
-    prices = bf.get_market_prices_compressed(session_token, 
-                                             exchange_id, 
-                                             market_id)
-
-    helpers = Betfair::Helpers.new
-
-    helpers.market_info(details)
-    helpers.combine(details, prices)
-
-    # The get_all_markets api call returns all markets in one huge
-    # string.  This helper provides them all in handy hashes with
-    # market id as key.  
-
-    helpers.all_markets(markets)
-
----
-Bet
----
-
-    bf.place_bet(session_token, 1, 104184109, 58805, 'B', 10.0, 5.0)
-    bf.cancel_bet(session_token, 1, 16939730542)
-
-----------
-API Limits
-----------
-http://bdp.betfair.com/index.php?option=com_content&task=view&id=36&Itemid=64
-
-------------
-Requirements
-------------
-
-    savon
-
-------------------------
-Requirements for testing
-------------------------
-
-    savon_spec
-    rspec
-    rake
-
-----------
-To Do
-----------
-
-- The WOM of money in Helpers#price_string returns 0 if either all b1,b2,b3 or l1,l2,l3 are all 0
-- Add some error checking to the Betfair::Helper methods
-- Finish of the mash method, to return a nice hash of all market and
-  runner info
-- Write a spec for the mashed method
-
-----------
-Contribute
-----------
-
-I have only added the Betfair API method calls that I need. 
-
-Feel free to fork this repo, add what you need to with the relevant
-RSpec tests and send me a pull request.
-
--------
-License
--------
-
-(The MIT License)
-
-Copyright (c) 2011 Luke Byrne
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.