ember-auth-rails 3.8.0 → 4.0.0

data/README.md

@@ -21,6 +21,10 @@ Add `ember-auth` to sprockets. `application.js`:
 
     //= require ember-auth
 
+Add the `ember-auth-source` gem to control dependencies explicitly:
+
+    $ gem install ember-auth-source --version '3.0.0'
+
 ## Usage
 
 See [README](https://github.com/heartsentwined/ember-auth) at the main

data/ember-auth-rails.gemspec

@@ -4,10 +4,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ember-auth/rails/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "ember-auth-rails"
+  gem.name          = 'ember-auth-rails'
   gem.version       = EmberAuth::Rails::VERSION
-  gem.authors       = ["heartsentwined"]
-  gem.email         = ["heartsentwined@cogito-lab.com"]
+  gem.authors       = ['heartsentwined']
+  gem.email         = ['heartsentwined@cogito-lab.com']
+  gem.date          = Time.now.strftime('%Y-%m-%d')
   gem.summary       = 'Ember-auth for Rails'
   gem.description   = <<-EOS
     Ember-auth provides token authentication support to ember.js.
@@ -15,12 +16,13 @@ Gem::Specification.new do |gem|
   EOS
   gem.homepage      = 'https://github.com/heartsentwined/ember-auth-rails'
 
-  gem.add_dependency 'ember-rails', ['~> 0.10']
+  gem.add_dependency 'ember-auth-source'
+  gem.add_dependency 'rails'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.license       = 'GPL-3'
 end

data/lib/ember-auth-rails.rb

@@ -1,7 +1,15 @@
+require 'rails'
+require 'ember-auth/source'
 require 'ember-auth/rails/version'
+require 'ember-auth/rails/engine'
 
 module EmberAuth
   module Rails
-    require 'ember-auth/rails/engine'
+    class Railtie < ::Rails::Railtie
+      initializer 'ember-auth.setup-vendor', :group => :all do |app|
+        app.assets.append_path \
+          File.expand_path('../', ::EmberAuth::Source.bundled_path)
+      end
+    end
   end
 end

data/lib/ember-auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberAuth
   module Rails
-    VERSION = '3.8.0'
+    VERSION = '4.0.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-auth-rails
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ember-rails
+  name: ember-auth-source
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    Ember-auth provides token authentication support to ember.js.\n
   \   It is expected to work out of the box with rails + devise.\n"
 email:
@@ -39,14 +55,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- app/assets/javascripts/ember-auth/ember-auth.js
-- app/assets/javascripts/ember-auth/index.js
-- app/assets/javascripts/ember-auth/jquery.cookie.js
 - ember-auth-rails.gemspec
 - lib/ember-auth-rails.rb
 - lib/ember-auth/rails/engine.rb
 - lib/ember-auth/rails/version.rb
-- lib/ember-auth/version.rb
 homepage: https://github.com/heartsentwined/ember-auth-rails
 licenses:
 - GPL-3
@@ -60,12 +72,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 161159805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 161159805
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/app/assets/javascripts/ember-auth/ember-auth.js

@@ -1,282 +0,0 @@
-// Generated by CoffeeScript 1.4.0
-(function() {
-  var evented;
-
-  evented = Em.Object.extend(Em.Evented);
-
-  window.Auth = evented.create({
-    authToken: null,
-    currentUserId: null,
-    currentUser: null,
-    jqxhr: null,
-    prevRoute: null,
-    signIn: function(data) {
-      var async,
-        _this = this;
-      if (data == null) {
-        data = {};
-      }
-      async = data.async != null ? data.async : true;
-      if (data.async != null) {
-        delete data['async'];
-      }
-      return this.ajax(this.resolveUrl(Auth.Config.get('tokenCreateUrl')), 'POST', {
-        data: data,
-        async: async
-      }).done(function(json, status, jqxhr) {
-        var model;
-        _this.set('authToken', json[Auth.Config.get('tokenKey')]);
-        _this.set('currentUserId', json[Auth.Config.get('idKey')]);
-        if (model = Auth.Config.get('userModel')) {
-          _this.set('currentUser', model.find(_this.get('currentUserId')));
-        }
-        _this.set('json', json);
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signInSuccess');
-      }).fail(function(jqxhr) {
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signInError');
-      }).always(function(jqxhr) {
-        _this.set('prevRoute', null);
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signInComplete');
-      });
-    },
-    signOut: function(data) {
-      var async,
-        _this = this;
-      if (data == null) {
-        data = {};
-      }
-      data[Auth.Config.get('tokenKey')] = this.get('authToken');
-      async = data.async != null ? data.async : true;
-      if (data.async != null) {
-        delete data['async'];
-      }
-      return this.ajax(this.resolveUrl(Auth.Config.get('tokenDestroyUrl')), 'DELETE', {
-        data: data,
-        async: async
-      }).done(function(json, status, jqxhr) {
-        _this.set('authToken', null);
-        _this.set('currentUserId', null);
-        _this.set('currentUser', null);
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signOutSuccess');
-      }).fail(function(jqxhr) {
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signOutError');
-      }).always(function(jqxhr) {
-        _this.set('prevRoute', null);
-        _this.set('jqxhr', jqxhr);
-        return _this.trigger('signOutComplete');
-      });
-    },
-    resolveUrl: function(path) {
-      var base;
-      base = Auth.Config.get('baseUrl');
-      if (base && base[base.length - 1] === '/') {
-        base = base.substr(0, base.length - 1);
-      }
-      if ((path != null ? path[0] : void 0) === '/') {
-        path = path.substr(1, path.length);
-      }
-      return [base, path].join('/');
-    },
-    resolveRedirectRoute: function(type) {
-      var fallback, isSmart, sameRoute, typeClassCase;
-      if (type !== 'signIn' && type !== 'signOut') {
-        return null;
-      }
-      typeClassCase = "" + (type[0].toUpperCase()) + (type.slice(1));
-      isSmart = Auth.Config.get("smart" + typeClassCase + "Redirect");
-      fallback = Auth.Config.get("" + type + "RedirectFallbackRoute");
-      sameRoute = Auth.Config.get("" + type + "Route");
-      if (!isSmart) {
-        return fallback;
-      }
-      if (!(this.prevRoute != null) || this.prevRoute === sameRoute) {
-        return fallback;
-      } else {
-        return this.prevRoute;
-      }
-    },
-    ajax: function(url, type, hash) {
-      var token;
-      if (token = this.get('authToken')) {
-        if (Auth.Config.get('requestHeaderAuthorization')) {
-          hash.headers || (hash.headers = {});
-          hash.headers[Auth.Config.get('requestHeaderKey')] = this.get('authToken');
-        } else {
-          hash.data || (hash.data = {});
-          hash.data[Auth.Config.get('tokenKey')] = this.get('authToken');
-        }
-      }
-      hash.url = url;
-      hash.type = type;
-      hash.dataType = 'json';
-      hash.contentType = 'application/json; charset=utf-8';
-      if (hash.data && type !== 'GET') {
-        hash.data = JSON.stringify(hash.data);
-      }
-      return jQuery.ajax(hash);
-    }
-  });
-
-  Auth.Config = Em.Object.create({
-    tokenCreateUrl: null,
-    tokenDestroyUrl: null,
-    tokenKey: null,
-    idKey: null,
-    userModel: null,
-    baseUrl: null,
-    requestHeaderAuthorization: false,
-    requestHeaderKey: null,
-    signInRoute: null,
-    signOutRoute: null,
-    authRedirect: false,
-    smartSignInRedirect: false,
-    smartSignOutRedirect: false,
-    signInRedirectFallbackRoute: 'index',
-    signOutRedirectFallbackRoute: 'index',
-    rememberMe: false,
-    rememberTokenKey: null,
-    rememberPeriod: 14,
-    rememberAutoRecall: true,
-    rememberUsingLocalStorage: false
-  });
-
-  Auth.Route = Em.Route.extend(Em.Evented, {
-    redirect: function() {
-      if (!Auth.get('authToken')) {
-        this.trigger('authAccess');
-        if (Auth.Config.get('authRedirect')) {
-          Auth.set('prevRoute', this.routeName);
-          return this.transitionTo(Auth.Config.get('signInRoute'));
-        }
-      }
-    }
-  });
-
-  Auth.SignInController = Em.ObjectController.extend({
-    registerRedirect: function() {
-      return Auth.addObserver('authToken', this, 'smartSignInRedirect');
-    },
-    smartSignInRedirect: function() {
-      if (Auth.get('authToken')) {
-        this.get('target.router').transitionTo(Auth.resolveRedirectRoute('signIn'));
-        return Auth.removeObserver('authToken', this, 'smartSignInRedirect');
-      }
-    }
-  });
-
-  Auth.SignOutController = Em.ObjectController.extend({
-    registerRedirect: function() {
-      return Auth.addObserver('authToken', this, 'smartSignOutRedirect');
-    },
-    smartSignOutRedirect: function() {
-      if (!Auth.get('authToken')) {
-        this.get('target.router').transitionTo(Auth.resolveRedirectRoute('signOut'));
-        return Auth.removeObserver('authToken', this, 'smartSignOutRedirect');
-      }
-    }
-  });
-
-  Auth.RESTAdapter = DS.RESTAdapter.extend({
-    ajax: function(url, type, hash) {
-      hash.context = this;
-      return Auth.ajax(url, type, hash);
-    }
-  });
-
-  Auth.Module = Em.Object.create();
-
-  Auth.Module.RememberMe = Em.Object.create({
-    init: function() {
-      var _this = this;
-      Auth.on('signInSuccess', function() {
-        return _this.remember();
-      });
-      Auth.on('signInError', function() {
-        return _this.forget();
-      });
-      return Auth.on('signOutSuccess', function() {
-        return _this.forget();
-      });
-    },
-    recall: function(opts) {
-      var data, token;
-      if (opts == null) {
-        opts = {};
-      }
-      if (!Auth.Config.get('rememberMe')) {
-        return;
-      }
-      if (!Auth.get('authToken') && (token = this.retrieveToken())) {
-        data = {};
-        if (opts.async != null) {
-          data['async'] = opts.async;
-        }
-        data[Auth.Config.get('rememberTokenKey')] = token;
-        return Auth.signIn(data);
-      }
-    },
-    remember: function() {
-      var token;
-      if (!Auth.Config.get('rememberMe')) {
-        return;
-      }
-      token = Auth.get('json')[Auth.Config.get('rememberTokenKey')];
-      if (token && token !== this.retrieveToken()) {
-        return this.storeToken(token);
-      }
-    },
-    forget: function() {
-      if (!Auth.Config.get('rememberMe')) {
-        return;
-      }
-      return this.removeToken();
-    },
-    retrieveToken: function() {
-      if (Auth.Config.get('rememberUsingLocalStorage')) {
-        return localStorage.getItem('ember-auth-remember-me');
-      } else {
-        return $.cookie('ember-auth-remember-me');
-      }
-    },
-    storeToken: function(token) {
-      if (Auth.Config.get('rememberUsingLocalStorage')) {
-        return localStorage.setItem('ember-auth-remember-me', token);
-      } else {
-        return $.cookie('ember-auth-remember-me', token, {
-          expires: Auth.Config.get('rememberPeriod')
-        });
-      }
-    },
-    removeToken: function() {
-      if (Auth.Config.get('rememberUsingLocalStorage')) {
-        return localStorage.removeItem('ember-auth-remember-me');
-      } else {
-        return $.removeCookie('ember-auth-remember-me');
-      }
-    }
-  });
-
-  Auth.Route.reopen({
-    redirect: function() {
-      var callback, request, self;
-      if (Auth.Config.get('rememberMe') && Auth.Config.get('rememberAutoRecall')) {
-        if (request = Auth.Module.RememberMe.recall({
-          async: false
-        })) {
-          self = this;
-          callback = this._super;
-          return request.always(function() {
-            return callback.call(self);
-          });
-        }
-      }
-      return this._super();
-    }
-  });
-
-}).call(this);

data/app/assets/javascripts/ember-auth/index.js

@@ -1,2 +0,0 @@
-//= require ./jquery.cookie
-//= require ./ember-auth

data/app/assets/javascripts/ember-auth/jquery.cookie.js

@@ -1,92 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.3.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
-	if (typeof define === 'function' && define.amd && define.amd.jQuery) {
-		// AMD. Register as anonymous module.
-		define(['jquery'], factory);
-	} else {
-		// Browser globals.
-		factory(jQuery);
-	}
-}(function ($) {
-
-	var pluses = /\+/g;
-
-	function raw(s) {
-		return s;
-	}
-
-	function decoded(s) {
-		return decodeURIComponent(s.replace(pluses, ' '));
-	}
-
-	function converted(s) {
-		if (s.indexOf('"') === 0) {
-			// This is a quoted cookie as according to RFC2068, unescape
-			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-		}
-		try {
-			return config.json ? JSON.parse(s) : s;
-		} catch(er) {}
-	}
-
-	var config = $.cookie = function (key, value, options) {
-
-		// write
-		if (value !== undefined) {
-			options = $.extend({}, config.defaults, options);
-
-			if (typeof options.expires === 'number') {
-				var days = options.expires, t = options.expires = new Date();
-				t.setDate(t.getDate() + days);
-			}
-
-			value = config.json ? JSON.stringify(value) : String(value);
-
-			return (document.cookie = [
-				encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value),
-				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-				options.path    ? '; path=' + options.path : '',
-				options.domain  ? '; domain=' + options.domain : '',
-				options.secure  ? '; secure' : ''
-			].join(''));
-		}
-
-		// read
-		var decode = config.raw ? raw : decoded;
-		var cookies = document.cookie.split('; ');
-		var result = key ? undefined : {};
-		for (var i = 0, l = cookies.length; i < l; i++) {
-			var parts = cookies[i].split('=');
-			var name = decode(parts.shift());
-			var cookie = decode(parts.join('='));
-
-			if (key && key === name) {
-				result = converted(cookie);
-				break;
-			}
-
-			if (!key) {
-				result[name] = converted(cookie);
-			}
-		}
-
-		return result;
-	};
-
-	config.defaults = {};
-
-	$.removeCookie = function (key, options) {
-		if ($.cookie(key) !== undefined) {
-			$.cookie(key, '', $.extend(options, { expires: -1 }));
-			return true;
-		}
-		return false;
-	};
-
-}));

data/lib/ember-auth/version.rb

@@ -1,3 +0,0 @@
-module EmberAuth
-  VERSION = '2.6.0'
-end