betfair_api_ng_rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20bda2211a6be34fbfffba46eb548faf580d3a3
-  data.tar.gz: 81c228df7a738da9bc5156485567ea34ab566820
+  metadata.gz: 3a846cee18d46f60c19a677111624b07cb5673ce
+  data.tar.gz: 5bbef065b3ef31d43d789d1daef6e347aa4d4678
 SHA512:
-  metadata.gz: a08183228cab41b7d28a52cc86328cdba3fcedc80a5aec045cf752810aa825ea8b1fc66c35a92dd71f2f008169592596e53bb295d8342232aa53ab74fdd451d4
-  data.tar.gz: 20693a5383bb7bcceb79d35977090acda984cd3327498c47160528dcadc2a98c438ba91fe8645bebc795f7b9a16fd143b8de5afe658e3df6eb855902ef9db9a3
+  metadata.gz: 8be49808b5673fc0dfd9aebfb786743d2749703d07adbd5de2ae171c518a1bd825c2d5a1af971e675a1e5af7f2d27034d96d7248022b13e1bceedb9b275d1bed
+  data.tar.gz: ed938a79784a41ddb3fff8dd18550d6b98c7b21bed9af4922eb2e67c1be180cd3c544559b789d13c893728a92fe0a65558e1349d4a989da9ef2a3f635f0468aa

data/README.md

@@ -35,7 +35,14 @@ In this files you must specify credentials to API-NG. Also you should notice tha
 
 ## Usage
 
-Please check [wiki pages](https://github.com/alterego-labs/betfair_api_ng_rails/wiki). It will be available soon...
+Please check [wiki pages](https://github.com/alterego-labs/betfair_api_ng_rails/wiki).
+
+## 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)
+2. Supporting **listMarketCatalogue** and **listMarketBook** methods
+3. Raising APINGException if error occurred similar official API-NG
+4. Refactoring and testing
 
 ## CHANGES IN 1.0.0
 
@@ -51,6 +58,10 @@ Please check [wiki pages](https://github.com/alterego-labs/betfair_api_ng_rails/
 4. Added shortcuts for models
 5. Refactoring
 
+## Specs
+
+You may running all specs by `rspec spec --color` to be sure that all is alright.
+
 ## Contributing
 
 1. Fork it

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/lib/betfair_api_ng_rails/api/connection.rb

@@ -1,3 +1,5 @@
+require "betfair_api_ng_rails/errors"
+
 module BetfairApiNgRails
   module Api
     class Connection
@@ -12,6 +14,7 @@ module BetfairApiNgRails
         provider.fetch method: method, params: hashing(params)
       end
 
+      include Api::ConnectionExt::ErrorHandling
       include Api::ConnectionExt::Parsing
       include Api::ConnectionExt::Formatting
 

data/lib/betfair_api_ng_rails/api/connection_ext/error_handling.rb

@@ -0,0 +1,31 @@
+require 'active_support/inflector'
+require "betfair_api_ng_rails/errors"
+
+module BetfairApiNgRails
+  module Api
+    module ConnectionExt
+      module ErrorHandling
+        include BetfairApiNgRails::Api::Constants
+
+        def self.included(base)
+          base.send :class_eval,  <<-CODE
+            def request_with_error_handling(method, params = {})
+              res = request_without_error_handling(method, params)
+              raise_exception(res.error_info) if res.has_error?
+              res
+            end
+            alias_method :request_without_error_handling, :request
+            alias_method :request, :request_with_error_handling
+          CODE
+        end
+
+      private
+
+        def raise_exception(error)
+          raise BetfairApiNgRails::APINGException.new(error), "Error in #{error[:type]} section"
+        end
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/connection_ext/formatting.rb

@@ -1,5 +1,4 @@
 require 'active_support/inflector'
-require 'pry-nav'
 
 module BetfairApiNgRails
   module Api

data/lib/betfair_api_ng_rails/api/connection_ext/parsing.rb

@@ -1,5 +1,4 @@
 require 'active_support/inflector'
-require 'pry-nav'
 
 module BetfairApiNgRails
   module Api

data/lib/betfair_api_ng_rails/api/data/base.rb

@@ -4,7 +4,8 @@ module BetfairApiNgRails
   module Api
     module Data
       class Base
-        include Api::Data::Attributes
+        include Api::Data::Concerns::Attributable
+        include Api::Data::Concerns::Jsonable
 
         def initialize(args = {})
           args.each { |attribute, value| self.send("#{attribute}=", value) }

data/lib/betfair_api_ng_rails/api/data/competition.rb

@@ -4,12 +4,13 @@ module BetfairApiNgRails
       class Competition < Api::Data::Base
         include Api::Data::Concerns::Hashable
 
-        attr_accessor *COMPETITION_ATTRS
-
-        def self.from_json(json_row)
-          new COMPETITION_ATTRS.inject({}) { |h, a| h[a] = json_row[a.to_s.camelize(:lower)]; h }
-        end
-
+        COMPETITION_ATTRS = [
+          :id,
+          :name
+        ]
+        
+        attributes COMPETITION_ATTRS
+        
         def self.to_hash_attrs
           COMPETITION_ATTRS
         end

data/lib/betfair_api_ng_rails/api/data/competition_result.rb

@@ -3,17 +3,13 @@ module BetfairApiNgRails
     module Data
       class CompetitionResult < Api::Data::Base
 
-        attr_accessor :market_count,
-                      :competition_region,
-                      :competition
+        COMPETITION_RESULT_ATTRS = [
+          :market_count,
+          :competition_region,
+          {competition: {type: BetfairApiNgRails::Competition} }
+        ]
 
-        def self.from_json(json_row)
-          new(
-            competition: Api::Data::Competition.from_json(json_row['competition']),
-            market_count: json_row['marketCount'],
-            competition_region: json_row['competitionRegion']
-          )
-        end
+        attributes COMPETITION_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/concerns/attributable.rb

@@ -0,0 +1,51 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      module Concerns
+        module Attributable
+
+          DEFAULT_OPTIONS = { type: String, array: false }
+
+          def self.included(base)
+            base.send :extend, ClassMethods
+          end
+
+          module ClassMethods
+            
+            def attributes(attrs)
+              define_class_attrs attrs
+              define_attr_accessors
+            end
+
+          private
+
+            def define_class_attrs(attrs)
+              class << self; attr_accessor :class_attrs; end
+              self.class_attrs = process_attributes(attrs)
+            end
+
+            def process_attributes(attrs)
+              attrs.each_with_object({}) do |a, h|
+                h[fetch_attr_name(a)] = fetch_attr_options(a)
+              end
+            end
+
+            def define_attr_accessors
+              self.class_attrs.each { |name, options| class_eval("attr_accessor :#{name}") }
+            end
+
+            def fetch_attr_name(attrib)
+              attrib.is_a?(Hash) ? attrib.keys.first : attrib
+            end
+
+            def fetch_attr_options(attrib)
+              attrib.is_a?(Hash) ? DEFAULT_OPTIONS.merge(attrib.values.first) : DEFAULT_OPTIONS
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/concerns/hashable.rb

@@ -13,8 +13,9 @@ module BetfairApiNgRails
 
           def attributes_hash
             self.class.to_hash_attrs.each_with_object({}) do |a, h|
-              val = get_attr_value(a)
-              h[a] = val unless val.nil?
+              key = get_attr_key(a)
+              val = get_attr_value(key)
+              h[get_attr_key(key)] = val unless val.nil?
             end
           end
 
@@ -22,6 +23,10 @@ module BetfairApiNgRails
             self.send attrib
           end
 
+          def get_attr_key(attrib)
+            attrib.is_a?(Hash) ? attrib.keys.first : attrib
+          end
+
         end
       end
     end

data/lib/betfair_api_ng_rails/api/data/concerns/jsonable.rb

@@ -0,0 +1,46 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      module Concerns
+        module Jsonable
+
+          def self.included(base)
+            base.send :extend, ClassMethods
+          end
+
+          module ClassMethods
+            
+            def from_json(data = {})
+              return nil unless self.respond_to?(:class_attrs)
+              self.new set_attributes(data)
+            end
+
+          private
+
+            def set_attributes(data)
+              self.class_attrs.each_with_object({}) do |(name, options), h|
+                h[name] = get_attr_value(data, name, options)
+              end
+            end
+
+            def json_key(attrib)
+              attrib.to_s.camelize(:lower)
+            end
+
+            def get_attr_value(data, name, options)
+              j_data = data[json_key(name)]
+              return nil unless j_data
+              options[:array] ? j_data.map { |r| prepare_value(options[:type], r) } : prepare_value(options[:type], j_data)
+            end
+
+            def prepare_value(type, data)
+              type == String ? data : type.from_json(data)
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module BetfairApiNgRails
     module Data
       module Constants
 
-        ATTRS_AS_IS = [Hash, String, Symbol, Fixnum]
+        ATTRS_AS_IS = [Hash, String, Symbol, Fixnum, NilClass]
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/country_code_result.rb

@@ -3,15 +3,12 @@ module BetfairApiNgRails
     module Data
       class CountryCodeResult < Api::Data::Base
 
-        attr_accessor :market_count,
-                      :country_code
+        COUNTRY_CODE_RESULT_ATTRS = [
+          :market_count,
+          :country_code
+        ]
 
-        def self.from_json(json_row)
-          new(
-            country_code: json_row['countryCode'],
-            market_count: json_row['marketCount']
-          )
-        end
+        attributes COUNTRY_CODE_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/event.rb

@@ -4,11 +4,16 @@ module BetfairApiNgRails
       class Event < Api::Data::Base
         include Api::Data::Concerns::Hashable
 
-        attr_accessor *EVENT_ATTRS
+        EVENT_ATTRS = [
+          :id,
+          :name,
+          :timezone,
+          :country_code,
+          :venue,
+          :open_date
+        ]
 
-        def self.from_json(json_row)
-          new EVENT_ATTRS.inject({}) { |h, a| h[a] = json_row[a.to_s.camelize(:lower)]; h }
-        end
+        attributes EVENT_ATTRS
 
         def self.to_hash_attrs
           EVENT_ATTRS

data/lib/betfair_api_ng_rails/api/data/event_result.rb

@@ -3,15 +3,12 @@ module BetfairApiNgRails
     module Data
       class EventResult < Api::Data::Base
 
-        attr_accessor :market_count,
-                      :event
+        EVENT_RESULT_ATTRS = [
+          :market_count,
+          {event: { type: BetfairApiNgRails::Event }}
+        ]
 
-        def self.from_json(json_row)
-          new(
-            event: Api::Data::Event.from_json(json_row['event']),
-            market_count: json_row['marketCount']
-          )
-        end
+        attributes EVENT_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/event_type.rb

@@ -4,11 +4,12 @@ module BetfairApiNgRails
       class EventType < Api::Data::Base
         include Api::Data::Concerns::Hashable
 
-        attr_accessor *EVENT_TYPE_ATTRS
+        EVENT_TYPE_ATTRS = [
+          :id,
+          :name
+        ]
 
-        def self.from_json(json_row)
-          new EVENT_TYPE_ATTRS.inject({}) { |h, a| h[a] = json_row[a.to_s.camelize(:lower)]; h }
-        end
+        attributes EVENT_TYPE_ATTRS
 
         def self.to_hash_attrs
           EVENT_TYPE_ATTRS

data/lib/betfair_api_ng_rails/api/data/event_type_result.rb

@@ -3,15 +3,12 @@ module BetfairApiNgRails
     module Data
       class EventTypeResult < Api::Data::Base
 
-        attr_accessor :market_count,
-                      :event_type
+        EVENT_TYPE_RESULT_ATTRS = [
+          :market_count,
+          {event_type: {type: BetfairApiNgRails::EventType}}
+        ]
 
-        def self.from_json(json_row)
-          new(
-            event_type: Api::Data::EventType.from_json(json_row['eventType']),
-            market_count: json_row['marketCount']
-          )
-        end
+        attributes EVENT_TYPE_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/ex_best_offers_overrides.rb

@@ -0,0 +1,24 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class ExBestOffersOverrides < Api::Data::Base
+        include Api::Data::Concerns::Hashable
+
+        EX_BEST_OFFERS_OVERRIDES_ATTRS = [
+          :best_prices_depth,
+          :rollup_model,
+          :rollup_limit,
+          :rollup_liability_threshold,
+          :rollup_liability_factor
+        ]
+
+        attributes EX_BEST_OFFERS_OVERRIDES_ATTRS
+
+        def self.to_hash_attrs
+          EX_BEST_OFFERS_OVERRIDES_ATTRS
+        end
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/exchange_prices.rb

@@ -0,0 +1,16 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class ExchangePrices < Api::Data::Base
+
+        EXCHANGE_PRICES_ATTRS = [
+          {available_to_back:    { type: BetfairApiNgRails::PriceSize, array: true }},
+          {available_to_lay:     { type: BetfairApiNgRails::PriceSize, array: true }},
+          {traded_volume:        { type: BetfairApiNgRails::PriceSize, array: true }}
+        ]
+
+        attributes EXCHANGE_PRICES_ATTRS
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/market_book.rb

@@ -0,0 +1,31 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class MarketBook < Api::Data::Base
+
+        MARKET_BOOK_ATTRS = [
+          :market_id,
+          :is_market_data_delayed,
+          :status,
+          :bet_delay,
+          :bsp_reconciled,
+          :complete,
+          :inplay,
+          :number_of_runners,
+          :number_of_winners,
+          :number_of_active_runners,
+          :last_match_time,
+          :total_matched,
+          :total_available,
+          :cross_matching,
+          :runners_voidable,
+          :version,
+          {runners: { type: BetfairApiNgRails::Runner, array: true }}
+        ]
+        
+        attributes MARKET_BOOK_ATTRS
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/market_catalogue.rb

@@ -0,0 +1,23 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class MarketCatalogue < Api::Data::Base
+
+        MARKET_CATALOGUE_ATTRS = [
+          :market_id,
+          :market_name,
+          :market_start_time,
+          :total_matched,
+          {description: { type: BetfairApiNgRails::MarketDescription          }},
+          {runners:     { type: BetfairApiNgRails::RunnerCatalog, array: true }},
+          {event_type:  { type: BetfairApiNgRails::EventType                  }},
+          {competition: { type: BetfairApiNgRails::Competition                }},
+          {event:       { type: BetfairApiNgRails::Event                      }}
+        ]
+
+        attributes MARKET_CATALOGUE_ATTRS
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/market_description.rb

@@ -0,0 +1,29 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class MarketDescription < Api::Data::Base
+
+        MARKET_DESCRIPTION_ATTRS = [
+          :persistence_enabled,
+          :bsp_market,
+          :market_time,
+          :suspend_time,
+          :settle_time,
+          :betting_type,
+          :turn_in_play_enabled,
+          :market_type,
+          :regulator,
+          :market_base_rate,
+          :discount_allowed,
+          :wallet,
+          :rules,
+          :rules_has_date,
+          :clarifications
+        ]
+
+        attributes MARKET_DESCRIPTION_ATTRS
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/market_filter.rb

@@ -4,7 +4,24 @@ module BetfairApiNgRails
       class MarketFilter < Api::Data::Base
         include Api::Data::Concerns::Hashable
 
-        attr_accessor *MARKET_FILTER_ATTRS
+        MARKET_FILTER_ATTRS = [
+          :text_query,
+          :exchange_ids,
+          :event_type_ids,
+          :event_ids,
+          :competition_ids,
+          :venues,
+          :bsp_only,
+          :turn_in_play_enabled,
+          :in_play_only,
+          :market_betting_types,
+          :market_countries,
+          :market_type_codes,
+          :market_start_time,
+          :with_orders
+        ]
+
+        attributes MARKET_FILTER_ATTRS
 
         def self.to_hash_attrs
           MARKET_FILTER_ATTRS

data/lib/betfair_api_ng_rails/api/data/market_type_result.rb

@@ -3,15 +3,12 @@ module BetfairApiNgRails
     module Data
       class MarketTypeResult < Api::Data::Base
 
-        attr_accessor :market_count,
-                      :market_type
+        MARKET_TYPE_RESULT_ATTRS = [
+          :market_count,
+          :market_type
+        ]
 
-        def self.from_json(json_row)
-          new(
-            market_type: json_row['marketType'],
-            market_count: json_row['marketCount']
-          )
-        end
+        attributes MARKET_TYPE_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/match.rb

@@ -0,0 +1,19 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class Match < Api::Data::Base
+
+        MATCH_ATTRS = [
+          :bet_id,
+          :match_id,
+          :side,
+          :price,
+          :size,
+          :match_date
+        ]
+
+        attributes MATCH_ATTRS
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/order.rb

@@ -0,0 +1,29 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class Order < Api::Data::Base
+
+        ORDER_ATTRS = [
+          :bet_id,
+          :order_type,
+          :status,
+          :persistence_type,
+          :side,
+          :price,
+          :size,
+          :bsp_liability,
+          :placed_date,
+          :avg_price_matched,
+          :size_matched,
+          :size_remaining,
+          :size_lapsed,
+          :size_cancelled,
+          :size_voided
+        ]
+
+        attributes ORDER_ATTRS
+        
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/price_projection.rb

@@ -0,0 +1,23 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class PriceProjection < Api::Data::Base
+        include Api::Data::Concerns::Hashable
+
+        PRICE_PROJECTION_ATTRS = [
+          :price_data,
+          {ex_best_offers_overrides: { type: BetfairApiNgRails::ExBestOffersOverrides }},
+          :virtualise,
+          :rollover_stakes
+        ]
+
+        attributes PRICE_PROJECTION_ATTRS
+
+        def self.to_hash_attrs
+          PRICE_PROJECTION_ATTRS
+        end
+
+      end
+    end
+  end
+end