cornell_ldap 1.4.0 → 1.4.2

data/.gitignore

@@ -1,21 +1,4 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cornell_ldap.gemspec
+gemspec

data/Rakefile

@@ -1,47 +1,2 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "cornell_ldap"
-    gem.summary = %Q{Toolkit for accessing information about people through the Cornell University LDAP directory.}
-    gem.description = %Q{Using ActiveLdap, this library provides an easy interface for communicating with the Cornell University LDAP directory.  Use of this directory is restricted to purposes authorized by the university.}
-    gem.email = "aepstein607@gmail.com"
-    gem.homepage = "http://github.com/aepstein/cornell_ldap"
-    gem.authors = ["Ari Epstein"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "net-ldap", '>= 0.1.1'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cornell_ldap #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"
 

data/cornell_ldap.gemspec

@@ -1,58 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "cornell_ldap/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{cornell_ldap}
-  s.version = "1.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ari Epstein"]
-  s.date = %q{2010-09-09}
+  s.name        = "cornell_ldap"
+  s.version     = CornellLdap::VERSION
+  s.authors     = ["Ari Epstein"]
+  s.email       = ["aepstein607@gmail.com"]
+  s.homepage    = "http://github.com/aepstein/cornell_ldap"
+  s.summary     = %q{Lightweight LDAP abstraction library to work Cornell's particular structure}
   s.description = %q{Using ActiveLdap, this library provides an easy interface for communicating with the Cornell University LDAP directory.  Use of this directory is restricted to purposes authorized by the university.}
-  s.email = %q{aepstein607@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "cornell_ldap.gemspec",
-     "lib/cornell_ldap.rb",
-     "spec/cornell_ldap_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/aepstein/cornell_ldap}
-  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.rubyforge_project = "cornell_ldap"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Toolkit for accessing information about people through the Cornell University LDAP directory.}
   s.test_files = [
     "spec/cornell_ldap_spec.rb",
      "spec/spec_helper.rb"
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency 'rspec'
+  s.add_dependency 'net-ldap'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<net-ldap>, [">= 0.1.1"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<net-ldap>, [">= 0.1.1"])
-  end
 end
 

data/lib/cornell_ldap/record.rb

@@ -0,0 +1,166 @@
+require 'rubygems' unless defined? Gem
+require 'net/ldap' unless defined? Net::LDAP
+
+module CornellLdap
+  class Record < Object
+
+    MAPPINGS = {
+      :cornelledutype          => :status,
+      :cornelleduwrkngtitle1   => :status_title1,
+      :cornelleduwrkngtitle2   => :status_title2,
+      :cornelleduacadcollege   => :college,
+      :cornelleducampusaddress => :campus_address,
+      :cornelledulocaladdress  => :local_address,
+      :homepostaladdress       => :home_address,
+      :givenname               => :first_name,
+      :cornelledumiddlename    => :middle_name,
+      :sn                      => :last_name,
+      :cornelleducampusphone   => :campus_phone,
+      :homephone               => :home_phone,
+      :cornelledulocalphone    => :local_phone
+    }
+
+    CONNECTION_PARAMETERS = [ :port, :host, :auth ]
+
+    def self.setup_connection( params )
+      @@connection_params = params.inject({}) do |memo, (k, v)|
+        memo[k.to_sym] = v
+        memo
+      end
+      @@connection = Net::LDAP.new(
+        @@connection_params.inject({}) do |memo, (k, v)|
+          memo[k] = v if CONNECTION_PARAMETERS.include? k
+          memo
+        end
+      )
+    end
+
+    def self.connection
+      @@connection
+    end
+
+    def self.find( subject )
+      r = connection.search(
+        :base => 'ou=People,' + @@connection_params[:base], :size => 1,
+        :filter => Net::LDAP::Filter.eq( 'uid', subject ),
+        :scope => Net::LDAP::SearchScope_SingleLevel
+      )
+      return CornellLdap::Record.new( r.first ) if r && r.length > 0
+      nil
+    end
+
+    # Takes an address string and converts it to a hash representation:
+    #
+    # [street] Street address
+    # [city]   City
+    # [state]  State
+    # [zip]    Zip code
+    def self.address_attributes(string_address)
+      return if string_address.nil?
+      array_address = string_address.split(',').map! { |x| x.strip }
+      state = false
+      array_address.each_index { |i| state = i if array_address[i] =~ /^[A-Za-z]{2,2}$/ }
+      return unless state && state > 1
+      attributes = { :street => array_address[0..(state-2)].join(', '),
+        :city => array_address[state - 1],
+        :state => array_address[state] }
+      attributes[:zip] = array_address[state + 1] unless array_address[state + 1].nil?
+      attributes
+    end
+
+    def self.sanitize_phone(string_phone)
+      return if string_phone.nil?
+      string_phone.gsub /[^0-9]/, ''
+    end
+
+    attr_accessor :attributes
+
+    def initialize( record )
+      self.attributes = Hash.new
+      MAPPINGS.each do |ldap, local|
+        self.attributes[local] = record[ldap].first unless record[ldap].nil? || record[ldap].empty?
+      end
+    end
+
+    # Returns a string representation of the person's status with the university
+    # of one of the following types:
+    #
+    # [staff]     non-faculty employee
+    # [faculty]   tenured or tenure-track faculty
+    # [undergrad] undergraduate student
+    # [grad]      graduate or professional student
+    # [alumni]    alumnus
+    # [temporary] temporary or casual employee
+    # false       status unknown
+    def status
+      return @status unless @status.nil?
+      return unless attributes.key?( :status )
+      @status = case attributes[:status]
+        when /^staff/ then 'staff'
+        when /^acad/ then
+          if ( attributes.key?(:status_title1) && attributes[:status_title1] =~ /^Prof/ ) ||
+             ( attributes.key?(:status_title2) && attributes[:status_title2] =~ /^Prof/ ) then
+             'faculty'
+          else
+            'staff'
+          end
+        when /^student/ then case attributes[:college]
+          when 'AS', 'AR', 'AG', 'IL', 'HE', 'HA', 'EN', 'UN' then 'undergrad'
+          else 'grad'
+        end
+        when /^alumni/ then 'alumni'
+        when /^temp/ then 'temporary'
+        else false
+      end
+    end
+
+    # Returns has representation of on campus address for person if one is
+    # reported.
+    # See CornellLdap::Record#address_attributes for more information.
+    def campus_address
+      unless @campus_address.nil?
+        return @campus_address
+      end
+      @campus_address = false unless attributes.key?(:campus_address) &&
+        @campus_address = { :street => attributes[:campus_address].strip,
+                            :on_campus => true }
+      return campus_address
+    end
+
+    # Returns local area (Ithaca area) address for person if one is reported
+    # See CornellLdap::Record#address_attributes for more information.
+    def local_address
+      unless @local_address.nil?
+        return @local_address
+      end
+      @local_address = false unless attributes.key?(:local_address) &&
+        @local_address = Record.address_attributes(attributes[:local_address])
+      return local_address
+    end
+
+    # Returns home address for person if one is reported
+    # See CornellLdap::Record#address_attributes for more information.
+    def home_address
+      unless @home_address.nil?
+        return @home_address
+      end
+      @home_address = false unless attributes.key?(:home_address) &&
+        @home_address = Record.address_attributes(attributes[:home_address])
+      return home_address
+    end
+
+    # Returns first name of person
+    def first_name; attributes[:first_name]; end
+
+    # Returns middle name of person
+    def middle_name; attributes[:middle_name]; end
+
+    # Returns last name of person
+    def last_name; attributes[:last_name]; end
+
+    def campus_phone; Record.sanitize_phone attributes[:campus_phone]; end
+    def local_phone; Record.sanitize_phone attributes[:local_phone]; end
+    def home_phone; Record.sanitize_phone attributes[:home_phone]; end
+  end
+end
+

data/lib/cornell_ldap/version.rb

@@ -0,0 +1,4 @@
+module CornellLdap
+  VERSION = "1.4.2"
+end
+

data/lib/cornell_ldap.rb

@@ -1,154 +1,6 @@
-require 'rubygems' unless defined? Gem
-require 'net/ldap' unless defined? Net::LDAP
+require "cornell_ldap/version"
 
 module CornellLdap
-  class Record < Object
-
-    MAPPINGS = {
-      :cornelledutype          => :status,
-      :cornelleduwrkngtitle1   => :status_title1,
-      :cornelleduwrkngtitle2   => :status_title2,
-      :cornelleduacadcollege   => :college,
-      :cornelleducampusaddress => :campus_address,
-      :cornelledulocaladdress  => :local_address,
-      :homepostaladdress       => :home_address,
-      :givenname               => :first_name,
-      :cornelledumiddlename    => :middle_name,
-      :sn                      => :last_name
-    }
-
-    CONNECTION_PARAMETERS = [ :port, :host, :auth ]
-
-    def self.setup_connection( params )
-      @@connection_params = params.inject({}) do |memo, (k, v)|
-        memo[k.to_sym] = v
-        memo
-      end
-      @@connection = Net::LDAP.new(
-        @@connection_params.inject({}) do |memo, (k, v)|
-          memo[k] = v if CONNECTION_PARAMETERS.include? k
-          memo
-        end
-      )
-    end
-
-    def self.connection
-      @@connection
-    end
-
-    def self.find( subject )
-      r = connection.search(
-        :base => 'ou=People,' + @@connection_params[:base], :size => 1,
-        :filter => Net::LDAP::Filter.eq( 'uid', subject ),
-        :scope => Net::LDAP::SearchScope_SingleLevel
-      )
-      return CornellLdap::Record.new( r.first ) if r && r.length > 0
-      nil
-    end
-
-    # Takes an address string and converts it to a hash representation:
-    #
-    # [street] Street address
-    # [city]   City
-    # [state]  State
-    # [zip]    Zip code
-    def self.address_attributes(string_address)
-      return if string_address.nil?
-      array_address = string_address.split(',').map! { |x| x.strip }
-      state = false
-      array_address.each_index { |i| state = i if array_address[i] =~ /^[A-Za-z]{2,2}$/ }
-      return unless state && state > 1
-      attributes = { :street => array_address[0..(state-2)].join(', '),
-        :city => array_address[state - 1],
-        :state => array_address[state] }
-      attributes[:zip] = array_address[state + 1] unless array_address[state + 1].nil?
-      attributes
-    end
-
-    attr_accessor :attributes
-
-    def initialize( record )
-      self.attributes = Hash.new
-      MAPPINGS.each do |ldap, local|
-        self.attributes[local] = record[ldap].first unless record[ldap].nil? || record[ldap].empty?
-      end
-    end
-
-    # Returns a string representation of the person's status with the university
-    # of one of the following types:
-    #
-    # [staff]     non-faculty employee
-    # [faculty]   tenured or tenure-track faculty
-    # [undergrad] undergraduate student
-    # [grad]      graduate or professional student
-    # [alumni]    alumnus
-    # [temporary] temporary or casual employee
-    # false       status unknown
-    def status
-      return @status unless @status.nil?
-      return unless attributes.key?( :status )
-      @status = case attributes[:status]
-        when /^staff/ then 'staff'
-        when /^acad/ then
-          if ( attributes.key?(:status_title1) && attributes[:status_title1] =~ /^Prof/ ) ||
-             ( attributes.key?(:status_title2) && attributes[:status_title2] =~ /^Prof/ ) then
-             'faculty'
-          else
-            'staff'
-          end
-        when /^student/ then case attributes[:college]
-          when 'AS', 'AR', 'AG', 'IL', 'HE', 'HA', 'EN', 'UN' then 'undergrad'
-          else 'grad'
-        end
-        when /^alumni/ then 'alumni'
-        when /^temp/ then 'temporary'
-        else false
-      end
-    end
-
-    # Returns has representation of on campus address for person if one is
-    # reported.
-    # See CornellLdap::Record#address_attributes for more information.
-    def campus_address
-      unless @campus_address.nil?
-        return @campus_address
-      end
-      @campus_address = false unless attributes.key?(:campus_address) &&
-        @campus_address = { :street => attributes[:campus_address].strip,
-                            :on_campus => true }
-      return campus_address
-    end
-
-    # Returns local area (Ithaca area) address for person if one is reported
-    # See CornellLdap::Record#address_attributes for more information.
-    def local_address
-      unless @local_address.nil?
-        return @local_address
-      end
-      @local_address = false unless attributes.key?(:local_address) &&
-        @local_address = Record.address_attributes(attributes[:local_address])
-      return local_address
-    end
-
-    # Returns home address for person if one is reported
-    # See CornellLdap::Record#address_attributes for more information.
-    def home_address
-      unless @home_address.nil?
-        return @home_address
-      end
-      @home_address = false unless attributes.key?(:home_address) &&
-        @home_address = Record.address_attributes(attributes[:home_address])
-      return home_address
-    end
-
-    # Returns first name of person
-    def first_name; attributes[:first_name]; end
-
-    # Returns middle name of person
-    def middle_name; attributes[:middle_name]; end
-
-    # Returns last name of person
-    def last_name; attributes[:last_name]; end
-  end
+  require 'cornell_ldap/record'
 end
 

data/spec/cornell_ldap_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
+require 'spec_helper'
 require 'cornell_ldap'
 
 CornellLdap::Record.setup_connection :host => 'directory.cornell.edu',
@@ -74,6 +73,13 @@ describe "CornellLdap" do
     person.campus_address[:street].should eql '-100 Day Hall'
   end
 
+  it "should strip non-numeric values from phone numbers" do
+    person = mock_person
+    person.campus_phone.should eql '6075551212'
+    person.local_phone.should eql '6075551212'
+    person.home_phone.should eql '6075551212'
+  end
+
   def mock_person(values = {})
     CornellLdap::Record.new( {
       :cornelledutype => ['staff'],
@@ -83,7 +89,10 @@ describe "CornellLdap" do
       :homepostaladdress => ['1 Broadway, New York, NY, 00000'],
       :givenname => ['John'],
       :cornelledumiddlename => ['A'],
-      :sn => ['Doe']
+      :sn => ['Doe'],
+      :cornelleducampusphone => ['607+555-1212'],
+      :homephone => ['607-555*1212'],
+      :cornelledulocalphone => ['607-555 1212']
     }.merge(values) )
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'cornell_ldap'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
 end
+

metadata

@@ -1,110 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cornell_ldap
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+version: !ruby/object:Gem::Version
+  version: 1.4.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ari Epstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9072920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-ldap
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *9072920
+- !ruby/object:Gem::Dependency
+  name: net-ldap
+  requirement: &9072040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Using ActiveLdap, this library provides an easy interface for communicating with the Cornell University LDAP directory.  Use of this directory is restricted to purposes authorized by the university.
-email: aepstein607@gmail.com
+  prerelease: false
+  version_requirements: *9072040
+description: Using ActiveLdap, this library provides an easy interface for communicating
+  with the Cornell University LDAP directory.  Use of this directory is restricted
+  to purposes authorized by the university.
+email:
+- aepstein607@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
 - .gitignore
+- .rspec
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - cornell_ldap.gemspec
 - lib/cornell_ldap.rb
+- lib/cornell_ldap/record.rb
+- lib/cornell_ldap/version.rb
 - spec/cornell_ldap_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/aepstein/cornell_ldap
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4054269777481147648
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4054269777481147648
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: cornell_ldap
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Toolkit for accessing information about people through the Cornell University LDAP directory.
-test_files: 
+summary: Lightweight LDAP abstraction library to work Cornell's particular structure
+test_files:
 - spec/cornell_ldap_spec.rb
 - spec/spec_helper.rb

data/.document

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

data/VERSION

@@ -1 +0,0 @@
-1.4.0