treequel 1.0.4 → 1.1.0

data/spec/treequel/schema/ldapsyntax_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
@@ -58,6 +59,9 @@ describe Treequel::Schema::LDAPSyntax do
 			@syntax.desc.should == 'Boolean'
 		end
 
+		it "can remake its own schema description" do
+			@syntax.to_s.should == BOOLEAN_SYNTAX
+		end
 	end
 
 
@@ -75,6 +79,10 @@ describe Treequel::Schema::LDAPSyntax do
 		it "knows that it doesn't have a DESC attribute" do
 			@syntax.desc.should be_nil()
 		end
+
+		it "can remake its own schema description" do
+			@syntax.to_s.should == NODESC_SYNTAX
+		end
 	end
 
 end

data/spec/treequel/schema/matchingrule_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
@@ -46,7 +47,8 @@ describe Treequel::Schema::MatchingRule do
 
 	describe "parsed from the 'octetStringMatch' matchingRule" do
 
-		OCTETSTRINGMATCH_RULE = %{( 2.5.13.17 NAME 'octetStringMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )}
+		OCTETSTRINGMATCH_RULE = %{( 2.5.13.17 NAME 'octetStringMatch' } +
+			%{SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )}
 
 		before( :each ) do
 			@rule = Treequel::Schema::MatchingRule.parse( @schema, OCTETSTRINGMATCH_RULE )
@@ -74,6 +76,9 @@ describe Treequel::Schema::MatchingRule do
 			@rule.should_not be_obsolete()
 		end
 
+		it "can remake its own schema description" do
+			@rule.to_s.should == OCTETSTRINGMATCH_RULE
+		end
 	end
 
 	describe "parsed from an matchingRule that has a DESC attribute" do

data/spec/treequel/schema/matchingruleuse_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
@@ -73,6 +74,10 @@ describe Treequel::Schema::MatchingRuleUse do
 				and_return({ :uniqueMember => :a_attrtype_object })
 			@ruleuse.attribute_types.should == [ :a_attrtype_object ]
 		end
+
+		it "can remake its own schema description" do
+			@ruleuse.to_s.should == UNIQUE_MEMBER_MATCH_DESC
+		end
 	end
 
 

data/spec/treequel/schema/objectclass_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
@@ -53,7 +54,7 @@ describe Treequel::Schema::ObjectClass do
 
 
 	before( :all ) do
-		setup_logging( :debug )
+		setup_logging( :fatal )
 		@datadir = Pathname( __FILE__ ).dirname.parent.parent + 'data'
 	end
 
@@ -125,6 +126,9 @@ describe Treequel::Schema::ObjectClass do
 			@oc.sup.should be_nil()
 		end
 
+		it "can remake its own schema description" do
+			@oc.to_s.should == TOP_OBJECTCLASS
+		end
 	end
 
 
@@ -180,6 +184,13 @@ describe Treequel::Schema::ObjectClass do
 				:physicalDeliveryOfficeName, :ou, :st, :l )
 		end
 
+		it "can remake its own schema description" do
+			@oc.to_s.should == ORGPERSON_OBJECTCLASS.squeeze(' ')
+		end
+
+		it "can fetch all of its ancestors" do
+			@oc.ancestors.should == @schema.object_classes.values_at( :orgPerson, :person, :top )
+		end
 	end
 
 
@@ -195,11 +206,15 @@ describe Treequel::Schema::ObjectClass do
 			@oc.should be_an_instance_of( Treequel::Schema::StructuralObjectClass )
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == KINDLESS_OBJECTCLASS
+		end
 	end
 
 	describe "parsed from an objectClass that has a list as the value of its NAME attribute" do
 
-		MULTINAME_OBJECTCLASS = %{( 1.1.1.1 NAME ('firstname' 'secondname') )}
+		MULTINAME_OBJECTCLASS = %{( 1.1.1.1 NAME ( 'firstname' 'secondname' ) )}
 
 		before( :each ) do
 			@oc = Treequel::Schema::ObjectClass.parse( @schema, MULTINAME_OBJECTCLASS )
@@ -214,6 +229,10 @@ describe Treequel::Schema::ObjectClass do
 			@oc.name.should == :firstname
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == MULTINAME_OBJECTCLASS
+		end
 	end
 
 	describe "parsed from an objectClass that has escaped characters in its DESC attribute" do
@@ -225,10 +244,14 @@ describe Treequel::Schema::ObjectClass do
 			@oc = Treequel::Schema::ObjectClass.parse( @schema, ESCAPED_DESC_OBJECTCLASS )
 		end
 
-		it "unscapes the escaped characters" do
+		it "unescapes the escaped characters" do
 			@oc.desc.should == %{This spec's example, which includes a \\ character.}
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == ESCAPED_DESC_OBJECTCLASS
+		end
 	end
 
 	describe "parsed from an objectClass that has the OBSOLETE attribute" do
@@ -243,6 +266,10 @@ describe Treequel::Schema::ObjectClass do
 			@oc.should be_obsolete()
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == OBSOLETE_OBJECTCLASS
+		end
 	end
 
 	describe "parsed from an objectClass that has organizationalPerson as its SUP" do
@@ -250,6 +277,8 @@ describe Treequel::Schema::ObjectClass do
 		SUB_OBJECTCLASS = %{( 1.1.1.1 SUP organizationalPerson )}
 
 		before( :each ) do
+			@top = Treequel::Schema::ObjectClass.parse( @schema, TOP_OBJECTCLASS )
+			@op = Treequel::Schema::ObjectClass.parse( @schema, ORGPERSON_OBJECTCLASS )
 			@oc = Treequel::Schema::ObjectClass.parse( @schema, SUB_OBJECTCLASS )
 		end
 
@@ -259,6 +288,11 @@ describe Treequel::Schema::ObjectClass do
 			@oc.sup.should == :organizationalPerson_objectclass
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == SUB_OBJECTCLASS
+		end
+
 	end
 
 	describe "parsed from an objectClass that has no explicit SUP" do
@@ -275,6 +309,10 @@ describe Treequel::Schema::ObjectClass do
 			@oc.sup.should == :top_objectclass
 		end
 
+		it "can remake its own schema description" do
+			# STRUCTURAL is implied...
+			@oc.to_s.sub( / STRUCTURAL/, '' ).should == ORPHAN_OBJECTCLASS
+		end
 	end
 
 end

data/spec/treequel/schema/table_spec.rb

@@ -6,25 +6,18 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'yaml'
-	require 'ldap'
-	require 'ldap/schema'
-	require 'treequel/schema'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'spec'
+require 'spec/lib/constants'
+require 'spec/lib/helpers'
+
+require 'yaml'
+require 'ldap'
+require 'ldap/schema'
+require 'treequel/schema'
 
 
 include Treequel::TestConstants
@@ -119,8 +112,8 @@ describe Treequel::Schema::Table do
 
 
 	it "provides a case-insensitive version of #values_at" do
-		@table[:cn]      = 'contra_rules'
-		@table[:d]       = 'ghosty'
+		@table[:cn]               = 'contra_rules'
+		@table[:d]                = 'ghosty'
 		@table[:porntipsGuzzardo] = 'cha-ching'
 
 		results = @table.values_at( :CN, 'PornTipsGuzzARDO' )
@@ -129,6 +122,26 @@ describe Treequel::Schema::Table do
 		results.should_not include( 'ghosty' )
 	end
 
+	it "can iterate over its members" do
+		@table[:cn]               = 'contra_rules'
+		@table[:d]                = 'ghosty'
+		@table[:porntipsGuzzardo] = 'cha-ching'
+
+		collection = []
+		@table.each {|k,v| collection << [k,v] }
+		collection.transpose[0].should include( :cn, :d, :porntipsguzzardo )
+		collection.transpose[1].should include( 'contra_rules', 'ghosty', 'cha-ching' )
+	end
+
+	it "is Enumerable" do
+		@table[:cn]               = 'contra_rules'
+		@table[:d]                = 'ghosty'
+		@table[:porntipsGuzzardo] = 'cha-ching'
+
+		collection = []
+		@table.any? {|k,v| v.index('o') }.should == true
+	end
+
 end
 
 

data/spec/treequel/schema_spec.rb

@@ -6,25 +6,18 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'yaml'
-	require 'ldap'
-	require 'ldap/schema'
-	require 'treequel/schema'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'spec'
+require 'spec/lib/constants'
+require 'spec/lib/helpers'
+
+require 'yaml'
+require 'ldap'
+require 'ldap/schema'
+require 'treequel/schema'
 
 
 include Treequel::TestConstants
@@ -62,6 +55,8 @@ describe Treequel::Schema do
 		schema.matching_rules.should have( 72 ).members
 		schema.matching_rule_uses.should have( 54 ).members
 		schema.ldap_syntaxes.should have( 31 ).members
+
+		schema.operational_attribute_types.should have( 31 ).members
 	end
 
 
@@ -82,6 +77,8 @@ describe Treequel::Schema do
 		schema.matching_rules.should have( 72 ).members
 		schema.matching_rule_uses.should have( 54 ).members
 		schema.ldap_syntaxes.should have( 31 ).members
+
+		schema.operational_attribute_types.should have( 31 ).members
 	end
 
 

data/spec/treequel_spec.rb

@@ -6,6 +6,7 @@ BEGIN {
 
 	libdir = basedir + "lib"
 
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 }
 
@@ -92,6 +93,11 @@ describe Treequel do
 			{ :base_dn => 'dc=example,dc=com', :port => 389 }
 	end
 
+	it "uses the LDAPS port for ldaps:// URIs" do
+		Treequel.make_options_from_uri( 'ldaps:///dc=example,dc=com' ).should ==
+			{ :base_dn => 'dc=example,dc=com', :connect_type => :ssl, :port => 636 }
+	end
+
 	# [?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
 	it "can build an options hash from an LDAP URL with extra stuff" do
 		uri = 'ldap:///dc=example,dc=com?uid=jrandom,ou=People?l?one?!bindname=cn=auth'
@@ -120,6 +126,12 @@ describe Treequel do
 		Treequel.directory( uri, :bind_dn => user_dn, :pass => pass, :connect_type => :plain )
 	end
 
+	it "raises an exception when ::directory is called with something other than a Hash, " +
+	   "String, or URI" do
+		expect {
+			Treequel.directory( 2 )
+		}.to raise_exception( ArgumentError, /unknown directory option/i )
+	end
 
 	it "provides a convenience method for creating directory objects from the system LDAP config" do
 		Treequel.should_receive( :find_configfile ).and_return( :a_configfile_path )
@@ -344,6 +356,16 @@ describe Treequel do
 				{ :port => 636, :connect_type => :ssl }
 		end
 
+		it "ignores nss-style 'ssl' option if it is set to something other than " +
+		   "'on', 'off', or 'start_tls'" do
+			IO.should_receive( :foreach ).with( :a_configfile ).
+				and_yield( "\n# Use alien-invasion protocol\nssl aliens\n" )
+
+			expect {
+				Treequel.read_opts_from_config( :a_configfile )
+			}.to_not raise_exception()
+		end
+
 		# 
 		# Environment
 		# 

data.tar.gz.sig

@@ -0,0 +1 @@
+�c	��\EQ�}L�m��%L���4HL�jѱ���E��.C�c�fσ�a���Napv�2�Ku�4A�y�: ��j�;RHC�X��Š?���M���r�$7?�3�-���G�P����@�]�6KcP�%u�7�yND��X8���y�	!�l��]=I
�����������ڕ����Bo����9>A���/�O]������e��o��O���6��v7H?f6E�O#Oe�PN��14������=f��0���w/�

metadata

@@ -1,29 +1,52 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael Granger, Mahlon E. Smith
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+  -----END CERTIFICATE-----
 
-date: 2010-07-07 00:00:00 -07:00
+date: 2010-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-ldap
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 41
         segments: 
         - 0
         - 9
@@ -62,6 +85,9 @@ files:
 - spec/treequel/directory_spec.rb
 - spec/treequel/filter_spec.rb
 - spec/treequel/mixins_spec.rb
+- spec/treequel/model/objectclass_spec.rb
+- spec/treequel/model_spec.rb
+- spec/treequel/monkeypatches_spec.rb
 - spec/treequel/schema/attributetype_spec.rb
 - spec/treequel/schema/ldapsyntax_spec.rb
 - spec/treequel/schema/matchingrule_spec.rb
@@ -69,7 +95,6 @@ files:
 - spec/treequel/schema/objectclass_spec.rb
 - spec/treequel/schema/table_spec.rb
 - spec/treequel/schema_spec.rb
-- spec/treequel/utils_spec.rb
 - spec/treequel_spec.rb
 - spec/lib/constants.rb
 - spec/lib/control_behavior.rb
@@ -89,6 +114,8 @@ files:
 - lib/treequel/exceptions.rb
 - lib/treequel/filter.rb
 - lib/treequel/mixins.rb
+- lib/treequel/model/objectclass.rb
+- lib/treequel/model.rb
 - lib/treequel/monkeypatches.rb
 - lib/treequel/schema/attributetype.rb
 - lib/treequel/schema/ldapsyntax.rb
@@ -137,23 +164,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - ldap >=0
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An honest LDAP library
@@ -168,6 +199,9 @@ test_files:
 - spec/treequel/directory_spec.rb
 - spec/treequel/filter_spec.rb
 - spec/treequel/mixins_spec.rb
+- spec/treequel/model/objectclass_spec.rb
+- spec/treequel/model_spec.rb
+- spec/treequel/monkeypatches_spec.rb
 - spec/treequel/schema/attributetype_spec.rb
 - spec/treequel/schema/ldapsyntax_spec.rb
 - spec/treequel/schema/matchingrule_spec.rb
@@ -175,7 +209,6 @@ test_files:
 - spec/treequel/schema/objectclass_spec.rb
 - spec/treequel/schema/table_spec.rb
 - spec/treequel/schema_spec.rb
-- spec/treequel/utils_spec.rb
 - spec/treequel_spec.rb
 - spec/lib/constants.rb
 - spec/lib/control_behavior.rb

data/spec/treequel/utils_spec.rb

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-
-BEGIN {
-	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
-	libdir = basedir + "lib"
-	
-	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
-}
-
-begin
-	require 'spec'
-	require 'spec/lib/constants'
-	require 'spec/lib/helpers'
-
-	require 'treequel'
-	require 'treequel/utils'
-rescue LoadError
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
-
-
-include Treequel::TestConstants
-# include Treequel::Constants
-
-#####################################################################
-###	C O N T E X T S
-#####################################################################
-
-describe Treequel, "utilities" do
-	include Treequel::SpecHelpers
-	
-	before( :all ) do
-		setup_logging( :fatal )
-	end
-	
-	after( :all ) do
-		reset_logging()
-	end
-
-end
-
-
-# vim: set nosta noet ts=4 sw=4: