omniauth-matique 0.1.1 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 980e0dc38689fb49ac61f868d081e8c167b4b5e3
-  data.tar.gz: 5f986205dfec931feebba5dcc6c4052c8dc42243
+SHA256:
+  metadata.gz: 93e81786297f0571cc96ac931ac6a92585e75cdd12c0dcfcb083d20f0f26437b
+  data.tar.gz: ee4cf38472bf0256484d5431d09f909903b23e45e71690f630b4e44e004e751b
 SHA512:
-  metadata.gz: 6b767b4eb52be4f98c1a45f64c445ba0bedbb895c1dfb01511810ae62ca744a16bd4052cf965ced8ff963de5186a47bb6cad3e8195ceb63ca2fc37f550faf6a3
-  data.tar.gz: 92375956494094a3704849d11ae41e80ec3b9530428b88a37afd04974c93185411619cf0f1e7ba10d81b4a7b3adad50372fb71b2dc908f00075df9f01511702a
+  metadata.gz: 20f88245da0999fc8029546172fc685d64392bdba64f0695cb08caccc74c5b8b4fd9afc7ebf3ad2b910cfb26034ed17ea81ec92a29ad3d9727c02599f060d581
+  data.tar.gz: 4b1d6ca038cbd559497661ee84e5fbcfedd3865466595691c2663854f9a4fbf83fae4abb1070e8384203c1a6ff30e6585b1d7e598ab7a914384932753cce46c5

data/.github/workflows/rake.yml

@@ -0,0 +1,24 @@
+name: Rake
+
+#on: [push, pull_request]
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+#        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+#        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: [2.7]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.gitignore

@@ -4,4 +4,3 @@ coverage/
 *.gem
 *.log
 *.lock
-*.sqlite

data/.rubocop.yml

@@ -0,0 +1,12 @@
+inherit_from:
+  - ~/configs/.rubocop.yml
+
+AllCops:
+  NewCops: enable
+  Include:
+    - 'lib/**/*.rb'
+  Exclude:
+    - 'test/**/*'
+
+Layout/HashAlignment:
+  Enabled: false

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.1
+rails-6.1

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.7.2

data/.watchr

@@ -1,3 +1,4 @@
+TESTING = %w[test]
 HH = '#' * 22  unless defined?(HH)
 H = '#' * 5    unless defined?(H)
 
@@ -16,33 +17,34 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-  when 'spec';  run %Q{rspec -X #{file}}
+  when 'test';  run %(bundle exec ruby -I test #{file})
+#  when 'spec';  run %(rspec -X #{file})
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end
 end
 
 def run_all_tests
   puts "\n#{HH} Running all tests #{HH}\n"
-  %w{test}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
-  %w{spec}.each { |dir| run "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+  TESTING.each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  TESTING.each { |type|
     files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
     run_it type, files.join(' ')  unless files.empty?
   }
 end
 
-%w{test spec}.each { |type|
+TESTING.each { |type|
   watch("#{type}/#{type}_helper\.rb") { run_all_tests }
+  watch('lib/.*\.rb')                 { run_all_tests }
   watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
 }
-%w{rb erb haml slim}.each { |type|
-  watch("app/.*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
+
+%w[rb erb haml slim].each { |type|
+  watch(".*/(.*)\.#{type}") { |match|
+    run_matching_files(match[1])
   }
 }
 

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 gemspec
 
-group :development, :test do
+gem 'rails'
+
+group :test do
   gem 'observr'
+  gem 'rubocop', require: false
   gem 'simplecov', require: false
-  gem 'minitest'
-  gem 'mocha'
-  gem 'sqlite3'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016-2017 Dittmar Krall http://matique.de
+Copyright 2016-2021 Dittmar Krall www.matique.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,6 @@
 Omniauth-Matique
 ================
 [![Gem Version](https://badge.fury.io/rb/omniauth-matique.svg)](https://badge.fury.io/rb/omniauth-matique)
-[![Build Status](https://travis-ci.org/matique/omniauth-matique.png?branch=master)](https://travis-ci.org/matique/omniauth-matique)
 
 # OmniAuth Matique Strategy
 
@@ -56,4 +55,4 @@ See also:
 - http://codetheory.in/rails-devise-omniauth-sso/
 - https://github.com/intridea/omniauth.git
 
-Copyright (c) [Dittmar Krall], released under the MIT license.
+Copyright (c) 2016..2019 Dittmar Krall, released under the MIT license.

data/Rakefile

@@ -1,11 +1,11 @@
-require 'bundler/setup'
-require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
+desc 'Run the tests.'
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.verbose = false
 end
 
-task :default => :test
+task default: :test

data/lib/omniauth-matique.rb

@@ -1,2 +1,4 @@
-require "omniauth-matique/version"
+# rubocop: disable all
+
+require 'omniauth-matique/version'
 require 'omniauth/strategies/matique'

data/lib/omniauth-matique/version.rb

@@ -1,5 +1,12 @@
+# rubocop: disable all
+
 module OmniAuth
   module Matique
-    VERSION = '0.1.1'
+    VERSION = '0.1.8'   # 2021-06-23
+#   VERSION = '0.1.7'   # 2020-07-17
+#   VERSION = '0.1.6'   # 2020-04-27
+#   VERSION = '0.1.5'   # 2019-10-06
+#   VERSION = '0.1.4'   # 2019-03-02
+#   VERSION = '0.1.3'
   end
 end

data/lib/omniauth/strategies/matique.rb

@@ -1,35 +1,40 @@
+# frozen_string_literal: true
+
 require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
     class Matique < OmniAuth::Strategies::OAuth2
-# AuthUrl = ENV["HEROKU_AUTH_URL"] || "https://id.heroku.com"
-#      SITE = 'https://login.matique.de'
-      SITE = 'http://localhost:3010'
+      # AUTH_URL = 'https://login.matique.de'
+      AUTH_URL = ENV['AUTH_URL'] || 'http://localhost:3010'
       STRATEGY = 'matique'
 
       option :client_options, {
-	site: SITE,
-	authorize_url: "#{SITE}/auth/#{STRATEGY}/authorize",
-	token_url: "#{SITE}/auth/#{STRATEGY}/access_token"
+        site:          AUTH_URL,
+        authorize_url: "#{AUTH_URL}/auth/#{STRATEGY}/authorize",
+        token_url:     "#{AUTH_URL}/auth/#{STRATEGY}/access_token"
       }
 
-      uid { raw_info['id'] }
+      uid { raw_info['id'].to_s }
 
       info do
-	{ 'email' => raw_info['email'] }
+        {
+          name: raw_info['name'],
+          username: raw_info['username'],
+          email: raw_info['email'],
+          image: raw_info['avatar_url']
+        }
       end
 
       extra do
-	{ 'raw_info' => raw_info }
+        {raw_info: raw_info}
       end
 
       def raw_info
-       @raw_info ||= access_token.get(
-	 "/auth/matique/user.json?oauth_token=#{access_token.token}").
-	 parsed || {}
+        @raw_info ||= access_token.get(
+          "/auth/matique/user.json?oauth_token=#{access_token.token}"
+        ).parsed || {}
       end
-
     end
   end
 end

data/omniauth-matique.gemspec

@@ -20,7 +20,10 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake', '~> 13'
   s.add_dependency 'omniauth-oauth2', '~> 1'
+
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'mocha', '~> 1'
 end

data/test/matique_test.rb

@@ -45,9 +45,8 @@ describe OmniAuth::Strategies::Matique do
     end
 
     it 'access email from the raw_info' do
-      assert_equal 'test@example.com', strategy.info['email']
-     # coverage
-      refute_nil strategy.extra['raw_info']
+      assert_equal 'test@example.com', strategy.info[:email]
+      refute_nil strategy.extra[:raw_info]
     end
   end
 end

data/test/oauth2strategy_test.rb

@@ -15,6 +15,7 @@ describe OmniAuth::Strategies do
   end
 
   def strategy
+    @options ||= nil
     @strategy ||= begin
       args = [@client_id, @client_secret, @options].compact
       OmniAuth::Strategies::Matique.new(nil, *args).tap do |strategy|

data/test/test_helper.rb

@@ -1,9 +1,13 @@
-require 'simplecov'
-SimpleCov.start
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
 
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'omniauth/strategies/matique'
 
 OmniAuth.config.test_mode = true

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-matique
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.8
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: "    Strategy to authenticate with matique UG via OAuth2 in OmniAuth.\n"
 email:
 - dittmar.krall@matique.de
@@ -59,10 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - ".watchr"
 - Gemfile
 - MIT-LICENSE
@@ -95,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for matique

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-sudo: false
-
-bundler_args: --without production
-before_install: gem update bundler --no-document
-script: 'bundle exec rake test'
-
-rvm:
-#  - 2.0.0
-#  - 2.2.3
-  - 2.3.0
-  - 2.4.1
-
-notifications:
-  email: false