tiddle 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e5143097b75f1bc0ffb7231b9d20b2a0f1bb4ce3936103f34779300b8f3aab
-  data.tar.gz: b18ce38bb5cb29eaaa606cc3d2658a789c3b38475d367e04061504a93f449135
+  metadata.gz: 3bd6e3feb1ccba22684e65085d74f245e894178246b8535c4ccc4d885984b154
+  data.tar.gz: c12348cf95c0731af63b99b8804e825652791e7c166d35d8f539a172fbb78601
 SHA512:
-  metadata.gz: ae553ceb3221decfa04a9b119add2f7244ad305cce18a919ca20132dba87b962bce058dde18ad496f4d17edbabbbc68b9f38177a3e0c76ef73aaaf235a6a5238
-  data.tar.gz: 435c9c1c88c5b6a00260ad12caf8484d8b3d50e8f6ace5b7f5669c1543a19c4379619821e1e6cecd5708b42c99cd7b7068e09a4a60e8c299837fef07a905fa9b
+  metadata.gz: c8e9eaf42c24032583f36906d73950ebaab11252193629f5b82045a8d81f51b39ca98beefb58ccec234499458407f4cdf0406902a166a5232ff713678d704207
+  data.tar.gz: d80bf9abe5d72446839eaab8f7dcb6d5c6521f8c15f0d646c564b8bb635c0d3475cf177cfbc917aab7a68b469613b3722657085a2a8599ffc5a394f087f0168e

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Include:
     - 'lib'
     - 'spec'

data/.travis.yml

@@ -1,18 +1,27 @@
 language: ruby
+branches:
+  only:
+    - master
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2'
 services:
   - mongodb
 rvm:
-  - "2.3.5"
-  - "2.4.2"
-  - "2.5.0"
+  - "2.4.6"
+  - "2.5.5"
+  - "2.6.3"
+  - "2.7.1"
 gemfile:
-  - "gemfiles/rails4.2.gemfile"
-  - "gemfiles/rails5.0.gemfile"
-  - "gemfiles/rails5.1.gemfile"
-  - "gemfiles/rails5.2.gemfile"
+  - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.2.gemfile
+  - gemfiles/rails6.0.gemfile
 env:
   - BACKEND=mongoid
   - BACKEND=active_record
+jobs:
+  exclude:
+  - rvm: "2.4.6"
+    gemfile: gemfiles/rails6.0.gemfile
+  - rvm: "2.7.1"
+    gemfile: gemfiles/rails4.2.gemfile

data/Appraisals

@@ -1,19 +1,17 @@
 appraise "rails4.2" do
   gem "rails", "~> 4.2.0"
   gem "mongoid", "~> 5"
-end
-
-appraise "rails5.0" do
-  gem "rails", "~> 5.0.0"
-  gem "mongoid", "~> 6"
-end
-
-appraise "rails5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "mongoid", "~> 6"
+  gem "sqlite3", "~> 1.3.13"
 end
 
 appraise "rails5.2" do
   gem "rails", "~> 5.2.1"
   gem "mongoid", "~> 6"
+  gem "sqlite3", "~> 1.3.13"
+end
+
+appraise "rails6.0" do
+  gem "rails", "~> 6.0.0"
+  gem "mongoid", "~> 7"
+  gem "sqlite3"
 end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.5.0
+
+Add Rails 6 support
+
+Fix warning on Ruby 2.7 (Andy Klimczak)
+
+Skip CSRF clean up (Marcelo Silveira)
+
 ### 1.4.0
 
 Support for Devise 4.6.

data/README.md

@@ -8,10 +8,6 @@ Tiddle provides Devise strategy for token authentication in API-only Ruby on Rai
 
 Tiddle is lightweight and non-configurable. It does what it has to do and leaves some manual implementation to you.
 
-## Versions
-
-Versions 0.7.x+ are meant to support Rails 5.0, but they require Devise 4. If you want to use Devise 3 with Rails 4.2 then take a look at the ```0.6.x``` branch.
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/gemfiles/rails4.2.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 4.2.0"
 gem "mongoid", "~> 5"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails5.2.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 5.2.1"
 gem "mongoid", "~> 6"
+gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/{rails5.0.gemfile → rails6.0.gemfile}

@@ -3,7 +3,8 @@
 source "https://rubygems.org"
 
 gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 5.0.0"
-gem "mongoid", "~> 6"
+gem "rails", "~> 6.0.0"
+gem "mongoid", "~> 7"
+gem "sqlite3"
 
 gemspec path: "../"

data/lib/tiddle.rb

@@ -6,7 +6,7 @@ require "tiddle/token_issuer"
 
 module Tiddle
   def self.create_and_return_token(resource, request, options = {})
-    TokenIssuer.build.create_and_return_token(resource, request, options)
+    TokenIssuer.build.create_and_return_token(resource, request, **options)
   end
 
   def self.expire_token(resource, request)

data/lib/tiddle/strategy.rb

@@ -28,6 +28,14 @@ module Devise
         false
       end
 
+      # Avoid CSRF clean up for token authentication as it might trigger session creation in API
+      # environments even if CSRF prevention is not being used.
+      # Devise provides a `clean_up_csrf_token_on_authentication` option but it's not always viable
+      # in applications with multiple user models and authentication strategies.
+      def clean_up_csrf?
+        false
+      end
+
       private
 
       def authentication_keys_from_headers

data/lib/tiddle/version.rb

@@ -1,3 +1,3 @@
 module Tiddle
-  VERSION = "1.4.0".freeze
+  VERSION = "1.5.0".freeze
 end

data/spec/rails_app_mongoid/config/application.rb

@@ -11,6 +11,5 @@ module RailsApp
     config.eager_load = true
     config.root = File.expand_path('../../.', __FILE__)
     config.consider_all_requests_local = true
-    config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
   end
 end

data/spec/spec_helper.rb

@@ -13,16 +13,16 @@ end
 ENV["RAILS_ENV"] = 'test'
 ENV["DATABASE_URL"] = "sqlite3:db/test.sqlite3"
 
-require 'rails/all'
-require 'rspec/rails'
+Dir[__dir__ + "/support/**/*.rb"].each { |f| require f }
+
 require 'devise'
 require 'tiddle'
 
-Dir[__dir__ + "/support/**/*.rb"].each { |f| require f }
-
 backend = Backend.from_name(ENV['BACKEND'])
 backend.load!
 
+require 'rspec/rails'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause

data/spec/support/backend.rb

@@ -23,11 +23,18 @@ module Backend
       # Do initial migration
       path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))
 
-      if Gem::Requirement.new(">= 5.2.0.rc1") =~ Rails.gem_version
+      # rubocop:disable Performance/RegexpMatch
+      if Gem::Requirement.new(">= 6.0.0") =~ Rails.gem_version
+        ActiveRecord::MigrationContext.new(
+          path,
+          ActiveRecord::SchemaMigration
+        ).migrate
+      elsif Gem::Requirement.new(">= 5.2.0") =~ Rails.gem_version
         ActiveRecord::MigrationContext.new(path).migrate
       else
         ActiveRecord::Migrator.migrate(path)
       end
+      # rubocop:enable Performance/RegexpMatch
     end
   end
 

data/spec/support/warningless_get.rb

@@ -1,7 +1,9 @@
 def warningless_get(path, headers:)
+  # rubocop:disable Performance/RegexpMatch
   if Gem::Requirement.new(">= 5") =~ Rails.gem_version
     get path, headers: headers
   else
     get path, {}, headers
   end
+  # rubocop:enable Performance/RegexpMatch
 end

data/tiddle.gemspec

@@ -16,15 +16,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
   spec.add_dependency "activerecord", ">= 4.2.0"
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "sqlite3", "< 1.4"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "rubocop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -190,9 +162,8 @@ files:
 - Rakefile
 - config/locales/en.yml
 - gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -243,15 +214,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Token authentication for Devise which supports multiple tokens per model

data/gemfiles/rails5.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubocop", "~> 0.52.0"
-gem "rails", "~> 5.1.0"
-gem "mongoid", "~> 6"
-
-gemspec path: "../"