triviacrack 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0498c4a4b88170d5974faab06d1f49c7c3b5235ab6d4224b7b82a95c019d0026'
-  data.tar.gz: a4dd24a8012cf642a970d95170f89f30523f0ab684d1d02278e78124dbbf5d1d
+  metadata.gz: bac625736e1fdbe91e229596d95e3af90c22ea6b7b2de6373717994301bfe3b9
+  data.tar.gz: 37afe95e8d8aa72297e85236c00af489bc6a8502c9f8b3d079062ed7157fec02
 SHA512:
-  metadata.gz: a9afae76cf81e4b70b60e41ec26e8c472ec243b5b8e306c1940c5bd14d2ce7749e13ed5b70ba016804021f7ce6b1c72c0248a72460cb1d363db14621adfd27e5
-  data.tar.gz: cb80258751e28d76cc0fa3aac24512afbaa290be20eff2850687d95ec46f8b576cb7247570d7c01380771cc717af946708591ee49a155185d9f7f70a699a1f92
+  metadata.gz: d5f407ab7c8f5ca194efe7bdea42f90943b5f41c80fc5e2485f8d891afc076bbca76a0b016b75c9da96d598e436371ee8db7763b3771fd21942052e76825ba0e
+  data.tar.gz: 28d4d34fb76d0fdaaa9c81b00fdf53bc7422406e701cf343275b0a81aebe0faabdb516dcdd1186309fba94bedfe33328111a70e03842c6f5acd17ea5af400fb9

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    triviacrack (0.5.1)
+    triviacrack (0.6.0)
       faraday (~> 1.7.2)
+      json (~> 2.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -65,7 +66,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.2.27)
   fuubar (~> 2.5.1)
-  json (~> 2.5.1)
   rake (~> 13.0.6)
   rspec (~> 3.10.0)
   rspec-its (~> 1.3.0)

data/lib/triviacrack/api/common.rb

@@ -1,3 +1,4 @@
+require "json"
 require "faraday"
 
 require "triviacrack/errors/request_error"
@@ -16,8 +17,7 @@ module TriviaCrack
       # Returns a Faraday Response object with the server's response.
       # Raises TriviaCrack:Errors::RequestError if the request fails.
       def get(url, parameters: nil)
-        response = Faraday.get "#{API_HOST}#{url}", params: parameters,
-                                                    headers: default_headers
+        response = Faraday.get "#{API_HOST}#{url}", parameters, default_headers
 
         check_response url, response
       end
@@ -31,8 +31,7 @@ module TriviaCrack
       # Returns a Faraday Response object with the server's response.
       # Raises TriviaCrack:Errors::RequestError if the request fails.
       def post(url, parameters: nil)
-        response = Faraday.post "#{API_HOST}#{url}", body: parameters,
-                                                     headers: default_headers
+        response = Faraday.post "#{API_HOST}#{url}", parameters, default_headers
 
         check_response url, response
       end
@@ -61,7 +60,7 @@ module TriviaCrack
       #
       # 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.status.between? 200, 299
@@ -69,7 +68,7 @@ module TriviaCrack
             "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
@@ -62,9 +63,9 @@ module TriviaCrack
       # Raises TriviaCrack::Errors::RequestError if the request fails
       def start_new_game
         response = post "/api/users/#{@session.user_id}/games",
-                        parameters: { language: "EN" }.to_s
+                        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"
 
@@ -25,9 +26,9 @@ module TriviaCrack
         response = post "/api/login", parameters: { email: email,
                                                     password: password,
                                                     language: "en"
-                                                  }.to_s
+                                                  }.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"
 
@@ -31,9 +32,9 @@ module TriviaCrack
                                 answer: answer,
                                 category: question.category.upcase
                                 }]
-                            }.to_s
+                            }.to_json
 
-        game = TriviaCrack::Parsers::GameParser.parse response.body
+        game = TriviaCrack::Parsers::GameParser.parse response
 
         [game, answer == question.correct_answer]
       end
@@ -72,9 +73,9 @@ module TriviaCrack
 
         response =
           post "/api/users/#{@session.user_id}/games/#{game_id}/answers",
-                parameters: { type: questions.first.type.upcase, answers: answers }.to_s
+                parameters: { type: questions.first.type.upcase, answers: answers }.to_json
 
-        game = TriviaCrack::Parsers::GameParser.parse response.body
+        game = TriviaCrack::Parsers::GameParser.parse response
 
         [game, correct_answers]
       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/version.rb

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

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 }
@@ -112,7 +112,7 @@ describe TriviaCrack::Parsers::GameParser do
     end
 
     context 'when given data from the games API and the game is a duel' do
-      let(:raw_data) { SpecData.get "game_duel.json" }
+      let(:raw_data) { SpecData.get_json "game_duel.json" }
 
       it { is_expected.to be_a TriviaCrack::Game }
       its(:id) { is_expected.to be 1119 }

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

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   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.5.1"
   spec.add_development_dependency "fuubar", "~> 2.5.1"
 
+  spec.add_dependency "json", "~> 2.5.1"
   spec.add_dependency "faraday", "~> 1.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triviacrack
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - David Kus
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -95,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         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.1
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: