betfair_api_ng_rails 0.0.6 → 0.0.8

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

@@ -7,46 +7,29 @@ module BetfairApiNgRails
         include Api::BF::Concerns::Errorable
         include Api::BF::Constants
 
-        attr_reader :session_manager
+        attr_reader :session_manager, :http_requester
 
         def initialize
           @session_manager = Api::BF::SessionManager.new
           @provider_name = "BF"
+          @http_requester = Api::BF::Http::Factory.provider_requester
         end
 
-        def fetch(data: "", parameters: {}, sport: "")
-          return [] unless session_manager.request_ssoid
-          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
+        def fetch(method: "", filter: {}, params: {})
+          return [] unless BetfairApiNgRails::Api::BF::SessionManager.request_ssoid
+          raise "Not allowed method #{method.to_s}" unless is_method_allowed?(method)
+          do_request with_method: method, filter: filter, params: params
         end
 
       private
 
-        def do_request(data, parameters, sport)
-          @http_responser = @http_requester.do_request
-          process_response data, @http_responser.result, build_parser(data)
+        def do_request(with_method: "", filter: {}, params: {})
+          http_requester.set_api_req_body with_method, filter, params
+          http_requester.do_request
         end
 
-        def process_response(data, response, parser)
-          format_response data, parser.parse(response: response)
-        end
-
-        def format_response(data, response)
-          return response unless Api::BF::Config.formatter
-          response.map { |r| Api::BF::Config.formatter.format(record: r, resource: data) }
-        end
-
-        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), params
-          end
-        end
-
-        def is_method_allowed?(data, sport)
-          ALLOWED_RESOURCES[sport.to_sym].include? data.to_sym
+        def is_method_allowed?(method)
+          ALLOWED_RESOURCES.include? method.to_s
         end
 
       end

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

@@ -1,56 +1,45 @@
-require "net/https"
-require "uri"
-require 'json'
 require 'betfair_api_ng_rails/api/bf/concerns/errorable'
 
 module BetfairApiNgRails
   module Api
     module BF
       class SessionManager
-        include Api::BF::Concerns::Errorable
-        include Api::BF::Constants
+        class << self
+          include Api::BF::Concerns::Errorable
+          include Api::BF::Constants
 
-        def initialize
-          setup_http_requester
-        end
-
-        def ssoid
-          @ssoid ||= fetch_ssoid
-        end
+          def ssoid
+            @ssoid ||= fetch_ssoid
+          end
 
-        def request_ssoid
-          ssoid
-          !has_errors?
-        end
+          def request_ssoid
+            ssoid
+            !has_errors?
+          end
 
-        def expire_ssoid
-          @ssoid = nil
-        end
+          def expire_ssoid
+            @ssoid = nil
+          end
 
-      private
+        private
 
-        def fetch_ssoid
-          process_response get_login_response
-        end
+          def fetch_ssoid
+            process_response get_login_response
+          end
 
-        def process_response(response)
-          response['sessionToken']
-        end
+          def process_response(response)
+            response['sessionToken']
+          end
 
-        def get_login_response
-          @http_responser = @http_requester.do_request
-          @http_responser.result
-        end
+          def get_login_response
+            http_requester.do_request.result
+          end
 
-        def setup_http_requester
-          @http_requester = Api::BF::HttpRequester.new(Api::BF::Config.login_url).tap do |req|
-            req.set_ssl_files Api::BF::Config.ssl_crt_filepath, Api::BF::Config.ssl_key_filepath
-            req.set_request_headers SESSION_REQUEST_HEADERS
-            req.set_auth_headers Api::BF::Config.application_key
-            req.set_form_data "username" => Api::BF::Config.username, "password" => Api::BF::Config.password
+          def http_requester
+            @_http_requester ||= Api::BF::Http::Factory.session_requester
           end
-        end
 
+        end
       end
     end
   end

data/lib/betfair_api_ng_rails/version.rb

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

data/lib/betfair_api_ng_rails.rb

@@ -4,38 +4,109 @@ 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 :FormatterFactory, 'betfair_api_ng_rails/api/formatter_factory'
 
     module BF
 
       autoload :Config,         'betfair_api_ng_rails/api/bf/config'
       autoload :Constants,      'betfair_api_ng_rails/api/bf/constants'
-      autoload :HttpRequester,  'betfair_api_ng_rails/api/bf/http_requester'
-      autoload :HttpResponser,  'betfair_api_ng_rails/api/bf/http_responser'
       autoload :Provider,       'betfair_api_ng_rails/api/bf/provider'
-      autoload :Parser,         'betfair_api_ng_rails/api/bf/parser'
       autoload :SessionManager, 'betfair_api_ng_rails/api/bf/session_manager'
 
       module Formatters
 
-        autoload :JsTreeFromatter, 'betfair_api_ng_rails/api/bf/formatters/js_tree_formatter'
+        autoload :JsTreeFormatter, 'betfair_api_ng_rails/api/bf/formatters/js_tree_formatter'
 
       end
 
-    end
+      module Data
+
+        autoload :Base,               'betfair_api_ng_rails/api/bf/data/base'
+        autoload :Attributes,         'betfair_api_ng_rails/api/bf/data/attributes'
+        autoload :Constants,          'betfair_api_ng_rails/api/bf/data/constants'
+        autoload :Competition,        'betfair_api_ng_rails/api/bf/data/competition'
+        autoload :CompetitionResult,  'betfair_api_ng_rails/api/bf/data/competition_result'
+        autoload :MarketFilter,       'betfair_api_ng_rails/api/bf/data/market_filter'
+        autoload :TimeRange,          'betfair_api_ng_rails/api/bf/data/time_range'
+        autoload :TimeRangeResult,    'betfair_api_ng_rails/api/bf/data/time_range_result'
+        autoload :EventType,          'betfair_api_ng_rails/api/bf/data/event_type'
+        autoload :EventTypeResult,    'betfair_api_ng_rails/api/bf/data/event_type_result'
+        autoload :Event,              'betfair_api_ng_rails/api/bf/data/event'
+        autoload :EventResult,        'betfair_api_ng_rails/api/bf/data/event_result'
+
+        module Concerns
+
+          autoload :Hashable,           'betfair_api_ng_rails/api/bf/data/concerns/hashable'
+          autoload :Querable,           'betfair_api_ng_rails/api/bf/data/concerns/querable'
+
+        end
+
+      end
+
+      module Enums
+
+        autoload :MarketProjection,           'betfair_api_ng_rails/api/bf/enums/market_projection'
+        autoload :PriceData,                  'betfair_api_ng_rails/api/bf/enums/price_data'
+        autoload :MatchProjection,            'betfair_api_ng_rails/api/bf/enums/match_projection'
+        autoload :OrderProjection,            'betfair_api_ng_rails/api/bf/enums/order_projection'
+        autoload :MarketStatus,               'betfair_api_ng_rails/api/bf/enums/market_status'
+        autoload :RunnerStatus,               'betfair_api_ng_rails/api/bf/enums/runner_status'
+        autoload :TimeGranularity,            'betfair_api_ng_rails/api/bf/enums/time_granularity'
+        autoload :Side,                       'betfair_api_ng_rails/api/bf/enums/side'
+        autoload :OrderStatus,                'betfair_api_ng_rails/api/bf/enums/order_status'
+        autoload :OrderBy,                    'betfair_api_ng_rails/api/bf/enums/order_by'
+        autoload :SortDir,                    'betfair_api_ng_rails/api/bf/enums/sort_dir'
+        autoload :OrderType,                  'betfair_api_ng_rails/api/bf/enums/order_type'
+        autoload :MarketSort,                 'betfair_api_ng_rails/api/bf/enums/market_sort'
+        autoload :MarketBettingType,          'betfair_api_ng_rails/api/bf/enums/market_betting_type'
+        autoload :ExecutionReportStatus,      'betfair_api_ng_rails/api/bf/enums/execution_report_status'
+        autoload :ExecutionReportErrorCode,   'betfair_api_ng_rails/api/bf/enums/execution_report_error_code'
+        autoload :PersistenceType,            'betfair_api_ng_rails/api/bf/enums/perisstence_type'
+        autoload :InstrictionReportStatus,    'betfair_api_ng_rails/api/bf/enums/instruction_report_status'
+        autoload :InstructionReportErrorCode, 'betfair_api_ng_rails/api/bf/enums/instruction_report_error_code'
+        autoload :RollupModel,                'betfair_api_ng_rails/api/bf/enums/rollup_model'
+        autoload :GroupBy,                    'betfair_api_ng_rails/api/bf/enums/group_by'
+        autoload :BetStatus,                  'betfair_api_ng_rails/api/bf/enums/bet_status'
+
+        module Concerns
+
+          autoload :Enumable, 'betfair_api_ng_rails/api/bf/enums/concerns/enumable'
+
+        end
 
-    module Soccer
+      end
+
+      module Http
+
+        autoload :Requester,  'betfair_api_ng_rails/api/bf/http/requester'
+        autoload :Responser,  'betfair_api_ng_rails/api/bf/http/responser'
+        autoload :Factory,    'betfair_api_ng_rails/api/bf/http/factory'
+
+      end
+
+      module ORM
 
-      autoload :Requester,                    'betfair_api_ng_rails/api/soccer/requester'
+        autoload :Requester, 'betfair_api_ng_rails/api/bf/orm/requester'
+
+        module Parsers
+
+          autoload :Base,             'betfair_api_ng_rails/api/bf/orm/parsers/base'
+          autoload :ListCompetitions, 'betfair_api_ng_rails/api/bf/orm/parsers/list_competitions'
+          autoload :ListEventTypes,   'betfair_api_ng_rails/api/bf/orm/parsers/list_event_types'
+          autoload :ListEvents,       'betfair_api_ng_rails/api/bf/orm/parsers/list_events'
+
+        end
+
+      end
 
     end
 
   end
 
+  include Api::BF::Data
+
   def self.config(&block)
     @_config ||= BetfairApiNgRails::Api::BF::Config
     block_given? ? yield(@_config) : @_config

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

@@ -10,8 +10,7 @@ BetfairApiNgRails.config do |config|
   config.api_url          = load_config['api_url']
   config.username         = load_config['username']
   config.password         = load_config['password']
-
-  # Uncomment and set needed formatter or nil if you want plain response
-  # config.formatter        = :js_tree
+  config.locale           = :ru
+  config.formatter        = nil #out of box available formatter for JsTree
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betfair_api_ng_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - sergio1990
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,21 +66,60 @@ files:
 - Rakefile
 - betfair_api_ng_rails.gemspec
 - lib/betfair_api_ng_rails.rb
-- lib/betfair_api_ng_rails/api/base_formatter.rb
-- lib/betfair_api_ng_rails/api/base_parser.rb
 - lib/betfair_api_ng_rails/api/base_provider.rb
-- lib/betfair_api_ng_rails/api/base_requester.rb
 - lib/betfair_api_ng_rails/api/bf/concerns/errorable.rb
 - lib/betfair_api_ng_rails/api/bf/config.rb
 - lib/betfair_api_ng_rails/api/bf/constants.rb
+- lib/betfair_api_ng_rails/api/bf/data/attributes.rb
+- lib/betfair_api_ng_rails/api/bf/data/base.rb
+- lib/betfair_api_ng_rails/api/bf/data/competition.rb
+- lib/betfair_api_ng_rails/api/bf/data/competition_result.rb
+- lib/betfair_api_ng_rails/api/bf/data/concerns/hashable.rb
+- lib/betfair_api_ng_rails/api/bf/data/concerns/querable.rb
+- lib/betfair_api_ng_rails/api/bf/data/constants.rb
+- lib/betfair_api_ng_rails/api/bf/data/event.rb
+- lib/betfair_api_ng_rails/api/bf/data/event_result.rb
+- lib/betfair_api_ng_rails/api/bf/data/event_type.rb
+- lib/betfair_api_ng_rails/api/bf/data/event_type_result.rb
+- lib/betfair_api_ng_rails/api/bf/data/market_filter.rb
+- lib/betfair_api_ng_rails/api/bf/data/time_range.rb
+- lib/betfair_api_ng_rails/api/bf/data/time_range_result.rb
+- lib/betfair_api_ng_rails/api/bf/enums/bet_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/concerns/enumable.rb
+- lib/betfair_api_ng_rails/api/bf/enums/execution_report_error_code.rb
+- lib/betfair_api_ng_rails/api/bf/enums/execution_report_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/group_by.rb
+- lib/betfair_api_ng_rails/api/bf/enums/instruction_report_error_code.rb
+- lib/betfair_api_ng_rails/api/bf/enums/instruction_report_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/market_betting_type.rb
+- lib/betfair_api_ng_rails/api/bf/enums/market_projection.rb
+- lib/betfair_api_ng_rails/api/bf/enums/market_sort.rb
+- lib/betfair_api_ng_rails/api/bf/enums/market_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/match_projection.rb
+- lib/betfair_api_ng_rails/api/bf/enums/order_by.rb
+- lib/betfair_api_ng_rails/api/bf/enums/order_projection.rb
+- lib/betfair_api_ng_rails/api/bf/enums/order_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/order_type.rb
+- lib/betfair_api_ng_rails/api/bf/enums/persistence_type.rb
+- lib/betfair_api_ng_rails/api/bf/enums/price_data.rb
+- lib/betfair_api_ng_rails/api/bf/enums/rollup_model.rb
+- lib/betfair_api_ng_rails/api/bf/enums/runner_status.rb
+- lib/betfair_api_ng_rails/api/bf/enums/side.rb
+- lib/betfair_api_ng_rails/api/bf/enums/sort_dir.rb
+- lib/betfair_api_ng_rails/api/bf/enums/time_granularity.rb
 - lib/betfair_api_ng_rails/api/bf/formatters/js_tree_formatter.rb
-- lib/betfair_api_ng_rails/api/bf/http_requester.rb
-- lib/betfair_api_ng_rails/api/bf/http_responser.rb
-- lib/betfair_api_ng_rails/api/bf/parser.rb
+- lib/betfair_api_ng_rails/api/bf/helper.rb
+- lib/betfair_api_ng_rails/api/bf/http/factory.rb
+- lib/betfair_api_ng_rails/api/bf/http/requester.rb
+- lib/betfair_api_ng_rails/api/bf/http/responser.rb
+- lib/betfair_api_ng_rails/api/bf/orm/parsers/base.rb
+- lib/betfair_api_ng_rails/api/bf/orm/parsers/list_competitions.rb
+- lib/betfair_api_ng_rails/api/bf/orm/parsers/list_event_types.rb
+- lib/betfair_api_ng_rails/api/bf/orm/parsers/list_events.rb
+- lib/betfair_api_ng_rails/api/bf/orm/requester.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/formatter_factory.rb
-- lib/betfair_api_ng_rails/api/soccer/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/base_formatter.rb

@@ -1,11 +0,0 @@
-module BetfairApiNgRails
-  module Api
-    class BaseFormatter
-
-      def format(record: {}, resource: "")
-        raise 'Must be reimplemented!'
-      end
-
-    end
-  end
-end

data/lib/betfair_api_ng_rails/api/base_parser.rb

@@ -1,25 +0,0 @@
-require 'json'
-
-module BetfairApiNgRails
-  module Api
-    class BaseParser
-
-      def parse(response: {})
-        raise 'Must be reimplemented!'
-      end
-
-    private
-
-      def jsonify(response)
-        JSON.parse response
-      rescue
-        {}
-      end
-
-      def process_record(h)
-        h
-      end
-
-    end
-  end
-end

data/lib/betfair_api_ng_rails/api/base_requester.rb

@@ -1,25 +0,0 @@
-require 'active_support/inflector'
-
-module BetfairApiNgRails
-  module Api
-    class BaseRequester
-
-      attr_reader :provider_name, :sport, :data
-
-      def initialize(provider)
-        @provider_name = provider
-      end
-
-      def load(resource: "", parameters: {})
-        raise "Must be reimplemented!"
-      end
-
-    private
-
-      def current_provider
-        @_current_provider ||= "BetfairApiNgRails::Api::#{provider_name.to_s.upcase}::Provider".constantize.new
-      end
-
-    end
-  end
-end

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

@@ -1,73 +0,0 @@
-require "net/https"
-require "uri"
-require 'json'
-
-module BetfairApiNgRails
-  module Api
-    module BF
-      class HttpRequester
-
-        attr_reader :http, :request, :uri
-
-        def initialize(url, use_ssl = true)
-          @uri = URI.parse url
-          @http = Net::HTTP.new uri.host, uri.port
-          http.use_ssl = use_ssl
-          @request = Net::HTTP::Post.new uri.request_uri
-        end
-
-        def do_request
-          Api::BF::HttpResponser.new http.request(request)
-        end
-
-        def set_crt_file(path)
-          http.cert = OpenSSL::X509::Certificate.new(read_file(path))
-        end
-
-        def set_key_file(path)
-          http.key = OpenSSL::PKey::RSA.new(read_file(path))
-        end
-
-        def set_verify_mode(value)
-          http.verify_mode = value
-        end
-
-        def set_ssl_files(crt_path, key_path, verify = OpenSSL::SSL::VERIFY_PEER)
-          set_crt_file crt_path
-          set_key_file key_path
-          set_verify_mode verify
-        end
-
-        def set_auth_headers(app_key, session_key = nil)
-          request["X-Application"] = app_key
-          request["X-Authentication"] = session_key if session_key
-        end
-
-        def set_request_headers(headers)
-          headers.each { |name, value| request[name] = value }
-        end
-
-        def set_form_data(values)
-          request.set_form_data values
-        end
-
-        def set_request_body(body)
-          request.body = body
-        end
-
-        def set_api_req_body(method, filter = {})
-          set_request_body "{\"jsonrpc\": \"2.0\", \"method\": \"SportsAPING/v1.0/#{method}\", \"params\": {\"filter\": #{filter.to_json}}}"
-        end
-
-      private
-
-        def read_file(path)
-          File.read path
-        rescue
-          ""
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-require 'json'
-
-module BetfairApiNgRails
-  module Api
-    module BF
-      class HttpResponser
-        include Api::BF::Constants
-
-        attr_reader :response, :error_info
-
-        def initialize(response)
-          @response = response
-        end
-
-        def result
-          JSON.parse response.body
-        end
-
-        def has_error?
-          http_error? || api_req_error? || session_req_error?
-        end
-
-      private
-
-        def http_error?
-          (response.code != '200').tap { |val| set_error_info(:HTTP, response.code) if val }
-        end
-
-        def session_req_error?
-          (result.fetch('loginStatus', SUCCESS_LOGIN) != SUCCESS_LOGIN).tap { |val| set_error_info(:SESSION, result['loginStatus']) if val }
-        end
-
-        def api_req_error?
-          (result.has_key?('error')).tap { |val| set_error_info(:API, result['error']) if val }
-        end
-
-        def set_error_info(type, info)
-          @error_info = { type: type, info: info }
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,31 +0,0 @@
-require 'active_support/inflector'
-
-module BetfairApiNgRails
-  module Api
-    module BF
-      class Parser < Api::BaseParser
-
-        attr_reader :data
-
-        def initialize(data)
-          @data = data
-        end
-
-        def parse(response: {})
-          response.fetch('result', []).map { |r| process_record(r) }
-        end
-
-      private
-
-        def resource_key
-          data.camelize :lower
-        end
-
-        def process_record(h)
-          h.merge!(h[resource_key]).except resource_key
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,25 +0,0 @@
-module BetfairApiNgRails
-  module Api
-    module Soccer
-      class Requester < BetfairApiNgRails::Api::BaseRequester
-
-        def initialize(provider: "")
-          @sport = :soccer
-          super provider
-        end
-
-        def load(resource: "", parameters: {})
-          @data = resource
-          make_fetch parameters: parameters
-        end
-
-      private
-
-        def make_fetch(parameters: {})
-          current_provider.fetch data: data, parameters: parameters, sport: sport
-        end
-
-      end
-    end
-  end
-end