devise_token_auth 0.1.20 → 0.1.21.alpha1

data/test/fixtures/mangs.yml

@@ -0,0 +1,31 @@
+<% timestamp = DateTime.parse(2.weeks.ago.to_s).to_time.strftime("%F %T") %>
+<% @email = Faker::Internet.email %>
+confirmed_email_user:
+  uid:                 "<%= @email %>"
+  email:               "<%= @email %>"
+  provider:            'email'
+  confirmed_at:        '<%= timestamp %>'
+  created_at:          '<%= timestamp %>'
+  updated_at:          '<%= timestamp %>'
+  confirm_success_url: '<%= Faker::Internet.url %>'
+  encrypted_password:  <%= Mang.new.send(:password_digest, 'secret123') %>
+
+<% @fb_email = Faker::Internet.email %>
+duplicate_email_facebook_user:
+  uid:                 "<%= Faker::Number.number(10) %>"
+  email:               "<%= @fb_email %>"
+  provider:            'facebook'
+  created_at:          '<%= timestamp %>'
+  updated_at:          '<%= timestamp %>'
+  confirmed_at:        '<%= timestamp %>'
+  encrypted_password:  <%= Mang.new.send(:password_digest, 'secret123') %>
+
+<% @unconfirmed_email = Faker::Internet.email %>
+unconfirmed_email_user:
+  uid:                 "<%= @unconfirmed_email %>"
+  email:               "<%= @unconfirmed_email %>"
+  provider:            'email'
+  confirm_success_url: '<%= Faker::Internet.url %>'
+  created_at:          '<%= timestamp %>'
+  updated_at:          '<%= timestamp %>'
+  encrypted_password:  <%= Mang.new.send(:password_digest, 'secret123') %>

data/test/test_helper.rb

@@ -1,4 +1,8 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 ENV["RAILS_ENV"] = "test"
+
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rails/test_help"
 require "minitest/rails"
@@ -10,7 +14,8 @@ require "minitest/rails"
 # Uncomment for awesome colorful output
 require "minitest/pride"
 
-ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__) 
+ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+ActionDispatch::IntegrationTest.fixture_path = File.expand_path("../fixtures", __FILE__)
 
 # I hate the default reporter. Use ProgressReporter instead.
 Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
@@ -18,8 +23,6 @@ Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
 class ActiveSupport::TestCase
   ActiveRecord::Migration.check_pending!
 
-  include Devise::TestHelpers
-
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
@@ -27,13 +30,14 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
+end
 
-  setup do
-    @routes = DeviseTokenAuth::Engine.routes
-  end
+class ActionController::TestCase
+  include Devise::TestHelpers
 
-  before do
-    @request.env["devise.mapping"] = Devise.mappings[:user]
+  setup do
+    @routes = Dummy::Application.routes
+    @request.env['devise.mapping'] = Devise.mappings[:user]
   end
 
   def age_token(user, client_id)
@@ -42,7 +46,7 @@ class ActiveSupport::TestCase
   end
 
   def expire_token(user, client_id)
-    user.tokens[client_id]['expiry'] = Time.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)
+    user.tokens[client_id]['expiry'] = (Time.now - (DeviseTokenAuth.token_lifespan.to_f + 10.seconds)).to_i
     user.save
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21.alpha1
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,7 +100,7 @@ files:
 - app/controllers/devise_token_auth/registrations_controller.rb
 - app/controllers/devise_token_auth/sessions_controller.rb
 - app/helpers/devise_token_auth/application_helper.rb
-- app/models/user.rb
+- app/models/devise_token_auth/concerns/user.rb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
@@ -112,24 +112,30 @@ files:
 - config/routes.rb
 - lib/devise_token_auth.rb
 - lib/devise_token_auth/engine.rb
+- lib/devise_token_auth/rails/routes.rb
 - lib/devise_token_auth/version.rb
 - lib/generators/devise_token_auth/USAGE
 - lib/generators/devise_token_auth/install_generator.rb
 - lib/generators/devise_token_auth/templates/devise_token_auth.rb
-- lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb
+- lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
+- lib/generators/devise_token_auth/templates/user.rb
 - lib/tasks/devise_token_auth_tasks.rake
 - test/controllers/demo_controller_test.rb
+- test/controllers/devise_token_auth/auth_controller_test.rb
 - test/controllers/devise_token_auth/confirmations_controller_test.rb
 - test/controllers/devise_token_auth/passwords_controller_test.rb
 - test/controllers/devise_token_auth/registrations_controller_test.rb
 - test/controllers/devise_token_auth/sessions_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/images/omniauth-provider-settings.png
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/demo_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/mang.rb
+- test/dummy/app/models/user.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -160,7 +166,8 @@ files:
 - test/dummy/config/secrets.yml
 - test/dummy/config/spring.rb
 - test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20140714223034_devise_token_auth_create_users.rb
+- test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
+- test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -170,6 +177,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/tmp/restart.txt
+- test/fixtures/mangs.yml
 - test/fixtures/users.yml
 - test/integration/navigation_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb
@@ -189,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -200,15 +208,19 @@ specification_version: 4
 summary: Token based authentication for rails. Uses Devies + Omniauth.
 test_files:
 - test/controllers/demo_controller_test.rb
+- test/controllers/devise_token_auth/auth_controller_test.rb
 - test/controllers/devise_token_auth/confirmations_controller_test.rb
 - test/controllers/devise_token_auth/passwords_controller_test.rb
 - test/controllers/devise_token_auth/registrations_controller_test.rb
 - test/controllers/devise_token_auth/sessions_controller_test.rb
+- test/dummy/app/assets/images/omniauth-provider-settings.png
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/demo_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/mang.rb
+- test/dummy/app/models/user.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -239,7 +251,8 @@ test_files:
 - test/dummy/config/spring.rb
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20140714223034_devise_token_auth_create_users.rb
+- test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
+- test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
@@ -251,6 +264,7 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/tmp/restart.txt
+- test/fixtures/mangs.yml
 - test/fixtures/users.yml
 - test/integration/navigation_test.rb
 - test/lib/generators/devise_token_auth/install_generator_test.rb