playlyfe_client 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 193418f3fbbd9cb946f415e2c90e8277a134153e
-  data.tar.gz: 4774b952eca4d59831f33755454f5512f2cd7ff9
+  metadata.gz: 170a7ef3d15bd9bb481d9e1ba25913fec61f3f3a
+  data.tar.gz: ed8b757df181b7e8379e12c4ff6830df4ee0be88
 SHA512:
-  metadata.gz: 33b415033499ea4b757a90e4942e8c6e3dffa613e9c615b5ef7bc93cda7916d9902c937538d5ae16650b24e535739fc95be9236fd90b97b1724300a87ae11159
-  data.tar.gz: c7299c3e9c1c1a61c82fb873b9d4b87b0da568b435b4e9a4858492375f1be4aff0177fd0caec357918d1f73ff25ee8616f53ee81bb0c71f01b0538115fd6fccc
+  metadata.gz: 525d488f25edd8ecf245c541acaa90dca294cdca4064ebd70fef8e118ccdda60572e80f6b9c0ed3b8b7a571c99295b5fb43728ea71e0978293668938a672e569
+  data.tar.gz: 91ba1e4b33d306f0a5732bc18e89d23baea470ddf307e5d2a8788f7336f9884d7db759f4a19b99e24aab1fe8700b5484c26e03a8def8d156163e9b6bd9096295

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    playlyfe_client (1.0.6)
+    playlyfe_client (1.1.0)
       json
       jwt
       rest-client
@@ -13,7 +13,7 @@ GEM
     builder (3.2.2)
     byebug (9.0.5)
     coderay (1.1.1)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -61,4 +61,4 @@ DEPENDENCIES
   rest-client
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/README.md

@@ -48,8 +48,8 @@ Or install it yourself as:
 
 ## Usage
 
-You have to setup a client at PlaylyfeClient which can access API (only paid plans) form your backend.
-Client shoul have 'Client Credential Flow' , all checks at config page should be on YES and should have all scopes with RW access.
+You have to setup a client at PlaylyfeClient which can access API (only paid plans) from your backend.
+Client should have 'Client Credential Flow' , all checks at config page should be on YES and should have all scopes with RW access.
 
 Then in your code initialize connection:
   

data/lib/playlyfe_client/connection.rb

@@ -139,7 +139,7 @@ module PlaylyfeClient
           if response.body == 'null'
             return nil
           else
-            return JSON.parse(response.body)
+            return JSON.parse(response.body)#, symbolize_names: true)
           end
         end
       rescue => e

data/lib/playlyfe_client/errors.rb

@@ -11,6 +11,7 @@ module PlaylyfeClient
   class MetricError < PlaylyfeClient::Error; end
   class PlaylyfeClient::ActionRateLimitExceededError < PlaylyfeClient::ActionError; end
   class PlaylyfeClient::PlayerExistsError < PlaylyfeClient::PlayerError; end
+  class PlaylyfeClient::CollectionFindOneIsNotSupportedError < PlaylyfeClient::Error; end
 
   class Error < StandardError
     attr_accessor :name, :message

data/lib/playlyfe_client/game.rb

@@ -24,6 +24,10 @@ module PlaylyfeClient
       []
     end
 
+    def events
+      []
+    end  
+
     private
 
       def initialize(conn)

data/lib/playlyfe_client/player.rb

@@ -68,7 +68,7 @@ module PlaylyfeClient
       []
     end  
 
-    def activities(start_time=nil,end_time=nil)
+    def events(start_time=nil,end_time=nil)
       []
     end
 

data/lib/playlyfe_client/team.rb

@@ -17,6 +17,10 @@ module PlaylyfeClient
       []
     end
 
+    def events
+      []
+    end  
+
     private
 
       def initialize(game)

data/lib/playlyfe_client/v2/collection/event_collection.rb

@@ -0,0 +1,37 @@
+require_relative "../collection.rb"
+require_relative "../event.rb"
+#require_relative "../event/process/*.rb"
+#require_relative "../event/team/*.rb"
+
+module PlaylyfeClient
+  module V2
+    class EventCollection < PlaylyfeClient::V2::Collection
+     
+      def find(str)
+        e=PlaylyfeClient::CollectionFindOneIsNotSupportedError.new
+        e.name="Find item is not supported"
+        e.message="This collections has no unique key, so no use for collection.find."
+        raise e
+      end  
+      
+      private
+
+        def initialize(game, event_array=[], player_team_or_process=nil)  
+          @game= game
+          @items=[]
+          event_array= game.connection.get_game_events_array if event_array == []
+          fill_items(event_array,player_team_or_process)
+        end
+        
+        def fill_items(hash_array, player_team_or_process)  
+          hash_array.each do |event_hash|
+          #  binding.pry
+            @items << PlaylyfeClient::V2::Event.build(event_hash, @game, player_team_or_process)
+          end  
+        end  
+        
+         
+    end  
+  end
+end    
+     

data/lib/playlyfe_client/v2/connection.rb

@@ -1,4 +1,3 @@
-
 require_relative "../connection.rb"
 
 module PlaylyfeClient
@@ -82,14 +81,11 @@ module PlaylyfeClient
         get("/runtime/definitions/metrics", {player_id: player_id})
       end  
 
-      def get_full_activity_feed_array(player_id, start_time=nil, end_time=nil)
-        start_str=start_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") if start_time.kind_of?(Time)
-        end_str=end_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") if start_time.kind_of?(Time)
-
+      def get_player_events_array(player_id, start_time=nil, end_time=nil)
         #/admin/players/player2/activity?start=2016-05-01T00:00:00Z&end=2016-05-21T00:00:00Z
         if start_time
           #get specified period of time
-          get("/admin/players/#{player_id}/activity",{"start" => start_str, "end" => end_str})
+          get("/admin/players/#{player_id}/activity",{"start" => start_str(start_time), "end" => end_str(end_time)})
         else
           #get last 24 hours
           get("/admin/players/#{player_id}/activity")
@@ -102,8 +98,38 @@ module PlaylyfeClient
 
       def delete_player(player_id)
         delete("/admin/players/#{player_id}")
+      end
+
+      def get_game_events_array(start_time=nil, end_time=nil)
+        if start_time
+          #get specified period of time
+          get("/admin/activity",{"start" => start_str(start_time), "end" => end_str(end_time)})
+        else
+          #get last 24 hours
+          get("/admin/activity")
+        end 
       end  
 
+      def get_team_events_array(team_id, start_time=nil, end_time=nil)
+        if start_time
+          #get specified period of time
+          get("/admin/teams/#{team_id}/activity",{"start" => start_str(start_time), "end" => end_str(end_time)})
+        else
+          #get last 24 hours
+          get("/admin/teams/#{team_id}/activity")
+        end 
+      end  
+
+      private
+
+        def start_str(start_time)
+          start_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") if start_time.kind_of?(Time)
+        end  
+
+        def end_str(end_time)
+          end_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") if end_time.kind_of?(Time)
+        end  
+
     end  
   end
 end

data/lib/playlyfe_client/v2/event/player_event.rb

@@ -0,0 +1,101 @@
+module PlaylyfeClient
+  module V2
+    module PlayerEvent 
+      class Base < PlaylyfeClient::V2::Event
+        attr_reader :actor_id, :actor_alias #who trigger event  (player or admin)
+        attr_reader :player_id, :player_alias #who receive results of event (player)
+        attr_reader :rule , :process, :action #what triggers event
+        attr_reader :count #The count with which the action was played.
+        attr_reader :changes
+
+        def player
+          game.players.find(player_id)
+        end  
+
+        private
+
+        def initialize(ev_hash,game,player=nil)
+          super(ev_hash,game)
+
+          
+          if @ev_hash.has_key?("actor")
+            @actor_id=@ev_hash["actor"]["id"]
+            @actor_alias=@ev_hash["actor"]["alias"]
+          else  
+            if player.nil?
+              raise "cannot create actor from hash #{@ev_hash} and player #{player}"
+            else
+              @actor_id=player.id
+              @actor_alias=player.alias
+            end  
+          end  
+
+          @rule= @ev_hash["rule"]["id"] unless @ev_hash["rule"].nil?
+          @process= @ev_hash["process"]["id"] unless @ev_hash["process"].nil?
+          @action= @ev_hash["action"]["id"] unless @ev_hash["action"].nil?
+          @count= @ev_hash["count"] || 0
+
+          @player_id=@actor_id
+          @player_alias=@actor_alias
+          if @ev_hash.has_key?("player")
+            @player_id=@ev_hash["player"]["id"]
+            @player_alias=@ev_hash["player"]["alias"]
+          end  
+
+          set_changes
+
+        end 
+ 
+        def set_changes
+          @changes=[]
+          return @changes if @ev_hash["changes"].nil?
+
+          for ch in @ev_hash["changes"]
+            
+            if ch["delta"].has_key?("old")
+              chng={delta: [ ch["delta"]["old"], ch["delta"]["new"] ]}
+            else
+              k=ch["delta"].keys.first
+              chng={delta: [ ch["delta"][k]["old"], ch["delta"][k]["new"], k ]}
+            end  
+            chng[:metric]=game.metrics.find(ch["metric"]["id"])
+            
+            @changes <<  chng
+          end  
+        end 
+
+       
+      end
+   
+      class LevelChangedEvent < PlaylyfeClient::V2::PlayerEvent::Base; end
+      class AchievementEvent < PlaylyfeClient::V2::PlayerEvent::Base; end
+      class ActionPlayedEvent < PlaylyfeClient::V2::PlayerEvent::Base; end
+      class CustomRuleAppliedEvent < PlaylyfeClient::V2::PlayerEvent::Base; end
+      class ScoreUpdatedByAdminEvent < PlaylyfeClient::V2::PlayerEvent::Base; end
+
+      class Base
+
+        def self.build(ev_hash, game, player=nil)      
+          case ev_hash["event"] 
+            when "level"
+              klass= LevelChangedEvent
+            when  "action"
+              klass= ActionPlayedEvent
+            when "achievement"  
+              klass= AchievementEvent
+            when "custom_rule"  
+              klass= CustomRuleAppliedEvent
+            when "score"
+              klass= ScoreUpdatedByAdminEvent
+            else  
+              return nil  
+          end  
+
+          return klass.new(ev_hash, game, player)
+        end  
+
+      end    
+    end  
+  end
+end  
+

data/lib/playlyfe_client/v2/event/process_event.rb

@@ -0,0 +1,88 @@
+module PlaylyfeClient
+  module V2
+    module ProcessEvent 
+      class Base < PlaylyfeClient::V2::Event
+          
+        private
+
+        def initialize(ev_hash,game,process_or_player=nil)
+          super(ev_hash,game)
+
+        end 
+
+      end
+         
+      class ProcessCreatedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class RequestToJoinEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class JoinAcceptedEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "player"; end; end
+      class JoinRejectedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class InviteSendEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "invitee"; end; end
+      class InviteAcceptedEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "inviter"; end; end
+      class InviteRejectedEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "inviter"; end; end
+      class JoinedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class RolesChangedEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; (event == "role:assign" ? "player" : nil ); end; end
+      class RequestForChangeOfRolesEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class ChangeOfRolesAcceptedEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "player"; end; end
+      class ChangeOfRolesRejectedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class KickedOutEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "player"; end; end
+      class LeavedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class ProcessDeletedEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+      class ProcessOwnershipTransferredEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "new_owner"; end; end
+      class ProgressEvent < PlaylyfeClient::V2::ProcessEvent::Base; def target_key; "new_owner"; end; end
+      class ResolutionEvent < PlaylyfeClient::V2::ProcessEvent::Base; end
+
+      class Base
+
+        def self.build(ev_hash, game, process=nil)      
+          case ev_hash["event"] 
+            when "create"
+              klass= ProcessCreatedEvent
+            when  "delete"
+              klass= ProcessDeletedEvent
+            when "join"  
+              klass= JoinedEvent
+            when "join:request"  
+              klass= RequestToJoinEvent
+            when "leave"
+              klass= LeavedEvent
+            when "role:change","role:assign"
+              klass= RolesChangedEvent
+            when "role:request"
+              klass= RequestForChangeOfRolesEvent 
+            when "join:request:accept"
+              klass= JoinAcceptedEvent
+            when "role:request:accept"
+              klass= ChangeOfRolesAcceptedEvent
+            when "join:request:reject"
+              klass= JoinRejectedEvent
+            when "invite"
+              klass= InviteSendEvent
+            when "invite:accept"
+              klass= InviteAcceptedEvent
+            when "invite:reject"
+              klass= InviteRejectedEvent
+            when "kick"
+              klass= KickedOutEvent
+            when "transfer"
+              klass= ProcessOwnershipTransferredEvent
+            when "progress"
+              klass=ProgressEvent
+            when "resolution"  
+              klass=ResolutionEvent 
+            else  
+              return nil  
+          end  
+
+          return klass.new(ev_hash, game, player)
+        end 
+
+        def two_player_event?
+          [JoinAcceptedEvent,ChangeOfRolesAcceptedEvent,InviteSendEvent,InviteAcceptedEvent,InviteRejectedEvent, KickedOutEvent,RolesChangedEvent,TeamOwnershipTransferredEvent].include?(self.class)
+        end 
+
+      end    
+    end  
+  end
+end  
+
+

data/lib/playlyfe_client/v2/event/team_event.rb

@@ -0,0 +1,196 @@
+module PlaylyfeClient
+  module V2
+    module TeamEvent 
+      class Base < PlaylyfeClient::V2::Event
+        attr_reader :from_player_id, :from_player_alias #who trigger event  (player or admin)
+        attr_reader :target_player_id, :target_player_alias #who recieve effects of event
+        attr_reader :team_id, :team_name
+        attr_reader :roles, :changes
+          
+        def from_player
+          @from_player ||=game.players.find(from_player_id)
+        end 
+        alias_method :actor, :from_player
+        alias_method :actor_id, :from_player_id
+        alias_method :actor_alias, :from_player_alias
+
+        def target_player 
+          @tagert_player=game.players.find(target_player_id)
+        end
+        alias_method :inviter, :target_player  
+        alias_method :invitee, :target_player  
+        alias_method :new_owner, :target_player  
+        alias_method :player, :target_player  
+
+        alias_method :inviter_id, :target_player_id  
+        alias_method :invitee_id, :target_player_id  
+        alias_method :new_owner_id, :target_player_id  
+        alias_method :player_id, :target_player_id  
+
+        alias_method :inviter_alias, :target_player_alias  
+        alias_method :invitee_alias, :target_player_alias  
+        alias_method :new_owner_alias, :target_player_alias  
+        alias_method :player_alias, :target_player_alias  
+
+        def team
+          @team ||=game.teams.find(team_id)
+        end 
+       
+        private
+
+        def initialize(ev_hash,game,team_or_player=nil)
+          super(ev_hash,game)
+          
+          set_from_player(team_or_player)
+          set_target_player(team_or_player)
+          set_team(team_or_player)
+          set_roles
+          set_changes
+
+        end 
+
+        def set_from_player(team_or_player)
+          if @ev_hash["actor"].nil?
+            if team_or_player.kind_of?(PlaylyfeClient::Player)
+              @from_player_id=team_or_player.id
+              @from_player_alias=team_or_player.alias
+            else
+              raise "cannot create actor/from_player from hash #{@ev_hash} and player #{team_or_player}"  
+            end
+          else    
+            @from_player_id=@ev_hash["actor"]["id"]
+            @from_player_alias=@ev_hash["actor"]["alias"]
+          end  
+        end
+
+
+        def target_key
+          nil
+        end
+          
+        def set_target_player(team_or_player)
+          return if target_key.nil?
+          
+          if @ev_hash[target_key].nil?
+            if two_player_event?
+              if team_or_player.kind_of?(PlaylyfeClient::Player) 
+                @target_player_id=team_or_player.id
+                @target_player_alias=team_or_player.alias
+              else
+                raise "cannot create #{target_key} from hash #{@ev_hash} and player #{team_or_player}"  
+              end
+            end  
+          else    
+            @target_player_id=@ev_hash[target_key]["id"]
+            @target_player_alias=@ev_hash[target_key]["alias"]
+          end  
+        end
+
+        def set_team(team_or_player)
+          if @ev_hash["team"].nil?
+            if team_or_player.kind_of?(PlaylyfeClient::Team)
+              @team_id=team_or_player.id
+              @team_name=team_or_player.name
+            else
+              raise "cannot create team from hash #{@ev_hash} and team #{team_or_player}"  
+            end
+          else    
+            @team_id=@ev_hash["team"]["id"]
+            @team_name=@ev_hash["team"]["name"]
+          end  
+        end
+
+        def set_changes
+          @changes=[]
+          roles=[]
+          return @changes if @ev_hash["changes"].nil?
+
+          @ev_hash["changes"].keys.each do |role|
+            chng={delta: [ @ev_hash["changes"][role]["old"], @ev_hash["changes"][role]["new"], role ]}
+            @changes <<  chng
+            roles << role if @ev_hash["changes"][role]["new"] == true
+          end  
+          @roles = (@roles+roles).uniq
+          @changes
+        end 
+
+
+        def set_roles
+          @roles=[]
+          return @roles if @ev_hash["roles"].nil?
+
+          for k in @ev_hash["roles"].keys
+            @roles <<  k if @ev_hash["roles"][k] 
+          end  
+          @roles
+        end  
+      end
+         
+      class TeamCreatedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class RequestToJoinEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class JoinAcceptedEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "player"; end; end
+      class JoinRejectedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class InviteSendEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "invitee"; end; end
+      class InviteAcceptedEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "inviter"; end; end
+      class InviteRejectedEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "inviter"; end; end
+      class JoinedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class RolesChangedEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; (event == "role:assign" ? "player" : nil ); end; end
+      class RequestForChangeOfRolesEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class ChangeOfRolesAcceptedEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "player"; end; end
+      class ChangeOfRolesRejectedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class KickedOutEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "player"; end; end
+      class LeavedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class TeamDeletedEvent < PlaylyfeClient::V2::TeamEvent::Base; end
+      class TeamOwnershipTransferredEvent < PlaylyfeClient::V2::TeamEvent::Base; def target_key; "new_owner"; end; end
+
+      class Base
+
+        def self.build(ev_hash, game, player=nil)      
+          case ev_hash["event"] 
+            when "create"
+              klass= TeamCreatedEvent
+            when  "delete"
+              klass= TeamDeletedEvent
+            when "join"  
+              klass= JoinedEvent
+            when "join:request"  
+              klass= RequestToJoinEvent
+            when "leave"
+              klass= LeavedEvent
+            when "role:change","role:assign"
+              klass= RolesChangedEvent
+            when "role:request"
+              klass= RequestForChangeOfRolesEvent 
+            when "join:request:accept"
+              klass= JoinAcceptedEvent
+            when "role:request:accept"
+              klass= ChangeOfRolesAcceptedEvent
+            when "join:request:reject"
+              klass= JoinRejectedEvent
+            when "invite"
+              klass= InviteSendEvent
+            when "invite:accept"
+              klass= InviteAcceptedEvent
+            when "invite:reject"
+              klass= InviteRejectedEvent
+            when "kick"
+              klass= KickedOutEvent
+            when "transfer"
+              klass= TeamOwnershipTransferredEvent
+            else  
+              return nil  
+          end  
+
+          return klass.new(ev_hash, game, player)
+        end 
+
+        def two_player_event?
+          [JoinAcceptedEvent,ChangeOfRolesAcceptedEvent,InviteSendEvent,InviteAcceptedEvent,InviteRejectedEvent, KickedOutEvent,RolesChangedEvent,TeamOwnershipTransferredEvent].include?(self.class)
+        end 
+
+      end    
+    end  
+  end
+end  
+
+

data/lib/playlyfe_client/v2/event.rb

@@ -0,0 +1,42 @@
+module PlaylyfeClient
+  module V2
+    class Event
+      attr_reader :event, :timestamp, :game 
+      
+      def created_at
+        @timestamp
+      end  
+      
+      private 
+          
+        def initialize(ev_hash,game)
+          @event=ev_hash[:event] || ev_hash["event"]
+          ts=ev_hash[:timestamp] || ev_hash["timestamp"]
+          @timestamp= (ts.kind_of?(Time) ? ts : Time.parse(ts) )
+          @game=game
+          @ev_hash=ev_hash
+        end    
+  
+    end  
+  end
+end  
+
+require_relative "./event/player_event.rb"
+require_relative "./event/team_event.rb"
+require_relative "./event/process_event.rb"
+
+
+module PlaylyfeClient
+  module V2
+    class Event
+   
+      def self.build(ev_hash, game, team_player_or_process=nil)   
+        event= PlaylyfeClient::V2::PlayerEvent::Base.build(ev_hash,game,team_player_or_process)
+        event= PlaylyfeClient::V2::TeamEvent::Base.build(ev_hash,game,team_player_or_process) if event.nil?
+        event= PlaylyfeClient::V2::ProcessEvent::Base.build(ev_hash,game,team_player_or_process) if event.nil?
+        return event #could be nil!
+      end    
+    end  
+  end
+end  
+

data/lib/playlyfe_client/v2/game.rb

@@ -4,6 +4,7 @@ require_relative "./collection/team_collection.rb"
 require_relative "./collection/leaderboard_collection.rb"
 require_relative "./collection/action_collection.rb"
 require_relative "./collection/metric_collection.rb"
+require_relative "./collection/event_collection.rb"
 
 require_relative "../game.rb"
 
@@ -49,6 +50,10 @@ module PlaylyfeClient
         puts(data)
       end  
 
+      def events
+        @events ||= PlaylyfeClient::V2::EventCollection.new(self)
+      end  
+
       private
 
         def initialize(conn)    

data/lib/playlyfe_client/v2/player.rb

@@ -56,23 +56,8 @@ module PlaylyfeClient
         game.leaderboards.for_players
       end  
 
-      def activities(start_time=nil,end_time=nil)
-        unless defined?(@activities)
-          #loading all activities for player (not restricted to some time period, ALL of them!)
-          @activities = build_activities_from(game.connection.get_full_activity_feed_array(self.id,self.game.created_at,Time.now.utc))
-        end  
-        
-        activities=@activities  
-        
-        if start_time
-          activities=activities.select {|act| act["timestamp"] > start_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") }
-        end    
-
-        if end_time
-          activities=activities.select {|act| act["timestamp"] < end_time.utc.strftime("%Y-%m-%dT%H:%M:%S.%LZ") }
-        end   
-        
-        return activities
+      def events(start_time=nil,end_time=nil)
+        @events ||= PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_player_events_array(self.id,start_time, end_time), self)
       end
    
       private 
@@ -128,12 +113,6 @@ module PlaylyfeClient
           (value.each.collect {|item| {name: item["name"], count: item["count"].to_i} } )
         end  
 
-        def build_activities_from(array_of_hashes)
-          #https://dev.playlyfe.com/docs/events.html
-          #TODO: DO a Events :: now, just simple hashes
-          array_of_hashes
-        end  
-
     end
   end
 end  

data/lib/playlyfe_client/v2/team.rb

@@ -13,6 +13,10 @@ module PlaylyfeClient
       def leaderboards
         @game.leaderboards.for_teams
       end
+
+      def events(start_time=nil,end_time=nil)
+        @events ||= PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_team_events_array(self.id,start_time, end_time), self)
+      end
    
       private 
       

data/lib/playlyfe_client/version.rb

@@ -1,3 +1,3 @@
 module PlaylyfeClient
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playlyfe_client
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Foton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -147,11 +147,16 @@ files:
 - lib/playlyfe_client/v2/action.rb
 - lib/playlyfe_client/v2/collection.rb
 - lib/playlyfe_client/v2/collection/action_collection.rb
+- lib/playlyfe_client/v2/collection/event_collection.rb
 - lib/playlyfe_client/v2/collection/leaderboard_collection.rb
 - lib/playlyfe_client/v2/collection/metric_collection.rb
 - lib/playlyfe_client/v2/collection/player_collection.rb
 - lib/playlyfe_client/v2/collection/team_collection.rb
 - lib/playlyfe_client/v2/connection.rb
+- lib/playlyfe_client/v2/event.rb
+- lib/playlyfe_client/v2/event/player_event.rb
+- lib/playlyfe_client/v2/event/process_event.rb
+- lib/playlyfe_client/v2/event/team_event.rb
 - lib/playlyfe_client/v2/game.rb
 - lib/playlyfe_client/v2/leaderboard.rb
 - lib/playlyfe_client/v2/leaderboard/players_leaderboard.rb