betfair_api_ng_rails 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a846cee18d46f60c19a677111624b07cb5673ce
-  data.tar.gz: 5bbef065b3ef31d43d789d1daef6e347aa4d4678
+  metadata.gz: ca32b3a7503facf55e960bae30e2ea935212e962
+  data.tar.gz: 3d8898545fa0c7946b87c1cef82a83105ae18518
 SHA512:
-  metadata.gz: 8be49808b5673fc0dfd9aebfb786743d2749703d07adbd5de2ae171c518a1bd825c2d5a1af971e675a1e5af7f2d27034d96d7248022b13e1bceedb9b275d1bed
-  data.tar.gz: ed938a79784a41ddb3fff8dd18550d6b98c7b21bed9af4922eb2e67c1be180cd3c544559b789d13c893728a92fe0a65558e1349d4a989da9ef2a3f635f0468aa
+  metadata.gz: 90341eaac7266d722a01a5ad8966b65e2b885ab0bae3aaa27bf7ae34d2e9416ab548db9e64f0f2f9c4cd95c6c79af8b67aba5c3e6aeef493d4aae41effcaff3b
+  data.tar.gz: b6f8573b8ed49d57edd03e2f1fcf59b4c8e3c9219d2463e443681739d4afd3fda9eea1c3f5ed0f0a0968623f5573ffd2cdcbcdac7d70c3729e7d2ed3612fead6

data/README.md

@@ -6,7 +6,7 @@ API-NG is Betfair's next generation API for developers looking to create automat
 
 Add this line to your application's Gemfile:
 
-    gem 'betfair_api_ng_rails', '1.0.0'
+    gem 'betfair_api_ng_rails', '2.0.0'
 
 And then execute:
 
@@ -37,6 +37,31 @@ In this files you must specify credentials to API-NG. Also you should notice tha
 
 Please check [wiki pages](https://github.com/alterego-labs/betfair_api_ng_rails/wiki).
 
+## CHANGES IN 2.0.0
+
+One of the main features of this release was the multiaccounting.
+Since version 1.5.0 is now available opportunity to place bets using placeOrders method. But at the same time there was another problem - to place bets in various Betfair accounts, and that the current implementation does not allow. Starting with version 2.0.0 is such an opportunity exists. But just be careful: if you want to use version 2.0.0 in an existing project, you have to do a small step:
+
+```ruby
+BetfairApiNgRails.config do |config|
+  # Rest of configuration same as for 1.5.0
+
+  # Setting up account
+  BetfairApiNgRails.account_manager.store BetfairApiNgRails::Account.new(config.username,
+                                                                         config.password,
+                                                                         config.application_key,
+                                                                         config.ssl_crt_filepath,
+                                                                         config.ssl_key_filepath)
+  BetfairApiNgRails.account_manager.default config.username
+end
+```
+
+For additional info please visit [specific wiki page](https://github.com/alterego-labs/betfair_api_ng_rails/wiki/Multiaccounting).
+
+## CHANGES IN 1.5.0
+
+1. Add supporting **placeOrders** method
+
 ## CHANGES IN 1.1.0
 
 1. Supporting all [Simple listing filtered requests](https://github.com/alterego-labs/betfair_api_ng_rails/wiki/Simple-listing-filtered-requests)

data/Rakefile

@@ -1,10 +1,10 @@
 require "rubygems"
-# require 'rspec/core/rake_task'
-# require 'rubygems/specification'
+require 'rspec/core/rake_task'
+require 'rubygems/specification'
 
-# task default: :spec
-# desc "Run specs"
-# RSpec::Core::RakeTask.new do |t|
-#   t.pattern = FileList['spec/**/*_spec.rb']
-#   t.rspec_opts = %w(--color)
-# end
+task default: :spec
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
+  t.rspec_opts = %w(--color)
+end

data/betfair_api_ng_rails.gemspec

@@ -18,10 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "activesupport", ">= 3.1.0"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta"
-  spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "pry-nav"
-end
+  spec.add_runtime_dependency    'activesupport',  '>= 4.0.4'
+  spec.add_runtime_dependency    'rails',          '>= 4.0.4'
+
+  spec.add_dependency             "colorize",      ">= 0.7.2"
+  spec.add_dependency             "redis",         '3.0.7'
+
+  spec.add_development_dependency "bundler",       "~> 1.3"
+  spec.add_development_dependency "rake",          ">= 10.3.0"
+  spec.add_development_dependency "rspec",         "~> 3.0.0.beta"
+  spec.add_development_dependency "rspec-its",     "1.0.1"
+  spec.add_development_dependency "pry-nav",       "0.2.3"
+end

data/lib/betfair_api_ng_rails.rb

@@ -1,150 +1,214 @@
 require "betfair_api_ng_rails/version"
 require "betfair_api_ng_rails/errors"
-require "betfair_api_ng_rails/api/request_methods"
+require "betfair_api_ng_rails/api/request_methods/all"
 require "betfair_api_ng_rails/railtie" if defined?(Rails)
+require 'redis'
+require 'active_support/dependencies/autoload'
 
 module BetfairApiNgRails
+  extend ActiveSupport::Autoload
+
+  autoload :Account
+  autoload :AccountSession
+  autoload :AccountManager
+  autoload :AccountSessionManager
+  autoload :BadResponseError
 
   module Api
+    extend ActiveSupport::Autoload
 
-    autoload :BaseProvider,     'betfair_api_ng_rails/api/base_provider'
-    autoload :BaseRequester,    'betfair_api_ng_rails/api/base_requester'
-    autoload :FormatterFactory, 'betfair_api_ng_rails/api/formatter_factory'
+    autoload :BaseProvider
+    autoload :BaseRequester
+    autoload :FormatterFactory
 
-    autoload :Config,         'betfair_api_ng_rails/api/config'
-    autoload :Constants,      'betfair_api_ng_rails/api/constants'
-    autoload :Provider,       'betfair_api_ng_rails/api/provider'
-    autoload :SessionManager, 'betfair_api_ng_rails/api/session_manager'
+    autoload :Config
+    autoload :Constants
+    autoload :Provider
+    autoload :SessionManager
 
-    autoload :Connection,         'betfair_api_ng_rails/api/connection'
-    autoload :Hashalator,         'betfair_api_ng_rails/api/hashalator'
+    autoload :Connection
+    autoload :Hashalator
 
-    module Formatters
+    autoload :RequestMethod
 
-      autoload :JsTreeFormatter, 'betfair_api_ng_rails/api/formatters/js_tree_formatter'
+    autoload :EndpointFactory
+    autoload :InvalidEndpointError
 
+    module Caching
+      extend ActiveSupport::Autoload
+
+      autoload :Helper
+      autoload :ResponseCache
     end
 
-    module Data
+    module Logs
+      extend ActiveSupport::Autoload
 
-      autoload :Base,                  'betfair_api_ng_rails/api/data/base'
-      autoload :Constants,             'betfair_api_ng_rails/api/data/constants'
-      autoload :Competition,           'betfair_api_ng_rails/api/data/competition'
-      autoload :CompetitionResult,     'betfair_api_ng_rails/api/data/competition_result'
-      autoload :MarketFilter,          'betfair_api_ng_rails/api/data/market_filter'
-      autoload :TimeRange,             'betfair_api_ng_rails/api/data/time_range'
-      autoload :TimeRangeResult,       'betfair_api_ng_rails/api/data/time_range_result'
-      autoload :EventType,             'betfair_api_ng_rails/api/data/event_type'
-      autoload :EventTypeResult,       'betfair_api_ng_rails/api/data/event_type_result'
-      autoload :Event,                 'betfair_api_ng_rails/api/data/event'
-      autoload :EventResult,           'betfair_api_ng_rails/api/data/event_result'
-      autoload :CountryCodeResult,     'betfair_api_ng_rails/api/data/country_code_result'
-      autoload :VenueResult,           'betfair_api_ng_rails/api/data/venue_result'
-      autoload :MarketTypeResult,      'betfair_api_ng_rails/api/data/market_type_result'
-      autoload :MarketCatalogue,       'betfair_api_ng_rails/api/data/market_catalogue'
-      autoload :MarketDescription,     'betfair_api_ng_rails/api/data/market_description'
-      autoload :RunnerCatalog,         'betfair_api_ng_rails/api/data/runner_catalog'
-      autoload :MarketBook,            'betfair_api_ng_rails/api/data/market_book'
-      autoload :Runner,                'betfair_api_ng_rails/api/data/runner'
-      autoload :Order,                 'betfair_api_ng_rails/api/data/order'
-      autoload :Match,                 'betfair_api_ng_rails/api/data/match'
-      autoload :StartingPrices,        'betfair_api_ng_rails/api/data/starting_prices'
-      autoload :ExchangePrices,        'betfair_api_ng_rails/api/data/exchange_prices'
-      autoload :PriceSize,             'betfair_api_ng_rails/api/data/price_size'
-      autoload :PriceProjection,       'betfair_api_ng_rails/api/data/price_projection'
-      autoload :ExBestOffersOverrides, 'betfair_api_ng_rails/api/data/ex_best_offers_overrides'
+      autoload :FileLogger
+      autoload :ConsoleLogger
+    end
 
-      module Concerns
+    module Formatters
+      extend ActiveSupport::Autoload
 
-        autoload :Hashable,           'betfair_api_ng_rails/api/data/concerns/hashable'
-        autoload :Attributable,       'betfair_api_ng_rails/api/data/concerns/attributable'
-        autoload :Jsonable,           'betfair_api_ng_rails/api/data/concerns/jsonable'
+      autoload :JsTreeFormatter
+    end
 
-      end
+    module Data
+      extend ActiveSupport::Autoload
+
+      autoload :Base
+      autoload :Constants
+      autoload :Competition
+      autoload :CompetitionResult
+      autoload :MarketFilter
+      autoload :TimeRange
+      autoload :TimeRangeResult
+      autoload :EventType
+      autoload :EventTypeResult
+      autoload :Event
+      autoload :EventResult
+      autoload :CountryCodeResult
+      autoload :VenueResult
+      autoload :MarketTypeResult
+      autoload :MarketCatalogue
+      autoload :MarketDescription
+      autoload :RunnerCatalog
+      autoload :MarketBook
+      autoload :Runner
+      autoload :Order
+      autoload :Match
+      autoload :StartingPrices
+      autoload :ExchangePrices
+      autoload :PriceSize
+      autoload :PriceProjection
+      autoload :ExBestOffersOverrides
+      autoload :PlaceExecutionReport
+      autoload :PlaceInstructionReport
+      autoload :PlaceInstruction
+      autoload :LimitOrder
+      autoload :LimitOnCloseOrder
+      autoload :MarketOnCloseOrder
+      autoload :AccountDetailsResponse
+      autoload :AccountFundsResponse
+      autoload :StatementLegacyData
+      autoload :StatementItem
+      autoload :AccountStatementReport
 
+      module Concerns
+        extend ActiveSupport::Autoload
+
+        autoload :Hashable
+        autoload :Attributable
+        autoload :Jsonable
+      end
     end
 
     module Enums
-
-      autoload :MarketProjection,           'betfair_api_ng_rails/api/enums/market_projection'
-      autoload :PriceData,                  'betfair_api_ng_rails/api/enums/price_data'
-      autoload :MatchProjection,            'betfair_api_ng_rails/api/enums/match_projection'
-      autoload :OrderProjection,            'betfair_api_ng_rails/api/enums/order_projection'
-      autoload :MarketStatus,               'betfair_api_ng_rails/api/enums/market_status'
-      autoload :RunnerStatus,               'betfair_api_ng_rails/api/enums/runner_status'
-      autoload :TimeGranularity,            'betfair_api_ng_rails/api/enums/time_granularity'
-      autoload :Side,                       'betfair_api_ng_rails/api/enums/side'
-      autoload :OrderStatus,                'betfair_api_ng_rails/api/enums/order_status'
-      autoload :OrderBy,                    'betfair_api_ng_rails/api/enums/order_by'
-      autoload :SortDir,                    'betfair_api_ng_rails/api/enums/sort_dir'
-      autoload :OrderType,                  'betfair_api_ng_rails/api/enums/order_type'
-      autoload :MarketSort,                 'betfair_api_ng_rails/api/enums/market_sort'
-      autoload :MarketBettingType,          'betfair_api_ng_rails/api/enums/market_betting_type'
-      autoload :ExecutionReportStatus,      'betfair_api_ng_rails/api/enums/execution_report_status'
-      autoload :ExecutionReportErrorCode,   'betfair_api_ng_rails/api/enums/execution_report_error_code'
-      autoload :PersistenceType,            'betfair_api_ng_rails/api/enums/perisstence_type'
-      autoload :InstrictionReportStatus,    'betfair_api_ng_rails/api/enums/instruction_report_status'
-      autoload :InstructionReportErrorCode, 'betfair_api_ng_rails/api/enums/instruction_report_error_code'
-      autoload :RollupModel,                'betfair_api_ng_rails/api/enums/rollup_model'
-      autoload :GroupBy,                    'betfair_api_ng_rails/api/enums/group_by'
-      autoload :BetStatus,                  'betfair_api_ng_rails/api/enums/bet_status'
+      extend ActiveSupport::Autoload
+
+      autoload :MarketProjection
+      autoload :PriceData
+      autoload :MatchProjection
+      autoload :OrderProjection
+      autoload :MarketStatus
+      autoload :RunnerStatus
+      autoload :TimeGranularity
+      autoload :Side
+      autoload :OrderStatus
+      autoload :OrderBy
+      autoload :SortDir
+      autoload :OrderType
+      autoload :MarketSort
+      autoload :MarketBettingType
+      autoload :ExecutionReportStatus
+      autoload :ExecutionReportErrorCode
+      autoload :PersistenceType
+      autoload :InstrictionReportStatus
+      autoload :InstructionReportErrorCode
+      autoload :RollupModel
+      autoload :GroupBy
+      autoload :BetStatus
+      autoload :IncludeItem
+      autoload :Wallet
+      autoload :ItemClass
 
       module Concerns
+        extend ActiveSupport::Autoload
 
-        autoload :Enumable, 'betfair_api_ng_rails/api/enums/concerns/enumable'
-
+        autoload :Enumable
       end
-
     end
 
     module Http
+      extend ActiveSupport::Autoload
 
-      autoload :Requester,  'betfair_api_ng_rails/api/http/requester'
-      autoload :Responser,  'betfair_api_ng_rails/api/http/responser'
-      autoload :Factory,    'betfair_api_ng_rails/api/http/factory'
-
+      autoload :Requester
+      autoload :Responser
+      autoload :Factory
+      autoload :ProxyRequester
     end
 
     module Parsers
-
-      autoload :Base,                'betfair_api_ng_rails/api/parsers/base'
-      autoload :ListCompetitions,    'betfair_api_ng_rails/api/parsers/list_competitions'
-      autoload :ListEventTypes,      'betfair_api_ng_rails/api/parsers/list_event_types'
-      autoload :ListEvents,          'betfair_api_ng_rails/api/parsers/list_events'
-      autoload :ListTimeRanges,      'betfair_api_ng_rails/api/parsers/list_time_ranges'
-      autoload :ListCountries,       'betfair_api_ng_rails/api/parsers/list_countries'
-      autoload :ListVenues,          'betfair_api_ng_rails/api/parsers/list_venues'
-      autoload :ListMarketTypes,     'betfair_api_ng_rails/api/parsers/list_market_types'
-      autoload :ListMarketCatalogue, 'betfair_api_ng_rails/api/parsers/list_market_catalogue'
-      autoload :ListMarketBook,      'betfair_api_ng_rails/api/parsers/list_market_book'
-
+      extend ActiveSupport::Autoload
+
+      autoload :Base
+      autoload :ListBase
+      autoload :SingleBase
+      autoload :ListCompetitions
+      autoload :ListEventTypes
+      autoload :ListEvents
+      autoload :ListTimeRanges
+      autoload :ListCountries
+      autoload :ListVenues
+      autoload :ListMarketTypes
+      autoload :ListMarketCatalogue
+      autoload :ListMarketBook
+      autoload :PlaceOrders
+      autoload :GetAccountDetails
+      autoload :GetAccountFunds
+      autoload :GetAccountStatement
     end
 
     module ConnectionExt
-      
-      autoload :ErrorHandling, 'betfair_api_ng_rails/api/connection_ext/error_handling'
-      autoload :Parsing,       'betfair_api_ng_rails/api/connection_ext/parsing'
-      autoload :Formatting,    'betfair_api_ng_rails/api/connection_ext/formatting'
-
+      extend ActiveSupport::Autoload
+
+      autoload :ErrorHandling
+      autoload :SsoidRefreshing
+      autoload :Parsing
+      autoload :Formatting
+      autoload :Logging
+      autoload :Caching
     end
 
+    module Endpoints
+      extend ActiveSupport::Autoload
+
+      autoload :Base
+      autoload :Uk
+      autoload :Australian
+      autoload :Italian
+      autoload :Spanish
+    end
   end
 
   include Api::Data
-  extend  Api::RequestMethods
+  extend  Api::RequestMethods::All
+
+  class << self
+    attr_accessor :log
+  end
 
   def self.config(&block)
     @_config ||= BetfairApiNgRails::Api::Config
     block_given? ? yield(@_config) : @_config
   end
 
-  def self.connection
-    raise BetfairApiNgRails::NoConnectionError unless @connection
-    @connection
+  def self.account_manager
+    BetfairApiNgRails::AccountManager.instance
   end
 
-  def self.connection=(value)
-    @connection = value
+  def self.account_session_manager
+    BetfairApiNgRails::AccountSessionManager.instance
   end
-
 end

data/lib/betfair_api_ng_rails/account.rb

@@ -0,0 +1,4 @@
+module BetfairApiNgRails
+  class Account < Struct.new(:username, :password, :app_key, :crt_filepath, :key_filepath)
+  end
+end

data/lib/betfair_api_ng_rails/account_manager.rb

@@ -0,0 +1,36 @@
+require 'singleton'
+
+module BetfairApiNgRails
+  class AccountManager
+    include Singleton
+
+    attr_reader :accounts
+    attr_reader :default_account
+
+    def initialize
+      clear
+    end
+
+    def store(account)
+      accounts[account.username] = account
+    end
+
+    def get(username)
+      accounts.fetch username, fetch_default_account
+    end
+
+    def default(username)
+      @default_account = username
+    end
+
+    def clear
+      @accounts = {}
+    end
+
+    private
+
+    def fetch_default_account
+      accounts.fetch default_account, nil
+    end
+  end
+end