tt2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a428227ce35f912c281e7ac78f5bb40d8b1bceb
-  data.tar.gz: 7278b6126c0e732a29a9779578930c3bd1da6225
+  metadata.gz: '08eb90cc5e429850613e0be0e9b966553bf58c03'
+  data.tar.gz: ac3ddeb75fa3e99ce8afd72e940660415eef5a3a
 SHA512:
-  metadata.gz: e71965509cc0692b09833ba53c902e0b39f836072e6af0b039bf3e43e9bf19d9c7dbc1b6618fb75b6d56720a4caf3ef2c9ac9c9c3ab975aaaa4c7d8a9547025a
-  data.tar.gz: aa4bbf9ffa8b8a8d9bf6ce59f625805bc85111dbe6e6deee11fcbc6b153e448b3eacbc44919b4075b8fa4191e2ae5a7389ca8704026f7490c222f66c7b8c1362
+  metadata.gz: f940ff584c6b41f9acac46813cbccc8a91f3331566f31e7d56a7ff1fe29c49793d8b06b6a16b4f47e719969af2d283a4b530ac1b34df09c1b2bf8990bdc89336
+  data.tar.gz: 7d49fa5d354332260d3fda11cb483fec2229ee9437dc496629b185d925755a35f59cbbd8b5a42a84429bdd15ced56e02a122364b4c81bd9918b16707fc50564d

data/lib/tt2.rb

@@ -1,6 +1,8 @@
 require 'tt2/version'
 require 'tt2/util'
 require 'tt2/save_parser'
+require 'tt2/api'
+require 'tt2/client'
 
 # Tap Titans 2 (TT2) is an incremental/clicker game made by Game Hive Games of
 # Toronto, Canada.

data/lib/tt2/api.rb

@@ -0,0 +1,54 @@
+require 'httparty'
+
+module TT2
+  class API
+    include HTTParty
+
+    attr_accessor :player_id, :auth_token, :created_at
+    attr_writer :ad_id
+
+    base_uri 'https://tt2.gamehivegames.com'
+    headers 'Accept'       => 'application/vnd.gamehive.btb4-v1.0+json',
+            'User-Agent'   => 'BestHTTP',
+            'Content-Type' => 'application/json; charset=UTF-8'
+
+    def ad_id
+      @ad_id || '00000000-0000-0000-0000-000000000000'
+    end
+
+    def query_params(body = '', overrides: {})
+      { d:     'ios',
+        v:     '1.7.1',
+        time:  TT2::Util.current_time_ticks,
+        dummy: Time.now - @created_at,
+        s:     TT2::Util.request_signature(body, ad_id: ad_id) }.merge(overrides)
+    end
+
+    def request_body(params = {})
+      base = { ad_id:     ad_id,
+               player_id: player_id }
+      JSON.generate(base.merge(params))
+    end
+
+    def reset_time
+      @created_at = Time.now
+    end
+
+    def get(url)
+      self.class.get(url)
+    end
+
+    def post(url, body_params = {})
+      body = request_body(body_params)
+      post_opts = {
+        query:   query_params(body),
+        body:    body,
+        headers: {
+          'X-HTTP-Method-Override' => 'POST',
+          'Authorization'          => "token #{auth_token}"
+        }
+      }
+      self.class.post(url, post_opts)
+    end
+  end
+end

data/lib/tt2/client.rb

@@ -1,21 +1,11 @@
 require 'httparty'
+
 module TT2
   # The TT2 API client
-  class Client
-    include HTTParty
-
-    base_uri 'https://tt2.gamehivegames.com'
-    headers 'Accept'       => 'application/vnd.gamehive.btb4-v1.0+json',
-            'User-Agent'   => 'BestHTTP',
-            'Content-Type' => 'application/json; charset=UTF-8'
+  class Client < API
+    Dir[File.expand_path('../client/*.rb', __FILE__)].each { |f| require f }
 
-    def query_options(data = '')
-      { d:     'ios',
-        v:     '1.7.1',
-        time:  Tt2::Util.current_time_ticks,
-        dummy: Time.now - @created_at,
-        s:     Tt2::Util.request_signature(data) }
-    end
+    include ServerTime
 
     def initialize(player_id:, auth_token:)
       @player_id = player_id
@@ -23,9 +13,5 @@ module TT2
 
       reset_time
     end
-
-    def reset_time
-      @created_at = Time.now
-    end
   end
 end

data/lib/tt2/client/server_time.rb

@@ -0,0 +1,8 @@
+class TT2::Client
+  module ServerTime
+    def server_time
+      data = get('/server_time')
+      Time.parse(data['server_time'])
+    end
+  end
+end

data/lib/tt2/util.rb

@@ -3,6 +3,8 @@ require 'openssl'
 module TT2
   # This is where all of the fun utility functions like to come and hang out.
   module Util
+    module_function
+
     BOSSES = %w[  Sponkinack Lucanus Caratacos Sklatborg Drakon
                   Straton Grokstomp Grekksfist Zeksgrat FumpTorm
                   RamBloggs Brongunk Plogriftus Darmbonack Gredmash
@@ -37,7 +39,8 @@ module TT2
     AVATARS = {}.freeze
 
     # The signature hash for all requests
-    def request_signature(data, key: '000')
+    def request_signature(data, ad_id: '00000000-0000-0000-0000-000000000000')
+      key = ad_id[1] + ad_id[0] + ad_id[3]
       digest = OpenSSL::Digest.new('md5')
       OpenSSL::HMAC.hexdigest(digest, key, data)
     end

data/lib/tt2/version.rb

@@ -1,3 +1,3 @@
 module TT2
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tt2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steve Whittaker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,9 @@ files:
 - README.md
 - exe/tt2
 - lib/tt2.rb
+- lib/tt2/api.rb
 - lib/tt2/client.rb
+- lib/tt2/client/server_time.rb
 - lib/tt2/save_parser.rb
 - lib/tt2/util.rb
 - lib/tt2/version.rb