omniauth-alephx 0.1.31 → 0.1.32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODYwZTc0Mzk4YTQwYThlMmU1MjM3ZjU1ODlhMTQxYjViMjA3OGQ0ZQ==
-  data.tar.gz: !binary |-
-    NzMzMTA0YTYxMjQ4ZjZmNWI3M2M1N2UxZDRmNDEzYjIyZjhkYWFmMA==
+SHA1:
+  metadata.gz: 99dce94d296aa5edf72468446c6fb60804802973
+  data.tar.gz: 9b8c2bde0041eb34fb0a9fb5235636af3a089411
 SHA512:
-  metadata.gz: !binary |-
-    YmVjNzI0ZWU4YThlMjc0MTdhOTQxNDZmYjZlMTA3OGMwZDVmYThmOWM3Yjk1
-    MmVhNzY2MzE5Zjg2MWMwYmI3NGU0MzNjZmQ2YTFhNDMyMjE4YjU5NGQ2Zjk4
-    NjdiODBlMjYyZmQyNWZkYTZkYTJjYzc5NGJhMTY4MDJmOWU4ODE=
-  data.tar.gz: !binary |-
-    YWEwMWIzZjcxMWZiNTc0NGE2YzgzYjlkMzJlMGQ0NTU3ZTRjNTdlYjkwNDJj
-    OTIzMDM2YTcxMTE5YjQ3ZDU5MzY0M2Q3YjU3ZDg3OThiNDU2MzRmNWUyM2Vi
-    ODE5Mzc1YTlmZTRjYTdmNmIzODUyMDQwZTFkYjc0ZTg5NTIyNGE=
+  metadata.gz: c5ef290341a1e27fecfafc94928c31e887ed4fde578383f39d5607827f68a16fd386b2ac32a73bfd2536c2855e1aac6d353bf640aa9418bcfc83cf788a0e79d0
+  data.tar.gz: ccfbc5c060d96727d1fbe02a0e8d8268fcf80949dac08fee5715d414a3f66bfc8303674d47ddfce9e1f3c45e0c61ffb3d685a4f2d2c04699c7e24c137f861ee7

data/Gemfile

@@ -1,16 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0"
-end
-gem 'omniauth'
-gem 'xml-simple'
+gem 'omniauth','1.3.2'
+gem 'xml-simple','1.1.5'

data/Gemfile.lock

@@ -1,87 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    atomic (1.1.15)
-    builder (3.2.2)
-    descendants_tracker (0.0.3)
-    docile (1.1.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    i18n (0.6.9)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.1)
-      hashie (>= 1.2, < 3)
-      rack (~> 1.0)
-    rack (1.5.2)
-    rake (10.1.1)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.5.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.38)
-    xml-simple (1.1.3)
+    hashie (3.6.0)
+    omniauth (1.3.2)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    rack (2.0.6)
+    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  jeweler (~> 2.0.1)
-  omniauth
-  rdoc (~> 3.12)
-  shoulda
-  simplecov
-  xml-simple
+  omniauth (= 1.3.2)
+  xml-simple (= 1.1.5)
+
+BUNDLED WITH
+   2.0.1

data/lib/omniauth-alephx/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Alephx
-    VERSION = "0.1.31"
+    VERSION = "0.1.32"
   end
 end

data/lib/omniauth/strategies/alephx.rb

@@ -11,51 +11,52 @@ module OmniAuth
       option :url # :url => "http://aleph.ugent.be/X"
       option :library # :library => "rug50"
 
-      #only for test purpose (if you do not specify the option :form, a form will be created, using these options)
+      #only for test purpose (if you do not specify the option :form, a form
+      #will be created, using these options)
       option :title_form, "Aleph authentication"
       option :label_password,:password
       option :label_username,:username
       option :label_submit, "submit"
 
-      @user_info = {}
-
       class << self
-        attr_accessor :filters,:on_error
+        attr_accessor :filters, :on_error
 
         def add_filter(&block)
-          @filters = [] if @filters.nil?
+          @filters ||= []
           @filters << block
         end
       end
 
       uid {
-        @user_info[:bor_id]
+        user_info[:bor_id]
       }
       info {
-        {
-          :name => @user_info[:name],
-          :email => @user_info[:email]
-        }
+        i = {}
+        [:name, :email].each do |key|
+          i[key] = user_info[key] if user_info[key].is_a? String
+        end
+        i
       }
       credentials {
         {}
       }
       extra {
-        @user_info
+        {}
       }
 
-      def request_phase
+      def user_info
+        @user_info ||= {}
+      end
 
+      def request_phase
         form = OmniAuth::Form.new(:title => options[:title_form], :url => callback_path)
         form.text_field options[:label_username],:username
         form.password_field options[:label_password],:password
         form.button options[:label_submit]
         form.to_response
-
       end
 
       def callback_phase
-
         params = request.params
 
         rp = script_name + request_path+"?"+{ :username => params['username'] }.to_query
@@ -68,7 +69,6 @@ module OmniAuth
 
         begin
 
-
           unless self.class.filters.nil?
             self.class.filters.each do |filter|
               filter.call(params)
@@ -96,7 +96,6 @@ module OmniAuth
       end
 
       def bor_auth(username,password)
-
         uri = URI.parse(options[:url]+"?"+{
           :op => "bor-auth",
           :bor_id => username,
@@ -115,15 +114,17 @@ module OmniAuth
         return false if document['error']
 
         @user_info = {
-          #user pwd to communicate with aleph (cannot extract cas username or barcode from alephx!)
+          # user pwd to communicate with aleph (cannot extract cas username or
+          # barcode from alephx!)
           :bor_id => document['z303']['z303-id'],
           :name => document['z303']['z303-name'],
-          :email => document['z304']['z304-email-address']
+          :email => document['z304']['z304-email-address'],
+          :doc => document
         }
 
         return true
-
       end
+
       def missing_credentials?
         request['username'].nil? or request['username'].empty? or request['password'].nil? or request['password'].empty?
       end

data/omniauth-alephx.gemspec

@@ -1,17 +1,9 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: omniauth-alephx 0.1.31 ruby lib
-
 Gem::Specification.new do |s|
   s.name = "omniauth-alephx"
-  s.version = "0.1.31"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "0.1.32"
   s.require_paths = ["lib"]
   s.authors = ["Nicolas Franck"]
-  s.date = "2015-10-05"
+  s.date = "2019-02-19"
   s.description = "omniauth strategy for authenticating against AlephX Service"
   s.email = "nicolas.franck@ugent.be"
   s.extra_rdoc_files = [
@@ -19,7 +11,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".document",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -29,42 +20,12 @@ Gem::Specification.new do |s|
     "lib/omniauth-alephx.rb",
     "lib/omniauth-alephx/version.rb",
     "lib/omniauth/strategies/alephx.rb",
-    "omniauth-alephx.gemspec",
-    "test/helper.rb"
+    "omniauth-alephx.gemspec"
   ]
   s.homepage = "http://github.com/nicolasfranck/omniauth-alephx"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
   s.summary = "omniauth strategy for authenticating against AlephX Service"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<omniauth>, [">= 0"])
-      s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<omniauth>, [">= 0"])
-      s.add_dependency(%q<xml-simple>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<omniauth>, [">= 0"])
-    s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
+  s.add_dependency('omniauth','1.3.2')
+  s.add_dependency('xml-simple','1.1.5')
 end
 

metadata

@@ -1,113 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-alephx
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Nicolas Franck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  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: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !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'
+        version: 1.1.5
 description: omniauth strategy for authenticating against AlephX Service
 email: nicolas.franck@ugent.be
 executables: []
@@ -116,7 +46,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -127,7 +56,6 @@ files:
 - lib/omniauth-alephx/version.rb
 - lib/omniauth/strategies/alephx.rb
 - omniauth-alephx.gemspec
-- test/helper.rb
 homepage: http://github.com/nicolasfranck/omniauth-alephx
 licenses:
 - MIT
@@ -138,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: omniauth strategy for authenticating against AlephX Service

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'omniauth-alephx'
-
-class Test::Unit::TestCase
-end