betfair_api_ng_rails 1.0.0 → 1.1.0

data/lib/betfair_api_ng_rails/api/data/price_size.rb

@@ -0,0 +1,15 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class PriceSize < Api::Data::Base
+
+        PRICE_SIZE_ATTRS = [
+          :price,
+          :size
+        ]
+
+        attributes PRICE_SIZE_ATTRS
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/runner.rb

@@ -0,0 +1,24 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class Runner < Api::Data::Base
+
+        RUNNER_ATTRS = [
+          :selection_id,
+          :handicap,
+          :status,
+          :adjustment_factor,
+          :last_price_traded,
+          :total_matched,
+          :removal_date,
+          {sp:      { type: BetfairApiNgRails::StartingPrices     }},
+          {ex:      { type: BetfairApiNgRails::ExchangePrices     }},
+          {orders:  { type: BetfairApiNgRails::Order, array: true }},
+          {matches: { type: BetfairApiNgRails::Match, array: true }}
+        ]
+
+        attributes RUNNER_ATTRS
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/runner_catalog.rb

@@ -0,0 +1,19 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class RunnerCatalog < Api::Data::Base
+
+        RUNNER_CATALOG_ATTRS = [
+          :selection_id,
+          :runner_name,
+          :handicap,
+          :sort_priority,
+          :metadata
+        ]
+
+        attributes RUNNER_CATALOG_ATTRS
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/starting_prices.rb

@@ -0,0 +1,18 @@
+module BetfairApiNgRails
+  module Api
+    module Data
+      class StartingPrices < Api::Data::Base
+
+        STARTING_PRICES_ATTRS = [
+          :near_price,
+          :far_price,
+          {back_stake_taken:    { type: BetfairApiNgRails::PriceSize, array: true }},
+          {lay_liability_taken: { type: BetfairApiNgRails::PriceSize, array: true }},
+          :actual_s_p
+        ]
+
+        attributes STARTING_PRICES_ATTRS
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/data/time_range.rb

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

data/lib/betfair_api_ng_rails/api/data/time_range_result.rb

@@ -3,15 +3,12 @@ module BetfairApiNgRails
     module Data
       class TimeRangeResult < Api::Data::Base
 
-        attr_accessor :time_range,
-                      :market_count
+        TIME_RANGE_RESULT_ATTRS = [
+          {time_range: {type: BetfairApiNgRails::TimeRange}},
+          :market_count
+        ]
 
-        def self.from_json(json_row)
-          new(
-            time_range: Api::Data::TimeRange.from_json(json_row['timeRange']),
-            market_count: json_row['marketCount'],
-          )
-        end
+        attributes TIME_RANGE_RESULT_ATTRS
 
       end
     end

data/lib/betfair_api_ng_rails/api/data/venue_result.rb

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

data/lib/betfair_api_ng_rails/api/hashalator.rb

@@ -11,7 +11,8 @@ module BetfairApiNgRails
 
       def to_hash
         hashable.inject({}) do |h, (k, v)|
-          h[hash_key(k)] = hash_value(v)
+          value = hash_value(v)
+          h[hash_key(k)] = value if !value.nil? && value != ""
           h
         end
       end

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

@@ -1,5 +1,3 @@
-require 'pry-nav'
-
 module BetfairApiNgRails
   module Api
     module Parsers

data/lib/betfair_api_ng_rails/api/parsers/list_market_book.rb

@@ -0,0 +1,15 @@
+module BetfairApiNgRails
+  module Api
+    module Parsers
+      class ListMarketBook < Api::Parsers::Base
+
+      private
+
+        def process_row(json_row)
+          BetfairApiNgRails::MarketBook.from_json json_row
+        end
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/parsers/list_market_catalogue.rb

@@ -0,0 +1,15 @@
+module BetfairApiNgRails
+  module Api
+    module Parsers
+      class ListMarketCatalogue < Api::Parsers::Base
+
+      private
+
+        def process_row(json_row)
+          BetfairApiNgRails::MarketCatalogue.from_json json_row
+        end
+
+      end
+    end
+  end
+end

data/lib/betfair_api_ng_rails/api/request_methods.rb

@@ -8,12 +8,20 @@ module BetfairApiNgRails
 
       SIMPLE_LISTING_FILTERED.each do |method|
         eval <<-CODE
-          def #{method.underscore}(filter: Api::Data::MarketFilter.new, locale: :en)
+          def #{method.underscore}(filter: Api::Data::MarketFilter.new, locale: BetfairApiNgRails.config.locale)
             run_request __method__, { filter: filter }, { locale: locale }
           end
         CODE
       end
 
+      def list_market_catalogue(filter: 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: "")
         run_request __method__, { market_id: market_id, instructions: instructions, customer_ref: customer_ref }
       end

data/lib/betfair_api_ng_rails/errors.rb

@@ -3,4 +3,11 @@ module BetfairApiNgRails
   class NoConnectionError < ::StandardError
   end
 
+  class APINGException < ::StandardError
+    attr_reader :info
+    def initialize(info)
+      @info = info
+    end
+  end
+
 end

data/lib/betfair_api_ng_rails/version.rb

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

data/lib/betfair_api_ng_rails.rb

@@ -27,25 +27,38 @@ module BetfairApiNgRails
 
     module Data
 
-      autoload :Base,               'betfair_api_ng_rails/api/data/base'
-      autoload :Attributes,         'betfair_api_ng_rails/api/data/attributes'
-      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 :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'
 
       module Concerns
 
         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'
 
       end
 
@@ -94,21 +107,24 @@ module BetfairApiNgRails
 
     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 :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'
 
     end
 
     module ConnectionExt
       
-      autoload :Parsing,    'betfair_api_ng_rails/api/connection_ext/parsing'
-      autoload :Formatting, 'betfair_api_ng_rails/api/connection_ext/formatting'
+      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'
 
     end
 

data/spec/betfair_api_ng_rails/api/connection_spec.rb

@@ -17,6 +17,7 @@ describe BetfairApiNgRails::Api::Connection do
     
     let(:provider) { double(:provider) }
     let(:parser)   { double(:parser, process: true) }
+    let(:response) { double(:response) }
 
     before(:each) do 
       expect_any_instance_of(described_class).to receive(:request_ssoid) 
@@ -25,7 +26,8 @@ describe BetfairApiNgRails::Api::Connection do
 
     it "calls provider's fetch method" do
       expect(subject).to receive(:provider).and_return provider
-      expect(provider).to receive(:fetch).with(method: 'method', params: {})
+      expect(provider).to receive(:fetch).with(method: 'method', params: {}).and_return response
+      expect(response).to receive(:has_error?).and_return false
       expect(subject).to receive(:hashing).with({}).and_return({})
       subject.request 'method'
     end

data/spec/betfair_api_ng_rails/api/data/competition_result_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::CompetitionResult do
+  
+  include_examples 'data model', DataModelsYamlLoader.new.fetch('competitionResult') do
+
+    describe "competition association" do
+      
+      its('competition.id') { is_expected.to eq '1' }
+
+    end
+
+  end
+
+end

data/spec/betfair_api_ng_rails/api/data/competition_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe BetfairApiNgRails::Competition do
+  
+  include_examples 'data model', DataModelsYamlLoader.new.fetch('competition')
+
+end

data/spec/betfair_api_ng_rails/api/data/concerns/attributable_spec.rb

@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+class TestClass
+  include BetfairApiNgRails::Api::Data::Concerns::Attributable
+end
+
+describe BetfairApiNgRails::Api::Data::Concerns::Attributable do
+
+  describe "class method" do
+    
+    subject { TestClass }
+
+    describe ".attributes" do
+      
+      let(:attrib) { [:some_attr] }
+
+      it "defines all needed attr accessors" do
+        expect(TestClass).to receive(:define_class_attrs).with(attrib)
+        expect(TestClass).to receive(:define_attr_accessors)
+        TestClass.attributes attrib
+      end
+
+    end
+
+    describe ".define_class_attrs" do
+      
+      before do
+        expect(TestClass).to receive(:process_attributes).and_return [:some_attr]
+        TestClass.send :define_class_attrs, [:some_attr]
+      end
+
+      its(:class_attrs) { is_expected.to include(:some_attr) }
+
+    end
+
+    describe ".fetch_attr_name" do
+      
+      subject { TestClass.send :fetch_attr_name, attrib }
+
+      context 'when passed hash' do
+        
+        let(:attrib) { {some_attr: {type: String}} }
+
+        context "returns first key name" do
+          it { is_expected.to eq :some_attr }
+        end
+
+      end
+
+      context 'when passed simple string' do
+        
+        let(:attrib) { :some_attr1 }
+
+        context 'returns passed value' do
+          it { is_expected.to eq :some_attr1 }
+        end
+
+      end
+
+    end
+
+    describe ".fetch_attr_options" do
+      
+      subject { TestClass.send :fetch_attr_options, attrib }
+
+      context 'when passed hash' do
+        
+        let(:attrib) { {some_attr: {type: String}} }
+
+        context "returns default options merged with setted one" do
+          it { is_expected.to eq({type: String, array: false}) }
+        end
+
+      end
+
+      context 'when passed simple string' do
+        
+        let(:attrib) { :some_attr1 }
+
+        context 'returns default options' do
+          it { is_expected.to eq({type: String, array: false}) }
+        end
+
+      end
+
+    end
+
+    describe ".define_attr_accessors" do
+
+      before { expect(TestClass).to receive(:class_attrs).and_return({some_attr: {type: String, array: false}}) }
+
+      it "defines attr accessors for instance" do
+        expect(TestClass).to receive(:class_eval).with("attr_accessor :some_attr")
+        TestClass.send :define_attr_accessors
+      end
+      
+    end
+
+    describe ".process_attributes" do
+      
+      subject { TestClass.send :process_attributes, attributes }
+
+      context 'when simple value passed' do
+        
+        let(:attributes) { [:some_attr] }
+
+        context "returns attributes with default settings" do
+          
+          it { is_expected.to eq({some_attr: BetfairApiNgRails::Api::Data::Concerns::Attributable::DEFAULT_OPTIONS}) }
+
+        end
+
+      end
+
+      context 'when attribute with params passed' do
+        
+        let(:attributes) { [{some_attr: {type: Integer}}] }
+
+        context "returns attributes with merged setting" do
+          
+          it { is_expected.to eq({some_attr: {type: Integer, array: false}}) }
+
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "integration tests" do
+    
+    let(:attrib) { [:some_attr, {some_attr1: {type: Integer}}] }
+
+    before { TestClass.attributes attrib }
+
+    context 'for instance' do
+
+      subject { TestClass.new }
+
+      its(:some_attr) { is_expected.to be_nil }
+      its(:some_attr1) { is_expected.to be_nil }
+
+    end
+
+    context 'for class' do
+      
+      subject { TestClass }
+
+      its('class_attrs.keys') { is_expected.to include(:some_attr) }
+
+    end
+
+  end
+
+end

data/spec/betfair_api_ng_rails/api/data/concerns/hashable_spec.rb

@@ -53,6 +53,36 @@ describe BetfairApiNgRails::Api::Data::Concerns::Hashable do
 
     end
 
+    describe "#get_attr_key" do
+      
+      subject { TestClass.new.send :get_attr_key, attrib }
+
+      context 'when passed Hash' do
+      
+        let(:attrib) { {some_attr: { type: String }} }
+
+        context 'returns first key' do
+          
+          it { is_expected.to eq :some_attr }
+
+        end
+
+      end 
+
+      context 'when passed single value' do
+        
+        let(:attrib) { :some_attr }
+
+        context 'returns it' do
+          
+          it { is_expected.to eq :some_attr }
+
+        end
+
+      end
+
+    end
+
   end
 
   describe "integration tests" do
@@ -76,6 +106,20 @@ describe BetfairApiNgRails::Api::Data::Concerns::Hashable do
 
     end
 
+    context 'when exists attr with additional options' do
+      
+      before(:each) do
+        subject.class.send :instance_eval, <<-CODE
+          attr_accessor :second_name
+          def self.to_hash_attrs; [:name, {second_name: {type: String, array: false}}]; end
+        CODE
+        subject.second_name = "Black"
+      end
+
+      its(:to_hash) { is_expected.to eq({'name' => 'Walli', 'secondName' => 'Black'}) }
+
+    end
+
   end
 
 end