betfair_api_ng_rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4047856d17acd629735d0b1ed9cac87dbddb2a
-  data.tar.gz: 56acfabb6cb2b33e9b4bbed51c80128e58687b0e
+  metadata.gz: 9d4331f320e5e91adc30dcca6364e44be4bc38ad
+  data.tar.gz: 32f2bb4dd3cf565ed282c9ddb1ba31e8a0538192
 SHA512:
-  metadata.gz: 5fb004e76dfbda6bc66a624feb375ded194a6d4d6fdea445c54bc3a0e2a8313711bb16a5395b9a2097c2802c9e298144c0b3a1c8a38f420e93ba032fed7f6d57
-  data.tar.gz: a707fd5f1ef38d874a016ef385b07f1e828e6c86d13be0bc51f99cfd985dd72f783efcba60c2c8d2a384ff0a666768166102034eb8219e9d6e8094c0a94933eb
+  metadata.gz: 09b7ff8a4028830d7addc66f5aabf22ed3a14bffe9d08bf071bccf5ec8634c5803dccb3873ebf036cdf396d1ca83fa74e4784e1e3f1fa79dabeadce7cf06e500
+  data.tar.gz: 00b898d7cbe81d336514bab145731cac7424fe8113429dbe118d902618cf8b24bf44825b345f7f7ba545eff1d9fc5f3e72b4ed1931b09974644c4e1bd765cf95

data/README.md

@@ -20,6 +20,10 @@ Or install it yourself as:
 
     $ gem install betfair_api_ng_rails
 
+Or if you want to stay on the edge:
+
+    gem 'betfair_api_ng_rails', github: 'alterego-labs/betfair_api_ng_rails'
+
 After this run next rake command:
 
     $ bundle exec rake betfair_api_ng_rails:install
@@ -38,8 +42,8 @@ In this files you must specify credentials to API-NG. Also you should notice tha
 Sample code for fetching competitions list:
 
 ```ruby
-requester = BetfairApiNgRails::Api::Soccer::CompetitionRequester.new provider: :bf
-res = requester.load
+requester = BetfairApiNgRails::Api::Soccer::Requester.new provider: :bf
+res = requester.load resource: :competitions
 ```
 
 For all available methods see [there](https://api.developer.betfair.com/services/webapps/docs/display/1smk3cen4v3lu3yomq5qye0ni/Betting+Operations).
@@ -47,8 +51,8 @@ For all available methods see [there](https://api.developer.betfair.com/services
 Also you may passing filering params in _load_:
 
 ```ruby
-requester = BetfairApiNgRails::Api::Soccer::CompetitionRequester.new provider: :bf
-res = requester.load parameters: { event_ids: [1, 2] }
+requester = BetfairApiNgRails::Api::Soccer::Requester.new provider: :bf
+res = requester.load resource: :competitions, parameters: { event_ids: [1, 2] }
 ```
 
 ## Contributing

data/lib/betfair_api_ng_rails.rb

@@ -4,10 +4,11 @@ module BetfairApiNgRails
 
   module Api
 
-    autoload :BaseParser,    'betfair_api_ng_rails/api/base_parser'
-    autoload :BaseProvider,  'betfair_api_ng_rails/api/base_provider'
-    autoload :BaseRequester, 'betfair_api_ng_rails/api/base_requester'
-    autoload :BaseFormatter, 'betfair_api_ng_rails/api/base_formatter'
+    autoload :BaseParser,       'betfair_api_ng_rails/api/base_parser'
+    autoload :BaseProvider,     'betfair_api_ng_rails/api/base_provider'
+    autoload :BaseRequester,    'betfair_api_ng_rails/api/base_requester'
+    autoload :BaseFormatter,    'betfair_api_ng_rails/api/base_formatter'
+    autoload :FormatterFactory, 'betfair_api_ng_rails/api/formatter_factory'
 
     module BF
 
@@ -30,18 +31,6 @@ module BetfairApiNgRails
     module Soccer
 
       autoload :Requester,                    'betfair_api_ng_rails/api/soccer/requester'
-      autoload :CompetitionRequester,         'betfair_api_ng_rails/api/soccer/competition_requester'
-      autoload :EventTypeRequester,           'betfair_api_ng_rails/api/soccer/event_type_requester'
-      autoload :TimeRangeRequester,           'betfair_api_ng_rails/api/soccer/time_range_requester'
-      autoload :EventRequester,               'betfair_api_ng_rails/api/soccer/event_requester'
-      autoload :MarketTypeRequester,          'betfair_api_ng_rails/api/soccer/market_type_requester'
-      autoload :CountryRequester,             'betfair_api_ng_rails/api/soccer/country_requester'
-      autoload :VenueRequester,               'betfair_api_ng_rails/api/soccer/venue_requester'
-      autoload :MarketCatalogueRequester,     'betfair_api_ng_rails/api/soccer/market_catalogue_requester'
-      autoload :MarketBookRequester,          'betfair_api_ng_rails/api/soccer/market_book_requester'
-      autoload :CurrentOrderRequester,        'betfair_api_ng_rails/api/soccer/current_order_requester'
-      autoload :ClearedOrderRequester,        'betfair_api_ng_rails/api/soccer/cleared_order_requester'
-      autoload :MarketProfitAndLossRequester, 'betfair_api_ng_rails/api/soccer/market_profit_and_loss_requester'
 
     end
 

data/lib/betfair_api_ng_rails/api/base_requester.rb

@@ -10,7 +10,7 @@ module BetfairApiNgRails
         @provider_name = provider
       end
 
-      def load(parameters: {})
+      def load(resource: "", parameters: {})
         raise "Must be reimplemented!"
       end
 

data/lib/betfair_api_ng_rails/api/bf/config.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/object'
 require 'betfair_api_ng_rails/api/bf/formatters/js_tree_formatter'
 
 module BetfairApiNgRails
@@ -18,17 +17,7 @@ module BetfairApiNgRails
                         :formatter
 
           def formatter=(value)
-            @formatter = initialize_formatter value
-          end
-
-        private
-
-          def initialize_formatter(name)
-            name.is_a?(Symbol) ? initialize_formatter_by(name: name) : name.try(:new)
-          end
-
-          def initialize_formatter_by(name: "")
-            "BetfairApiNgRails::Api::BF::Formatters::#{name.to_s.camelize}Formatter".constantize.new
+            @formatter = BetfairApiNgRails::Api::FormatterFactory.initialize_formatter value
           end
 
         end

data/lib/betfair_api_ng_rails/api/bf/constants.rb

@@ -16,6 +16,11 @@ module BetfairApiNgRails
           "Accept"       => "application/json"
         }
 
+        ALLOWED_RESOURCES = {
+          soccer: [:event_types, :competitions, :time_ranges, :events, :market_types, :countries, :venues, :market_catalogue,
+                   :market_book, :current_orders, :cleared_orders, :market_profit_and_loss]
+        }
+
       end
     end
   end

data/lib/betfair_api_ng_rails/api/bf/formatters/js_tree_formatter.rb

@@ -19,7 +19,7 @@ module BetfairApiNgRails
             {
               id: record['id'],
               text: record['name'],
-              chldren: ALLOW_CHILDREN.include?(resource),
+              children: ALLOW_CHILDREN.include?(resource.to_sym),
               data:{
                 type: resource.to_s.singularize,
                 fields: record

data/lib/betfair_api_ng_rails/api/bf/parser.rb

@@ -17,8 +17,12 @@ module BetfairApiNgRails
 
       private
 
+        def resource_key
+          data.camelize :lower
+        end
+
         def process_record(h)
-          h.merge!(h[data]).except data
+          h.merge!(h[resource_key]).except resource_key
         end
 
       end

data/lib/betfair_api_ng_rails/api/bf/provider.rb

@@ -16,7 +16,8 @@ module BetfairApiNgRails
 
         def fetch(data: "", parameters: {}, sport: "")
           return [] unless session_manager.request_ssoid
-          setup_http_requester with_method: data
+          raise "Not allowed method #{data.to_s} for sport #{sport.to_s}" unless is_method_allowed?(data, sport)
+          setup_http_requester with_method: data, params: parameters
           do_request data, parameters, sport
         end
 
@@ -36,14 +37,18 @@ module BetfairApiNgRails
           response.map { |r| Api::BF::Config.formatter.format(record: r, resource: data) }
         end
 
-        def setup_http_requester(with_method: "")
+        def setup_http_requester(with_method: "", params: {})
           @http_requester = Api::BF::HttpRequester.new(Api::BF::Config.api_url).tap do |req|
             req.set_request_headers API_REQUEST_HEADERS
             req.set_auth_headers Api::BF::Config.application_key, session_manager.ssoid
-            req.set_api_req_body build_function(with_method)
+            req.set_api_req_body build_function(with_method), params
           end
         end
 
+        def is_method_allowed?(data, sport)
+          ALLOWED_RESOURCES[sport.to_sym].include? data.to_sym
+        end
+
       end
     end
   end

data/lib/betfair_api_ng_rails/api/formatter_factory.rb

@@ -0,0 +1,21 @@
+require 'active_support/core_ext/object'
+
+module BetfairApiNgRails
+  module Api
+    class FormatterFactory
+      class << self
+
+        def initialize_formatter(name)
+          name.is_a?(Symbol) ? initialize_formatter_by(name: name) : name.try(:new)
+        end
+
+      private
+
+        def initialize_formatter_by(name: "")
+          "BetfairApiNgRails::Api::BF::Formatters::#{name.to_s.camelize}Formatter".constantize.new
+        end
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/soccer/requester.rb

@@ -3,12 +3,13 @@ module BetfairApiNgRails
     module Soccer
       class Requester < BetfairApiNgRails::Api::BaseRequester
 
-        def initialize(provider)
+        def initialize(provider: "")
           @sport = :soccer
           super provider
         end
 
-        def load(parameters: {})
+        def load(resource: "", parameters: {})
+          @data = resource
           make_fetch parameters: parameters
         end
 

data/lib/betfair_api_ng_rails/version.rb

@@ -1,3 +1,3 @@
 module BetfairApiNgRails
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betfair_api_ng_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - sergio1990
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,19 +79,8 @@ files:
 - lib/betfair_api_ng_rails/api/bf/parser.rb
 - lib/betfair_api_ng_rails/api/bf/provider.rb
 - lib/betfair_api_ng_rails/api/bf/session_manager.rb
-- lib/betfair_api_ng_rails/api/soccer/cleared_order_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/competition_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/country_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/current_order_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/event_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/event_type_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/market_book_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/market_catalogue_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/market_profit_and_loss_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/market_type_requester.rb
+- lib/betfair_api_ng_rails/api/formatter_factory.rb
 - lib/betfair_api_ng_rails/api/soccer/requester.rb
-- lib/betfair_api_ng_rails/api/soccer/time_range_requester.rb
-- lib/betfair_api_ng_rails/api/soccer/venue_requester.rb
 - lib/betfair_api_ng_rails/version.rb
 - lib/generators/betfair_api_ng_rails/install/install_generator.rb
 - lib/generators/betfair_api_ng_rails/install/templates/betfair_api_ng_rails.rb

data/lib/betfair_api_ng_rails/api/soccer/cleared_order_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::ClearedOrderRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :cleared_orders
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/competition_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::CompetitionRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :competitions
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/country_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::CountryRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :countries
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/current_order_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::CurrentOrderRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :current_orders
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/event_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::EventRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :events
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/event_type_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::EventTypeRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :event_types
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/market_book_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::MarketBookRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :market_book
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/market_catalogue_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::MarketCatalogueRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :market_catalogue
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/market_profit_and_loss_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::MarketProfitAndLossRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :market_profit_and_loss
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/market_type_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::MarketTypeRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :market_types
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/time_range_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::TimeRangeRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :time_ranges
-      super provider
-    end
-
-  end
-end

data/lib/betfair_api_ng_rails/api/soccer/venue_requester.rb

@@ -1,10 +0,0 @@
-module BetfairApiNgRails
-  class Api::Soccer::VenueRequester < BetfairApiNgRails::Api::Soccer::Requester
-
-    def initialize(provider: '')
-      @data = :venues
-      super provider
-    end
-
-  end
-end