uaeds 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510a5eadadf27d9a168ff820e233666e28fec424
-  data.tar.gz: b34c8c4c0bad37c7405bd142153e7bd7e3c0dd1e
+  metadata.gz: 321e76f2448db246c261c1f57973ea639f78da6b
+  data.tar.gz: 86aa1597823bca7f937509ffb8ee5105043223be
 SHA512:
-  metadata.gz: '0646084b81b0ab5be6f982af7240f860af2b7616eaf56157f0c5da3d55a8345bd8f0d02755b9f9ed552abac3cae68a98b0a59ca964cf04b4cd5194c30aa12d18'
-  data.tar.gz: fa1d7cde23aebfe1a4db020cecd5cf2ec206f6c448994a5cd8779b3eb5696935bec5b852ddf606c0415104dcd23eed239a8db2e11016f81087354cf82f86efda
+  metadata.gz: f303b5f4a6bb386017b9a712e60e9ee86d6888573e06e817361fc70670d1f212675f25c7424898508b8a35cc101c1f48da4a2e7d73469898e78edd13694e9533
+  data.tar.gz: b94ef1920eef55878691f16bfa8610841a02c7d178f44f390cc99a170abdcaf28d5021b100a0688ff5729a5b1ef81bdecb6dcb96d25f6fa90df8ae990d4ef5e9

data/lib/uaeds/dsml_person.rb

@@ -1,7 +1,7 @@
 module Uaeds
   class DSMLPerson < DSML
     def date_of_birth
-      if(@value_h.key? :dateOfBirth)
+      if (@value_h.key? :dateOfBirth)
         @value_h[:dateOfBirth]
       else
         dob = get_value(:dateOfBirth)

data/lib/uaeds/eds_dsml.rb

@@ -1,7 +1,6 @@
 module Uaeds
   class EdsDSML < Eds
     include Singleton
-
     @@eds_dsml_endpoint = nil
 
     def self.eds_endpoint=(endpoint=nil)
@@ -16,8 +15,9 @@ module Uaeds
 
     def open_person(identifier)
       # This might be improved with some more handling here and in DSML init.
-      if(@user && @password)
-        DSMLPerson.new(Nokogiri::XML(open(@url + "/people/#{identifier}", :http_basic_authentication=>[@user, @password])))
+      if @user && @password
+        DSMLPerson.new(Nokogiri::XML(open(@url + "/people/#{identifier}",
+                                          http_basic_authentication: [@user, @password])))
       else
         DSMLPerson.new(Nokogiri::XML(open(@url + "/people/#{identifier}")))
       end

data/lib/uaeds/mock_eds.rb

@@ -1,17 +1,13 @@
 # Provided to ease testing of applications using DSML
 module Uaeds
   class MockEdsDSML < EdsDSML
-
-
     def initialize
       @mock_overrides = {}
     end
 
-    def self.eds_endpoint=(endpoint=nil)
-    end
+    def self.eds_endpoint=(_endpoint = nil) end
 
-    def self.eds_endpoint
-    end
+    def self.eds_endpoint() end
 
     def set_mock_overrides(dict)
       @mock_overrides = dict
@@ -25,34 +21,33 @@ module Uaeds
 
     def generate_attributes(identifier)
       # I'm sure there's a more elegant way to write this, but it's already written.
-      return {
-        :uid => @mock_overrides[:uid] || "mockuser#{identifier}", # netid
-        :uaId => @mock_overrides[:uaId] || ('%012i' % identifier), # 12 digits
-        :isoNumber => @mock_overrides[:isoNumber] || ('%016i' % identifier), # cat card, 16 digits
-        :emplId => @mock_overrides[:emplid] || ('%08i' % identifier), # also SID, 8 digit
-        :cn => @mock_overrides[:cn] || "mock user #{identifier}", # complete name
-        :givenName => @mock_overrides[:givenName] || "mock", # First + initial
-        :sn => @mock_overrides[:sn] || "user #{identifier}", # surname/last name
-        :mail => @mock_overrides[:mail] || "mockuser#{identifier}@example.com", # email
-        :eduPersonPrimaryAffiliation => @mock_overrides[:eduPersonPrimaryAffiliation] || "staff", # staff, student, member, etc.
-        :employeeTitle => @mock_overrides[:employeeTitle] || "Test Robot",
-        :employeePrimaryDept => @mock_overrides[:employeePrimaryDept] || "0000",
-        :employeePrimaryDeptName => @mock_overrides[:employeePrimaryDeptName] || "Robot Wing"
+      {
+        uid: @mock_overrides[:uid] || "mockuser#{identifier}", # netid
+        uaId: @mock_overrides[:uaId] || ('%012i' % identifier), # 12 digits
+        isoNumber: @mock_overrides[:isoNumber] || ('%016i' % identifier), # cat card, 16 digits
+        emplId: @mock_overrides[:emplid] || ('%08i' % identifier), # also SID, 8 digit
+        cn: @mock_overrides[:cn] || "mock user #{identifier}", # complete name
+        givenName: @mock_overrides[:givenName] || 'mock j', # First + initial
+        preferredGivenname: @mock_overrides[:preferredGivenname] || 'mock',
+        sn: @mock_overrides[:sn] || "user #{identifier}", # surname/last name
+        mail: @mock_overrides[:mail] || "mockuser#{identifier}@example.com", # email
+        # staff, student, member, etc.
+        eduPersonPrimaryAffiliation: @mock_overrides[:eduPersonPrimaryAffiliation] || 'staff',
+        employeeTitle: @mock_overrides[:employeeTitle] || 'Test Robot',
+        employeePrimaryDept: @mock_overrides[:employeePrimaryDept] || '0000',
+        employeePrimaryDeptName: @mock_overrides[:employeePrimaryDeptName] || 'Robot Wing'
       }
     end
-
   end
 
   class MockDSMLPerson < DSMLPerson
-
-    def initialize(data={})
-       @xml = data
-       @value_h = {}
+    def initialize(data = {})
+      @xml = data
+      @value_h = {}
     end
 
     def get_xml_attr(attr)
-      return @xml[attr]
+      @xml[attr]
     end
   end
-
 end

data/lib/uaeds/version.rb

@@ -1,3 +1,3 @@
 module Uaeds
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/mock_uaeds_spec.rb

@@ -1,24 +1,19 @@
+require 'uaeds'
 require 'uaeds/mock_eds'
-
-
 module Uaeds
-  
   describe MockEdsDSML, MockDSMLPerson do
-
     describe 'MockEdsDSML' do
-      let(:eds){ MockEdsDSML.instance }
-      
+      let(:eds) { MockEdsDSML.instance }
       it 'provides an mock instance' do
         expect(eds).to be_an_instance_of MockEdsDSML
       end
     end
 
     describe 'MockEdsDSML can retrieve a mock person' do
-      before{
+      before {
         @test_id = 1
       }
-      let(:person){ MockEdsDSML.instance.person_by_uaid(@test_id) }
-
+      let(:person) { MockEdsDSML.instance.person_by_uaid(@test_id) }
       it 'provides a mock person' do
         expect(person).to be_an_instance_of MockDSMLPerson
         expect(person.uaid).to eq('%012i' % @test_id)
@@ -27,20 +22,16 @@ module Uaeds
     end
 
     describe 'can override default mock values' do
-      before{
+      before {
         @test_id = 1
-        MockEdsDSML.instance.set_mock_overrides({:givenName => 'Larry'})
+        MockEdsDSML.instance.set_mock_overrides(preferredGivenname: 'Larry')
       }
-      let(:person){ MockEdsDSML.instance.person_by_uaid(@test_id) }
-
+      let(:person) { MockEdsDSML.instance.person_by_uaid(@test_id) }
       it 'overrode property' do
         expect(person).to be_an_instance_of MockDSMLPerson
         expect(person.uaid).to eq('%012i' % @test_id)
         expect(person.first_name).to eq('Larry')
       end
     end
-
   end
 end
-
-

data/spec/uaeds_spec.rb

@@ -3,12 +3,11 @@ require 'uaeds/eds_dsml'
 require 'uaeds/eds_json'
 require 'highline/import'
 
-def color(a,b)
-  HighLine.color(a,b)
+def color(a, b)
+  HighLine.color(a, b)
 end
 
 module Uaeds
-  
   describe EdsDSML, EdsJSON do
     eds_user = nil
     eds_key = nil
@@ -19,94 +18,89 @@ module Uaeds
     person_0 = nil
     person_1 = nil
     eds_test_user_netid = nil
-    
+
     describe 'Get access credentials for testing' do
       info_color = [:yellow, :bold]
       question_color = [:green]
       error_color = [:red, :bold]
-      
+
       say(color("To test this library access to an EDS system is required.", info_color))
       say(color("Please provide access credentials and endpoints for", info_color))
       say(color("testing as prompted.\n", info_color))
-      
+
       eds_user = ask(color("EDS user name?", question_color)) do |input|
         input.validate = /.+/
         input.responses[:not_valid] = color("Please provide an EDS user name.", error_color)
         input.responses[:ask_on_error] = ""
       end
-      
+
       eds_key = ask(color("EDS key?", question_color)) do |input|
         input.echo = "*"
         input.validate = /.+/
         input.responses[:not_valid] = color("Please provide an EDS key.", error_color)
         input.responses[:ask_on_error] = ""
       end
-      
+
       eds_dsml_ep = ask(color("DSML endpoint?", question_color)) do |input|
         input.validate = /.+/
         input.responses[:not_valid] = color("Please provide a DSML service endpoint.", error_color)
         input.responses[:ask_on_error] = ""
       end
-      
+
       eds_json_ep = ask(color("JSON endpoint?", question_color)) do |input|
         input.validate = /.+/
         input.responses[:not_valid] = color("Please provide a JSON service endpoint.", error_color)
         input.responses[:ask_on_error] = ""
       end
-      
+
       eds_test_user_netid = ask(color("Please provide a NetID for testing.", question_color)) do |input|
         input.validate = /^\s*[a-zA-Z0-9]{3,16}\s*$/
         input.responses[:not_valid] = color("Please provide a NetID for testing.", error_color)
         input.responses[:ask_on_error] = ""
       end
-      
+
       eds_user.strip!
       eds_key.strip!
       eds_dsml_ep.strip!
       eds_json_ep.strip!
       eds_test_user_netid.strip!
-      
+
       puts(color("\nStarting tests...\n++++++++++++++\n", [:blue, :bold]))
-      
+
       it 'Should have test credentials' do
         expect(eds_user).not_to be_empty
         expect(eds_key).not_to be_empty
         expect(eds_dsml_ep).not_to be_empty
         expect(eds_json_ep).not_to be_empty
       end
-      
+
       Eds.eds_user = eds_user
       Eds.eds_key = eds_key
       EdsDSML.eds_endpoint = "https://#{eds_dsml_ep}"
       EdsJSON.eds_endpoint = "https://#{eds_json_ep}"
-      
     end
-        
-        
+
+
     describe 'EdsDSML and EdsJSON retrieve the same results' do
-    
       eds0 = EdsDSML.instance
       eds1 = EdsJSON.instance
-      
       describe 'EdsDSML and EdsJSON should match when retrieved by NetId' do
-        
         person_0 = eds0.person_by_netid(eds_test_user_netid)
         person_1 = eds1.person_by_netid(eds_test_user_netid)
-        
         it 'retrieved a DSML person' do
           expect(person_0).to_not be_nil
           expect(person_0).to be_an_instance_of(DSMLPerson)
         end
-        
+
         it 'retrieved a JSON person' do
           expect(person_1).to_not be_nil
           expect(person_1).to be_an_instance_of(JSONPerson)
         end
-        
+
         it 'has the sanem netid' do
           expect(person_1.netid).to eq(person_0.netid)
         end
-        
+
         it 'has the same name' do
           expect(person_0.name).to eq(person_1.name)
         end
@@ -117,18 +111,13 @@ module Uaeds
           # probably nil
           expect(person_1.emplid).to eq(person_0.emplid)
         end
-        
       end
 
-      
       describe 'EdsDSML and EdsJSON should match when retrieved by uaid' do
-
         person_1 = eds1.person_by_uaid(person_0.uaid)
-        
         # Currently uiad's starting with a letter
         # can not be retrieved by the DSML API.
         # person_0 = eds0.person_by_uaid(person_1.uaid)
-        
         it 'has the same netid' do
           expect(person_1.netid).to eq(person_0.netid)
         end
@@ -141,7 +130,6 @@ module Uaeds
         it 'has the same emplid' do
           expect(person_1.emplid).to eq(person_0.emplid)
         end
-        
       end
 
       describe 'EdsDSML and EdsJSON both retrieve the proper user' do
@@ -149,16 +137,15 @@ module Uaeds
           expect(person_1.netid).to eq(eds_test_user_netid)
           expect(person_0.netid).to eq(eds_test_user_netid)
         end
-      
       end
-      
+
       describe 'EdsDSML and EdsJSON return nil for undefined attributes' do
         it 'returns nil' do
           expect(person_0.lookup_value('robotDinosaur')).to be_nil
           expect(person_1.lookup_value('robotDinosaur')).to be_nil
         end
       end
-      
+
       describe 'EdsDSML returns nils for all values when blank entry is found' do
         person_2 = eds0.person_by_uaid('T0T0T0T0T0T0T0T0T0T0T0T0')
         it 'has nils' do
@@ -168,6 +155,5 @@ module Uaeds
         end
       end
     end
-    
   end
-end
+end

data/uaeds.gemspec

@@ -4,25 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'uaeds/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "uaeds"
+  spec.name          = 'uaeds'
   spec.version       = Uaeds::VERSION
-  spec.authors       = ["dgsan"]
-  spec.email         = ["dgsan@gmx.com"]
-  spec.description   = "Tool for working with UA's 'Enterprise Directory Service,' an XML-based (DSML) (or JSON-based) lookup service."
-  spec.summary       = 'Tool for working with UA EDS'
-  spec.homepage      = "https://github.com/dgsan/uaeds"
-  spec.license       = "MIT"
+  spec.authors       = ['dgsan']
+  spec.email         = ['dgsan@gmx.com']
+  spec.description   = "Tool for working with 'Enterprise Directory Service,' an XML-based (DSML) (or JSON-based) lookup service."
+  spec.summary       = 'Tool for working with EDS'
+  spec.homepage      = 'https://github.com/dgsan/uaeds'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency 'bundler', "~> 1.3"
-  spec.add_development_dependency 'rake', "~> 10.1"
-  spec.add_development_dependency 'rspec', "~> 2.6"
-  spec.add_development_dependency 'highline', "~> 1.6"
-  spec.add_runtime_dependency 'nokogiri', "~> 1.6"
-  spec.add_runtime_dependency 'json', "~> 1.8"
+  spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'highline', '~> 1.6'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8'
+  spec.add_runtime_dependency 'json', '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uaeds
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - dgsan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -72,30 +72,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-description: Tool for working with UA's 'Enterprise Directory Service,' an XML-based
-  (DSML) (or JSON-based) lookup service.
+        version: '2.1'
+description: Tool for working with 'Enterprise Directory Service,' an XML-based (DSML)
+  (or JSON-based) lookup service.
 email:
 - dgsan@gmx.com
 executables: []
@@ -144,7 +144,7 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Tool for working with UA EDS
+summary: Tool for working with EDS
 test_files:
 - spec/mock_uaeds_spec.rb
 - spec/spec_helper.rb