spoll 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98aa6e7d101f518d199c52ea4aa1695fb63bc8e9
-  data.tar.gz: 010a7638b42892d2a2add2c91c026a6fae4d7e8b
+  metadata.gz: 84c96351fb151e16778a9bf6d8d47ccdf88bd30a
+  data.tar.gz: e6e8ead477d379bc25b94bb3d7e8cbf49fd70d43
 SHA512:
-  metadata.gz: 8eeff96eb8d4a0223b2f21a941c796e0147ebb9a5ca080aa2235a14d532bc752eafbd45b195a52e30a60d9aee0aab64870b9821fe5c48251f0ad09e426ba0bd3
-  data.tar.gz: e87ff89fe07223c42b9a025335730b3272d93e43cec3e659e6580ab44c165d68019559c2107494aebc6f23bfdfa5d0167c523ea4603915c95f390c0627a3c87e
+  metadata.gz: 043a9f772592a874b40a8325cb501a80b8b6acd36b3041fc3923a679b5e9826f37fbccb609041212bf2068bf55959fd291e2111f2523424a6f191edb996e18e0
+  data.tar.gz: 566a87841753105ac4c180ab94056f660974f08ad20d18633f665fc5d1eadea71e7fa7c27e8253ecebd953688ea11d5c481dfd69ed665eb910f9a8366e6c1d1e

data/lib/spoll/client.rb

@@ -19,10 +19,12 @@ module Spoll
     end
 
     def get_match(id, params = {})
-      response = get("/matches/#{id}", params)
-      r = Spoll::Response.new(response)
-      r.match = Models::Match.new(response.parsed)
-      r
+      json = get("/matches/#{id}", params)
+      response = Spoll::Response.new(json)
+      match = Models::Match.new(json.parsed['match'])
+      match.set_relations(response)
+      response.match = match
+      response
     end
 
     def get_events(params)
@@ -30,7 +32,12 @@ module Spoll
     end
 
     def get_event(id, params = {})
-      get("/events/#{id}", params)
+      json = get("/events/#{id}", params)
+      response = Spoll::Response.new(json)
+      event = Models::Event.new(json.parsed['event'])
+      event.set_relations(response)
+      response.event = event
+      response
     end
 
     private
@@ -72,8 +79,7 @@ module Spoll
           error.response
         end
       end
-
     end
-  end
 
+  end
 end

data/lib/spoll/models/base.rb

@@ -2,6 +2,23 @@ module Spoll::Models
   class Base
     include Virtus.model(nullify_blank: true)
 
+    attribute :id, Integer
+
+    def set_relations(response)
+    end
+
+    def set_relation(relation, data, primary_key, foreign_key)
+      record = find_by(data, primary_key, send(foreign_key))
+      send("#{relation}=", record)
+    end
+
+    def set_array_relation(relation, data, primary_key, foreign_key)
+      records = find_all(data, primary_key, send(foreign_key))
+      send("#{relation}=", records)
+    end
+
+    private
+
     def find_by(json, key, value)
       json.each do |record|
         return record if record[key].eql?(value)
@@ -9,5 +26,16 @@ module Spoll::Models
 
       nil
     end
+
+    def find_all(json, key, value)
+      result = []
+
+      json.each do |record|
+        result << record if record[key].eql?(value)
+      end
+
+      result
+    end
+
   end
 end

data/lib/spoll/models/event.rb

@@ -1,16 +1,17 @@
 module Spoll::Models
   class Event < Base
+    attr_accessor :event_type, :match
+
     attribute :minute, Integer
     attribute :comments_count, Integer
     attribute :agrees, Integer
     attribute :disagrees, Integer
     attribute :event_type_id, Integer
-    attribute :event_type, EventType
+    attribute :match_id, Integer
 
-    def set_event_type(event_types)
-      if event_types.present?
-        self.event_type = find_by(event_types, 'id', event_type_id)
-      end
+    def set_relations(response)
+      set_relation(:event_type, response.event_types, 'id', :event_type_id)
+      set_relation(:match, response.matches, 'id', :match_id)
     end
   end
 end

data/lib/spoll/models/match.rb

@@ -1,50 +1,17 @@
 module Spoll::Models
   class Match < Base
+    attr_accessor :events, :home_team, :away_team
+
     attribute :start_time, DateTime
-    attribute :home_team, Team
-    attribute :away_team, Team
     attribute :status, String
     attribute :home_team_id, Integer
     attribute :away_team_id, Integer
-    attribute :events, Array[Event]
-
-    def initialize(json)
-      match = json['match']
-
-      self.start_time   = match['start_time']
-      self.status       = match['status']
-      self.home_team_id = match['home_team_id']
-      self.away_team_id = match['away_team_id']
-      include_teams(json['teams'])
-      include_events(json['events'], json['event_types'])
-    end
-
-    private
 
-    def include_teams(teams)
-      if teams.present?
-        self.home_team  = init_team(teams, home_team_id)
-        self.away_team  = init_team(teams, away_team_id)
-      end
+    def set_relations(response)
+      set_array_relation(:events, response.events, 'match_id', :id)
+      set_relation(:home_team, response.teams, 'id', :home_team_id)
+      set_relation(:away_team, response.teams, 'id', :away_team_id)
     end
 
-    def include_events(events, event_types)
-      if events.present?
-        all = []
-
-        events.each do |event|
-          e = Event.new(event)
-          e.set_event_type(event_types)
-          all << e
-        end
-
-        self.events = all
-      end
-    end
-
-    def init_team(json, id)
-      team = find_by(json, 'id', id)
-      Team.new(team)
-    end
   end
 end

data/lib/spoll/response.rb

@@ -1,13 +1,56 @@
 module Spoll
   class Response
-    attr_accessor :match
+    attr_accessor :match, :matches,
+                  :event, :events,
+                  :event_type, :event_types,
+                  :teams, :team
+
 
     def initialize(response)
-      @response = response
+      @response    = response
+      @matches     = []
+      @events      = []
+      @event_types = []
+      @teams       = []
+
+      includes = [
+        { model: Spoll::Models::Match, key: 'matches', attribute:  @matches },
+        { model: Spoll::Models::Event, key: 'events', attribute:  @events },
+        { model: Spoll::Models::EventType, key: 'event_types', attribute:  @event_types },
+        { model: Spoll::Models::Team, key: 'teams', attribute:  @teams }
+      ]
+
+      load_includes(includes)
+      set_relations(includes)
     end
 
     def status
       @response.status
     end
+
+    private
+
+    def load_includes(includes)
+      includes.each do |hash|
+        load_include(hash[:model], hash[:key], hash[:attribute])
+      end
+    end
+
+    def load_include(model, key, attribute)
+      if @response.parsed.key?(key)
+        @response.parsed[key].each do |record|
+          attribute << model.new(record)
+        end
+      end
+    end
+
+    def set_relations(includes)
+      includes.each do |hash|
+        hash[:attribute].each do |record|
+          record.set_relations(self)
+        end
+      end
+    end
+
   end
 end

data/lib/spoll/version.rb

@@ -1,3 +1,3 @@
 module Spoll
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoll
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - "İ. Emre Kutlu"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2