betfair_api_ng_rails 1.1.0 → 2.1.0

data/lib/betfair_api_ng_rails/api/request_methods/all.rb

@@ -0,0 +1,26 @@
+require 'active_support/inflector'
+require 'betfair_api_ng_rails/api/constants'
+require 'betfair_api_ng_rails/api/request_methods/betting'
+require 'betfair_api_ng_rails/api/request_methods/account'
+
+module BetfairApiNgRails
+  module Api
+    module RequestMethods
+      module All
+        include Api::Constants
+        include Api::RequestMethods::Betting
+        include Api::RequestMethods::Account
+
+        private
+
+        def run_request(method, params, account_name = '')
+          BetfairApiNgRails::Api::Connection.new(account_name).request build_request_type(method), params
+        end
+
+        def build_request_type(name)
+          name.to_s.camelize(:lower)
+        end
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/request_methods/betting.rb

@@ -0,0 +1,30 @@
+module BetfairApiNgRails
+  module Api
+    module RequestMethods
+      module Betting
+        include Api::Constants
+
+        SIMPLE_LISTING_FILTERED.each do |method|
+          eval <<-CODE
+          def #{method.underscore}(filter: BetfairApiNgRails::MarketFilter.new, locale: BetfairApiNgRails.config.locale)
+            run_request __method__, { filter: filter, locale: locale }
+          end
+          CODE
+        end
+
+        def list_market_catalogue(filter: BetfairApiNgRails::MarketFilter.new, market_projection: [], sort: "", max_results: '1', locale: BetfairApiNgRails.config.locale)
+          run_request __method__, { filter: filter, market_projection: market_projection, sort: sort, max_results: max_results, locale: locale }
+        end
+
+        def list_market_book(market_ids: [], price_projection: BetfairApiNgRails::PriceProjection.new, order_projection: '', match_projection: '', currency_code: 'USD', locale: BetfairApiNgRails.config.locale)
+          run_request __method__, { market_ids: market_ids, price_projection: price_projection, order_projection: order_projection, match_projection: match_projection, currency_code: currency_code, locale: locale }
+        end
+
+        def place_orders(market_id: "", instructions: [], customer_ref: "", account_name: '')
+          run_request __method__, { market_id: market_id, instructions: instructions, customer_ref: customer_ref }, account_name
+        end
+      end
+    end
+  end
+end
+

data/lib/betfair_api_ng_rails/api/session_manager.rb

@@ -1,54 +1,57 @@
 require 'betfair_api_ng_rails/api/concerns/errorable'
+require 'active_support/core_ext/module/delegation'
 
 module BetfairApiNgRails
   module Api
-    class SessionManager
-      class << self
-        include Api::Concerns::Errorable
-        include Api::Constants
+    class SessionManager < Struct.new(:endpoint)
+      include Api::Concerns::Errorable
+      include Api::Constants
+
+      def get_ssoid(account)
+        username = account.username
+        ssoid = BetfairApiNgRails.account_session_manager.get username
+        ssoid || SsoidRequester.new(account, endpoint).get
+      end
 
-        def ssoid
-          @ssoid ||= fetch_ssoid
-        end
+      def expire_ssoid(account)
+        username = account.username
+        BetfairApiNgRails.account_session_manager.expire username
+      end
 
-        def request_ssoid
-          ssoid
-          !has_errors?
-        end
+      private
 
-        def expire_ssoid
-          @ssoid = nil
-        end
+      class SsoidRequester < Struct.new(:account, :endpoint)
+        delegate :username, to: :account
+        delegate :login_url, to: :endpoint
 
-        def new_ssoid
-          expire_ssoid
-          ssoid
+        def get
+          session_token.tap do |token|
+            store_session token
+          end
         end
 
-      private
+        private
 
-        def fetch_ssoid
-          get_login_response.session_token.tap { |sid| send_keep_alive(sid) }
+        def store_session(token)
+          BetfairApiNgRails.account_session_manager.store account_session(token)
         end
 
-        def get_login_response
-          http_requester.do_request
+        def account_session(token)
+          BetfairApiNgRails::AccountSession.new(username, token)
         end
 
-        def send_keep_alive(sid)
-          return unless Api::Config.keep_alive_session
-          keep_alive_requester(sid).do_request
+        def session_token
+          get_login_response.session_token
         end
 
-        def http_requester
-          @_http_requester ||= Api::Http::Factory.session_requester
+        def get_login_response
+          http_requester.do_request
         end
 
-        def keep_alive_requester(sid)
-          Api::Http::Factory.keep_alive_requester sid
+        def http_requester
+          @_http_requester ||= Api::Http::Factory.session_requester(login_url, account)
         end
-
       end
     end
   end
-end
+end

data/lib/betfair_api_ng_rails/bad_response_error.rb

@@ -0,0 +1,4 @@
+module BetfairApiNgRails
+  class BadResponseError < StandardError
+  end
+end

data/lib/betfair_api_ng_rails/errors.rb

@@ -1,5 +1,4 @@
 module BetfairApiNgRails
-  
   class NoConnectionError < ::StandardError
   end
 
@@ -10,4 +9,6 @@ module BetfairApiNgRails
     end
   end
 
-end
+  class NoAccountProvided < ::StandardError
+  end
+end

data/lib/betfair_api_ng_rails/railtie.rb

@@ -1,7 +1,12 @@
 module BetfairApiNgRails
   class Railtie < Rails::Railtie
     config.after_initialize do
-      BetfairApiNgRails.connection = BetfairApiNgRails::Api::Connection.new
+      BetfairApiNgRails.log        = BetfairApiNgRails::Api::Logs::FileLogger.new Rails.root, Rails.env
     end
+
+    console do
+      BetfairApiNgRails.log        = BetfairApiNgRails::Api::Logs::ConsoleLogger.new
+    end
+
   end
-end
+end

data/lib/betfair_api_ng_rails/version.rb

@@ -1,3 +1,3 @@
 module BetfairApiNgRails
-  VERSION = "1.1.0"
+  VERSION = "2.1.0"
 end

data/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.rb

@@ -1,18 +1,27 @@
 BetfairApiNgRails.config do |config|
-  require 'yaml'
+  config.load_for_environment "#{Rails.root}/config/betfair_api_ng_rails.yml", Rails.env
 
-  load_config = YAML.load_file("#{Rails.root}/config/betfair_api_ng_rails.yml")[Rails.env]
-
-  config.application_key    = load_config['application_key']
   config.ssl_key_filepath   = "#{Rails.root}/public/client-2048.key"
   config.ssl_crt_filepath   = "#{Rails.root}/public/client-2048.crt"
-  config.login_url          = load_config['login_url']
-  config.api_url            = load_config['api_url']
-  config.keep_alive_url     = load_config['keep_alive_url']
-  config.username           = load_config['username']
-  config.password           = load_config['password']
+
   config.locale             = :ru
-  config.formatter          = nil #out of box available formatter for JsTree
+  config.formatter          = nil
   config.keep_alive_session = true
 
-end
+  # Caching settings
+  config.use_cache          = false
+  config.cache_expire       = 5     # in seconds
+
+  # Proxy layer settings
+  config.proxy_enable       = false
+  # Uncomment next line if you will use go layer and go_enable is set to true
+  # config.proxy_url          = "http://127.0.0.1/"
+
+  # 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

data/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.yml

@@ -1,15 +1,13 @@
 development:
   application_key: YOUR_APP_KEY
-  login_url: https://identitysso.betfair.com/api/certlogin
-  api_url: https://api-ng.betstores.com/betting/betfair/services/api.betfair.com/exchange/betting/json-rpc/v1
-  keep_alive_url: https://identitysso.betfair.com/api/keepAlive
   username: YOUR_ACCOUNT_USERNAME
   password: YOUR_ACCOUNT_PASSWORD
+  go_localuser: YOURUSERNAME
+  go_filename: betfair
 
 production:
   application_key: YOUR_APP_KEY
-  login_url: https://identitysso.betfair.com/api/certlogin
-  api_url: https://api-ng.betstores.com/betting/betfair/services/api.betfair.com/exchange/betting/json-rpc/v1
-  keep_alive_url: https://identitysso.betfair.com/api/keepAlive
   username: YOUR_ACCOUNT_USERNAME
-  password: YOUR_ACCOUNT_PASSWORD
+  password: YOUR_ACCOUNT_PASSWORD
+  go_localuser: YOURUSERNAME
+  go_filename: betfair

data/spec/lib/betfair_api_ng_rails/account_manager_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::AccountManager do
+  let(:account) { BetfairApiNgRails::Account.new('user001', 'password', 'cf23f23') }
+  subject(:manager) { described_class.instance }
+
+  it { is_expected.to respond_to :accounts }
+
+  describe '#store' do
+    before do
+      manager.clear
+    end
+
+    it 'stores account in global hash' do
+      expect{
+        manager.store account
+      }.to change(manager.accounts, :count).by 1
+    end
+  end
+
+  describe '#get' do
+    context 'gets account by username' do
+      context 'when it exists' do
+        before do
+          manager.store account
+        end
+
+        it 'returns this one' do
+          expect(manager.get('user001')).to eq account
+        end
+      end
+
+      context 'when it not exists' do
+        context 'and default exists' do
+          before do
+            manager.store account
+            manager.default 'user001'
+          end
+
+          it 'returns it' do
+            expect(manager.get('user002')).to eq account
+          end
+        end
+
+        context 'and no defaults' do
+          before do
+            manager.clear
+          end
+
+          it 'returns nil' do
+            expect(manager.get('user002')).to be_nil
+          end
+        end
+      end
+    end
+  end
+
+  describe '#clear' do
+    before do
+      manager.store account
+    end
+
+    it 'cleares account register' do
+      manager.clear
+      expect(manager.accounts.count).to eq 0
+    end
+  end
+
+  describe '#default' do
+    it 'sets default account' do
+      expect{
+        manager.default 'user001'
+      }.to_not raise_error
+    end
+  end
+end

data/spec/lib/betfair_api_ng_rails/account_session_manager_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::AccountSessionManager do
+  let(:session) { BetfairApiNgRails::AccountSession.new('user001', 'nwfh7348ofho3478fh') }
+  subject(:manager) { described_class.instance }
+
+  describe '#store' do
+    before do
+      manager.clear
+    end
+
+    it 'stores session in global hash' do
+      expect{
+        manager.store session
+      }.to change(manager.sessions, :count).by 1
+    end
+  end
+
+  describe '#get' do
+    context 'when information for user exists' do
+      before do
+        manager.store session
+      end
+
+      it 'returns it' do
+        expect(manager.get('user001')).to_not be_nil
+      end
+    end
+
+    context 'when information for user not exists' do
+      it 'returns nil' do
+        expect(manager.get('003')).to be_nil
+      end
+    end
+  end
+
+  describe '#expire' do
+    before do
+      manager.store session
+    end
+
+    it 'removes session of user' do
+      expect{
+        manager.expire 'user001'
+      }.to change(manager.sessions, :count).by -1
+    end
+  end
+
+  describe '#clear' do
+    before do
+      manager.store session
+    end
+
+    it 'cleares sessions register' do
+      manager.clear
+      expect(manager.sessions.count).to eq 0
+    end
+  end
+end

data/spec/lib/betfair_api_ng_rails/account_session_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::AccountSession do
+  let(:username) { 'user001' }
+  let(:ssoid) { 'wgj34g8h39p4hgp3j' }
+  let(:opts) { [username, ssoid] }
+
+  subject(:account_session) { described_class.new(*opts) }
+
+  its(:username) { is_expected.to eq username }
+  its(:ssoid)    { is_expected.to eq ssoid }
+end
+

data/spec/lib/betfair_api_ng_rails/account_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::Account do
+  let(:username) { 'user001' }
+  let(:password) { 'some_password' }
+  let(:app_key)  { 'n34f73o48fn' }
+  let(:crt_filepath) { 'cn2i3nc2f32' }
+  let(:key_filepath) { 'f23f23f23f' }
+  let(:opts) { [username, password, app_key, crt_filepath, key_filepath] }
+
+  subject(:account) { described_class.new(*opts) }
+
+  its(:username) { is_expected.to eq username }
+  its(:password) { is_expected.to eq password }
+  its(:app_key)  { is_expected.to eq app_key }
+  its(:crt_filepath)  { is_expected.to eq crt_filepath }
+  its(:key_filepath)  { is_expected.to eq key_filepath }
+end

data/spec/lib/betfair_api_ng_rails/api/caching/helper_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+class TestObject
+  include BetfairApiNgRails::Api::Caching::Helper
+end
+
+describe BetfairApiNgRails::Api::Caching::Helper do
+
+  subject(:helper) { TestObject.new }
+
+  describe ".createsig" do
+
+    it "creates hex from sigflat result" do
+      expect(helper).to receive(:sigflat).with("some").and_return "some-sigflat"
+      expect(Digest::MD5).to receive(:hexdigest).with "some-sigflat"
+      helper.createsig "some"
+    end
+
+    describe 'real tests' do
+      
+      context 'sigs equal values' do
+        
+        let(:value1) { {key1: :value2} }
+        let(:value2) { {key1: :value2} }
+
+        it 'expects to be equal' do
+          val1 = helper.createsig(value1)
+          val2 = helper.createsig(value2)
+          expect(val1).to eq val2
+        end
+
+      end
+
+      context 'sigs different values' do
+        
+        let(:value1) { {key1: :value2} }
+        let(:value2) { {key1: :value3} }
+
+        it 'expects not to be equal' do
+          val1 = helper.createsig(value1)
+          val2 = helper.createsig(value2)
+          expect(val1).not_to eq val2
+        end
+
+      end
+
+    end
+
+  end
+
+  describe ".sigflat" do
+
+    subject { helper.sigflat(value) }
+
+    context "when String passed" do
+
+      let(:value) { 'some' }
+
+      it { is_expected.to eq("some") }
+
+    end
+
+    context "when Integer passed" do
+
+      let(:value) { 1 }
+
+      it { is_expected.to eq("1Fixnum") }
+
+    end
+
+    context "when Hash passed" do
+
+      let(:value) { { key: :value } }
+
+      it { is_expected.to eq("{:key=>:value}Hash") }
+
+    end
+
+    context "when Array passed" do
+
+      let(:value) { ["val1", "val2"] }
+
+      it { is_expected.to eq("[\"val1\", \"val2\"]Array") }
+
+    end
+
+  end
+
+end