sorcery 0.16.5 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28e735926cc783f48b5f8708fcdba63b66d20c54acb46197a633c3a2c27ed9f
-  data.tar.gz: c48a71718894e02b6d556143d7019b64698d938faf3d82cc97362314e5d821eb
+  metadata.gz: f0d32dda46271c863af12b7e00fd451bf10017f3976c863c628c35e92694ba11
+  data.tar.gz: c10900d15fd8ab8277be5bc9f6402e5fa8a60ea30141212b4f05f354768cb06f
 SHA512:
-  metadata.gz: 94876b13d7838ab273e7cf01489914dfce2cdf9f27259f2f3dcb98d62dfe126b65daf3dde018c6423e4a6fbe9b526339c85dfa978dcdf61698ce77b42f722a4d
-  data.tar.gz: 4defd2381f95ab3b89c859430a68fe9c0bb5068d09276100c80996b196448c1289057b3f8059c2d1188199bd0ae3852c6bd5c33a0701c61cd27c1acd7b692ac1
+  metadata.gz: c86b28d8be6ffff0d2ea865cf18af4dc432fc046f8b1d0fe57091529d5f936d2b2cb54692110675f91e1126d9ae8987b24e423b2aacc8f2205d511e7a8ae8a90
+  data.tar.gz: d37df5136edd49c75f8f28aae3f8a5a007dbc42ae3aefea7c270b2fb561ca73e628d478d5d4fab073a8546c4f1103af44969cfe0ad8b897579e72c01e02253d8

data/.github/FUNDING.yml

@@ -1 +1 @@
-github: athix
+github: joshbuker

data/.github/workflows/ruby.yml

@@ -16,44 +16,28 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.4
-          - 2.5
-          - 2.6
-          - 2.7
-          - 3.0.0
-          # - 3.1
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
 
         rails:
-          - '52'
-          - '60'
           - '61'
-          # - '70'
+          - '70'
+          - '71'
 
         exclude:
-          - ruby: 2.4
-            rails: '60'
-          - ruby: 2.4
+          - ruby: '3.3'
+            rails: '70'
+          - ruby: '3.3'
+            rails: '61'
+          - ruby: '3.2'
             rails: '61'
-          # - ruby: 2.4
-          #   rails: '70'
-          # - ruby: 2.5
-          #   rails: '70'
-          # - ruby: 2.6
-          #   rails: '70'
-          - ruby: 3.0.0
-            rails: '52'
-          # - ruby: 3.1
-          #   rails: '52'
-          # - ruby: 3.1
-          #   rails: '60'
-          # - ruby: 3.1
-          #   rails: '61'
-
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.gitignore

@@ -53,7 +53,7 @@ tmtags
 #
 spec/rails_app/log/*
 *.log
-*.sqlite3
+*.sqlite3*
 Gemfile*.lock
 gemfiles/*.lock
 .ruby-version

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 ## HEAD
 
+## 0.17.0
+
+* Fix Rails 7.1 compatibility by using `ActiveRecord.timestamped_migrations` [#352](https://github.com/Sorcery/sorcery/pull/352)
+* Change CI settings for support Ruby3.0+ Rails6.1+ [#357](https://github.com/Sorcery/sorcery/pull/357)
+* Fix error when running the install generator [#339](https://github.com/Sorcery/sorcery/pull/339)
+
 ## 0.16.5
 
 * Raise ArgumentError when calling change_password! with blank password [#333](https://github.com/Sorcery/sorcery/pull/333)

data/README.md

@@ -235,7 +235,7 @@ Feel free to ask questions using these contact details:
 
 **Current Maintainers:**
 
-- Josh Buker ([@athix](https://github.com/athix)) | [Email](mailto:crypto+sorcery@joshbuker.com?subject=Sorcery)
+- Josh Buker ([@joshbuker](https://github.com/joshbuker)) | [Email](mailto:crypto+sorcery@joshbuker.com?subject=Sorcery)
 
 **Past Maintainers:**
 

data/gemfiles/rails_61.gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 gem 'rails', '~> 6.1.0'
 gem 'rails-controller-testing'
 gem 'sqlite3', '~> 1.4'
-
+gem 'rspec-rails', '>= 5.0'
 gemspec path: '..'

data/gemfiles/rails_70.gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 gem 'rails', '~> 7.0.0'
 gem 'rails-controller-testing'
 gem 'sqlite3', '~> 1.4'
-
+gem 'rspec-rails', '>= 6.0'
 gemspec path: '..'

data/gemfiles/{rails_60.gemfile → rails_71.gemfile}

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 7.1.0'
 gem 'rails-controller-testing'
 gem 'sqlite3', '~> 1.4'
-
+gem 'rspec-rails', '>= 6.1'
 gemspec path: '..'

data/lib/generators/sorcery/install_generator.rb

@@ -48,7 +48,6 @@ module Sorcery
         return if only_submodules?
 
         generate "model #{model_class_name} --skip-migration"
-        inject_sorcery_to_model
       end
 
       def inject_sorcery_to_model
@@ -75,7 +74,7 @@ module Sorcery
 
       # Define the next_migration_number method (necessary for the migration_template method to work)
       def self.next_migration_number(dirname)
-        if ActiveRecord::Base.timestamped_migrations
+        if timestamped_migrations?
           sleep 1 # make sure each time we get a different timestamp
           Time.new.utc.strftime('%Y%m%d%H%M%S')
         else
@@ -85,6 +84,14 @@ module Sorcery
 
       private
 
+      def self.timestamped_migrations?
+        if Rails::VERSION::MAJOR >= 7
+          ActiveRecord.timestamped_migrations
+        else
+          ActiveRecord::Base.timestamped_migrations
+        end
+      end
+
       def only_submodules?
         options[:migrations] || options[:only_submodules]
       end

data/lib/sorcery/version.rb

@@ -1,3 +1,3 @@
 module Sorcery
-  VERSION = '0.16.5'.freeze
+  VERSION = '0.17.0'.freeze
 end

data/sorcery.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'oauth2', '~> 2.0'
 
   s.add_development_dependency 'byebug', '~> 10.0.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.7.0'
+  s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov', '>= 0.3.8'
   s.add_development_dependency 'test-unit', '~> 3.2.0'

data/spec/controllers/controller_oauth2_spec.rb

@@ -32,14 +32,14 @@ describe SorceryController, active_record: true, type: :controller do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:facebook, :user_info_mapping, username: 'name')
 
-      expect(User).to receive(:create_from_provider).with('facebook', '123', username: 'Noam Ben Ari')
+      expect(User).to receive(:create_from_provider).with('facebook', '123', { username: 'Noam Ben Ari' })
       get :test_create_from_provider, params: { provider: 'facebook' }
     end
 
     it 'supports nested attributes' do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:facebook, :user_info_mapping, username: 'hometown/name')
-      expect(User).to receive(:create_from_provider).with('facebook', '123', username: 'Haifa, Israel')
+      expect(User).to receive(:create_from_provider).with('facebook', '123', { username: 'Haifa, Israel' })
 
       get :test_create_from_provider, params: { provider: 'facebook' }
     end
@@ -48,7 +48,7 @@ describe SorceryController, active_record: true, type: :controller do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:facebook, :user_info_mapping, username: 'name', created_at: 'does/not/exist')
 
-      expect(User).to receive(:create_from_provider).with('facebook', '123', username: 'Noam Ben Ari')
+      expect(User).to receive(:create_from_provider).with('facebook', '123', { username: 'Noam Ben Ari' })
 
       get :test_create_from_provider, params: { provider: 'facebook' }
     end
@@ -59,7 +59,7 @@ describe SorceryController, active_record: true, type: :controller do
         sorcery_controller_external_property_set(:facebook, :user_info_mapping, username: 'name')
 
         u = double('user')
-        expect(User).to receive(:create_from_provider).with('facebook', '123', username: 'Noam Ben Ari').and_return(u).and_yield(u)
+        expect(User).to receive(:create_from_provider).with('facebook', '123', { username: 'Noam Ben Ari' }).and_return(u).and_yield(u)
         # test_create_from_provider_with_block in controller will check for uniqueness of username
         get :test_create_from_provider_with_block, params: { provider: 'facebook' }
       end

data/spec/controllers/controller_oauth_spec.rb

@@ -136,7 +136,7 @@ describe SorceryController, type: :controller do
       it 'creates a new user' do
         sorcery_controller_external_property_set(:twitter, :user_info_mapping, username: 'screen_name')
         expect(User).to receive(:load_from_provider).with('twitter', '123').and_return(nil)
-        expect(User).to receive(:create_from_provider).with('twitter', '123', username: 'nbenari').and_return(user)
+        expect(User).to receive(:create_from_provider).with('twitter', '123', { username: 'nbenari' }).and_return(user)
 
         get :test_create_from_provider, params: { provider: 'twitter' }
       end
@@ -144,7 +144,7 @@ describe SorceryController, type: :controller do
       it 'supports nested attributes' do
         sorcery_controller_external_property_set(:twitter, :user_info_mapping, username: 'status/text')
         expect(User).to receive(:load_from_provider).with('twitter', '123').and_return(nil)
-        expect(User).to receive(:create_from_provider).with('twitter', '123', username: 'coming soon to sorcery gem: twitter and facebook authentication support.').and_return(user)
+        expect(User).to receive(:create_from_provider).with('twitter', '123', { username: 'coming soon to sorcery gem: twitter and facebook authentication support.' }).and_return(user)
 
         get :test_create_from_provider, params: { provider: 'twitter' }
       end
@@ -152,7 +152,7 @@ describe SorceryController, type: :controller do
       it 'does not crash on missing nested attributes' do
         sorcery_controller_external_property_set(:twitter, :user_info_mapping, username: 'status/text', created_at: 'does/not/exist')
         expect(User).to receive(:load_from_provider).with('twitter', '123').and_return(nil)
-        expect(User).to receive(:create_from_provider).with('twitter', '123', username: 'coming soon to sorcery gem: twitter and facebook authentication support.').and_return(user)
+        expect(User).to receive(:create_from_provider).with('twitter', '123', { username: 'coming soon to sorcery gem: twitter and facebook authentication support.' }).and_return(user)
 
         get :test_create_from_provider, params: { provider: 'twitter' }
       end
@@ -175,7 +175,7 @@ describe SorceryController, type: :controller do
 
           u = double('user')
           expect(User).to receive(:load_from_provider).with('twitter', '123').and_return(nil)
-          expect(User).to receive(:create_from_provider).with('twitter', '123', username: 'nbenari').and_return(u).and_yield(u)
+          expect(User).to receive(:create_from_provider).with('twitter', '123', { username: 'nbenari' }).and_return(u).and_yield(u)
 
           get :test_create_from_provider_with_block, params: { provider: 'twitter' }
         end

data/spec/controllers/controller_session_timeout_spec.rb

@@ -129,9 +129,11 @@ describe SorceryController, type: :controller do
     end
 
     context "with 'session_timeout_from_last_action'" do
+      before { create_new_user }
+      after { User.delete_all }
+
       it 'does not logout if there was activity' do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
-        expect(User).to receive(:authenticate).with('bla@bla.com', 'secret') { |&block| block.call(user, nil) }
 
         get :test_login, params: { email: 'bla@bla.com', password: 'secret' }
         Timecop.travel(Time.now.in_time_zone + 0.3)

data/spec/controllers/controller_spec.rb

@@ -64,7 +64,13 @@ describe SorceryController, type: :controller do
           expect(session[:user_id]).to eq user.id.to_s
         end
 
+        # NOTE: The lack of a CSRF token may mean that sessions will break
+        #       horribly for Sorcery when using Rails 7.1+. We shall see.
         it 'sets csrf token in session' do
+          if Gem::Version.new(Rails.version) >= Gem::Version.new('7.1')
+            pending 'Rails 7.1 is not including the csrf token in the session for unknown reasons'
+          end
+
           expect(session[:_csrf_token]).not_to be_nil
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcery
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.17.0
 platform: ruby
 authors:
 - Noam Ben Ari
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -74,16 +74,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -202,10 +202,9 @@ files:
 - README.md
 - Rakefile
 - SECURITY.md
-- gemfiles/rails_52.gemfile
-- gemfiles/rails_60.gemfile
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
+- gemfiles/rails_71.gemfile
 - lib/generators/sorcery/USAGE
 - lib/generators/sorcery/helpers.rb
 - lib/generators/sorcery/install_generator.rb
@@ -382,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Magical authentication for Rails applications

data/gemfiles/rails_52.gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 5.2.0'
-gem 'rails-controller-testing'
-gem 'sqlite3', '~> 1.3.6'
-
-gemspec path: '..'