triviacrack 0.3.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb67144378010ccdb7d4f1c3827dcc632edf3947de9303428778ddd906196f0
-  data.tar.gz: e25ada0b08a6a906e992e449b6d269ccd04253deb77a573b1d907c26ffd4506c
+  metadata.gz: bac625736e1fdbe91e229596d95e3af90c22ea6b7b2de6373717994301bfe3b9
+  data.tar.gz: 37afe95e8d8aa72297e85236c00af489bc6a8502c9f8b3d079062ed7157fec02
 SHA512:
-  metadata.gz: 662f27c81247ce6b788e03727585cfb8af826e54afd93b17f38b813a684029935a2e5b276ab0b30bf8040bf9701400a843a00a6ef57bd991f1849cf9693efabb
-  data.tar.gz: e687e13f2c5c1f03859de4e48c484f24bbb708520f3b1f76128531635298337f36ea3fe1ddd77c9aff4165b10e74b3fa51f9a45e2959db3d1fff8b1c6a9bdb97
+  metadata.gz: d5f407ab7c8f5ca194efe7bdea42f90943b5f41c80fc5e2485f8d891afc076bbca76a0b016b75c9da96d598e436371ee8db7763b3771fd21942052e76825ba0e
+  data.tar.gz: 28d4d34fb76d0fdaaa9c81b00fdf53bc7422406e701cf343275b0a81aebe0faabdb516dcdd1186309fba94bedfe33328111a70e03842c6f5acd17ea5af400fb9

data/.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.5
+          ruby-version: 3.0.2
 
       - name: Bundle Install
         run: |

data/.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.5
+          ruby-version: 3.0.2
 
       - name: Bundle Install
         run: |

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/Gemfile

@@ -1,4 +1,4 @@
-#ruby=ruby-2.6.5
+#ruby=ruby-3.0.2
 #ruby-gemset=triviacrack
 
 source 'https://rubygems.org'

data/Gemfile.lock

@@ -1,78 +1,76 @@
 PATH
   remote: .
   specs:
-    triviacrack (0.3.2)
-      unirest-2x (~> 1.1.3)
+    triviacrack (0.6.0)
+      faraday (~> 1.7.2)
+      json (~> 2.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    fuubar (2.5.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    faraday (1.7.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    http-accept (1.7.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    json (2.3.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    netrc (0.11.0)
-    public_suffix (4.0.3)
-    rake (13.0.1)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    json (2.5.1)
+    multipart-post (2.1.1)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    unirest-2x (1.1.3)
-      addressable (~> 2.4)
-      json (~> 2.0)
-      rest-client (~> 2.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.1.4)
-  fuubar (~> 2.5.0)
-  json (~> 2.3.0)
-  rake (~> 13.0.1)
-  rspec (~> 3.9.0)
+  bundler (~> 2.2.27)
+  fuubar (~> 2.5.1)
+  rake (~> 13.0.6)
+  rspec (~> 3.10.0)
   rspec-its (~> 1.3.0)
-  simplecov (~> 0.17.1)
+  simplecov (~> 0.21.2)
   triviacrack!
 
 BUNDLED WITH
-   2.1.4
+   2.2.27

data/lib/triviacrack/api/common.rb

@@ -1,4 +1,5 @@
-require "unirest"
+require "json"
+require "faraday"
 
 require "triviacrack/errors/request_error"
 
@@ -13,11 +14,10 @@ module TriviaCrack
       # url        - The URL of the TriviaCrack API resource.
       # parameters - The parameters to send with the request.
       #
-      # Returns a Unirest Response object with the server's response.
+      # Returns a Faraday Response object with the server's response.
       # Raises TriviaCrack:Errors::RequestError if the request fails.
       def get(url, parameters: nil)
-        response = Unirest.get "#{API_HOST}#{url}", parameters: parameters,
-                                                    headers: default_headers
+        response = Faraday.get "#{API_HOST}#{url}", parameters, default_headers
 
         check_response url, response
       end
@@ -28,11 +28,10 @@ module TriviaCrack
       # url        - The URL of the TriviaCrack API resource.
       # parameters - The parameters to send with the request.
       #
-      # Returns a Unirest Response object with the server's response.
+      # Returns a Faraday Response object with the server's response.
       # Raises TriviaCrack:Errors::RequestError if the request fails.
       def post(url, parameters: nil)
-        response = Unirest.post "#{API_HOST}#{url}", parameters: parameters,
-                                                     headers: default_headers
+        response = Faraday.post "#{API_HOST}#{url}", parameters, default_headers
 
         check_response url, response
       end
@@ -59,17 +58,17 @@ module TriviaCrack
       # Internal: Checks the response's code to see if the request was
       # successful
       #
-      # response - Unirest response returned by the API.
+      # response - Faraday response returned by the API.
       #
-      # Returns the response object.
+      # Returns the response body parsed from JSON
       # Raises TriviaCrack:Errors::RequestError if the request failed.
       def check_response(url, response)
-        if not response.code.between? 200, 299
-          raise TriviaCrack::Errors::RequestError.new(response.code, url, response.body),
-            "Request to #{API_HOST}#{url} failed with code #{response.code}."
+        if not response.status.between? 200, 299
+          raise TriviaCrack::Errors::RequestError.new(response.status, url, response.body),
+            "Request to #{API_HOST}#{url} failed with code #{response.status}."
         end
 
-        response
+        JSON.parse(response.body)
       end
     end
   end

data/lib/triviacrack/api/game.rb

@@ -1,3 +1,4 @@
+require "json"
 require "triviacrack/api/common"
 require "triviacrack/parsers/game_parser"
 
@@ -21,7 +22,7 @@ module TriviaCrack
       def get_games
         response = get "/api/users/#{@session.user_id}/dashboard"
 
-        games_data = response.body["list"]
+        games_data = response["list"]
 
         games = []
         if games_data
@@ -48,7 +49,7 @@ module TriviaCrack
       def get_game(game_id)
         response = get "/api/users/#{@session.user_id}/games/#{game_id}"
 
-        TriviaCrack::Parsers::GameParser.parse response.body
+        TriviaCrack::Parsers::GameParser.parse response
       end
 
       # Public: Uses the Trivia Crack API to start a new game for the current
@@ -64,7 +65,7 @@ module TriviaCrack
         response = post "/api/users/#{@session.user_id}/games",
                         parameters: { language: "EN" }.to_json
 
-        TriviaCrack::Parsers::GameParser.parse response.body
+        TriviaCrack::Parsers::GameParser.parse response
       end
 
     end

data/lib/triviacrack/api/login.rb

@@ -1,3 +1,4 @@
+require "json"
 require "triviacrack/api/common"
 require "triviacrack/parsers/session_parser"
 
@@ -27,7 +28,7 @@ module TriviaCrack
                                                     language: "en"
                                                   }.to_json
 
-        @session = TriviaCrack::Parsers::SessionParser.parse response.body
+        @session = TriviaCrack::Parsers::SessionParser.parse response
       end
 
     end

data/lib/triviacrack/api/profile.rb

@@ -21,7 +21,7 @@ module TriviaCrack
       def get_profile(user_id)
         response = get "/api/users/#{@session.user_id}/profiles/#{user_id}"
 
-        TriviaCrack::Parsers::ProfileParser.parse response.body
+        TriviaCrack::Parsers::ProfileParser.parse response
       end
 
       # Public: Uses the Trivia Crack API to get the profile of current user.
@@ -36,7 +36,7 @@ module TriviaCrack
         response =
           get "/api/users/#{@session.user_id}/profiles/#{@session.user_id}"
 
-        TriviaCrack::Parsers::ProfileParser.parse response.body
+        TriviaCrack::Parsers::ProfileParser.parse response
       end
 
     end

data/lib/triviacrack/api/question.rb

@@ -1,3 +1,4 @@
+require "json"
 require "triviacrack/api/common"
 require "triviacrack/parsers/game_parser"
 
@@ -11,7 +12,7 @@ module TriviaCrack
 
       # Public: Uses the Trivia Crack API to answer the given question.
       #
-      # game      - The ID of the TriviaCrack::Game.
+      # game_id   - The ID of the TriviaCrack::Game.
       # question  - The TriviaCrack::Question.
       # answer    - The index of the answer to be submitted.
       #
@@ -33,11 +34,52 @@ module TriviaCrack
                                 }]
                             }.to_json
 
-        game = TriviaCrack::Parsers::GameParser.parse response.body
+        game = TriviaCrack::Parsers::GameParser.parse response
 
         [game, answer == question.correct_answer]
       end
 
+      # Public: Uses the Trivia Crack API to answer duel questions for the game.
+      #
+      # game_id    - The ID of the TriviaCrack::Game.
+      # questions  - The array of TriviaCrack::Question to answer
+      # answer_map - Hash of question ID / answer indices.
+      #
+      # Examples
+      #
+      #   answers = {}
+      #   for question in game.questions do
+      #     answers[question.id] = <some answer index> // 0, 1, 2 or 3
+      #   end
+      #   answer_questions game.id, game.questions, answers
+      #
+      # Returns the update TriviaCrack::Game object, as well as a map
+      # with an entry for each question ID and a boolean indicating if
+      # the question was answered successfully.
+      # Raises TriviaCrack::Errors::RequestError if the request fails
+      def answer_questions(game_id, questions, answer_map)
+        answers = []
+        correct_answers = {}
+
+        for question in questions do
+          answer = {
+            id: question.id,
+            answer: answer_map[question.id],
+            category: question.category.upcase
+          }
+          answers << answer
+          correct_answers[question.id] = answer_map[question.id] == question.correct_answer
+        end
+
+        response =
+          post "/api/users/#{@session.user_id}/games/#{game_id}/answers",
+                parameters: { type: questions.first.type.upcase, answers: answers }.to_json
+
+        game = TriviaCrack::Parsers::GameParser.parse response
+
+        [game, correct_answers]
+      end
+
     end
   end
 end

data/lib/triviacrack/api/user.rb

@@ -26,9 +26,7 @@ module TriviaCrack
           username = username[1..-1]
         end
 
-        response = get "/api/search?username=#{username}"
-
-        body = response.body
+        body = get "/api/search?username=#{username}"
 
         user_id = false
         body["list"].each do |user|
@@ -48,7 +46,7 @@ module TriviaCrack
       def get_user
         response = get "/api/users/#{@session.user_id}"
 
-        TriviaCrack::Parsers::UserParser.parse response.body
+        TriviaCrack::Parsers::UserParser.parse response
       end
 
     end

data/lib/triviacrack/parsers/game_parser.rb

@@ -31,6 +31,12 @@ module TriviaCrack
             question = TriviaCrack::Parsers::QuestionParser.parse q_data
             questions << question
           end
+          if raw_data["spins_data"]["spins"][0]["type"] == "DUEL"
+            q_data = raw_data["spins_data"]["spins"][0]["tie_break_question"]
+            q_data["type"] = raw_data["spins_data"]["spins"][0]["type"]
+            question = TriviaCrack::Parsers::QuestionParser.parse q_data
+            questions << question
+          end
         end
 
         if raw_data["available_crowns"]

data/lib/triviacrack/version.rb

@@ -1,4 +1,4 @@
 # Public: The version of this gem.
 module TriviaCrack
-  VERSION = "0.3.2"
+  VERSION = "0.6.0"
 end

data/spec/api/game_spec.rb

@@ -5,10 +5,10 @@ describe TriviaCrack::API::Game do
   let(:session) { TriviaCrack::Session.new session_id: "session", user_id: 1 }
   let(:client) { (Class.new(APIStub) { include TriviaCrack::API::Game }).new session }
 
-  let(:response) { double(code: code, body: raw_data) }
+  let(:response) { double(status: code, body: raw_data) }
 
-  before { allow(Unirest).to receive(:get) { response } }
-  before { allow(Unirest).to receive(:post) { response } }
+  before { allow(Faraday).to receive(:get) { response } }
+  before { allow(Faraday).to receive(:post) { response } }
 
   describe "#get_games" do
 

data/spec/api/login_spec.rb

@@ -4,9 +4,9 @@ describe TriviaCrack::API::Login do
 
   let(:client) { (Class.new(APIStub) { include TriviaCrack::API::Login }).new }
 
-  let(:response) { double(code: code, body: raw_data) }
+  let(:response) { double(status: code, body: raw_data) }
 
-  before { allow(Unirest).to receive(:post) { response } }
+  before { allow(Faraday).to receive(:post) { response } }
 
   describe "#login" do
 

data/spec/api/profile_spec.rb

@@ -5,9 +5,9 @@ describe TriviaCrack::API::Profile do
   let(:session) { TriviaCrack::Session.new session_id: "session", user_id: 1 }
   let(:client) { (Class.new(APIStub) { include TriviaCrack::API::Profile }).new session }
 
-  let(:response) { double(code: code, body: raw_data) }
+  let(:response) { double(status: code, body: raw_data) }
 
-  before { allow(Unirest).to receive(:get) { response } }
+  before { allow(Faraday).to receive(:get) { response } }
 
   describe "#get_profile" do
     let(:user_id) { 111 }

data/spec/api/question_spec.rb

@@ -5,9 +5,9 @@ describe TriviaCrack::API::Question do
   let(:session) { TriviaCrack::Session.new session_id: "session", user_id: 1 }
   let(:client) { (Class.new(APIStub) { include TriviaCrack::API::Question }).new session }
 
-  let(:response) { double(code: code, body: raw_data) }
+  let(:response) { double(status: code, body: raw_data) }
 
-  before { allow(Unirest).to receive(:post) { response } }
+  before { allow(Faraday).to receive(:post) { response } }
 
   describe "#answer_question" do
 
@@ -17,7 +17,7 @@ describe TriviaCrack::API::Question do
     let(:question) { double(id: 1, correct_answer: 1, type: "NORMAL", category: "SPORTS") }
     let(:game_id) { 22 }
 
-    context 'given that the question was answer correctly' do
+    context 'given that the question was answered correctly' do
       let(:code) { 200 }
       let(:answer) { 1 }
 
@@ -26,7 +26,7 @@ describe TriviaCrack::API::Question do
       it { expect(subject[1]).to be true }
     end
 
-    context 'given that the question was answer incorrectly' do
+    context 'given that the question was answered incorrectly' do
       let(:code) { 200 }
       let(:answer) { 0 }
 
@@ -46,4 +46,46 @@ describe TriviaCrack::API::Question do
         .and having_attributes(url: "/api/users/#{session.user_id}/games/#{game_id}/answers")) }
     end
   end
+
+  describe "#answer_questions" do
+
+    subject { client.answer_questions game_id, questions, answers }
+
+    let(:raw_data) { SpecData.get "answer.json" }
+    let(:question_one) { double(id: 1, correct_answer: 1, type: "DUEL", category: "SPORTS") }
+    let(:question_two) { double(id: 2, correct_answer: 2, type: "DUEL", category: "ART") }
+    let(:questions) { [question_one, question_two] }
+    let(:game_id) { 22 }
+
+    context 'given that the questions were answered correctly' do
+      let(:code) { 200 }
+      let(:answers) { {1 => 1, 2 => 2} }
+
+      it { expect(TriviaCrack::Parsers::GameParser).to receive(:parse).once; subject }
+      it { expect(subject[0]).to be_a TriviaCrack::Game }
+      it { expect(subject[1][1]).to be true }
+      it { expect(subject[1][2]).to be true }
+    end
+
+    context 'given that a question was answered incorrectly' do
+      let(:code) { 200 }
+      let(:answers) { {1 => 1, 2 => 3} }
+
+      it { expect(TriviaCrack::Parsers::GameParser).to receive(:parse).once; subject }
+      it { expect(subject[0]).to be_a TriviaCrack::Game }
+      it { expect(subject[1][1]).to be true }
+      it { expect(subject[1][2]).to be false }
+    end
+
+    context 'given that the request fails' do
+      let(:code) { 400 }
+      let(:answers) { {1 => 1, 2 => 2} }
+
+      it { expect{ subject }.to raise_error TriviaCrack::Errors::RequestError }
+      it { expect{ subject }.to raise_error(an_instance_of(TriviaCrack::Errors::RequestError)
+        .and having_attributes(code: code)) }
+      it { expect{ subject }.to raise_error(an_instance_of(TriviaCrack::Errors::RequestError)
+        .and having_attributes(url: "/api/users/#{session.user_id}/games/#{game_id}/answers")) }
+    end
+  end
 end

data/spec/api/user_spec.rb

@@ -5,9 +5,9 @@ describe TriviaCrack::API::User do
   let(:session) { TriviaCrack::Session.new session_id: "session", user_id: 1 }
   let(:client) { (Class.new(APIStub) { include TriviaCrack::API::User }).new session }
 
-  let(:response) { double(code: code, body: raw_data) }
+  let(:response) { double(status: code, body: raw_data) }
 
-  before { allow(Unirest).to receive(:get) { response } }
+  before { allow(Faraday).to receive(:get) { response } }
 
   describe "#get_user_id" do
     let(:username) { "example.2" }

data/spec/data/game_duel.json

@@ -0,0 +1,336 @@
+{
+    "id": 1119,
+    "safeOpponentSelectionType": "RANDOM",
+    "spins_data": {
+        "spins": [
+            {
+                "type": "DUEL",
+                "second_chance_available": false,
+                "questions": [
+                    {
+                        "question": {
+                            "id": 17881223,
+                            "category": "HISTORY",
+                            "text": "The Suffrage movement pertained to what?",
+                            "answers": [
+                                "Prohibition",
+                                "Racial Equality",
+                                "Women's Rights",
+                                "Right To Unionize"
+                            ],
+                            "correct_answer": 2,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 82565321,
+                                "name": "anniesparkles",
+                                "username": "anniesparkles",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "UNSPECIFIED"
+                            }
+                        }
+                    },
+                    {
+                        "question": {
+                            "id": 53333638,
+                            "category": "GEOGRAPHY",
+                            "text": "Where is Slovakia?",
+                            "answers": [
+                                "Oceania",
+                                "Africa",
+                                "Europe",
+                                "Asia"
+                            ],
+                            "correct_answer": 2,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 204000197,
+                                "name": "martingres",
+                                "username": "martingres",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "UNSPECIFIED"
+                            }
+                        }
+                    },
+                    {
+                        "question": {
+                            "id": 62181053,
+                            "category": "ARTS",
+                            "text": "Who has painted the Sistine Chapel?",
+                            "answers": [
+                                "Michelangelo",
+                                "Van Gogh",
+                                "Picasso",
+                                "Mezzosin"
+                            ],
+                            "correct_answer": 0,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 223909199,
+                                "facebook_id": "843171349124950",
+                                "name": "Kristina Marie Poulsen",
+                                "username": "kp89facebook",
+                                "facebook_name": "Kristina Marie Poulsen",
+                                "fb_show_picture": true,
+                                "fb_show_name": true,
+                                "gender": "female"
+                            },
+                            "translator": {
+                                "id": 252287897,
+                                "name": "ragingraids",
+                                "username": "ragingraids",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "UNSPECIFIED"
+                            }
+                        }
+                    },
+                    {
+                        "question": {
+                            "id": 51360542,
+                            "category": "SPORTS",
+                            "text": "What two Allstars have the number of 23?",
+                            "answers": [
+                                "Steph Curry And Blake Griffen",
+                                "Lebron James And Michael Jordan",
+                                "Chris Paul And Jr Smith",
+                                "Clay Thompson And Kevin Love"
+                            ],
+                            "correct_answer": 1,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 200488852,
+                                "name": "mitchelldonegan06",
+                                "username": "mitchelldonegan06",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "UNSPECIFIED"
+                            }
+                        }
+                    },
+                    {
+                        "question": {
+                            "id": 11817577,
+                            "category": "ENTERTAINMENT",
+                            "text": "Which pop star calls her fans \"Monsters\"?",
+                            "answers": [
+                                "Madonna",
+                                "Lady Gaga",
+                                "Britney Spears",
+                                "Christina Aguilera"
+                            ],
+                            "correct_answer": 1,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 51771646,
+                                "facebook_id": "",
+                                "name": "linda.tsacalides",
+                                "username": "linda.tsacalides",
+                                "facebook_name": "UNSPECIFIED",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "female"
+                            }
+                        }
+                    },
+                    {
+                        "question": {
+                            "id": 54733278,
+                            "category": "SCIENCE",
+                            "text": "Which is NOT a blood type?",
+                            "answers": [
+                                "Ab",
+                                "Oa",
+                                "O",
+                                "B"
+                            ],
+                            "correct_answer": 1,
+                            "media_type": "NORMAL",
+                            "author": {
+                                "id": 114837290,
+                                "name": "rocat26",
+                                "username": "rocat26",
+                                "fb_show_picture": false,
+                                "fb_show_name": false,
+                                "gender": "female"
+                            }
+                        }
+                    }
+                ],
+                "tie_break_question": {
+                    "id": 51774,
+                    "category": "HISTORY",
+                    "text": "Which historical figure is famous for being short?",
+                    "answers": [
+                        "Napoleon",
+                        "Stalin",
+                        "Bismark",
+                        "Julius Caesar"
+                    ],
+                    "correct_answer": 0,
+                    "media_type": "NORMAL",
+                    "author": {
+                        "id": 23831917,
+                        "facebook_id": "100006890463075",
+                        "name": "Igor Gardella Trifunovic",
+                        "username": "kider.jo",
+                        "facebook_name": "Igor Gardella Trifunovic",
+                        "fb_show_picture": true,
+                        "fb_show_name": true,
+                        "gender": "UNSPECIFIED"
+                    },
+                    "translator": {
+                        "id": 100940141,
+                        "facebook_id": "100002352524111",
+                        "name": "Abigail Morgan",
+                        "username": "almangel21",
+                        "facebook_name": "Abigail Morgan",
+                        "fb_show_picture": true,
+                        "fb_show_name": true,
+                        "gender": "female"
+                    }
+                }
+            }
+        ]
+    },
+    "available_crowns": [
+        "SCIENCE",
+        "HISTORY",
+        "ENTERTAINMENT",
+        "SPORTS"
+    ],
+    "my_player_number": 1,
+    "player_one": {
+        "charges": 3,
+        "crowns": [
+            "GEOGRAPHY",
+            "ARTS"
+        ]
+    },
+    "player_two": {
+        "charges": 0,
+        "crowns": [
+            "SCIENCE"
+        ]
+    },
+    "round_number": 2,
+    "crown_events": [
+        {
+            "timestamp": 1583628928756,
+            "userId": 123,
+            "category": "SCIENCE",
+            "won": true
+        }
+    ],
+    "sub_status": "P1_PLAYING_TURN",
+    "previous_sub_status": "P1_PLAYING_TURN",
+    "statistics": {
+        "player_one_statistics": {
+            "category_questions": [
+                {
+                    "category": "HISTORY",
+                    "correct": 1,
+                    "incorrect": 0,
+                    "worst": false
+                },
+                {
+                    "category": "SCIENCE",
+                    "correct": 2,
+                    "incorrect": 0,
+                    "worst": false
+                },
+                {
+                    "category": "ARTS",
+                    "correct": 3,
+                    "incorrect": 0,
+                    "worst": false
+                },
+                {
+                    "category": "ENTERTAINMENT",
+                    "correct": 0,
+                    "incorrect": 1,
+                    "worst": true,
+                    "performance": 0
+                },
+                {
+                    "category": "SPORTS",
+                    "correct": 2,
+                    "incorrect": 0,
+                    "worst": false
+                },
+                {
+                    "category": "GEOGRAPHY",
+                    "correct": 1,
+                    "incorrect": 0,
+                    "worst": false
+                }
+            ],
+            "correct_answers": 9,
+            "incorrect_answers": 1,
+            "challenges_won": 0,
+            "questions_answered": 10,
+            "crowns_won": 2
+        },
+        "player_two_statistics": {
+            "category_questions": [
+                {
+                    "category": "HISTORY",
+                    "correct": 0,
+                    "incorrect": 1,
+                    "worst": false
+                },
+                {
+                    "category": "SCIENCE",
+                    "correct": 1,
+                    "incorrect": 0,
+                    "worst": false
+                }
+            ],
+            "correct_answers": 1,
+            "incorrect_answers": 1,
+            "challenges_won": 0,
+            "questions_answered": 2,
+            "crowns_won": 1
+        }
+    },
+    "is_random": true,
+    "unread_messages": 0,
+    "last_turn": "03/07/2020 19:56:48 EST",
+    "status_version": 13,
+    "my_level_data": {
+        "level": 16,
+        "points": 152,
+        "goal_points": 168,
+        "progress": 11,
+        "level_up": true
+    },
+    "opponent_selection_type": "RANDOM",
+    "nudge_available": false,
+    "opponent": {
+        "id": 321,
+        "alerts_count": 0,
+        "username": "aaa",
+        "facebook_id": "123",
+        "facebookId": {
+            "value": "",
+            "defined": false
+        },
+        "facebook_name": "a b",
+        "fb_show_picture": true,
+        "fb_show_name": true,
+        "allow_og_posts": true,
+        "photo_url": "",
+        "level_data": {
+            "level": 6
+        },
+        "is_friend": false,
+        "league_name": "APPRENTICE_1"
+    },
+    "game_status": "ACTIVE",
+    "language": "EN",
+    "created": "03/07/2020 19:30:03 EST",
+    "type": "NORMAL",
+    "my_turn": true,
+    "expiration_date": "03/09/2020 07:56:48 EST"
+}

data/spec/parsers/category_statistics_parser_spec.rb

@@ -9,7 +9,7 @@ describe TriviaCrack::Parsers::CategoryStatisticsParser do
     let(:category_data) { raw_data["statistics"]["player_one_statistics"]["category_questions"] }
 
     context 'when given data from the games API' do
-      let(:raw_data) { SpecData.get "game.json" }
+      let(:raw_data) { SpecData.get_json "game.json" }
 
       it { is_expected.to be_a TriviaCrack::CategoryStatistics }
       its(:category) { is_expected.to be :geography }
@@ -19,7 +19,7 @@ describe TriviaCrack::Parsers::CategoryStatisticsParser do
     end
 
     context 'when given data from the dashboard API' do
-      let(:raw_data) { SpecData.get("dashboard.json")["list"][3] }
+      let(:raw_data) { SpecData.get_json("dashboard.json")["list"][3] }
 
       it { is_expected.to be_a TriviaCrack::CategoryStatistics }
       its(:category) { is_expected.to eq :arts }
@@ -29,7 +29,7 @@ describe TriviaCrack::Parsers::CategoryStatisticsParser do
     end
 
     context 'when given data from the answers API' do
-      let(:raw_data) { SpecData.get "answer.json" }
+      let(:raw_data) { SpecData.get_json "answer.json" }
 
       it { is_expected.to be_a TriviaCrack::CategoryStatistics }
       its(:category) { is_expected.to eq :sports }

data/spec/parsers/game_parser_spec.rb

@@ -6,13 +6,13 @@ describe TriviaCrack::Parsers::GameParser do
 
     subject { TriviaCrack::Parsers::GameParser.parse raw_data }
 
-    let(:game_data) { SpecData.get "game.json" }
-    let(:dashboard_data) { SpecData.get "dashboard.json" }
-    let(:answer_data) { SpecData.get "answer.json" }
-    let(:new_game_data) { SpecData.get "new_game.json" }
+    let(:game_data) { SpecData.get_json "game.json" }
+    let(:dashboard_data) { SpecData.get_json "dashboard.json" }
+    let(:answer_data) { SpecData.get_json "answer.json" }
+    let(:new_game_data) { SpecData.get_json "new_game.json" }
 
     context 'when given data from the games API' do
-      let(:raw_data) { SpecData.get "game.json" }
+      let(:raw_data) { SpecData.get_json "game.json" }
 
       it { is_expected.to be_a TriviaCrack::Game }
       its(:id) { is_expected.to be 1111 }
@@ -37,7 +37,7 @@ describe TriviaCrack::Parsers::GameParser do
     end
 
     context 'when given data from the dashboard API' do
-      let(:raw_data) { SpecData.get("dashboard.json")["list"][3] }
+      let(:raw_data) { SpecData.get_json("dashboard.json")["list"][3] }
 
       it { is_expected.to be_a TriviaCrack::Game }
       its(:id) { is_expected.to be 1115 }
@@ -62,7 +62,7 @@ describe TriviaCrack::Parsers::GameParser do
     end
 
     context 'when given data from the answers API' do
-      let(:raw_data) { SpecData.get "answer.json" }
+      let(:raw_data) { SpecData.get_json "answer.json" }
 
       it { is_expected.to be_a TriviaCrack::Game }
       its(:id) { is_expected.to be 1111 }
@@ -87,7 +87,7 @@ describe TriviaCrack::Parsers::GameParser do
     end
 
     context 'when given data from the new game API' do
-      let(:raw_data) { SpecData.get "new_game.json" }
+      let(:raw_data) { SpecData.get_json "new_game.json" }
 
       it { is_expected.to be_a TriviaCrack::Game }
       its(:id) { is_expected.to be 2222 }
@@ -110,5 +110,31 @@ describe TriviaCrack::Parsers::GameParser do
       its(:my_statistics) { is_expected.to be_a TriviaCrack::GameStatistics }
       its(:opponent_statistics) { is_expected.to be_a TriviaCrack::GameStatistics }
     end
+
+    context 'when given data from the games API and the game is a duel' do
+      let(:raw_data) { SpecData.get_json "game_duel.json" }
+
+      it { is_expected.to be_a TriviaCrack::Game }
+      its(:id) { is_expected.to be 1119 }
+      its(:opponent) { is_expected.to be_a TriviaCrack::User }
+      its('opponent.id') { is_expected.to be 321 }
+      its(:game_status) { is_expected.to be :active }
+      its(:language) { is_expected.to be :en }
+      its(:created) { is_expected.to be_a Time }
+      its(:last_turn) { is_expected.to be_a Time }
+      its(:type) { is_expected.to be :normal }
+      its(:expiration_date) { is_expected.to be_a Time }
+      its(:my_turn) { is_expected.to be true }
+      its(:round_number) { is_expected.to be 2 }
+      its(:is_random) { is_expected.to be true }
+      its(:unread_messages) { is_expected.to be 0 }
+      its(:status_version) { is_expected.to be 13 }
+      its(:available_crowns) { is_expected.to contain_exactly(:entertainment, :science, :history, :sports) }
+      its('questions.size') { is_expected.to eq(7) }
+      its('questions.first') { is_expected.to be_a TriviaCrack::Question }
+      its('questions.first.id') { is_expected.to be 17881223 }
+      its(:my_statistics) { is_expected.to be_a TriviaCrack::GameStatistics }
+      its(:opponent_statistics) { is_expected.to be_a TriviaCrack::GameStatistics }
+    end
   end
 end

data/spec/parsers/game_statistics_parser_spec.rb

@@ -10,7 +10,7 @@ describe TriviaCrack::Parsers::GameStatisticsParser do
     before { statistics_data["crowns"] = raw_data["player_one"]["crowns"] }
 
     context 'when given data from the games API' do
-      let(:raw_data) { SpecData.get "game.json" }
+      let(:raw_data) { SpecData.get_json "game.json" }
 
       it { is_expected.to be_a TriviaCrack::GameStatistics }
       its(:correct_answers) { is_expected.to be 12 }
@@ -21,7 +21,7 @@ describe TriviaCrack::Parsers::GameStatisticsParser do
     end
 
     context 'when given data from the dashboard API' do
-      let(:raw_data) { SpecData.get("dashboard.json")["list"][3] }
+      let(:raw_data) { SpecData.get_json("dashboard.json")["list"][3] }
 
       it { is_expected.to be_a TriviaCrack::GameStatistics }
       its(:correct_answers) { is_expected.to be 13 }
@@ -32,7 +32,7 @@ describe TriviaCrack::Parsers::GameStatisticsParser do
     end
 
     context 'when given data from the answer API' do
-      let(:raw_data) { SpecData.get "answer.json" }
+      let(:raw_data) { SpecData.get_json "answer.json" }
 
       it { is_expected.to be_a TriviaCrack::GameStatistics }
       its(:correct_answers) { is_expected.to be 13 }
@@ -43,7 +43,7 @@ describe TriviaCrack::Parsers::GameStatisticsParser do
     end
 
     context 'when given data from the new game API' do
-      let(:raw_data) { SpecData.get "new_game.json" }
+      let(:raw_data) { SpecData.get_json "new_game.json" }
 
       it { is_expected.to be_a TriviaCrack::GameStatistics }
       its(:correct_answers) { is_expected.to be 0 }

data/spec/parsers/profile_parser_spec.rb

@@ -7,7 +7,7 @@ describe TriviaCrack::Parsers::ProfileParser do
     subject { TriviaCrack::Parsers::ProfileParser.parse raw_data }
 
     context 'when given data from the profile API' do
-      let(:raw_data) { SpecData.get "profile.json" }
+      let(:raw_data) { SpecData.get_json "profile.json" }
 
       it { is_expected.to be_a TriviaCrack::Profile }
       its(:id) { is_expected.to be 111 }
@@ -32,7 +32,7 @@ describe TriviaCrack::Parsers::ProfileParser do
     end
 
     context 'when given data from the current user profile API' do
-      let(:raw_data) { SpecData.get "my_profile.json" }
+      let(:raw_data) { SpecData.get_json "my_profile.json" }
 
       it { is_expected.to be_a TriviaCrack::Profile }
       its(:id) { is_expected.to be 222 }

data/spec/parsers/question_parser_spec.rb

@@ -7,7 +7,7 @@ describe TriviaCrack::Parsers::QuestionParser do
     subject { TriviaCrack::Parsers::QuestionParser.parse raw_data }
 
     context 'when given data without an image' do
-      let(:raw_data) { SpecData.get "question.json" }
+      let(:raw_data) { SpecData.get_json "question.json" }
 
       it { is_expected.to be_a TriviaCrack::Question }
       its(:type) { is_expected.to be :normal }
@@ -19,7 +19,7 @@ describe TriviaCrack::Parsers::QuestionParser do
     end
 
     context 'when given data with an image' do
-      let(:raw_data) { SpecData.get "question_image.json" }
+      let(:raw_data) { SpecData.get_json "question_image.json" }
 
       it { is_expected.to be_a TriviaCrack::Question }
       its(:type) { is_expected.to be :normal }

data/spec/parsers/session_parser_spec.rb

@@ -7,7 +7,7 @@ describe TriviaCrack::Parsers::SessionParser do
     subject { TriviaCrack::Parsers::SessionParser.parse raw_data }
 
     context 'when given data from the login API' do
-      let(:raw_data) { SpecData.get "login.json" }
+      let(:raw_data) { SpecData.get_json "login.json" }
 
       it { is_expected.to be_a TriviaCrack::Session }
       its(:user_id) { is_expected.to be 111 }

data/spec/parsers/user_parser_spec.rb

@@ -7,7 +7,7 @@ describe TriviaCrack::Parsers::UserParser do
     subject { TriviaCrack::Parsers::UserParser.parse raw_data }
 
     context 'when given data from the user API' do
-      let(:raw_data) { SpecData.get "user.json" }
+      let(:raw_data) { SpecData.get_json "user.json" }
 
       it { is_expected.to be_a TriviaCrack::User }
       its(:id) { is_expected.to be 111 }
@@ -28,7 +28,7 @@ describe TriviaCrack::Parsers::UserParser do
     end
 
     context 'when given opponent data from the game API' do
-      let(:raw_data) { SpecData.get("game.json")["opponent"] }
+      let(:raw_data) { SpecData.get_json("game.json")["opponent"] }
 
       it { is_expected.to be_a TriviaCrack::User }
       its(:id) { is_expected.to be 111 }

data/spec/spec_helper.rb

@@ -33,6 +33,10 @@ require_relative "../lib/triviacrack/parsers/user_parser"
 class SpecData
 
   def self.get(filename)
+    File.read(File.expand_path("../data/#{filename}", __FILE__))
+  end
+
+  def self.get_json(filename)
     file = File.read(File.expand_path("../data/#{filename}", __FILE__))
     JSON.parse(file)
   end

data/triviacrack.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0"
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
-  spec.add_development_dependency "simplecov", "~> 0.17.1"
-  spec.add_development_dependency "rake", "~> 13.0.1"
-  spec.add_development_dependency "rspec", "~> 3.9.0"
+  spec.add_development_dependency "bundler", "~> 2.2.27"
+  spec.add_development_dependency "simplecov", "~> 0.21.2"
+  spec.add_development_dependency "rake", "~> 13.0.6"
+  spec.add_development_dependency "rspec", "~> 3.10.0"
   spec.add_development_dependency "rspec-its", "~> 1.3.0"
-  spec.add_development_dependency "json", "~> 2.3.0"
-  spec.add_development_dependency "fuubar", "~> 2.5.0"
+  spec.add_development_dependency "fuubar", "~> 2.5.1"
 
-  spec.add_dependency "unirest-2x", "~> 1.1.3"
+  spec.add_dependency "json", "~> 2.5.1"
+  spec.add_dependency "faraday", "~> 1.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: triviacrack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors:
 - David Kus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.27
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -81,47 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
+        version: 2.5.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: unirest-2x
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.7.2
 description: A Ruby interface to the Trivia Crack API.
 email:
 - david@kus.dk
@@ -133,6 +133,7 @@ files:
 - ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -172,6 +173,7 @@ files:
 - spec/data/answer.json
 - spec/data/dashboard.json
 - spec/data/game.json
+- spec/data/game_duel.json
 - spec/data/login.json
 - spec/data/my_profile.json
 - spec/data/new_game.json
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A Ruby interface to the Trivia Crack API.
@@ -224,6 +226,7 @@ test_files:
 - spec/data/answer.json
 - spec/data/dashboard.json
 - spec/data/game.json
+- spec/data/game_duel.json
 - spec/data/login.json
 - spec/data/my_profile.json
 - spec/data/new_game.json