spoll 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c96351fb151e16778a9bf6d8d47ccdf88bd30a
-  data.tar.gz: e6e8ead477d379bc25b94bb3d7e8cbf49fd70d43
+  metadata.gz: e4c93138850732759a693db59dfc427df18a4373
+  data.tar.gz: 11442e2b93c26c15628bbaf4810f9feb25f7743b
 SHA512:
-  metadata.gz: 043a9f772592a874b40a8325cb501a80b8b6acd36b3041fc3923a679b5e9826f37fbccb609041212bf2068bf55959fd291e2111f2523424a6f191edb996e18e0
-  data.tar.gz: 566a87841753105ac4c180ab94056f660974f08ad20d18633f665fc5d1eadea71e7fa7c27e8253ecebd953688ea11d5c481dfd69ed665eb910f9a8366e6c1d1e
+  metadata.gz: cfb0e5fa0a51855c086ccd07bd2ae8c3da7f77d85275f6f32ce12c2fad6c22d6f77d8f238e1ea4e50ac92d9d2e59c77f21d26de794553b9c52d67c980992590a
+  data.tar.gz: e6b7cf1c1e4148f1d1ee3bbf8d28cd0e77d55410a6bf5aec3daa0915aecc57f7119e2e269334b04eba941cc79eacb71e2edd7a4cd9721da055bf0199eb30d42f

data/lib/spoll/client.rb

@@ -19,12 +19,7 @@ module Spoll
     end
 
     def get_match(id, params = {})
-      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
+      get("/matches/#{id}", params)
     end
 
     def get_events(params)
@@ -32,12 +27,7 @@ module Spoll
     end
 
     def get_event(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
+      get("/events/#{id}", params)
     end
 
     private
@@ -60,7 +50,8 @@ module Spoll
 
     def request(method, url, params, body)
       with_retry do
-        token.send(method, "/#{version}/#{url}", headers: HEADERS, params: params, body: body.to_json)
+        json = token.send(method, "/#{version}/#{url}", headers: HEADERS, params: params, body: body.to_json)
+        Spoll::Response.new(json)
       end
     end
 

data/lib/spoll/response.rb

@@ -14,10 +14,11 @@ module Spoll
       @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 }
+        { model: Spoll::Models::Match, key: 'match', attribute:  'match' },
+        { 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)
@@ -38,16 +39,31 @@ module Spoll
 
     def load_include(model, key, attribute)
       if @response.parsed.key?(key)
-        @response.parsed[key].each do |record|
-          attribute << model.new(record)
+        parsed = @response.parsed[key]
+
+        if parsed.is_a?(Array)
+          load_array(attribute, parsed, model)
+        else
+          load_single(attribute, parsed, model)
         end
       end
     end
 
+    def load_array(attribute, array, model)
+      array.each do |record|
+        send(attribute) << model.new(record)
+      end
+    end
+
+    def load_single(attribute, value, model)
+      self.send("#{attribute}=", model.new(value))
+    end
+
     def set_relations(includes)
       includes.each do |hash|
-        hash[:attribute].each do |record|
-          record.set_relations(self)
+        [*hash[:attribute]].each do |record|
+          attribute = send(record)
+          attribute.set_relations(self) if attribute.present?
         end
       end
     end

data/lib/spoll/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoll
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - "İ. Emre Kutlu"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: API client for spoll