devise-browserid 0.5.1 → 0.5.2

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-devise-browserid depends on warden-browserid and lives in the Rails
+devise-browserid depends on warden-browserid and is enabled in the Rails
 asset pipeline.
 
 I use the devise-browserid strategy with warden, configured like this in
@@ -27,7 +27,11 @@ config/initializers/devise.rb in Rails:
 ```ruby
   config.warden do |manager|
     manager.default_strategies(:scope => :user).unshift :browserid
-    manager.browserid_url = "dev.diresworb.org"
+    # [Mozilla] [1] says to use BrowserID as follows:
+    # manager.browserid_url = "dev.diresworb.org"  # Development
+(default)
+    # manager.browserid_url = "diresworb.org"      # Beta
+    # manager.browserid_url = "browserid.org"      # Production
   end
 ```
 
@@ -41,6 +45,9 @@ And the login button wherever you want to:
 <%= browserid_login_tag %>
 ```
 
+[1]: https://developer.mozilla.org/en/BrowserID/Primary/Developer_tips
+"Mozilla BrowserID Developer Tips"
+
 ## Contributing
 
 1. Fork it

data/devise-browserid.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "warden-browserid"
+  s.add_dependency "warden-browserid", ">= 0.8.0"
   s.add_dependency "devise"
 end

data/lib/devise-browserid/railtie.rb

@@ -1,7 +1,7 @@
 require 'devise-browserid/view_helpers'
 module BrowserId
   class Railtie < Rails::Railtie
-    initializer "my_gem.view_helpers" do
+    initializer "browser_id.view_helpers" do
       ActionView::Base.send :include, ViewHelpers
     end
   end

data/lib/devise-browserid/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Browserid
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

data/lib/devise-browserid/view_helpers.rb

@@ -1,11 +1,22 @@
 module BrowserId
   module ViewHelpers
+
+    # BrowserID JavaScript tags:
+    # - The official BrowserID include.js
+    # - The Devise enabled login and assertion reponse
     def browserid_include_tag
-      javascript_include_tag("https://#{ request.env['warden'].config.browserid_url }/include.js", "browserid")
+      javascript_include_tag(browserid_include_js_url, "browserid")
     end
 
+    # The BrowserID login button
     def browserid_login_tag
       image_tag("sign_in_blue.png", :onclick => "browserIdLogin();")
     end
+
+    # The URL to the BrowserID official JavaScript
+    def browserid_include_js_url
+      "https://#{ Warden::BrowserId::Strategy.browserid_url }/include." + (::Rails.env == "development" ? "orig.js" : ".js")
+    end
+
   end
 end

data/vendor/assets/javascripts/browserid.js

@@ -1,3 +1,6 @@
+/*
+* BrowserID API function: https://developer.mozilla.org/en/BrowserID/Quick_Setup
+*/
 function gotAssertion(assertion) {
   // got an assertion, now send it up to the server for verification
   if (assertion !== null) {
@@ -18,26 +21,30 @@ function gotAssertion(assertion) {
   }
 }
 
-  function browserIdLogin() {
-    navigator.id.get(function(assertion) {
-      if (assertion) {
-          // This code will be invoked once the user has successfully
-          // selected an email address they control to sign in with.
-         $.ajax({
-         	url:"/d/users/sign_in/",
-            type: "POST",
-            data: {"assertion": assertion},
-            cache:false,
-         	success:function(data,status){
-         		window.location.href = '/';
-            },
-            error:function(data,status){
-              alert(data.statusText + ": " + data.responseText);
-            }
-         })
-      } else {
-        // something went wrong!  the user isn't logged in.
-        alert("Could not log you in!");
-      }
-      });
-   }
+/*
+* Our BrowserID login call. If the assertion was found, send this to Devise
+* with warden-browserid enabled for verification and login.
+*/
+function browserIdLogin() {
+  navigator.id.get(function(assertion) {
+    if (assertion) {
+      // This code will be invoked once the user has successfully
+      // selected an email address they control to sign in with.
+      $.ajax({
+        url:"/d/users/sign_in/",
+        type: "POST",
+        data: {"assertion": assertion},
+        cache:false,
+        success:function(data,status){
+          window.location.href = '/';
+        },
+        error:function(data,status){
+          alert(data.statusText + ": " + data.responseText);
+        }
+      })
+    } else {
+      // something went wrong!  the user isn't logged in.
+      alert("Could not log you in!");
+    }
+  });
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-browserid
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-04-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden-browserid
-  requirement: &15949380 !ruby/object:Gem::Requirement
+  requirement: &13162420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *15949380
+  version_requirements: *13162420
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &15948960 !ruby/object:Gem::Requirement
+  requirement: &13162000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15948960
+  version_requirements: *13162000
 description: BrowserID helpers for Devise
 email:
 - runar@rin.no