ucb_groups 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bdf549f13edf65d636beb2404cd2a5b6157ddb
-  data.tar.gz: aa0116d5ffea6cdc906625032a27e6159d4b273c
+  metadata.gz: 44afd05e9f0cda43ea10a6bc30255a8b3f44b199
+  data.tar.gz: ec73f0e642dc406795ac8565d3b7b010bb6b1a9b
 SHA512:
-  metadata.gz: 589a70bcc804a10e3f7c9e8ef2ffd0c233b0155f73f306ef6dcba4cd1af5b4d0d12a64b3a7ddca312d4794e0462902f90101cd2f3cbe063fc0f352f7d672982d
-  data.tar.gz: fc314a5db50aac3ad35b183acc134d7e785eb9d93e9658765175126b27f14a33d9eb427c8286982a7a269daf5e86638b4873dca26e5f9ef0a91e32dab9f10fa8
+  metadata.gz: 7ba3c534c2a9cfce09ed164dc98e54f5a6bef9fcb2b2d084349ee1607fe2ca4365e140d1100e4601e5fde40d55069666f7cb77f1c4ffc39c5ba744e9a2680f8e
+  data.tar.gz: e6ba58c3607583394757680f4f7679df8bbb282241c676a03f963aa4d40d116675bd154dafabc70e122cd50099f09b4b209761821378cc38bead8c54ca951611

data/README.md

@@ -27,8 +27,10 @@ Then...
 
 Get list of groups in namespace:
 ```
-UcbGroups::CampusGroup.find(<namespace>)
+groups = UcbGroups::CampusGroup.find(<namespace>)
 => [CampusGroup, CampusGroup, ...]
+groups.first
+=>
 ```
 
 Find people in one or more groups:

data/lib/ucb_groups/campus_group.rb

@@ -1,18 +1,19 @@
 module UcbGroups
   class CampusGroup
-    attr_accessor :dn, :description, :namespace, :name
+    attr_accessor :id, :name, :description, :namespace, :dn
 
     def initialize(ldap_entry)
       @dn = ldap_entry[:dn].first.to_s
       @description = ldap_entry[:description].first.to_s
-      @namespace, @name = parse_dn
+      @name = ldap_entry[:displayName].first.to_s
+      @namespace, @id = parse_dn
     end
 
     def self.find(namespace)
       args = {
           :base => "ou=campus groups,dc=berkeley,dc=edu",
           :filter => build_filter(namespace),
-          :attributes => %w(dn description name),
+          :attributes => %w(name displayName description dn)
       }
       LdapConn.conn.search(args).map { |entry| CampusGroup.new(entry) }
     end

data/lib/ucb_groups/ldap_conn.rb

@@ -8,10 +8,10 @@ module UcbGroups
       raise(LdapBindFailedException)
     end
 
-    def self.authenticate(username, password, host='nds.berkeley.edu')
+    def self.authenticate(username, password, host)
       @username = username
       @password = password
-      @host = host
+      @host = host || 'nds.berkeley.edu'
     end
 
     def self.authenticate_from_config(config_file)

data/lib/ucb_groups/membership_finder.rb

@@ -45,7 +45,7 @@ module UcbGroups
     end
 
     def namespace_groups
-      @namespace_groups ||= CampusGroup.find(namespace).map(&:name)
+      @namespace_groups ||= CampusGroup.find(namespace).map(&:id)
     end
   end
 end

data/lib/ucb_groups/version.rb

@@ -1,3 +1,3 @@
 module UcbGroups
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ucb_groups.rb

@@ -26,6 +26,10 @@ module UcbGroups
       super("You must provide at least one group or one org")
     end
   end
+
+  def self.root
+    File.expand_path(File.join(__FILE__, '..', '..'))
+  end
 end
 
 

data/spec/spec_helper.rb

@@ -2,6 +2,6 @@ require_relative '../lib/ucb_groups'
 require 'yaml'
 
 RSpec.configure do |config|
-  ldap_yml = File.expand_path(File.dirname("#{__FILE__}") + "/../ldap.yml")
+  ldap_yml = File.expand_path(File.join(UcbGroups.root, "config", "ldap.yml"))
   UcbGroups::LdapConn.authenticate_from_config(ldap_yml)
 end

data/spec/ucb_groups/campus_group_spec.rb

@@ -5,7 +5,8 @@ describe "CampusGroup" do
   let(:entry) do
     {
         :dn => ["cn=edu:berkeley:app:calmessages:faculty,ou=campus groups,dc=berkeley,dc=edu"],
-        :description => ["Instructors"]
+        :description => ["UCB Instructors"],
+        :displayName => ["Instructors"]
     }
   end
 
@@ -17,9 +18,10 @@ describe "CampusGroup" do
   it "initializes an entry" do
     group = UcbGroups::CampusGroup.new(entry)
 
-    group.dn.should eql(entry[:dn].first)
+    group.id.should eql("faculty")
+    group.name.should eql("Instructors")
     group.description.should eql(entry[:description].first)
     group.namespace.should eql("calmessages")
-    group.name.should eql("faculty")
+    group.dn.should eql(entry[:dn].first)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucb_groups
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - sahglie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler