omniauth-matique 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717942741d02e474b4028898fe9655ee0b2a3edfe4934d66747f50a635d7dc4b
-  data.tar.gz: 5c22be58d56513e990e536874800902e57d753f6f9bc4035d6fc14902c3f17d9
+  metadata.gz: e48cb0b561ff78279781e9b5cef8619f4167cf4d631cfe3b8bf8c6f1c9a65343
+  data.tar.gz: 2e843cc7a3f4ac5226e722dadec8bb13d816b6b35044315193dc41a9031f7ae4
 SHA512:
-  metadata.gz: 2a38371f0cb009e68e21aec3f724371f17f1060aa9772b4b4117ab4133931a92a0ba0cf871e6221764993fa353fb2328266096ae44ce9bb72acb49cb93b3f2e4
-  data.tar.gz: ac04a8079f6dc78c0c744bde9a7a3c2905032508d7a1b5f4c40f69df4e12358bb8c304f9a7c0acd1def63390f8b7e83028ee4e49ca389dad00347f1fe7a409eb
+  metadata.gz: 36f3b583714621b43fc2019c8c944b2ac166dd240635d0e1bb4b520b609ae4a4b50d56ba9b35d972e896b20ddb0264c71f0357e2127ebf5d8554dcfa1ca94ef5
+  data.tar.gz: 20fef38023b607218daaa159e6f9bc39f71700639f6c3c635f9979bd0fbc21d555425e61cd72621fe21be4812d6d79862ab191eeb3ee5092beca0aa30e028ac6

data/.rubocop.yml

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

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.6

data/.travis.yml

@@ -6,14 +6,16 @@ bundler_args: --without production
 script: 'bundle exec rake test'
 
 rvm:
-  - 2.6.4
+  - 2.6.6
+#  - 2.6.5
+#  - 2.6.4
 #  - 2.6.3
 #  - 2.6.1
 #  - 2.5.1
 #  - 2.4.1
 #  - 2.3.0
 #  - 2.2.3
-  - 2.0.0
+#  - 2.0.0
 
 notifications:
   email: false

data/.watchr

@@ -16,37 +16,30 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-#  when 'test';  run %Q{rails test #{file}}
-  when 'spec';  run %Q{rspec -X #{file}}
+  when 'test';  run %(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"
-#  system "spring stop"
-  %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) }
+  %w[test spec].each { |dir| run "rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  %w[test spec].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|
+%w[test spec].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}") { |match|
-    run_matching_files(match[1])
-  }
-}
 
 # Ctrl-\ or ctrl-4
     Signal.trap('QUIT') { run_all_tests }

data/Gemfile

@@ -1,6 +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
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016-2019 Dittmar Krall http://matique.de
+Copyright 2016-2020 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/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,7 +1,11 @@
+# rubocop: disable all
+
 module OmniAuth
   module Matique
-    VERSION = '0.1.5'   # 2019-10-06
-#    VERSION = '0.1.4'   # 2019-03-02
-#    VERSION = '0.1.3'
+    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"
-      AUTH_URL = ENV["AUTH_URL"] || 'http://localhost:3010'
-#      AUTH_URL = 'https://login.matique.de'
+      # AUTH_URL = 'https://login.matique.de'
+      AUTH_URL = ENV['AUTH_URL'] || 'http://localhost:3010'
       STRATEGY = 'matique'
 
       option :client_options, {
-	site: AUTH_URL,
-	authorize_url: "#{AUTH_URL}/auth/#{STRATEGY}/authorize",
-	token_url: "#{AUTH_URL}/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

@@ -21,11 +21,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'rake', '~> 13'
   s.add_dependency 'omniauth-oauth2', '~> 1'
 
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
+  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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-matique
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     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
@@ -56,58 +56,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: "    Strategy to authenticate with matique UG via OAuth2 in OmniAuth.\n"
 email:
 - dittmar.krall@matique.de
@@ -116,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -151,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for matique