ucb_groups 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f043f60d47d06ac9784377d91f42ab15efcc96db
-  data.tar.gz: 7260b09220253c01c0acd2e610a245a2259425a0
+  metadata.gz: 8a1c5751bd7d0cd52a43f821bfab1ceb96d95e4b
+  data.tar.gz: ba5e2a7dedb493d49c526e555f8c3f59447de177
 SHA512:
-  metadata.gz: 6266d83c93e0e115cdff01c31f4aaac49e9f6c7ef00384e922ea622f198f8db5325b6e1522191ac907906d2a5b27f26121aa96622858caa054085d00b282c0c5
-  data.tar.gz: 35cba662be0566a36dadc04684cd8616474a8e37f16a32cf082ccfceeed6ee37dd7b2e981aac9965364c5429f1fde5f8c3a4e56845e3d63732f549fca93cd656
+  metadata.gz: 107f2e3bbb3edcc37df8916a82ae76e5d384f69f3115d8617e2f655218915582c40e5f5b1fb7c8b68419b5b1023a6f087f25276541cbca3ab3fa4c2c7db08853
+  data.tar.gz: 9451a7d4426cd76a4a087ded3c82d1ae555f15b6f3c6e9382d7e8300311d1dc8024b66f3cf810b564583a45428a9326ec8dba1240e7526c3e388228d25d6506d

data/README.md

@@ -52,8 +52,10 @@ person.first_name
 => "Joe"
 person.last_name
 => "Smith"
-person.email
-=> "email@berkeley.edu"
+person.public_email
+=> "email-public@berkeley.edu"
+person.official_email
+=> "email-official@berkeley.edu"
 person.orgs
 => "UCBKL-SCHOL-SCHSW-CSDEP"
 ```

data/lib/ucb_groups/campus_group.rb

@@ -4,8 +4,8 @@ module UcbGroups
 
     def initialize(ldap_entry)
       @dn = ldap_entry[:dn].first.to_s
-      @description = ldap_entry[:description].first.to_s
       @name = ldap_entry[:displayName].first.to_s
+      @description = ldap_entry[:description].first.to_s
       @namespace, @id = parse_dn
     end
 

data/lib/ucb_groups/person.rb

@@ -6,7 +6,8 @@ module UcbGroups
         :uid => :uid,
         :first_name => :givenname,
         :last_name => :sn,
-        :email => :mail,
+        :public_email => :mail,
+        :official_email => :ucbemail,
         :orgs => :berkeleyEduPrimaryDeptUnitHierarchyString
     }.freeze
 

data/lib/ucb_groups/version.rb

@@ -1,3 +1,3 @@
 module UcbGroups
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/ucb_groups/campus_group_spec.rb

@@ -4,13 +4,13 @@ require_relative "../spec_helper"
 describe "CampusGroup" do
   let(:entry) do
     {
-        :dn => ["cn=edu:berkeley:app:calmessages:faculty,ou=campus groups,dc=berkeley,dc=edu"],
-        :description => ["UCB Instructors"],
-        :displayName => ["Instructors"]
+        :dn => ["cn=edu:berkeley:app:calmessages:calmessages-test,ou=campus groups,dc=berkeley,dc=edu"],
+        :description => ["Calmessages Test"],
+        :displayName => ["calmessages-test"]
     }
   end
 
-  it "Finds Campus Groups" do
+  it "finds all groups within a namespace" do
     groups = UcbGroups::CampusGroup.find(:calmessages)
     groups.should_not be_empty
   end
@@ -18,8 +18,8 @@ describe "CampusGroup" do
   it "initializes an entry" do
     group = UcbGroups::CampusGroup.new(entry)
 
-    group.id.should eql("faculty")
-    group.name.should eql("Instructors")
+    group.id.should eql("calmessages-test")
+    group.name.should eql(entry[:displayName].first)
     group.description.should eql(entry[:description].first)
     group.namespace.should eql("calmessages")
     group.dn.should eql(entry[:dn].first)

data/spec/ucb_groups/membership_finder_spec.rb

@@ -22,7 +22,7 @@ describe "MembershipFinder" do
     end
 
     it "finds users in a multiple groups" do
-      finder.find(:groups => [:deans, :instructors]).should_not be_empty
+      finder.find(:groups => [:deans, 'calmessages-test']).should_not be_empty
     end
   end
 
@@ -41,12 +41,16 @@ describe "MembershipFinder" do
 
   context "Finding by group and org" do
     it "finds users in a single group and org" do
-      campus_it_staff = finder.find(:groups => ["it-staff"])
-      ist_it_staff = finder.find(:groups => ["it-staff"], :orgs => [:VRIST])
+      # Note, the memebers in these two groups may change over time, but it shouldn't
+      # happen very often.  Test will need to be updated when groups members are changed
 
-      campus_it_staff.should_not be_empty
-      ist_it_staff.should_not be_empty
-      (ist_it_staff.length < campus_it_staff.length).should be_true
+      testers = finder.find(:groups => ['calmessages-test'])
+      names = testers.map(&:first_name)
+      names.should =~ ["Sondra", "Veronica", "Steven", "Jeff", "Elise", "Cindy", "Annika"]
+
+      jlstp_testers = finder.find(:groups => ['calmessages-test'], :orgs => [:JLSTP])
+      jlstp_names = jlstp_testers.map(&:first_name)
+      jlstp_names.should =~ ["Sondra", "Jeff", "Veronica"]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucb_groups
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - sahglie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,6 @@ files:
 - lib/ucb_groups/monkey_patches/net_ldap_filter.rb
 - lib/ucb_groups/person.rb
 - lib/ucb_groups/version.rb
-- spec/integration/calmsgs_groups_spec.rb
 - spec/spec_helper.rb
 - spec/ucb_groups/campus_group_spec.rb
 - spec/ucb_groups/membership_filter_spec.rb
@@ -155,15 +154,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Finds users that belong to a given ucb group
 test_files:
-- spec/integration/calmsgs_groups_spec.rb
 - spec/spec_helper.rb
 - spec/ucb_groups/campus_group_spec.rb
 - spec/ucb_groups/membership_filter_spec.rb
 - spec/ucb_groups/membership_finder_spec.rb
 - spec/ucb_groups_spec.rb
-has_rdoc: 

data/spec/integration/calmsgs_groups_spec.rb

@@ -1,127 +0,0 @@
-require 'rest-client'
-require_relative "../spec_helper"
-require 'set'
-
-#groups = UcbGroups::CampusGroup.find(:calmessages)
-#pp groups.map(&:name).sort
-
-
-def assert_matching_group(group)
-  @finder ||= UcbGroups::MembershipFinder.new(:calmessages)
-  grouper_uids = @finder.find(:groups => [group]).map(&:uid).sort
-  calmsgs_uids = calmsgs_group_uids(group)
-
-  #if calmsgs_uids.length != grouper_uids.length
-    puts "calmsgs: #{calmsgs_uids.length}, grouper: #{grouper_uids.length}"
-    puts "Only In Calmsgs: #{calmsgs_uids - grouper_uids}\nOnly in Grouper: #{grouper_uids - calmsgs_uids}"
-    grouper_uids.length.should eql(calmsgs_uids.length)
-  #end
-
-  calmsgs_uids.should eql(grouper_uids)
-end
-
-def calmsgs_group_uids(group)
-  uids = RestClient.get("localhost:3000/api/groups/#{group}.json")
-  JSON.parse(uids).map(&:to_s).sort
-end
-
-
-describe "Calmsgs Groups Compatibility" do
-  it "academic-senate-faculty" do
-    # fails but close enough
-    assert_matching_group("academic-senate-faculty")
-  end
-
-  it "deans" do
-    # fails but close enough
-    assert_matching_group("deans")
-  end
-
-  it "dept-admin" do
-    # fails because ldap does not keep emptititlecode around for expired people and caldap does (close enough)
-    assert_matching_group("dept-admin")
-  end
-
-  it "dept-chairs" do
-    # fails but close enough
-    assert_matching_group("dept-chairs")
-  end
-
-  it "directors" do
-    assert_matching_group("directors")
-  end
-
-  it "emeriti" do
-    assert_matching_group("emeriti")
-  end
-
-  it "faculty" do
-    # fails because calmsgs is grabbing people that it shouldn't.  In many instances calmsgs
-    # is grabbing staff that have no academic affiliation (close enough)
-    assert_matching_group("faculty")
-  end
-
-  it "it-staff" do
-    # fails because calmsgs it grabbing retired or expired it-staff (close enough)
-    assert_matching_group("it-staff")
-  end
-
-  it "staff" do
-    # fails but close enough
-    assert_matching_group("staff")
-  end
-
-  it "students" do
-    # fails but close enough
-    assert_matching_group("students")
-  end
-
-  it "managers" do
-    assert_matching_group("managers") # fails but close enough
-  end
-
-  it "supervisors" do
-    assert_matching_group("supervisors") # fails but close enough
-  end
-
-  it "affiliates" do
-    assert_matching_group("affiliates") # fails
-  end
-
-  it "ucop" do
-    # fails but close enough
-    assert_matching_group("ucop")
-  end
-
-  it "graduate-students" do
-    # no calmsgs group
-    # assert_matching_group("graduate-students")
-  end
-
-  it "advisors" do
-    # no calmsgs group
-    # assert_matching_group("advisors")
-  end
-
-  it "gsis" do
-    # no calmsgs group
-    # assert_matching_group("gsis")
-  end
-
-  it "gsrs" do
-    # no calmsgs group
-    # assert_matching_group("gsrs")
-  end
-
-  it "instructors" do
-    # no calmsgs group
-    #assert_matching_group("instructors")
-  end
-
-  it "undergrad-students" do
-    # no calmsgs group
-    # assert_matching_group("undergrad-students")
-  end
-end
-
-