wanikani 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf87a757aae58a6cc3885aebbb39ae4027320544
-  data.tar.gz: 17cb747c793b240b4fba3ec8193572386590503e
+  metadata.gz: 138c753cc3cd8de0fdc6431696fafef58e6cc0b2
+  data.tar.gz: cd01ab65169dc4e9ef4a0e82b82efa0b15d86908
 SHA512:
-  metadata.gz: f32a2d019b45c21f0999ee8275140ae6986b1b82a57cb9e054c079cb0b6ef227490dc9205f188cc51f157d002a3942341c8fc0aa0fb749aff2900aeffed81741
-  data.tar.gz: 577f2371137cec6415331baa3825e6a120b819ccae0b21a1b2f76734d6246b2fd0a6c7cd07939642f8c6c359cb1e159ae7a8b838be24319af0e658406883c01e
+  metadata.gz: f5722801a57c16801ba3104fac258d7bd4a4a5a97aa340a5c8787d89a7d27df03b702212744b1b656eb85ea90299cee9fe93d7bbcf860d905aac407d4694fb8a
+  data.tar.gz: 44e0dd55615a5ee0f9243ad3ea7f94db1308725f250535f87ec61e6b32fd4c7e8232f89ad0aa6e538f94754358f87aeb8f8592bdd2d6286cf2e6b6de8fdf14ea

data/lib/wanikani.rb

@@ -42,15 +42,13 @@ module Wanikani
     begin
       res = client.get("/api/#{Wanikani.api_version}/user/#{Wanikani.api_key}/#{resource}/#{optional_arg}")
 
-      if !res.success?
-        self.raise_exception("Status code: #{res.status}")
-      elsif res.body.has_key?("error")
-        self.raise_exception(res.body["error"]["message"])
+      if !res.success? || res.body.has_key?("error")
+        self.raise_exception(res)
       else
         return res.body
       end
     rescue => error
-      self.raise_exception(error.message)
+      raise Exception, "There was an error: #{error.message}"
     end
   end
 
@@ -59,7 +57,9 @@ module Wanikani
     return false if api_key.nil? || api_key.empty?
 
     res = client.get("/api/#{Wanikani.api_version}/user/#{api_key}/user-information")
-    !res.body.has_key?("error")
+
+    return false if !res.success? || res.body.has_key?("error")
+    return true
   end
 
   private
@@ -71,7 +71,14 @@ module Wanikani
     end
   end
 
-  def self.raise_exception(message)
+  def self.raise_exception(response)
+    raise Wanikani::InvalidKey, "The API key used for this request is invalid." and return if response.status == 401
+
+    message = if response.body.is_a?(Hash) and response.body.has_key?("error")
+                response.body["error"]["message"]
+              else
+                "Status code: #{response.status}"
+              end
     raise Wanikani::Exception, "There was an error fetching the data from Wanikani (#{message})"
   end
 end

data/lib/wanikani/exceptions.rb

@@ -1,3 +1,4 @@
 module Wanikani
+  class InvalidKey < Exception; end
   class Exception < Exception; end
 end

data/lib/wanikani/version.rb

@@ -1,3 +1,3 @@
 module Wanikani
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wanikani
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Dennis Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 description: Use WaniKani's (https://www.wanikani.com/) API in your Ruby applications
 email: dennis@dennmart.com
 executables: []
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Add Japanese Kanji learning goodness to your Ruby projects!