opta_sd 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847ce22203095424651f83675de69d9ffb5fa385
-  data.tar.gz: 8f039445d073795f3c53aa6220b97b7b88935cfa
+  metadata.gz: b05838606d5aec71c44d53b9b36e08a6edb3b9f2
+  data.tar.gz: a2efaf04c4d2bc3404d4303427d98e2af91ea7d9
 SHA512:
-  metadata.gz: 587284cea05cece9d49e277f6cad246ad1e3f89ae7e992e4cd0f3e52404dcd0cf7bf042b9b74093378c96a64d32bca686af88934408798b9fda68dcc4f6ca73b
-  data.tar.gz: 87753fa9c9992f71b40834e9ffa6c54bdc85cad378adb10c938245768ebad68ae81f2a81467ad90b9d8fa6fba1cc6d036a153c382eee2f35e75a20e01da5f1fc
+  metadata.gz: 7506dbb1a6b244daf66494ffa29bccfa316bdb7195bd70bbc2d59b46a2cba39bad5b8b265c14d669b8a0a53ffcc22e32e2bffb4947b734c292e1692f11c6b3c5
+  data.tar.gz: ee4fb65491efdf7ecb4c89195756a905b6f9bc3d2a674d8408287ced9eee31ef1b4c96b74fcfe2cd8e0a90236edc43c394886e36049269309ecad9de618294d4

data/.gitignore

@@ -1 +1,3 @@
 .byebug_history
+.bundle
+vendor

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.2

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# CHANGELOG
+
+## 1.1 - ( Master ) - 6 May 2017
+
+### Add
+- Add Venues
+
+### Changed
+- Refactor all parameters methods in Core class and `config/parameters.yml`
+- Update Matches `time_range` format
+
+## 1.0 ( First Release ) - 3 Feb 2017
+
+### ADD
+- Initial release

data/Gemfile

@@ -10,13 +10,14 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-gem 'activesupport'
+# gem 'activesupport'
 
 gem 'nokogiri', '~> 1.7', '>= 1.7.0.1'
 
 group :development, :test do
   # To use a debugger
-  gem 'byebug'
-  gem 'pry'
+  gem 'rake', '~> 12.0'
+  gem 'byebug', '~> 9.0', '>= 9.0.6'
+  gem 'pry', '~> 0.10.4'
   gem 'rspec'
 end

data/Gemfile.lock

@@ -1,63 +1,52 @@
 PATH
   remote: .
   specs:
-    opta_sd (1.0.0)
-      bundler
+    opta_sd (1.1.0)
       json
       nokogiri (~> 1.7, >= 1.7.0.1)
-      rspec (~> 3.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
     diff-lcs (1.3)
-    i18n (0.8.0)
-    json (2.0.3)
+    json (2.1.0)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  byebug
+  bundler
+  byebug (~> 9.0, >= 9.0.6)
   nokogiri (~> 1.7, >= 1.7.0.1)
   opta_sd!
-  pry
+  pry (~> 0.10.4)
+  rake (~> 12.0)
   rspec
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/README.md

@@ -1,6 +1,10 @@
-# OPTA Sports Data Soccer API
+# OPTA Sports Data Soccer API (OPTA SDAPI)
 
-OPTA SD is a library to Integrate and Utilize Opta Sports Data Apis.
+[![Ruby Gem](https://img.shields.io/gem/v/opta_sd.svg)](https://rubygems.org/gems/opta_sd)
+[![Build Status](https://travis-ci.org/ali-sheiba/opta_sd.svg?branch=master)](https://travis-ci.org/ali-sheiba/opta_sd?branch=master)
+
+
+Ruby API Client for OPTA SDAPI (Sports Data Soccer API)
 
 ## Installation
 
@@ -47,6 +51,7 @@ Tournament Calendars              |  [TournamentCalendar](#12-tournament-calenda
 Match Preview                     |         [MatchPreview](#13-match-preview)         | `/soccerdata/matchpreview/...`
 Rankings                          |             [Rankings](#14-rankings)              | `/soccerdata/rankings/...`
 Tournament Schedule               |   [TournamentSchedule](#15-tournament-schedule)   | `/soccerdata/tournamentschedule/...`
+Venues                            |               [Venues](#16-venues)                | `/soccerdata/venues/...`
 
 ### Parameter Methods :
 
@@ -383,6 +388,22 @@ Available Parameters:
 - `resource(tournament_id)`
 - `tournament(tournament_id)`
 
+
+### 16\. Venues
+
+```ruby
+# Get Venues
+OptaSD::Soccer::Venues.new.venue('bdkmbkf8yi951wrjraknp9wad').get
+OptaSD::Soccer::Venues.new.tournament('9xjsbe05up1jqycf7no90as4p').get
+OptaSD::Soccer::Venues.new.contestant('c8h9bw1l82s06h77xxrelzhur').get
+```
+
+Available Parameters:
+
+- `venue(venue_id)`
+- `tournament(tournament_id)`
+- `contestant(contestant_id)`
+
 --------------------------------------------------------------------------------
 
 ## Contributing

data/Rakefile

@@ -1 +1,5 @@
-require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/config/parameters.yml

@@ -1,74 +1,25 @@
 core:
-  _rt: "_rt"
-  _format: "_fmt"
-  _locale: "_lcl"
-  _callback: "_clbk"
-  _sort: "_ordSrt"
-  _page_size: "_pgSz"
+  _callback:    "_clbk"
+  _format:      "_fmt"
+  _locale:      "_lcl"
   _page_number: "_pgNm"
-
-match:
-  fixture: "fx"
-  tournament: "tmcl" # tournament_calendar
-  stage: "stg"
-  competition: "comp"
-  contestant: "ctst"
-  match_time: "mt.mDt"
-  match_date: "mt.mDt"
-  live: "live"
-  lineups: "lineups"
-  status: "status"
-
-tournamentcalendar:
-  competition: "comp"
-
-squads:
-  tournament: "tmcl"
-  contestant: "ctst"
-  detailed: "detailed"
-  people: "people"
-
-possession:
-  fixture: "fx"
-
-matchevent:
-  fixture: "fx"
-
-matchstats:
-  fixture: "fx"
-  detailed: "detailed"
-
-passmatrix:
-  fixture: "fx"
-
-commentary:
-  fixture: "fx"
-  type: "type"
-
-matchfacts:
-  fixture: "fx"
-
-seasonstats:
-  tournament: "tmcl"
-  contestant: "ctst"
-  competition: "comp"
-
-standings:
-  stage: "stg"
-  tournament: "tmcl"
-  live: "live"
-  type: "type"
-
-playercareer:
-  person: "prsn"
-  active: "active"
-  contestant: "ctst"
-
-matchpreview:
-  fixture: "fx"
-
-rankings:
-  tournament: "tmcl"
-
-tournamentschedule:
-  tournament: "tmcl"
+  _page_size:   "_pgSz"
+  _rt:          "_rt"
+  _sort:        "_ordSrt"
+
+active:      "active"
+competition: "comp"
+contestant:  "ctst"
+detailed:    "detailed"
+fixture:     "fx"
+lineups:     "lineups"
+live:        "live"
+match_date:  "mt.mDt"
+match_time:  "mt.mDt"
+people:      "people"
+person:      "prsn"
+stage:       "stg"
+status:      "status"
+tournament:  "tmcl"
+type:        "type"
+venue:       "venue"

data/lib/opta_sd.rb

@@ -1,6 +1,7 @@
 # Project Requirements
 require 'yaml'
 require 'json'
+require 'time'
 require 'nokogiri'
 require 'net/http'
 
@@ -23,6 +24,7 @@ require 'opta_sd/soccer/team_standings'
 require 'opta_sd/soccer/match_statistics'
 require 'opta_sd/soccer/tournament_calendar'
 require 'opta_sd/soccer/tournament_schedule'
+require 'opta_sd/soccer/venues'
 
 
 # Wrapper Classes

data/lib/opta_sd/core.rb

@@ -96,24 +96,23 @@ module OptaSD
     ## ---------------------------------------- ##
 
     # Define resource for Boolean Parameters
-    def self.boolean_params(model , *args)
+    def self.boolean_params(*args)
       args.each do |param_name|
         define_method param_name do |value = true|
-          @params[PARAMETERS[model.to_s][param_name.to_s]] = value ? 'yes' : 'no'
+          @params[PARAMETERS[param_name.to_s]] = value ? 'yes' : 'no'
           self
         end
       end
     end
 
     # Define Pesource Parameters
-    def self.resource_params(model, *args)
+    def self.resource_params(*args)
       args.each do |param_name|
         define_method param_name do |value|
-          @params[PARAMETERS[model.to_s][param_name.to_s] || param_name.to_s] = value
+          @params[PARAMETERS[param_name.to_s] || param_name.to_s] = value
           self
         end
       end
     end
-
   end
 end

data/lib/opta_sd/soccer/commentary.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class Commentary < OptaSD::Soccer::SoccerCore
 
-      resource_params 'commentary', :fixture, :type
+      resource_params :fixture, :type
 
       def initialize
         super

data/lib/opta_sd/soccer/match.rb

@@ -2,8 +2,8 @@ module OptaSD
   module Soccer
     class Match < OptaSD::Soccer::SoccerCore
 
-      boolean_params  'match', :live,    :lineups
-      resource_params 'match', :fixture, :tournament, :stage, :competition, :contestant, :match_time, :match_date, :status
+      boolean_params  :live,    :lineups
+      resource_params :fixture, :tournament, :stage, :competition, :contestant, :match_time, :match_date, :status
 
       def initialize
         super
@@ -11,10 +11,9 @@ module OptaSD
       end
 
       def time_range(from, to)
-        match_time("[#{from.strftime('%Y-%m-%dT%H:%M:%SZ')} TO #{to.strftime('%Y-%m-%dT%H:%M:%SZ')}]")
+        match_time("[#{from.utc.iso8601} TO #{to.utc.iso8601}]")
         return self
       end
-
     end
   end
 end

data/lib/opta_sd/soccer/match_event.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class MatchEvent < OptaSD::Soccer::SoccerCore
 
-      resource_params 'matchevent', :fixture
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/match_facts.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class MatchFacts < OptaSD::Soccer::SoccerCore
 
-      resource_params 'matchfacts', :fixture
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/match_preview.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class MatchPreview < OptaSD::Soccer::SoccerCore
 
-      resource_params 'matchpreview', :fixture
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/match_statistics.rb

@@ -2,8 +2,8 @@ module OptaSD
   module Soccer
     class MatchStatistics < OptaSD::Soccer::SoccerCore
 
-      boolean_params  'matchstats', :detailed
-      resource_params 'matchstats', :fixture
+      boolean_params  :detailed
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/pass_matrix.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class PassMatrix < OptaSD::Soccer::SoccerCore
 
-      resource_params 'passmatrix', :fixture
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/player_career.rb

@@ -2,8 +2,8 @@ module OptaSD
   module Soccer
     class PlayerCareer < OptaSD::Soccer::SoccerCore
 
-      boolean_params  'playercareer', :active
-      resource_params 'playercareer', :person, :contestant
+      boolean_params  :active
+      resource_params :person, :contestant
 
       def initialize
         super

data/lib/opta_sd/soccer/possession.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class Possession < OptaSD::Soccer::SoccerCore
 
-      resource_params 'possession', :fixture
+      resource_params :fixture
 
       def initialize
         super

data/lib/opta_sd/soccer/rankings.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class Rankings < OptaSD::Soccer::SoccerCore
 
-      resource_params 'rankings', :tournament
+      resource_params :tournament
 
       def initialize
         super

data/lib/opta_sd/soccer/seasonal_stats.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class SeasonalStats < OptaSD::Soccer::SoccerCore
 
-      resource_params  'seasonstats', :tournament, :contestant, :competition
+      resource_params :tournament, :contestant, :competition
 
       def initialize
         super

data/lib/opta_sd/soccer/squads.rb

@@ -2,8 +2,8 @@ module OptaSD
   module Soccer
     class Squads < OptaSD::Soccer::SoccerCore
 
-      boolean_params  'squads', :people, :detailed
-      resource_params 'squads', :tournament, :contestant
+      boolean_params  :people, :detailed
+      resource_params :tournament, :contestant
 
       def initialize
         super

data/lib/opta_sd/soccer/team_standings.rb

@@ -2,8 +2,8 @@ module OptaSD
   module Soccer
     class TeamStandings < OptaSD::Soccer::SoccerCore
 
-      boolean_params  'standings', :live
-      resource_params 'standings', :stage, :tournament, :type
+      boolean_params  :live
+      resource_params :stage, :tournament, :type
 
       def initialize
         super

data/lib/opta_sd/soccer/tournament_calendar.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class TournamentCalendar < OptaSD::Soccer::SoccerCore
 
-      resource_params 'tournamentcalendar', :competition
+      resource_params :competition
 
       def initialize
         super

data/lib/opta_sd/soccer/tournament_schedule.rb

@@ -2,7 +2,7 @@ module OptaSD
   module Soccer
     class TournamentSchedule < OptaSD::Soccer::SoccerCore
 
-      resource_params 'tournamentschedule', :tournament
+      resource_params :tournament
 
       def initialize
         super

data/lib/opta_sd/soccer/venues.rb

@@ -0,0 +1,13 @@
+module OptaSD
+  module Soccer
+    class Venues < OptaSD::Soccer::SoccerCore
+
+      resource_params :tournament, :contestant, :venue
+
+      def initialize
+        super
+        @feed_name = 'venues'
+      end
+    end
+  end
+end

data/lib/opta_sd/version.rb

@@ -1,3 +1,3 @@
 module OptaSD
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/opta_sd.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency "bundler"
+  s.add_development_dependency "byebug"
+  s.add_development_dependency "pry"
   s.add_development_dependency "rspec",    '~> 3.5'
   s.add_dependency "nokogiri", '~> 1.7', '>= 1.7.0.1'
   s.add_dependency "json"

data/spec/venues_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe OptaSD::Soccer::Venues do
+
+  before do
+    @valid_venue_id      = "bdkmbkf8yi951wrjraknp9wad"
+    @valid_tournament_id = "9xjsbe05up1jqycf7no90as4p"
+    @valid_contestant_id = "c8h9bw1l82s06h77xxrelzhur"
+  end
+
+  it "gets venues based on venue id" do
+    venues = OptaSD::Soccer::Venues.new.venue(@valid_venue_id).get
+    expect(venues.data).to include("venue")
+  end
+
+  it "gets venues based on tournament" do
+    venues = OptaSD::Soccer::Venues.new.tournament(@valid_tournament_id).get
+    expect(venues.data).to include("venue")
+  end
+
+  it "gets venues based on contestant" do
+    venues = OptaSD::Soccer::Venues.new.contestant(@valid_contestant_id).get
+    expect(venues.data).to include("venue")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opta_sd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ali Al-Sheiba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +109,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -108,6 +138,7 @@ files:
 - lib/opta_sd/soccer/team_standings.rb
 - lib/opta_sd/soccer/tournament_calendar.rb
 - lib/opta_sd/soccer/tournament_schedule.rb
+- lib/opta_sd/soccer/venues.rb
 - lib/opta_sd/version.rb
 - opta_sd.gemspec
 - spec/commentary_spec.rb
@@ -126,6 +157,7 @@ files:
 - spec/team_standings_spec.rb
 - spec/tournament_schedule_spec.rb
 - spec/tournament_spec.rb
+- spec/venues_spec.rb
 homepage: https://github.com/ali-sheiba/opta_sd
 licenses:
 - MIT
@@ -146,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Opta Sports Data Soccer API.
@@ -167,3 +199,4 @@ test_files:
 - spec/team_standings_spec.rb
 - spec/tournament_schedule_spec.rb
 - spec/tournament_spec.rb
+- spec/venues_spec.rb