koa 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0a36d7a479927aedae831cc52ea4666a6459eb
-  data.tar.gz: 7b2715f889d044cffb30d99817c8af4c214aad55
+  metadata.gz: 4527672e44d188f950838b2ffb7cf0c4fab99519
+  data.tar.gz: a24329ff70bb83b6c1a38c545bb2b4e8a88914e2
 SHA512:
-  metadata.gz: 8fade97f37ecf8561faf373260090983c7a4e7b0225ea9d515012ac515ac5ae2cc7c9ffc7a507c93557747f7423cba5351b3775cd0d18381930358c78e6de529
-  data.tar.gz: 2c00d131a8c09746da4ed3312f8815188fa3e7f6c1db732f47a7fe16ab3010dc0f6474538f9a4a9206e72ff151e3d3ae4c0d06f2834797cdb16f238087db2b58
+  metadata.gz: 7694ae4f33a88a267786303ce3ece54457988c228652432444f160232225b2978f8a9883e015a1b1eaac13732e8533f7c4bac9378704ca1a9b5998b6a9d57e8c
+  data.tar.gz: c91060f60942fd40c8838312c2284e49c2a1944adc191a96bc1532ca497e3ac5af6ab6bbd3dad8f145a6fe5239be03a7ce5eb4ef09e7929e0ff8ea638317405e

data/lib/koa/kik.rb

@@ -2,9 +2,12 @@ require 'json'
 require 'net/http'
 require 'timeout'
 
-module Koa::Kik
-  def self.purchase(signedData, username, host)
-    Koa::Logger.measure_block("kikpurchase") do
+module Koa
+  module Kik
+    include Measurement
+    measure_methods :purchase, :push, :verify
+
+    def self.purchase(signedData, username, host)
       url = "https://purchase.kik.com/verification/v1/check?u=#{username}&d=#{host}"
       response = request_with_retry(url, signedData, 5)
       if response.nil? or response.code.to_i != 200
@@ -16,10 +19,8 @@ module Koa::Kik
       end
       JSON.parse(response.body)
     end
-  end
-  
-  def self.push(token, message, data)
-    Koa::Logger.measure_block("kikpush") do
+
+    def self.push(token, message, data)
       url = "https://api.kik.com/push/v1/send"
       body = {
         token: token,
@@ -37,51 +38,49 @@ module Koa::Kik
         end
       end
     end
-  end
-  
-  def self.verify(signedData, username, host)
-    Koa::Logger.measure_block("kikverify") do
+
+    def self.verify(signedData, username, host)
       url = "https://auth.kik.com/verification/v1/check?u=#{username}&d=#{host}"
       request_with_retry(url, signedData, 5).body
     end
-  end
-  
-  def self.request_with_retry(url, body, tries, seconds = 2)
-    tries.times do
-      begin
-        Timeout::timeout(seconds) do 
-          return request(url, body)
+
+    def self.request_with_retry(url, body, tries, seconds = 2)
+      tries.times do
+        begin
+          Timeout::timeout(seconds) do
+            return request(url, body)
+          end
+        rescue Timeout::Error
+          Koa::Logger.count("kiktimeout", 1)
+          nil
         end
-      rescue Timeout::Error
-        Koa::Logger.count("kiktimeout", 1)
-        nil
       end
     end
-  end
-  
-  def self.request(url, body)
-    uri = URI.parse(url)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.add_field('Content-Type', 'application/json')
-    request.add_field('Content-Length', body.size)
-    
-    request.body = body
-    http.request(request)
-  end
-  
-  class PushResponse
-    def initialize(response)
-      @response = response
-    end
-    
-    def success?
-      @response and @response.code.to_i == 200
+
+    def self.request(url, body)
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request.add_field('Content-Type', 'application/json')
+      request.add_field('Content-Length', body.size)
+
+      request.body = body
+      http.request(request)
     end
-    
-    def bad_token?
-      @response and @response.code.to_i == 403
+
+    class PushResponse
+      def initialize(response)
+        @response = response
+      end
+
+      def success?
+        @response and @response.code.to_i == 200
+      end
+
+      def bad_token?
+        @response and @response.code.to_i == 403
+      end
     end
   end
 end

data/lib/koa/leaderboard-client.rb

@@ -6,49 +6,45 @@ module Koa
     URL = Conf.env!('LEADERBOARD_URL')
     GAME_ID = Conf.env!('KOA_GAME_ID')
 
+    include Measurement
+    measure_methods :get_leaderboards, :get_user_scores, :add_score
+
     def self.get_leaderboards(limit)
-      Logger.measure_block("leaderboard-client.get-leaderboards") do
-        response = Koa::Request.make(
-          type: :get,
-          url: URL + "/boards",
-          data: {limit: limit, game_id: GAME_ID}
-        )
-        if response.successful?
-          JSON.parse(response.body)
-        else
-          {}
-        end
+      response = Koa::Request.make(
+        type: :get,
+        url: URL + "/boards",
+        data: {limit: limit, game_id: GAME_ID}
+      )
+      if response.successful?
+        JSON.parse(response.body)
+      else
+        {}
       end
     end
 
     def self.get_user_scores(user_id)
-      Logger.measure_block("leaderboard-client.get-user-scores") do
-        response = Koa::Request.make(
-          type: :get,
-          url: URL + "/user_scores",
-          data: {game_id: GAME_ID, user_id: user_id}
-        )
-        if response.successful?
-          user_scores = JSON.parse(response.body)
-        end
-      end
+      response = Koa::Request.make(
+        type: :get,
+        url: URL + "/user_scores",
+        data: {game_id: GAME_ID, user_id: user_id}
+      )
+      JSON.parse(response.body) if response.successful?
     end
 
     def self.add_score(user_id, score)
-      Logger.measure_block("leaderboard-client.add-score") do
-        Koa::Request.make(
-          type: :put,
-          url: URL + "/score",
-          data: {
-            user_id: user_id,
-            score: score,
-            request_id: SecureRandom.uuid,
-            game_id: GAME_ID
-          },
-          tries: 3,
-          timeout: 5
-        )
-      end
+      response = Koa::Request.make(
+        type: :put,
+        url: URL + "/score",
+        data: {
+          user_id: user_id,
+          score: score,
+          request_id: SecureRandom.uuid,
+          game_id: GAME_ID
+        },
+        tries: 3,
+        timeout: 5
+      )
+      JSON.parse(response.body)["scores"] if response.successful?
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: koa
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Rykwalder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies: []
 description: Gem of tools for Koala
 email: eric@koa.la