omniauth-polaris 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 782f2fe5ef9e563de8acb9bc4bc40514d868fa06
-  data.tar.gz: 72d665983d951640d341aa4328a3213829237d98
+  metadata.gz: 854ec536ec951da3a404a8fb0cff3afa47f4b2e1
+  data.tar.gz: f275bc49cc3cf0798fb624e9a68eeda2766bb43a
 SHA512:
-  metadata.gz: fcf55973229e7642569371ca24ddc023263998d274a41bdd905823d130d5ae10d528f8718651e5358e82ec4ba6366b777805d68bd643d23f8ba701a03042bf87
-  data.tar.gz: bb794c07c75c09ad7461c1959dfffbb14776b54bbe059ddf2a751edb6cb9e52a9fa45bbc97ca10e32906721ea6a63df5b58cf58e5a0451428dff1ae1418b1349
+  metadata.gz: 193cc616630ee2455da017cdb4dfedcbb560fa80aa5c4e5b4e6f2bf421c3575b4040a9f4082f893a66377ca68f145b6590e3e04b7f4511f2142d9b77b7c465df
+  data.tar.gz: d83f04c7c4aff9a7af297661839eb869a4b924da6553b72ce02ce28d0095b4611d976cd89aa865f53d992134dbec970ab0b9f01fcc8eb6c050608b3c32b944b6

data/.gitignore

@@ -42,6 +42,7 @@ role_map_test.yml
 
 # Specific Files to ignore #
 ############################
+Gemfile.lock
 Thumbs.db
 Icon?
 .DS_Store?

data/.rubocop.yml

@@ -0,0 +1 @@
+require: rubocop-rspec

data/Gemfile

@@ -1,38 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.9'
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem "rubocop", ">= 0.47", require: false
 
-gem 'sqlite3'
+#TODO create a coveralls repo token for this
+gemspec
 
-
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
+group :test do
+  gem 'simplecov', require: false
+  gem 'rubocop-rspec', require: false
+  gem 'rack-test', '~> 1.1.0'
 end
-
-gem 'jquery-rails'
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'

data/Rakefile

@@ -2,6 +2,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
-
-OmniauthPolaris::Application.load_tasks
+unless Dir[File.expand_path('../config/application', __FILE__)].empty?
+  require File.expand_path('../config/application', __FILE__)
+  OmniauthPolaris::Application.load_tasks
+end

data/lib/omniauth-polaris.rb

@@ -1,3 +1,3 @@
-require "omniauth-polaris/version"
-require "omniauth-polaris/adaptor"
+require 'omniauth-polaris/version'
+require 'omniauth-polaris/adaptor'
 require 'omniauth/strategies/polaris'

data/lib/omniauth-polaris/adaptor.rb

@@ -82,19 +82,15 @@ module OmniAuth
       end
 
       private
-      def ensure_method(method)
-        method ||= "get"
+
+      def ensure_method(method="get")
         normalized_method = method.to_s.upcase.to_sym
-        return METHOD[normalized_method] if METHOD.has_key?(normalized_method)
+        return METHOD[normalized_method] if METHOD.key?(normalized_method)
 
         available_methods = METHOD.keys.collect {|m| m.inspect}.join(", ")
         format = "%s is not one of the available connect methods: %s"
         raise ConfigurationError, format % [method.inspect, available_methods]
       end
-
-
-
-
     end
   end
-end
+end

data/lib/omniauth-polaris/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Polaris
-    VERSION = '1.0.0'
+    VERSION = '1.0.5'.freeze
   end
 end

data/lib/omniauth/strategies/polaris.rb

@@ -1,5 +1,4 @@
-require 'omniauth'
-
+require 'omniauth' unless defined? OmniAuth
 
 module OmniAuth
   module Strategies
@@ -7,7 +6,7 @@ module OmniAuth
       class MissingCredentialsError < StandardError; end
       include OmniAuth::Strategy
       @@config = {
-          'barcode' => 'Barcode',
+          'barcode' => 'barcode',
           'valid_patron' => 'ValidPatron',
           'patron_id' => 'PatronID',
           'assigned_branch_id' => 'AssignedBranchID',
@@ -55,54 +54,52 @@ module OmniAuth
         { :raw_info => @polaris_user_info }
       }
 
-      def map_user(mapper, object)
-
-        user = {}
-        mapper.each do |key, value|
-          case value
-            when String
-              #user[key] = object[value.downcase.to_sym].first if object[value.downcase.to_sym]
-              user[key.to_sym] = object[value] if object[value]
-            when Array
-              #value.each {|v| (user[key] = object[v.downcase.to_sym].first; break;) if object[v.downcase.to_sym]}
-              value.each {|v| (user[key] = object[v.downcase.to_sym]; break;) if object[v.downcase.to_sym]}
-            when Hash
-              value.map do |key1, value1|
-                pattern = key1.dup
-                value1.each_with_index do |v,i|
-                  #part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1].first; break;) if object[v1]}
-                  part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1]; break;) if object[v1]}
-                  pattern.gsub!("%#{i}",part||'')
-                end
-                user[key] = pattern
-              end
-          end
-        end
-        user
-      end
+      # def map_user(mapper, object)
+      #   Ben 12/24/2018 Doesnt appear this method is in use
+      #   user = {}
+      #   mapper.each do |key, value|
+      #     case value
+      #       when String
+      #         #user[key] = object[value.downcase.to_sym].first if object[value.downcase.to_sym]
+      #         user[key.to_sym] = object[value] if object[value]
+      #       when Array
+      #         #value.each {|v| (user[key] = object[v.downcase.to_sym].first; break;) if object[v.downcase.to_sym]}
+      #         value.each {|v| (user[key] = object[v.downcase.to_sym]; break;) if object[v.downcase.to_sym]}
+      #       when Hash
+      #         value.map do |key1, value1|
+      #           pattern = key1.dup
+      #           value1.each_with_index do |v,i|
+      #             #part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1].first; break;) if object[v1]}
+      #             part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1]; break;) if object[v1]}
+      #             pattern.gsub!("%#{i}", part || '')
+      #           end
+      #           user[key] = pattern
+      #         end
+      #     end
+      #   end
+      #   user
+      # end
 
 
       def self.map_user(mapper, object)
-
         user = {}
         mapper.each do |key, value|
-          case value
-            when String
-              #user[key] = object[value.downcase.to_sym].first if object[value.downcase.to_sym]
-              user[key.to_sym] = object[value] if object[value]
-            when Array
-              #value.each {|v| (user[key] = object[v.downcase.to_sym].first; break;) if object[v.downcase.to_sym]}
-              value.each {|v| (user[key] = object[v.downcase.to_sym]; break;) if object[v.downcase.to_sym]}
-            when Hash
-              value.map do |key1, value1|
-                pattern = key1.dup
-                value1.each_with_index do |v,i|
-                  #part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1].first; break;) if object[v1]}
-                  part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1]; break;) if object[v1]}
-                  pattern.gsub!("%#{i}",part||'')
-                end
-                user[key] = pattern
+          case value.class.to_s
+          when String
+            user[key.to_sym] = object[value.to_sym] if object[value.to_sym]
+          when Array
+            #value.each {|v| (user[key] = object[v.downcase.to_sym].first; break;) if object[v.downcase.to_sym]}
+            value.each {|v| (user[key] = object[v.downcase.to_sym]; break;) if object[v.downcase.to_sym]}
+          when Hash
+            value.map do |key1, value1|
+              pattern = key1.dup
+              value1.each_with_index do |v,i|
+                #part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1].first; break;) if object[v1]}
+                part = ''; v.collect(&:downcase).collect(&:to_sym).each {|v1| (part = object[v1]; break;) if object[v1]}
+                pattern.gsub!("%#{i}", part || '')
               end
+              user[key] = pattern
+            end
           end
         end
         user
@@ -111,4 +108,4 @@ module OmniAuth
   end
 end
 
-OmniAuth.config.add_camelization 'polaris', 'Polaris'
+OmniAuth.config.add_camelization 'polaris', 'Polaris'

data/omniauth-polaris.gemspec

@@ -1,25 +1,29 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-polaris/version', __FILE__)
-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'omniauth-polaris/version'
 Gem::Specification.new do |gem|
-  gem.authors = ["Steven Anderson"]
-  gem.email = ["sanderson@bpl.org"]
+  gem.name = "omniauth-polaris"
+  gem.version = OmniAuth::Polaris::VERSION
+  gem.authors = ["Steven Anderson", "Ben Barber"]
+  gem.email = ["sanderson@bpl.org", "bbarber@bpl.org"]
   gem.description = %q{A Polaris API strategy for OmniAuth.}
   gem.summary = %q{A Polaris API strategy for OmniAuth.}
   gem.homepage = "https://github.com/boston-library/omniauth-polaris"
 
-  gem.add_runtime_dependency 'omniauth', '~> 1.0'
-  gem.add_runtime_dependency 'rest-client', '~> 1.6.7'
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'libnotify'
-  gem.add_development_dependency 'ruby-debug19'
-  
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name = "omniauth-polaris"
-  gem.require_paths = ["lib"]
-  gem.version = OmniAuth::Polaris::VERSION
+  gem.required_ruby_version = '~> 2.4'
+
+
+  gem.add_dependency 'rest-client', '~> 2.0.2'
+
+  gem.add_development_dependency 'omniauth', '~> 1.8.1'
+  gem.add_development_dependency 'bundler', '>= 1.3.0'
+  gem.add_development_dependency 'awesome_print'
+  gem.add_development_dependency 'rspec', '~> 3.8'
+  gem.add_development_dependency 'libnotify', '~> 0.9.3'
+
+  gem.files         = `git ls-files -z`.split("\x0")
+  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
 end

data/spec/omniauth-ldap/adaptor_spec.rb

@@ -4,12 +4,12 @@ describe "OmniAuth::Polaris::Adaptor" do
   describe 'initialize' do
     it 'should throw exception when must have field is not set' do
       #[:host, :port, :method, :bind_dn]
-      lambda { OmniAuth::Polaris::Adaptor.new({http_uri: "http://blah.org/PAPIService/REST/public/v1/1000/100/1/patron/", method: 'GET'})}.should raise_error(ArgumentError)
+      expect{ OmniAuth::Polaris::Adaptor.new({http_uri: "http://blah.org/PAPIService/REST/public/v1/1000/100/1/patron/", method: 'GET'})}.to raise_error(ArgumentError)
     end
 
     it 'should throw exception when method is not supported' do
-      lambda { OmniAuth::Polaris::Adaptor.new({http_uri: "http://blah.org/PAPIService/REST/public/v1/1000/100/1/patron/", method: 'POST', access_key: 'F9998888-A000-1111-C22C-CC3333BB4444', access_id: 'API'})}.should raise_error(OmniAuth::Polaris::Adaptor::ConfigurationError)
+      expect { OmniAuth::Polaris::Adaptor.new({http_uri: "http://blah.org/PAPIService/REST/public/v1/1000/100/1/patron/", method: 'POST', access_key: 'F9998888-A000-1111-C22C-CC3333BB4444', access_id: 'API'})}.to raise_error(OmniAuth::Polaris::Adaptor::ConfigurationError)
     end
   end
 
-end
+end

data/spec/omniauth/strategies/polaris_spec.rb

@@ -16,68 +16,68 @@ describe "OmniAuth::Strategies::Polaris" do
   end
 
   it 'should add a camelization for itself' do
-    OmniAuth::Utils.camelize('polaris').should == 'Polaris'
+    expect( OmniAuth::Utils.camelize('polaris') ).to eq('Polaris')
   end
 
   describe '/auth/polaris' do
     before(:each){ get '/auth/polaris' }
 
     it 'should display a form' do
-      last_response.status.should == 200
-      last_response.body.should be_include("<form")
+      expect(last_response.status).to eql(200)
+      expect(last_response.body).to include("<form")
     end
 
     it 'should have the callback as the action for the form' do
-      last_response.body.should be_include("action='/auth/polaris/callback'")
+      expect(last_response.body).to include("action='/auth/polaris/callback'")
     end
 
     it 'should have a text field for each of the fields' do
-      last_response.body.scan('<input').size.should == 2
+      expect(last_response.body.scan('<input').size).to eq(2)
     end
     it 'should have a label of the form title' do
-      last_response.body.scan('MyPolaris Form').size.should > 1
+      expect(last_response.body.scan('MyPolaris Form').size).to be > 1
     end
 
   end
 
   describe 'post /auth/polaris/callback' do
     before(:each) do
-      @adaptor = mock(OmniAuth::Polaris::Adaptor, {:barcode => '29999999999999'})
-      OmniAuth::Polaris::Adaptor.stub(:new).and_return(@adaptor)
+      @adaptor = double(OmniAuth::Polaris::Adaptor, {:barcode => '29999999999999'})
+      allow(OmniAuth::Polaris::Adaptor).to receive(:new).and_return(@adaptor)
     end
     context 'failure' do
       before(:each) do
-        @adaptor.stub(:bind_as).and_return(false)
+        allow(@adaptor).to receive(:bind_as).and_return(false)
       end
       it 'should raise MissingCredentialsError' do
-        lambda{post('/auth/polaris/callback', {})}.should raise_error OmniAuth::Strategies::Polaris::MissingCredentialsError
+        expect{ post('/auth/polaris/callback', {}) }.to raise_error OmniAuth::Strategies::Polaris::MissingCredentialsError
       end
       it 'should redirect to error page' do
         post('/auth/polaris/callback', {:barcode => 'ping', :pin => 'password'})
-        last_response.should be_redirect
-        last_response.headers['Location'].should =~ %r{invalid_credentials}
+        expect(last_response).to be_redirect
+        expect(last_response.headers['Location']).to match(%r{invalid_credentials})
       end
     end
 
     context 'success' do
       let(:auth_hash){ last_request.env['omniauth.auth'] }
       before(:each) do
-        @adaptor.stub(:bind_as).and_return({:PAPIErrorCode => "0", :barcode => '29999999999999', :ValidPatron => 'true', :PatronID => '111111', :PatronCodeID => '27',
+        allow(@adaptor).to receive(:bind_as).and_return({:PAPIErrorCode => "0", :barcode => '29999999999999', :ValidPatron => 'true', :PatronID => '111111', :PatronCodeID => '27',
                                             :AssignedBranchID => '3', :PatronBarcode => '29999999999999', :AssignedBranchName => 'BPL - Central', :ExpirationDate => '2015-09-20T00:00:00', :OverridePasswordUsed =>'false'})
         #
         post('/auth/polaris/callback', {:barcode => '29999021413588', :pin => '0407'})
       end
 
-      it 'should raise MissingCredentialsError' do
-        should_not raise_error OmniAuth::Strategies::Polaris::MissingCredentialsError
-      end
+      # it 'should raise MissingCredentialsError' do
+      #   should_not raise_error OmniAuth::Strategies::Polaris::MissingCredentialsError
+      # end
       it 'should map user info' do
-        auth_hash.info.barcode.should == '29999999999999'
-        auth_hash.info.valid_patron.should == 'true'
-        auth_hash.info.patron_id.should == '111111'
-        auth_hash.info.assigned_branch_id.should == '3'
-        auth_hash.info.assigned_branch_name.should == 'BPL - Central'
+        expect(auth_hash.info.barcode).to eq('29999999999999')
+        expect(auth_hash.info.valid_patron).to eq('true')
+        expect(auth_hash.info.patron_id).to eq('111111')
+        expect(auth_hash.info.assigned_branch_id).to eq('3')
+        expect(auth_hash.info.assigned_branch_name).to eq('BPL - Central')
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -6,8 +6,9 @@ require 'rspec'
 require 'rack/test'
 require 'omniauth'
 require 'omniauth-polaris'
+require 'awesome_print'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.extend OmniAuth::Test::StrategyMacros, :type => :strategy
-end
+end

metadata

@@ -1,121 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-polaris
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Steven Anderson
+- Ben Barber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: awesome_print
   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: libnotify
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: libnotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 description: A Polaris API strategy for OmniAuth.
 email:
 - sanderson@bpl.org
+- bbarber@bpl.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -136,19 +125,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: A Polaris API strategy for OmniAuth.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/omniauth-ldap/adaptor_spec.rb
+- spec/omniauth/strategies/polaris_spec.rb
+- spec/spec_helper.rb