playlyfe_client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170a7ef3d15bd9bb481d9e1ba25913fec61f3f3a
-  data.tar.gz: ed8b757df181b7e8379e12c4ff6830df4ee0be88
+  metadata.gz: f60f5a03a4b845f9fa638d24b10d74fde2e4b3e2
+  data.tar.gz: 9704cd30d13338af3b5627a91536968e94c4ca7b
 SHA512:
-  metadata.gz: 525d488f25edd8ecf245c541acaa90dca294cdca4064ebd70fef8e118ccdda60572e80f6b9c0ed3b8b7a571c99295b5fb43728ea71e0978293668938a672e569
-  data.tar.gz: 91ba1e4b33d306f0a5732bc18e89d23baea470ddf307e5d2a8788f7336f9884d7db759f4a19b99e24aab1fe8700b5484c26e03a8def8d156163e9b6bd9096295
+  metadata.gz: 46decdb377e1314c6b3f3142bc239fc5c79d8ca9cf8df771a5a578efa58abdfee4d97abca2cdfe66ecd592fc61a4202910b00b77f76d9c13fd7ee81e2ccf1e77
+  data.tar.gz: 7004a254a84bb638da2ecc8edda3ff07562d363e035b143d95da01c3ad4bdfc8aca22809810a5362b19f805e8dd1933d6b28833808856402cc259cb8e42fba06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    playlyfe_client (1.1.0)
+    playlyfe_client (1.1.1)
       json
       jwt
       rest-client

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

@@ -4,7 +4,7 @@ module PlaylyfeClient
       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 :rule_id , :rule_name,  :process_id, :process_name, :action_id, :action_name #what triggers event
         attr_reader :count #The count with which the action was played.
         attr_reader :changes
 
@@ -12,6 +12,19 @@ module PlaylyfeClient
           game.players.find(player_id)
         end  
 
+        def rule
+          rule_id #todo
+        end
+
+        def process
+          process_id #todo
+        end  
+        
+        def action
+          return nil if action_id.nil?
+          game.actions.find(action_id)
+        end    
+
         private
 
         def initialize(ev_hash,game,player=nil)
@@ -30,9 +43,14 @@ module PlaylyfeClient
             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?
+          ["action", "rule", "process"].each do |att|
+            unless @ev_hash[att].nil?  
+              instance_variable_set("@#{att}_id", @ev_hash[att]["id"])
+              instance_variable_set("@#{att}_name", @ev_hash[att]["name"])
+            end
+          end  
+         
+
           @count= @ev_hash["count"] || 0
 
           @player_id=@actor_id

data/lib/playlyfe_client/v2/game.rb

@@ -49,9 +49,14 @@ module PlaylyfeClient
         data=connection.get_game_image_data
         puts(data)
       end  
-
-      def events
-        @events ||= PlaylyfeClient::V2::EventCollection.new(self)
+ 
+      #results are cached if start_time is nil (events for last 24 hours), otherwise direct call to Playlyfe is made
+      def events(start_time=nil,end_time=nil)
+        if start_time.nil?
+          @events ||= PlaylyfeClient::V2::EventCollection.new(self)
+        else  
+          PlaylyfeClient::V2::EventCollection.new(self, self.connection.get_game_events_array(start_time, end_time))
+        end
       end  
 
       private

data/lib/playlyfe_client/v2/player.rb

@@ -36,8 +36,11 @@ module PlaylyfeClient
         end  
       end
       
-      def scores
-        @scores||=fill_scores
+      def scores(force_refill=false)
+        if (!defined?(@scores) || force_refill)
+          @scores=fill_scores
+        end
+        @scores  
       end
 
       def roles_in_team(team)
@@ -56,8 +59,13 @@ module PlaylyfeClient
         game.leaderboards.for_players
       end  
 
+      #results are cached if start_time is nil, otherwise, direct call to Playlyfe is made
       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)
+        if start_time.nil?
+          @events ||= PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_player_events_array(self.id), self)
+        else  
+          PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_player_events_array(self.id, start_time, end_time), self)
+        end
       end
    
       private 

data/lib/playlyfe_client/v2/team.rb

@@ -13,9 +13,14 @@ module PlaylyfeClient
       def leaderboards
         @game.leaderboards.for_teams
       end
-
+      
+      #results are cached if start_time is nil (events for last 24 hours), otherwise direct call to Playlyfe is made
       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)
+        if start_time.nil?
+          @events ||= PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_team_events_array(self.id), self)
+        else
+          PlaylyfeClient::V2::EventCollection.new(game, game.connection.get_team_events_array(self.id,start_time, end_time), self)
+        end
       end
    
       private 

data/lib/playlyfe_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playlyfe_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Foton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json