playlyfe_client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f60f5a03a4b845f9fa638d24b10d74fde2e4b3e2
-  data.tar.gz: 9704cd30d13338af3b5627a91536968e94c4ca7b
+  metadata.gz: 27a6645e14ef7e0623cb4d51483aa4ad7200e365
+  data.tar.gz: c606bd525855f1d96e91bc466a07eb58d4b571fb
 SHA512:
-  metadata.gz: 46decdb377e1314c6b3f3142bc239fc5c79d8ca9cf8df771a5a578efa58abdfee4d97abca2cdfe66ecd592fc61a4202910b00b77f76d9c13fd7ee81e2ccf1e77
-  data.tar.gz: 7004a254a84bb638da2ecc8edda3ff07562d363e035b143d95da01c3ad4bdfc8aca22809810a5362b19f805e8dd1933d6b28833808856402cc259cb8e42fba06
+  metadata.gz: b770fa236cd02b1058338588f87bbbdc9eae67fa050124cc3fe9e542f8ee3e4e7d1ae06771cbf44bae09c3394cca6064bd049d3c719ebf73a3d9b08276a7d61a
+  data.tar.gz: 6b0878013d909a7f53fa3423b67e968f1a317c41bee1460a0f8da26ca0e6f6825c5da482c7c0ae5450223e99d8d67245f4cf7d93e95f7559d11fb48042c591d3

data/Gemfile.lock

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

data/lib/playlyfe_client/connection.rb

@@ -34,6 +34,7 @@ module PlaylyfeClient
       @store = options[:store]
       @load = options[:load]
       @redirect_uri = options[:redirect_uri]
+      @skip_api_calls_limit_exceeded_error=options[:skip_api_calls_limit_exceeded_error] || false
       if @store.nil?
         @store = lambda { |token| puts 'Storing Token' }
       end

data/lib/playlyfe_client/errors.rb

@@ -12,6 +12,7 @@ module PlaylyfeClient
   class PlaylyfeClient::ActionRateLimitExceededError < PlaylyfeClient::ActionError; end
   class PlaylyfeClient::PlayerExistsError < PlaylyfeClient::PlayerError; end
   class PlaylyfeClient::CollectionFindOneIsNotSupportedError < PlaylyfeClient::Error; end
+  class PlaylyfeClient::ApiCallsLimitExceededError < PlaylyfeClient::Error; end
 
   class Error < StandardError
     attr_accessor :name, :message
@@ -33,6 +34,8 @@ module PlaylyfeClient
           err_class= PlaylyfeClient::ActionRateLimitExceededError
         elsif res_h['error'] == "player_exists"
           err_class= PlaylyfeClient::PlayerExistsError
+        elsif res_h['error'] == "plan_limit_exceeded"
+          err_class= PlaylyfeClient::ApiCallsLimitExceededError
               
         end  
       end  

data/lib/playlyfe_client/v2/connection.rb

@@ -12,9 +12,25 @@ module PlaylyfeClient
         @game=nil
       end  
 
+      def skip_errors_with(skipping_result, &block)
+        begin
+          yield
+        rescue PlaylyfeClient::ApiCallsLimitExceededError => e
+          if @skip_api_calls_limit_exceeded_error
+            skipping_result
+          else
+            raise e  
+          end  
+        end  
+      end  
+
       #for calls to "runtime" there MUST be a player_id, even for Metrics or Leaderboards. So we pick first one.
       def dummy_player_id
-        @dummy_player_id||= get_full_players_hash["data"].first["id"]
+        unless defined?(@dummy_player_id)
+          fph= get_full_players_hash["data"]
+          @dummy_player_id=fph.empty? ? 0 : fph.first["id"]
+        end
+        @dummy_player_id
       end  
 
       def dummy_player_id=(id)
@@ -22,7 +38,7 @@ module PlaylyfeClient
       end 
   
       def get_full_game_hash
-        self.get('/admin')
+        skip_errors_with({"name" => "unknown", "game" => {"id" => 0 ,"title" => "no response"}}) { self.get('/admin') }
       end
         
       def get_game_hash
@@ -30,7 +46,7 @@ module PlaylyfeClient
       end  
 
       def get_full_players_hash
-        get("/admin/players")
+        skip_errors_with({"data" => [], "total" => 0}) { get("/admin/players") }
       end   
 
       def get_player_hash_array
@@ -38,11 +54,11 @@ module PlaylyfeClient
       end   
 
       def get_game_image_data(player_id=dummy_player_id)
-        get_raw("/runtime/assets/game", {size: style.to_s, player_id: player_id})
+        skip_errors_with(nil) { get_raw("/runtime/assets/game", {size: style.to_s, player_id: player_id}) }
       end
         
       def get_full_teams_hash
-        get("/admin/teams")
+        skip_errors_with({"data" => [], "total" => 0}) { get("/admin/teams") }
       end  
       
       def get_team_hash_array
@@ -50,11 +66,11 @@ module PlaylyfeClient
       end  
 
       def get_full_player_profile_hash(player_id)
-        get("/admin/players/#{player_id}")
+        skip_errors_with({"id" => "0", "alias" => "no response", "scores" => [],  "teams" => []}) { get("/admin/players/#{player_id}") }
       end  
 
       def get_full_team_members_hash(team_id)
-        get("/admin/teams/#{team_id}/members")
+        skip_errors_with({"data" => [], "total" => 0}) { get("/admin/teams/#{team_id}/members") }
       end  
 
       def get_team_members_hash_array(team_id)
@@ -62,62 +78,68 @@ module PlaylyfeClient
       end  
       
       def get_full_leaderboards_array(player_id=dummy_player_id)
-        get("/runtime/leaderboards", {player_id: player_id})
+        skip_errors_with([]) { get("/runtime/leaderboards", {player_id: player_id}) }
       end  
 
       def get_full_leaderboard_hash(leaderboard_id, cycle="alltime", player_id=dummy_player_id)
-        get("/runtime/leaderboards/#{leaderboard_id}", {cycle: cycle, player_id: player_id})
+        skip_errors_with({"data" => [], "total" => 0}) { get("/runtime/leaderboards/#{leaderboard_id}", {cycle: cycle, player_id: player_id}) }
       end 
 
       def get_full_all_actions_array(player_id=dummy_player_id)
-        get("/runtime/actions", {player_id: player_id})
+        skip_errors_with([]) { get("/runtime/actions", {player_id: player_id}) }
       end  
 
       def post_play_action(action_id, player_id, body ={})
-        post("/runtime/actions/#{action_id}/play", {player_id: player_id}, body)
+        skip_errors_with({"actions" => [], "events" => []}) { post("/runtime/actions/#{action_id}/play", {player_id: player_id}, body) }
       end  
 
       def get_full_metrics_array(player_id=dummy_player_id)
-        get("/runtime/definitions/metrics", {player_id: player_id})
+        skip_errors_with([]) { get("/runtime/definitions/metrics", {player_id: player_id}) }
       end  
 
       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(start_time), "end" => end_str(end_time)})
-        else
-          #get last 24 hours
-          get("/admin/players/#{player_id}/activity")
-        end  
+        skip_errors_with([]) do 
+          if start_time
+            #get specified period of time
+            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")
+          end  
+        end
       end  
    
       def post_create_player(player_h)
-        post("/admin/players", {}, player_h)
+        skip_errors_with({"id" => "0", "alias" => "no response", "scores" => [],  "teams" => []}) { post("/admin/players", {}, player_h) }
       end  
 
       def delete_player(player_id)
-        delete("/admin/players/#{player_id}")
+        skip_errors_with(nil) { 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 
+        skip_errors_with([]) do 
+          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  
       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 
+        skip_errors_with([]) do 
+          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  
       end  
 
       private

data/lib/playlyfe_client/v2/game.rb

@@ -71,7 +71,7 @@ module PlaylyfeClient
           @title=game_hash["title"]
           @type=game_hash["type"]
           @timezone=game_hash["timezone"] #TODO converion to TZInfo::Timezone ? http://www.rubydoc.info/gems/tzinfo/frames
-          @created_at=Time.parse(game_hash["created"])
+          @created_at=game_hash["created"] ? Time.parse(game_hash["created"]) : nil
         end  
 
      

data/lib/playlyfe_client/v2/player.rb

@@ -29,7 +29,7 @@ module PlaylyfeClient
           game.connection.post_play_action(action.id, self.id)
           @profile_hash= game.connection.get_full_player_profile_hash(self.id)
           @scores=fill_scores
-        rescue PlaylyfeClient::ActionRateLimitExceededError => e
+        rescue PlaylyfeClient::ActionRateLimitExceededError   => e
           unless game.ignore_rate_limit_errors  
             fail e
           end

data/lib/playlyfe_client/version.rb

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

metadata

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