tiddle 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd6e3feb1ccba22684e65085d74f245e894178246b8535c4ccc4d885984b154
-  data.tar.gz: c12348cf95c0731af63b99b8804e825652791e7c166d35d8f539a172fbb78601
+  metadata.gz: ceda852fb296447c9da00e1f7cafabbfe6eefa599f457bcf1885aa937ba549db
+  data.tar.gz: 4d0133d03bd53b4e75595a26ebb6ca115cb9ab6858f3a557eb38fb70dddf01c1
 SHA512:
-  metadata.gz: c8e9eaf42c24032583f36906d73950ebaab11252193629f5b82045a8d81f51b39ca98beefb58ccec234499458407f4cdf0406902a166a5232ff713678d704207
-  data.tar.gz: d80bf9abe5d72446839eaab8f7dcb6d5c6521f8c15f0d646c564b8bb635c0d3475cf177cfbc917aab7a68b469613b3722657085a2a8599ffc5a394f087f0168e
+  metadata.gz: 97f53dad24042c517c85445a98e26206995d0242e7d80f42bfd1a49dd6cc40e8f55cfcfbfb9e704aed8992b3872897f8b39b5bb8d4b145e758536bc2ce1d7712
+  data.tar.gz: ebdda46f4045e4aeb26ea535b233b3b75b6c434b7a2062fdc5f2342b0e529189c0f413c9d7d1e94693774efb4d95617b2f2b0082af038f1dd9ddcf8d483e28e4

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile:
+          - rails5.2
+          - rails6.0
+          - rails6.1
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+        backend:
+          - active_record
+          - mongoid
+        exclude:
+          - gemfile: rails5.2
+            ruby: 3.0
+    name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}, ${{ matrix.backend }}
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      BACKEND: ${{ matrix.backend }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+        ruby-version: ${{ matrix.ruby }}
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      if: ${{ matrix.backend == 'mongoid' }}
+    - name: Run tests
+      run: |
+        bundle exec rake spec

data/.rubocop.yml

@@ -1,11 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Include:
-    - 'lib'
-    - 'spec'
+    - 'lib/**/*.rb'
+    - 'spec/**/*.rb'
   Exclude:
     - 'spec/rails_app/**/*'
     - 'spec/spec_helper.rb'
+    - 'vendor/bundle/**/*'
+  SuggestExtensions: false
 Style/StringLiterals:
   Enabled: false
 Style/Documentation:
@@ -14,17 +16,73 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/SignalException:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 Gemspec/OrderedDependencies:
   Enabled: false
-Naming/FileName:
-  Exclude:
-    - 'Rakefile'
-    - 'Gemfile'
-    - 'Appraisals'
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 Metrics/MethodLength:
   Max: 15
+
+Gemspec/DateAssignment:
+  Enabled: true
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+Lint/AmbiguousAssignment:
+  Enabled: true
+Lint/DeprecatedConstants:
+  Enabled: true
+Lint/DuplicateBranch:
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+Lint/EmptyBlock:
+  Enabled: true
+Lint/EmptyClass:
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+Lint/NumberedParameterAssignment:
+  Enabled: true
+Lint/OrAssignmentToConstant:
+  Enabled: true
+Lint/RedundantDirGlobSort:
+  Enabled: true
+Lint/SymbolConversion:
+  Enabled: true
+Lint/ToEnumArguments:
+  Enabled: true
+Lint/TripleQuotes:
+  Enabled: true
+Lint/UnexpectedBlockArity:
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+Style/ArgumentsForwarding:
+  Enabled: true
+Style/CollectionCompact:
+  Enabled: true
+Style/DocumentDynamicEvalDefinition:
+  Enabled: true
+Style/EndlessMethod:
+  Enabled: true
+Style/HashConversion:
+  Enabled: true
+Style/HashExcept:
+  Enabled: true
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+Style/NegatedIfElseCondition:
+  Enabled: true
+Style/NilLambda:
+  Enabled: true
+Style/RedundantArgument:
+  Enabled: true
+Style/StringChars:
+  Enabled: true
+Style/SwapValues:
+  Enabled: true

data/Appraisals

@@ -1,9 +1,3 @@
-appraise "rails4.2" do
-  gem "rails", "~> 4.2.0"
-  gem "mongoid", "~> 5"
-  gem "sqlite3", "~> 1.3.13"
-end
-
 appraise "rails5.2" do
   gem "rails", "~> 5.2.1"
   gem "mongoid", "~> 6"
@@ -15,3 +9,9 @@ appraise "rails6.0" do
   gem "mongoid", "~> 7"
   gem "sqlite3"
 end
+
+appraise "rails6.1" do
+  gem "rails", "~> 6.1.0"
+  gem "mongoid"
+  gem "sqlite3"
+end

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.6.0
+
+Add Rails 6.1 support
+
+Add Ruby 3.0 support
+
+Remove Rails 4.2 support
+
+Remove Ruby 2.4 support
+
+
 ### 1.5.0
 
 Add Rails 6 support

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem "rubocop", "~> 0.52.0"
-
 # Specify your gem's dependencies in tiddle.gemspec
 gemspec

data/README.md

@@ -1,7 +1,5 @@
 # Tiddle
 
-[![Build Status](https://travis-ci.org/adamniedzielski/tiddle.svg?branch=master)](https://travis-ci.org/adamniedzielski/tiddle)
-[![Coverage Status](https://coveralls.io/repos/adamniedzielski/tiddle/badge.svg?branch=master)](https://coveralls.io/r/adamniedzielski/tiddle?branch=master)
 [![Code Climate](https://codeclimate.com/github/adamniedzielski/tiddle/badges/gpa.svg)](https://codeclimate.com/github/adamniedzielski/tiddle)
 
 Tiddle provides Devise strategy for token authentication in API-only Ruby on Rails applications. Its main feature is **support for multiple tokens per user**.

data/Rakefile

@@ -6,7 +6,7 @@ require 'appraisal'
 RSpec::Core::RakeTask.new(spec: :rubocop)
 RuboCop::RakeTask.new(:rubocop)
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+if !ENV["APPRAISAL_INITIALIZED"]
   task default: :appraisal
 else
   task default: :spec

data/gemfiles/rails5.2.gemfile

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

data/gemfiles/rails6.0.gemfile

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rubocop", "~> 0.52.0"
 gem "rails", "~> 6.0.0"
 gem "mongoid", "~> 7"
 gem "sqlite3"

data/gemfiles/rails6.1.gemfile

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

data/lib/tiddle/version.rb

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

data/spec/rails_app_active_record/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require "active_model/railtie"
 require "active_record/railtie"
@@ -8,7 +8,7 @@ require "action_view/railtie"
 module RailsApp
   class Application < Rails::Application
     config.eager_load = true
-    config.root = File.expand_path('../../.', __FILE__)
+    config.root = File.expand_path('..', __dir__)
     config.consider_all_requests_local = true
     config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
   end

data/spec/rails_app_active_record/config/boot.rb

@@ -1,2 +1,2 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
 require 'bundler/setup'

data/spec/rails_app_active_record/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/rails_app_active_record/db/migrate/20150217000000_create_tables.rb

@@ -1,10 +1,4 @@
-migration_class = if Rails::VERSION::MAJOR > 4
-                    ActiveRecord::Migration[4.2]
-                  else
-                    ActiveRecord::Migration
-                  end
-
-class CreateTables < migration_class
+class CreateTables < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/AbcSize
   # rubocop:disable Metrics/MethodLength
   def change

data/spec/rails_app_mongoid/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require "active_model/railtie"
 require "active_job/railtie"
@@ -9,7 +9,7 @@ require "action_view/railtie"
 module RailsApp
   class Application < Rails::Application
     config.eager_load = true
-    config.root = File.expand_path('../../.', __FILE__)
+    config.root = File.expand_path('..', __dir__)
     config.consider_all_requests_local = true
   end
 end

data/spec/rails_app_mongoid/config/boot.rb

@@ -1,2 +1,2 @@
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __dir__)
 require 'bundler/setup'

data/spec/rails_app_mongoid/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 require 'bundler/setup'
 require 'simplecov'
-require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
 SimpleCov.start do
   add_filter "/spec/"
 end

data/spec/strategy_spec.rb

@@ -6,7 +6,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "allows to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "test@example.com",
@@ -25,7 +25,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
         it "updates last_used_at field" do
           expect do
-            warningless_get(
+            get(
               secrets_path,
               headers: {
                 "X-USER-EMAIL" => "test@example.com",
@@ -43,7 +43,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
         it "does not update last_used_at field" do
           expect do
-            warningless_get(
+            get(
               secrets_path,
               headers: {
                 "X-USER-EMAIL" => "test@example.com",
@@ -57,7 +57,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     context "when email contains uppercase letters" do
       it "converts email to lower case and authenticates user" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "TEST@example.com",
@@ -76,7 +76,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "does not allow to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "wrong@example.com",
@@ -94,7 +94,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "does not allow to access endpoints which require authentication" do
-      warningless_get(
+      get(
         secrets_path,
         headers: {
           "X-USER-EMAIL" => "test@example.com",
@@ -107,7 +107,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
   context "when no headers are passed" do
     it "does not allow to access endpoints which require authentication" do
-      warningless_get secrets_path, headers: {}
+      get secrets_path, headers: {}
       expect(response.status).to eq 401
     end
   end
@@ -119,7 +119,7 @@ describe "Authentication using Tiddle strategy", type: :request do
     end
 
     it "allows to access endpoints which require authentication" do
-      warningless_get(
+      get(
         long_secrets_path,
         headers: {
           "X-ADMIN-USER-EMAIL" => "test@example.com",
@@ -152,7 +152,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     it "allows to access endpoints which require authentication with valid \
       nick name and token" do
-      warningless_get(
+      get(
         secrets_path,
         headers: { "X-USER-NICK-NAME" => "test", "X-USER-TOKEN" => @token }
       )
@@ -168,7 +168,7 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     describe "token is not expired" do
       it "does allow to access endpoints which require authentication" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "test@example.com",
@@ -181,12 +181,12 @@ describe "Authentication using Tiddle strategy", type: :request do
 
     describe "token is expired" do
       before do
-        token = @user.authentication_tokens.sort_by(&:id).last
+        token = @user.authentication_tokens.max_by(&:id)
         token.update_attribute(:last_used_at, 1.month.ago)
       end
 
       it "does not allow to access endpoints which require authentication" do
-        warningless_get(
+        get(
           secrets_path,
           headers: {
             "X-USER-EMAIL" => "test@example.com",

data/spec/support/backend.rb

@@ -23,18 +23,14 @@ module Backend
       # Do initial migration
       path = File.expand_path("../rails_app_active_record/db/migrate/", File.dirname(__FILE__))
 
-      # 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)
+        ActiveRecord::MigrationContext.new(path).migrate
       end
-      # rubocop:enable Performance/RegexpMatch
     end
   end
 
@@ -43,12 +39,11 @@ module Backend
       require 'mongoid'
       require 'devise/orm/mongoid'
       require 'rails_app_mongoid/config/environment'
-      require 'database_cleaner'
+      require 'database_cleaner-mongoid'
     end
 
     def setup_database_cleaner
       DatabaseCleaner.allow_remote_database_url = true
-      DatabaseCleaner[:mongoid].strategy = :truncation
     end
 
     def migrate!

data/spec/support/fake_request.rb

@@ -9,7 +9,5 @@ class FakeRequest
     self.headers = headers
   end
 
-  attr_accessor :remote_ip
-  attr_accessor :user_agent
-  attr_accessor :headers
+  attr_accessor :remote_ip, :user_agent, :headers
 end

data/tiddle.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiddle
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam Niedzielski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,10 +149,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -161,9 +161,9 @@ files:
 - README.md
 - Rakefile
 - config/locales/en.yml
-- gemfiles/rails4.2.gemfile
 - gemfiles/rails5.2.gemfile
 - gemfiles/rails6.0.gemfile
+- gemfiles/rails6.1.gemfile
 - lib/tiddle.rb
 - lib/tiddle/model.rb
 - lib/tiddle/model_name.rb
@@ -199,7 +199,6 @@ files:
 - spec/strategy_spec.rb
 - spec/support/backend.rb
 - spec/support/fake_request.rb
-- spec/support/warningless_get.rb
 - spec/tiddle_spec.rb
 - tiddle.gemspec
 homepage: ''
@@ -214,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -254,5 +253,4 @@ test_files:
 - spec/strategy_spec.rb
 - spec/support/backend.rb
 - spec/support/fake_request.rb
-- spec/support/warningless_get.rb
 - spec/tiddle_spec.rb

data/.travis.yml

@@ -1,27 +0,0 @@
-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.4.6"
-  - "2.5.5"
-  - "2.6.3"
-  - "2.7.1"
-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/gemfiles/rails4.2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-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/spec/support/warningless_get.rb

@@ -1,9 +0,0 @@
-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