devise_touchpassable 0.0.1 → 0.0.2

data/app/controllers/devise/touchpass_controller.rb

@@ -1,4 +1,5 @@
 class Devise::TouchpassController < DeviseController
+
   def show
     self.resource = send("current_#{resource_name}")
 

data/devise_touchpassable.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'rails', '~> 3.2.0'
   gem.add_runtime_dependency 'devise', '~> 2.1.0'
-  gem.add_runtime_dependency 'touchpass'
+  gem.add_runtime_dependency 'touchpass', '0.0.8.18'
 
   gem.add_development_dependency 'rspec', '~> 2.0.0'
 end

data/lib/devise_touchpassable/model.rb

@@ -4,6 +4,8 @@ module Devise
   module Models
     module Touchpassable
 
+      class ResponseError < StandardError ; end
+
       # Override this in your model if you want to control which users
       # require touchpass verification
       def need_touchpass_authentication?
@@ -18,7 +20,8 @@ module Devise
 
       def generate_touchpass_verification
         response = touchpass_client.create_verification(:to_party => touchpass_username)
-        # TODO handle errors
+        logger.debug(response)
+        check_response(response)
         logger.debug "Touchpass::Client#create_verification -> %s" % [response]
         return response
       end
@@ -37,6 +40,7 @@ module Devise
 
       def touchpass_verification_state(verification_id)
         response = touchpass_client.get_verification(:id => verification_id)
+        check_response(response)
         logger.debug "Touchpass::Client#get_verification(:id => %d) -> state = '%s' (%s)" % [
           verification_id, response['state'],  response
         ]
@@ -53,6 +57,19 @@ module Devise
           client.api_key = Devise.touchpass_api_key
         end
       end
+
+      def check_response(response)
+        if response.has_key?('error')
+          raise ResponseError.new(response['error'])
+        elsif response.has_key?('errors')
+          raise ResponseError.new(response['errors'])
+        # Sometimes the touchpass gem returns a hash of headers instead of
+        # a JSON response body.
+        elsif response.has_key?('status') and response.has_key?('content-type')
+          raise ResponseError.new(response)
+        end
+      end
+
     end
   end
 end

data/lib/devise_touchpassable/version.rb

@@ -1,3 +1,3 @@
 module DeviseTouchpassable
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_touchpassable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8.18
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2748537932132156047
+      hash: -1272606961912556354
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2748537932132156047
+      hash: -1272606961912556354
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24