devise_castle 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fed2b4bde70c3fb648b8b73ba596ddae8c57c87c
-  data.tar.gz: 4235c9af1d89be5575a18c8247f0afc2c4f51e93
+  metadata.gz: b2f22f6ada2c44ff3db71806b63389b1ab3effbd
+  data.tar.gz: 9a7908fc9fd6f1dd802a8d190b798924a6fc731a
 SHA512:
-  metadata.gz: fa706cce1ce7efdf2e096ebf71b783106aed6595cfd4153a68be8c33ab6aebd9d81e51ae6c0dd4ac4e103ed051438f6dc314be5f8dc3751cb872f86ac77b59c0
-  data.tar.gz: 31eb367a77bef0ad819a3c15d20267755a41ad06cefab41d15f00f5496040d968e5fcdd47ff4704b6ec54ee8d0142891e6ba82b245ffe9251440da3b2cd5ccb6
+  metadata.gz: e164170c07efabe7eddd0f26dfc753c598ee3fd6a61af621d031edf3ee338aa7d3b7cae6ca2e3315856de5a651c64775ec04f6a5f38ab1ffc65794a6ad2e6552
+  data.tar.gz: 0877d062f9ed3a9025b940118bfbb9998aa147b0c0c2d31b0b831759c7abe43e9cfa6695e80ca3942b8c2f1fee78fd67864d9ef03712be6835cec65bf78c39a5

data/app/controllers/devise_castle/passwords_controller.rb

@@ -11,11 +11,17 @@ class DeviseCastle::PasswordsController < Devise::PasswordsController
     super do |resource|
       return if resource.respond_to?(:castle_do_not_track?) && resource.castle_do_not_track?
 
-      castle.track(
-        name: '$password_reset.requested',
-        details: {
-          '$login' => username
-        })
+      begin
+        castle.track(
+          name: '$password_reset.requested',
+          details: {
+            '$login' => username
+          })
+      rescue ::Castle::Error => e
+        if Devise.castle_error_handler.is_a?(Proc)
+          Devise.castle_error_handler.call(e)
+        end
+      end
     end
   end
 
@@ -23,14 +29,20 @@ class DeviseCastle::PasswordsController < Devise::PasswordsController
     super do |resource|
       return if resource.respond_to?(:castle_do_not_track?) && resource.castle_do_not_track?
 
-      if resource.errors.empty?
-        castle.track(
-          name: '$password_reset.succeeded',
-          user_id: resource._castle_id)
-      else
-        castle.track(
-          name: '$password_reset.failed',
-          user_id: resource._castle_id)
+      begin
+        if resource.errors.empty?
+          castle.track(
+            name: '$password_reset.succeeded',
+            user_id: resource._castle_id)
+        else
+          castle.track(
+            name: '$password_reset.failed',
+            user_id: resource._castle_id)
+        end
+      rescue ::Castle::Error => e
+        if Devise.castle_error_handler.is_a?(Proc)
+          Devise.castle_error_handler.call(e)
+        end
       end
     end
   end

data/app/controllers/devise_castle/registrations_controller.rb

@@ -3,13 +3,19 @@ class DeviseCastle::RegistrationsController < Devise::RegistrationsController
 
   def create
     super do |resource|
-      if resource.persisted?
-        castle.track(
-          name: '$registration.succeeded',
-          user_id: resource._castle_id)
-      else
-        castle.track(
-          name: '$registration.failed')
+      begin
+        if resource.persisted?
+          castle.track(
+            name: '$registration.succeeded',
+            user_id: resource._castle_id)
+        else
+          castle.track(
+            name: '$registration.failed')
+        end
+      rescue ::Castle::Error => e
+        if Devise.castle_error_handler.is_a?(Proc)
+          Devise.castle_error_handler.call(e)
+        end
       end
     end
   end
@@ -17,15 +23,21 @@ class DeviseCastle::RegistrationsController < Devise::RegistrationsController
   def update_resource(resource, params)
     resource_updated = super
 
-    if params['password'].present?
-      if resource_updated
-        castle.track(
-          name: '$password_change.succeeded',
-          user_id: resource._castle_id)
-      else
-        castle.track(
-          name: '$password_change.failed',
-          user_id: resource._castle_id)
+    begin
+      if params['password'].present?
+        if resource_updated
+          castle.track(
+            name: '$password_change.succeeded',
+            user_id: resource._castle_id)
+        else
+          castle.track(
+            name: '$password_change.failed',
+            user_id: resource._castle_id)
+        end
+      end
+    rescue ::Castle::Error => e
+      if Devise.castle_error_handler.is_a?(Proc)
+        Devise.castle_error_handler.call(e)
       end
     end
 

data/lib/devise_castle/hooks.rb

@@ -9,7 +9,13 @@ Warden::Manager.before_logout do |record, warden, opts|
   if record.respond_to?(:castle_id)
     unless record.respond_to?(:castle_do_not_track?) && record.castle_do_not_track?
       castle = warden.request.env['castle']
-      castle.track(user_id: record._castle_id, name: '$logout.succeeded')
+      begin
+        castle.track(user_id: record._castle_id, name: '$logout.succeeded')
+      rescue ::Castle::Error => e
+        if Devise.castle_error_handler.is_a?(Proc)
+          Devise.castle_error_handler.call(e)
+        end
+      end
     end
   end
 end
@@ -23,12 +29,18 @@ Warden::Manager.before_failure do |env, opts|
     end
 
     castle = env['castle']
-    castle.track(
-      name: '$login.failed',
-      user_id: user_id,
-      details: {
-        '$login' => opts[:username]
-      })
+    begin
+      castle.track(
+        name: '$login.failed',
+        user_id: user_id,
+        details: {
+          '$login' => opts[:username]
+        })
+    rescue ::Castle::Error => e
+      if Devise.castle_error_handler.is_a?(Proc)
+        Devise.castle_error_handler.call(e)
+      end
+    end
   end
 end
 
@@ -37,10 +49,13 @@ Warden::Manager.after_set_user :except => :fetch do |record, warden, opts|
   if record.respond_to?(:castle_id)
     unless record.respond_to?(:castle_do_not_track?) && record.castle_do_not_track?
       castle = warden.request.env['castle']
-      castle.identify(record._castle_id, {
-        email: record.email
-      })
-      castle.track(user_id: record._castle_id, name: '$login.succeeded')
+      begin
+        castle.track(user_id: record._castle_id, name: '$login.succeeded')
+      rescue ::Castle::Error => e
+        if Devise.castle_error_handler.is_a?(Proc)
+          Devise.castle_error_handler.call(e)
+        end
+      end
     end
   end
 end

data/lib/devise_castle/version.rb

@@ -1,3 +1,3 @@
 module DeviseCastle
-  VERSION = "1.3.2".freeze
+  VERSION = "1.3.4".freeze
 end

data/lib/devise_castle.rb

@@ -7,7 +7,9 @@ require 'castle-rb'
 
 module Devise
   mattr_accessor :castle_api_secret
+  mattr_accessor :castle_error_handler
   @@castle_api_secret = ''
+  @@castle_error_handler = nil
 end
 
 module DeviseCastle

data/lib/generators/devise_castle/install_generator.rb

@@ -18,6 +18,10 @@ module DeviseCastle
   # ==> Configuration for :castle
   config.castle_api_secret = '#{api_secret}'
 
+  # config.castle_error_handler = Proc.new { |exception|
+  #   # Handle error from Castle
+  # }
+
 CONTENT
             end
           end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: devise_castle
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Johan Brissmyr
+- Sebastian Wallin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -30,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.13
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,3 +128,4 @@ signing_key:
 specification_version: 4
 summary: Devise extension for Castle
 test_files: []
+has_rdoc: