codeforces 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI4YzZkNzdmN2NhZmU0ZDFmY2FiODI4MDRjZDU5ZTlhZDkxYjEzYg==
+    YWU0ZDA0N2FlYTY5YmM1ZTViODRlMDdkYzE4YTNkMWQ2ZjdlODE4ZA==
   data.tar.gz: !binary |-
-    ZjQxOGUzYWU3MDE2ODI1MmNlZTkwYmY5NmJiNWNhMDg1YmVlNDFkNQ==
+    ZTM5MDA4NGIwZDE5ODA3ZjllMDM2MTg4MTY5YTdhYTZkOTUwYTY3Ng==
 SHA512:
   metadata.gz: !binary |-
-    OWRmZGNmMmJkYzZiZTUzMTA5YTg1ZDFkOTVjNjUyOGMyNGM5MjM1MDc5YmNm
-    YjU4YmNlYjQ2YWJjZmE2YTk4NTQyNjQ0NjBlZTAxZGU3M2ZmZjI0ZmE4ZjFl
-    MzY3NDg4YTYzNzMwNWQ0Mzc5NWU0YWJkNzI4NTdlODBhZDBkMWE=
+    ZGE4M2NlNTlmN2JiMDkzOThkMWVmNGI4OTRkYWU1NzIwZjFlMGI4MjczYWJi
+    NGZhMTE4MmU2ZGJiY2YxODgzODM2NjJiNTk0ZjU0NGJjZWZlNmI2ZWI2NTE5
+    ZTZiNjZhNzA4NTk1NmUwZDU2MWY3OTAzZDM3Y2I2NmVkMmQ5NWM=
   data.tar.gz: !binary |-
-    YzAzYWZmMGRlYzUyMzk5ODRlMTg0ZTE4ZDEyMzgyYmQxMjA3ZjVkOTJmYjc4
-    ZTcyODIyZjE2NTI4Y2M0ZGNlMTc2MzViNDA0ZjdlMzI5ODVmMGUxN2U0ODMy
-    NjQ0MmEyYmI5ZDI5M2RjM2Y5MTlmMzQwYjhmMWRhYmExOWYxYzk=
+    YTY3MTJlZmJkMTM5NjNhYmMwNWFkZjliYjJlNjkyZjhmYWFjOWZiMWY3NzEx
+    YWI4YmYxOTAzZjdjMGQ0MDFkN2JmYWM2ZTViYjMzYzEyNjMwMDEyMWEyN2E1
+    Y2U5MTMyNWQzODNlYmY5OTkzZDg0YmVhMzgzZmVmY2UyMzk4MWE=

data/lib/codeforces/api/user.rb

@@ -10,8 +10,8 @@ class Codeforces::Api
 
     def info(handles, options = {})
       handles = [handles] unless handles.is_a?(Array)
-      options[:query] ||= {}
-      options[:query][:handles] = multi_values(handles)
+      options[:data] ||= {}
+      options[:data][:handles] = multi_values(handles)
       post("user.info", options)
     end
 

data/lib/codeforces/client.rb

@@ -2,6 +2,8 @@ require "sawyer"
 require "logger"
 require "uri"
 require "addressable/uri"
+require "time"
+require "digest/sha2"
 require "codeforces/api"
 require "codeforces/client"
 require "codeforces/helper"
@@ -13,11 +15,17 @@ class Codeforces::Client
 
   DEFAULT_ENDPOINT = "http://codeforces.com/api/"
   DEFAULT_PAGE_COUNT = 50
+  DEFAULT_API_KEY = ENV["CODEFORCES_API_KEY"]
+  DEFAULT_API_SECRET = ENV["CODEFORCES_API_SECRET"]
 
   attr_reader :endpoint
+  attr_reader :api_key
+  attr_reader :api_secret
 
-  def initialize(endpoint = DEFAULT_ENDPOINT)
-    @endpoint = endpoint
+  def initialize(options = {})
+    @endpoint = options.fetch(:endpoint, DEFAULT_ENDPOINT)
+    @api_key = options.fetch(:api_key, DEFAULT_API_KEY)
+    @api_secret = options.fetch(:api_secret, DEFAULT_API_SECRET)
   end
 
   def logger
@@ -33,25 +41,30 @@ class Codeforces::Client
   end
 
   def get(path, options = {})
-    request_uri = ::Addressable::URI.new
-    options[:query] ||= {}
-    request_uri.query_values = options[:query]
-    request(:get, "#{path}#{request_uri.query.empty? ? "" : "?#{request_uri.query}"}", options[:data], options).result
+    request(:get, path, options).result
   end
 
   def post(path, options = {})
-    request_uri = ::Addressable::URI.new
-    options[:query] ||= {}
-    request_uri.query_values = options[:query]
-    request(:post, path, request_uri.query).result
+    request(:post, path, options).result
   end
 
-  def request(method, path, data, options = {})
-    logger.debug "#{method.upcase} #{URI.join endpoint, path}"
-    @last_response = agent.call(method, path, data)
+  def request(method, path, options = {})
+    request_uri = ::Addressable::URI.new
+    query = {}
+    query.merge!(options[:query]) unless options[:query].nil?
+    request_uri.query_values = query
+
+    enable_auth!(path, request_uri, query) unless api_key.nil?
+
+    path += "?#{request_uri.query}" unless request_uri.query.empty?
+
+    @last_response = agent.call(method, path, options[:data])
+
+    logger.debug "#{method.upcase} #{::URI.join endpoint, path}"
+    logger.debug "Status: #{last_response.data.status}"
 
     unless last_response.data.status === "OK"
-      raise "Error: #{last_response.data.status}"
+      raise "Error: #{last_response.data.status} #{last_response.data.comment}"
     end
 
     last_response.data
@@ -109,5 +122,37 @@ class Codeforces::Client
     logger
   end
 
+  def enable_auth!(path, request_uri, query)
+    query.merge!({:time => server_time})
+    query.merge!({:apiKey => api_key})
+    request_uri.query_values = query
+
+    # calc signature
+    seed = api_sig_seed(654321, path, request_uri)
+    hash = ::Digest::SHA512.hexdigest(seed)
+    query.merge!({:apiSig => "654321#{hash}"})
+    request_uri.query_values = query
+
+    logger.debug "Enable Auth"
+    logger.debug "API signature seed: #{seed}"
+  end
+
+  def is_old_time?(t)
+    t.nil? || ::Time.now.to_i - t > 30
+  end
+
+  def server_time
+    return @server_time unless is_old_time?(@server_time)
+
+    logger.debug "Resolve Server Time"
+    @server_time = ::Net::HTTP.start("codeforces.com", 80) do |http|
+      ::Time.parse(http.head("/")["date"]).to_i
+    end
+  end
+
+  def api_sig_seed(rand, path, uri)
+    "#{rand}/#{path}?#{uri.query}##{api_secret}"
+  end
+
 end
 

data/lib/codeforces/version.rb

@@ -1,4 +1,4 @@
 module Codeforces
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeforces
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Hiroyuki Sano