devise_capturable 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35e33d8a0bbb3e0bc3f1c3c3673f399668b23ed
-  data.tar.gz: 15d157ef99560f9e250099df336c08ebad8adb41
+  metadata.gz: e932376112dd1d89509666eb50bfd1392308756f
+  data.tar.gz: 3d4435c57dc7167d5e58abb7f680b6efed28d7f8
 SHA512:
-  metadata.gz: 77e7dac34ed01b8310cf43a641a0556ba8495ad0a3640f0dd800781a0136f07565e25641da2f488eec912e8111c5890d54b6fad36795c59de61c4851820877e4
-  data.tar.gz: 144cddbc639f09c62aada71287460ab9915b0f7a0fe95a717248e0b48debbe7ae8b7453987bd0e87695f00003be1c1141ccd5f2bcfbf3d920c6eabe1f1cfa58a
+  metadata.gz: 16747279659a61bc61e6c1fbb7ac2dad51a15d7486a242d42b997f22916b9a67f9aab536192b6ae975d89f8bfbc231fe4a445b3d600c6b7885cacf6ed0e24a7c
+  data.tar.gz: 4558d7617ff67409de2278a12e1dda0cf3d9486ed190b359037606090428b3f49502906d09f2220731768f32793164b7c345ff956a54bce1c1b68f8877005eb8

data/README.md

@@ -40,6 +40,8 @@ Devise.setup do |config|
   config.capturable_server = "https://myapp.janraincapture.com"  
   config.capturable_client_id = "myclientid"
   config.capturable_client_secret = "myclientsecret"
+  # Optional, see below to override config.capturable_redirect_uri
+  # config.capturable_redirect_uri = "http://sample.com"
 end
 ```
 
@@ -100,11 +102,9 @@ By default Devise will now create a database record when the user logs in for th
 The Janrain User Registration widget relies on settings that are 1) never used and 2) breaks the widget if they are not present. To circumvent this madness, this gem will automatically set a bunch of janrain setting variables for you:
 
 ```javascript
-// these settings will always be the same
+// default settings for gem
 janrain.settings.capture.flowName = 'signIn';
 janrain.settings.capture.responseType = 'code';
-
-// these settings are never used but crashes the widget if not present
 janrain.settings.capture.redirectUri = 'http://stupidsettings.com';
 ```
 
@@ -112,7 +112,6 @@ You can delete these settings from your embed code, as the gem will set them for
 
 ## Changing defaults
 
-
 #### Overriding `before_capturable_create`
 
 There are times where you might want to save more than the `email` of your user in the Rails `User` model. You can override the `before_capturable_create` instance method to do this. Here's an example where I'm also saving the `uuid`. The `capture_data` parameter passed to the function is the Janrain Capture `entity` JSON result that has a bunch of information about the user, and the `params` parameter is the controller parameters.
@@ -161,6 +160,38 @@ Devise.setup do |config|
 end
 ```
 
+#### Overriding `janrainCaptureWidgetOnLoad`
+
+There are a number of reasons you may need to override the default `janrainCaptureWidgetOnLoad` Javascript function:
+
+* To use the `signInEmbedded` flow instead of the default `signIn`
+* To specify a `redirectUri` value (required to use Janrain's Federate feature)
+* To add functionality to Janrain event handlers, or add more event handlers
+
+To do so, you'll need to write your own `janrainCaptureWidgetOnLoad` function and include it separately. In this example, I'm replacing the default function with my own, included inline when loading the Janrain widget:
+
+```javascript
+  function janrainCaptureWidgetOnLoad() {
+    janrain.settings.capture.flowName = 'signInEmbedded';
+    janrain.settings.capture.responseType = 'code';
+    janrain.settings.capture.redirectUri = 'http://mydomain.com';
+    janrain.capture.ui.start();
+
+    // afterJanrainLogin is provided by Devise::Capturable to assist with
+    // server-side login
+    janrain.events.onCaptureLoginSuccess.addHandler(afterJanrainLogin);
+    janrain.events.onCaptureRegistrationSuccess.addHandler(afterJanrainLogin);
+  };
+```
+
+Finally, I can also provide an optional path to send the Janrain `authorizationCode` to in my application, if using a Devise resource not named `User`:
+
+```erb
+janrain.events.onCaptureRegistrationSuccess.addHandler(function(result) {
+  afterJanrainLogin(result, '<%= new_admin_session_path %>');
+});
+```
+
 ## Running the Tests
 
 Run the tests with the `rspec` command.

data/devise_capturable.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency("httparty")
   gem.add_development_dependency("devise")
-  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rspec", "~> 2.14")
   gem.add_development_dependency("rails")
 
 end

data/lib/assets/javascripts/devise_capturable.js

@@ -1,7 +1,9 @@
-function afterJanrainLogin(result)
+function afterJanrainLogin(result, path)
 {
+  path = path || "/users/sign_in";
+
   // create form
-  var form  = $('<form accept-charset="UTF-8" action="/users/sign_in" method="post" id="capturable-inject-form"></form>')
+  var form  = $('<form accept-charset="UTF-8" action="' + path + '" method="post" id="capturable-inject-form"></form>')
   
   // create hidden div in form
   var hidden_els = $('<div style="margin:0;padding:0;display:inline"></div>')

data/lib/devise_capturable/api.rb

@@ -10,9 +10,11 @@ module Devise
       #debug_output $stderr
     
       def self.token(code)
+        redirect_uri = Devise.capturable_redirect_uri || 'http://stupidsettings.com'
+
         post("#{Devise.capturable_server}/oauth/token", :query => {
           code: code,
-          redirect_uri: "http://stupidsettings.com",
+          redirect_uri: redirect_uri,
           grant_type: 'authorization_code',
           client_id: Devise.capturable_client_id,
           client_secret: Devise.capturable_client_secret,

data/lib/devise_capturable/strategy.rb

@@ -33,7 +33,7 @@ module Devise
 
             success!(user)
           rescue Exception => e
-            fail!(:capturable_invalid)
+            fail!("Login failed: #{e}")
           end
         end
         

data/lib/devise_capturable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Capturable
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/devise_capturable.rb

@@ -11,6 +11,7 @@ module Devise
 	mattr_accessor :capturable_server
 	mattr_accessor :capturable_client_id
 	mattr_accessor :capturable_client_secret
+	mattr_accessor :capturable_redirect_uri
 end
 
 I18n.load_path.unshift File.join(File.dirname(__FILE__), *%w[devise_capturable locales en.yml])

data/spec/api_spec.rb

@@ -7,12 +7,13 @@ describe 'Devise::Capturable::API' do
 		Devise.stub(:capturable_server).and_return("https://something.dev.janraincapture.com")
     Devise.stub(:capturable_client_id).and_return("thisis")
     Devise.stub(:capturable_client_secret).and_return("atest")
+    Devise.stub(:capturable_redirect_uri).and_return("http://sample.com")
 	end
 
   it "should get token from code" do
   	Devise::Capturable::API.should_receive(:post).with("https://something.dev.janraincapture.com/oauth/token", :query => {
         code: "abcdef",
-        redirect_uri: "http://stupidsettings.com",
+        redirect_uri: "http://sample.com",
         grant_type: 'authorization_code',
         client_id: "thisis",
         client_secret: "atest",

data/spec/view_helpers_spec.rb

@@ -9,7 +9,7 @@ describe 'View Helpers' do
     end
     test = Testing.new
     link = test.link_to_capturable("Login")
-    link.should == '<a class="capture_modal_open" href="#" id="capture_signin_link">Login</a>'
+    link.should == '<a href="#" class="capture_modal_open" id="capture_signin_link">Login</a>'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_capturable
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Rune Skjoldborg Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement