Merge branch 'master' of github.com:NoamB/sorcery

.travis.yml

@@ -1,40 +1,41 @@
 language: ruby
 rvm:
+  - jruby
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
+  - 2.3.0
 
 gemfile:
   - Gemfile
+  - gemfiles/active_record-rails40.gemfile
+  - gemfiles/active_record-rails41.gemfile
+  - gemfiles/active_record-rails42.gemfile
 
 before_script:
   - mysql -e 'create database sorcery_test;'
 
+before_install:
+  - rvm get stable --auto-dotfiles
+  - gem update bundler
+
 matrix:
   allow_failures:
     - rvm: :jruby
 
-  include:
+  exclude:
     - rvm: 1.9.3
-      gemfile: gemfiles/active_record-rails41.gemfile
+      gemfile: gemfiles/active_record-rails42.gemfile
 
     - rvm: 2.0.0
-      gemfile: gemfiles/active_record-rails41.gemfile
-
-    - rvm: 2.1
-      gemfile: gemfiles/active_record-rails41.gemfile
+      gemfile: gemfiles/active_record-rails42.gemfile
 
     - rvm: jruby
-      gemfile: gemfiles/active_record-rails41.gemfile
+      gemfile: Gemfile
 
-    - rvm: 1.9.3
+    - rvm: 2.2
       gemfile: gemfiles/active_record-rails40.gemfile
 
-    - rvm: 2.0.0
-      gemfile: gemfiles/active_record-rails40.gemfile
-
-    - rvm: 2.1
-      gemfile: gemfiles/active_record-rails40.gemfile
-
-    - rvm: jruby
+    - rvm: 2.3.0
       gemfile: gemfiles/active_record-rails40.gemfile

gemfiles/active_record-rails42.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'sqlite3', platform: :mri
+gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+gem 'rails', '~> 4.2.0'
+
+gemspec path: '..'

lib/generators/sorcery/templates/migration/activity_logging.rb

@@ -7,4 +7,4 @@ def change
 
     add_index :<%= model_class_name.tableize %>, [:last_logout_at, :last_activity_at]
   end
-end
+end

lib/generators/sorcery/templates/migration/core.rb

@@ -10,4 +10,4 @@ def change
 
     add_index :<%= model_class_name.tableize %>, :email, unique: true
   end
-end
+end

lib/generators/sorcery/templates/migration/remember_me.rb

@@ -5,4 +5,4 @@ def change
 
     add_index :<%= model_class_name.tableize %>, :remember_me_token
   end
-end
+end

lib/generators/sorcery/templates/migration/reset_password.rb

@@ -6,4 +6,4 @@ def change
 
     add_index :<%= model_class_name.tableize %>, :reset_password_token
   end
-end
+end

lib/generators/sorcery/templates/migration/user_activation.rb

@@ -6,4 +6,4 @@ def change
 
     add_index :<%= model_class_name.tableize %>, :activation_token
   end
-end
+end

lib/sorcery/controller/submodules/activity_logging.rb

@@ -66,7 +66,7 @@ def register_last_activity_time_to_db
           # This runs as a hook just after a successful login.
           def register_last_ip_address(user, credentials)
             return unless Config.register_last_ip_address
-            current_user.set_last_ip_addess(request.remote_ip)
+            current_user.set_last_ip_address(request.remote_ip)
           end
         end
       end

lib/sorcery/model/submodules/activity_logging.rb

@@ -45,7 +45,7 @@ def set_last_activity_at(time)
             sorcery_adapter.update_attribute(sorcery_config.last_activity_at_attribute_name, time)
           end
 
-          def set_last_ip_addess(ip_address)
+          def set_last_ip_address(ip_address)
             sorcery_adapter.update_attribute(sorcery_config.last_login_from_ip_address_name, ip_address)
           end
 

spec/controllers/controller_activity_logging_spec.rb

@@ -69,7 +69,7 @@
 
     it "logs last IP address when logged in" do
       sorcery_controller_property_set(:register_last_ip_address, true)
-      expect(user).to receive(:set_last_ip_addess).with('0.0.0.0')
+      expect(user).to receive(:set_last_ip_address).with('0.0.0.0')
 
       login_user(user)
     end
@@ -107,7 +107,7 @@
 
     it "does not register last IP address if configured so" do
       sorcery_controller_property_set(:register_last_ip_address, false)
-      expect(user).to receive(:set_last_ip_addess).never
+      expect(user).to receive(:set_last_ip_address).never
 
       login_user(user)
     end

spec/shared_examples/user_activity_logging_shared_examples.rb

@@ -53,11 +53,11 @@
       user.set_last_activity_at(now)
     end
 
-    it '.set_last_ip_addess update last_login_from_ip_address' do
+    it '.set_last_ip_address update last_login_from_ip_address' do
       user = create_new_user
       expect(user.sorcery_adapter).to receive(:update_attribute).with(:last_login_from_ip_address, '0.0.0.0')
 
-      user.set_last_ip_addess('0.0.0.0')
+      user.set_last_ip_address('0.0.0.0')
     end
 
     it 'show if user logged in' do