ncs_navigator_authority 0.0.2 → 1.0.0

data/buildfile

@@ -2,6 +2,6 @@ require 'buildr/bnd'
 require 'buildr-gemjar'
 
 define 'ncs_navigator_authority_gems' do
-  project.version = '0.0.1.DEV'
-  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-0.0.1.gem'))
+  project.version = '1.0.0'
+  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-1.0.0.gem')).with_gem('jruby-ossl', '0.7.5')
 end

data/lib/ncs_navigator/authorization/psc/authority.rb

@@ -1,8 +1,10 @@
 require 'ncs_navigator/configuration'
+require 'logger'
 module NcsNavigator::Authorization::Psc
   class Authority
     def initialize(ignored_config=nil)
       @staff_portal_connection ||= staff_portal_client.connection
+      @logger = Logger.new("#{Java::JavaLang::System.getProperty('catalina.base')}/logs/ncs_navigator_authority.log")
     end
     
     def get_user_by_username(username, role_detail_level)
@@ -29,8 +31,9 @@ module NcsNavigator::Authorization::Psc
     
       def users_hash(users)
         users_hash = []
+        return users_hash unless users
         users.each do |u|
-          users_hash << user_hash(u)
+          users_hash << user_hash(u) if u["username"]
         end
         users_hash
       end
@@ -65,7 +68,8 @@ module NcsNavigator::Authorization::Psc
       end
     
       def staff_portal_client
-        NcsNavigator::Authorization::StaffPortal::Client.new(NcsNavigator.configuration.staff_portal_uri, :authenticator => create_authenticator)
+        NcsNavigator::Authorization::StaffPortal::Client.new(NcsNavigator.configuration.staff_portal_uri, 
+        :authenticator => create_authenticator)
       end
     
       def create_authenticator
@@ -73,12 +77,18 @@ module NcsNavigator::Authorization::Psc
       end
     
       def get_staff(url)
-        response = @staff_portal_connection.get url
-        if response.status == 200
-          response.body
-        else
-          nil
+        staff = nil
+        begin
+          response = @staff_portal_connection.get url
+          if response.status == 200
+            staff = response.body
+          else            
+            @logger.warn("#{Time.now}: Staff Portal Response: #{response.body}")
+          end
+        rescue => e
+          @logger.error("#{Time.now} : Staff Portal: #{e.class} #{e.backtrace.join("\n")}")
         end
+        staff
       end
       
       def get_user_by_username_or_id(staff)
@@ -190,4 +200,4 @@ module NcsNavigator::Authorization::Psc
     end
   end
   
-end
+end

data/lib/ncs_navigator/authorization/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   class Authorization
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/spec/ncs_navigator/authorization/psc/authority_spec.rb

@@ -131,6 +131,13 @@ describe NcsNavigator::Authorization::Psc::Authority do
         end
         @return_users.should be_empty
       end
+
+      it "excludes the user with null username from list of users returning" do
+        VCR.use_cassette('staff_portal/psc/users_with_null_username') do
+          @return_users = @psc_authority.get_users_by_role(:subject_manager)
+        end
+        @return_users.count.should == 1
+      end
     end    
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ncs_navigator_authority
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jalpa Patel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 -05:00
+date: 2012-09-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency