From 4f4fe3bb4056fc3b16cab6e66e4eca4858d75f28 Mon Sep 17 00:00:00 2001
From: Sergey Gernyak <sergeg1990@gmail.com>
Date: Mon, 24 Nov 2014 13:39:51 +0200
Subject: [PATCH] Move api urls to constants

---
 lib/betfair_api_ng_rails/api/config.rb        |  1 -
 lib/betfair_api_ng_rails/api/constants.rb     | 37 +++++++++++--------
 .../templates/betfair_api_ng_rails.yml        |  2 -
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/lib/betfair_api_ng_rails/api/config.rb b/lib/betfair_api_ng_rails/api/config.rb
index 53cb75c..66b9ca0 100644
--- a/lib/betfair_api_ng_rails/api/config.rb
+++ b/lib/betfair_api_ng_rails/api/config.rb
@@ -5,7 +5,6 @@ module BetfairApiNgRails
         attr_accessor :application_key,
                       :ssl_key_filepath,
                       :ssl_crt_filepath,
-                      :api_url,
                       :username,
                       :password,
                       :locale,
diff --git a/lib/betfair_api_ng_rails/api/constants.rb b/lib/betfair_api_ng_rails/api/constants.rb
index 96d3ecf..cda161c 100644
--- a/lib/betfair_api_ng_rails/api/constants.rb
+++ b/lib/betfair_api_ng_rails/api/constants.rb
@@ -12,21 +12,27 @@ module BetfairApiNgRails
         "Accept"       => "application/json"
       }
 
-      ALLOWED_RESOURCES = [
-        "listEventTypes",
-        "listCompetitions",
-        "listTimeRanges",
-        "listEvents",
-        "listMarketTypes",
-        "listCountries",
-        "listVenues",
-        "listMarketCatalogue",
-        "listMarketBook",
-        "listCurrentOrders",
-        "listClearedOrders",
-        "listMarketProfitAndLoss",
-        "placeOrders"
-      ]
+      ALLOWED_RESOURCES = {
+        betting:[
+          "listEventTypes",
+          "listCompetitions",
+          "listTimeRanges",
+          "listEvents",
+          "listMarketTypes",
+          "listCountries",
+          "listVenues",
+          "listMarketCatalogue",
+          "listMarketBook",
+          "listCurrentOrders",
+          "listClearedOrders",
+          "listMarketProfitAndLoss",
+          "placeOrders"
+        ],
+        account:[
+          "getAccountDetails",
+          "getAccountFunds"
+        ]
+      }
 
       ALLOWED_FORMATTING = [
         "listEventTypes",
@@ -46,7 +52,6 @@ module BetfairApiNgRails
 
       LOADABLE_CONFIG_OPTIONS = [
         :application_key,
-        :api_url,
         :username,
         :password,
         :go_localuser,
diff --git a/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.yml b/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.yml
index 7a199b6..a72525b 100644
--- a/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.yml
+++ b/lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.yml
@@ -1,6 +1,5 @@
 development:
   application_key: YOUR_APP_KEY
-  api_url: https://api-ng.betstores.com/betting/betfair/services/api.betfair.com/exchange/betting/json-rpc/v1
   username: YOUR_ACCOUNT_USERNAME
   password: YOUR_ACCOUNT_PASSWORD
   go_localuser: YOURUSERNAME
@@ -8,7 +7,6 @@ development:
 
 production:
   application_key: YOUR_APP_KEY
-  api_url: https://api-ng.betstores.com/betting/betfair/services/api.betfair.com/exchange/betting/json-rpc/v1
   username: YOUR_ACCOUNT_USERNAME
   password: YOUR_ACCOUNT_PASSWORD
   go_localuser: YOURUSERNAME
-- 
GitLab