wanikani 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47162b1fe2e86d5d805dae4c0e248c0f562ee8ba
-  data.tar.gz: ce663341e1e1a9f753a04d629eb3062c08335406
+  metadata.gz: c80fe4a266a176e7b3e9ef72398a2cfef11d16df
+  data.tar.gz: b523b20cf4098bb327ae0587f554df26088ff4da
 SHA512:
-  metadata.gz: 76585b1c58d2148d2ad6ace39e9be05e7f7f348e33d5ee73893a95c06496e679043e7df77567ff094d9f8c8c900d92257d766559c72ccc62904eae621790581e
-  data.tar.gz: 0d6ff0ef83595072ea0010594a3656a6022980d56fae0627ae9ec205349036cea08bf9ebbc00d427a1851e9572f5f4bf11fcaca6a1623f16ee281cddd84710dd
+  metadata.gz: d6fe284b27ac4398c138973336d604296a7e2f13792ac06eb65b1095a8e1b1aef46e1bb79ca804afea4a0931e308085e6047b1268b19736805e17307b288f519
+  data.tar.gz: b4addf8432b0d277b4a4d16cd452d349975f3b828b421fbe6cf8fe300860fee281dce7188acabba713d9884ac82fb66d840f20b47ff0e8710b512e3fe31cc3f7

data/lib/wanikani.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'rest_client'
-require 'multi_json'
+require 'faraday'
+require 'faraday_middleware'
 
 require 'wanikani/user'
 require 'wanikani/study_queue'
@@ -14,7 +14,7 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 module Wanikani
-  API_ENDPOINT = "https://www.wanikani.com/api"
+  API_ENDPOINT = "https://www.wanikani.com"
   DEFAULT_API_VERSION = "v1.4"
   VALID_API_VERSIONS = %w(v1 v1.1 v1.2 v1.3 v1.4)
 
@@ -40,13 +40,12 @@ module Wanikani
     raise ArgumentError, "You must set your Wanikani API key before querying the API" if Wanikani.api_key.nil? || Wanikani.api_key.empty?
 
     begin
-      response = RestClient.get("#{Wanikani::API_ENDPOINT}/#{Wanikani.api_version}/user/#{Wanikani.api_key}/#{resource}/#{optional_arg}")
-      parsed_response = MultiJson.load(response)
+      res = client.get("/api/#{Wanikani.api_version}/user/#{Wanikani.api_key}/#{resource}/#{optional_arg}")
 
-      if parsed_response.has_key?("error")
-        self.raise_exception(parsed_response["error"]["message"])
+      if res.body.has_key?("error")
+        self.raise_exception(res.body["error"]["message"])
       else
-        return parsed_response
+        return res.body
       end
     rescue => error
       self.raise_exception(error.message)
@@ -57,12 +56,19 @@ module Wanikani
     api_key ||= Wanikani.api_key
     return false if api_key.nil? || api_key.empty?
 
-    response = RestClient.get("#{Wanikani::API_ENDPOINT}/#{Wanikani.api_version}/user/#{api_key}/user-information/")
-    !MultiJson.load(response).has_key?("error")
+    res = client.get("/api/#{Wanikani.api_version}/user/#{api_key}/user-information")
+    !res.body.has_key?("error")
   end
 
   private
 
+  def self.client
+    Faraday.new(url: Wanikani::API_ENDPOINT) do |conn|
+      conn.response :json, :content_type => /\bjson$/
+      conn.adapter Faraday.default_adapter
+    end
+  end
+
   def self.raise_exception(message)
     raise Wanikani::Exception, "There was an error fetching the data from Wanikani (#{message})"
   end

data/lib/wanikani/version.rb

@@ -1,3 +1,3 @@
 module Wanikani
-  VERSION = '1.3'
+  VERSION = '1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wanikani
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Dennis Martinez
@@ -11,47 +11,47 @@ cert_chain: []
 date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add Japanese Kanji learning goodness to your Ruby projects!