treequel 1.5.1 → 1.5.2

data/ChangeLog

@@ -1,8 +1,65 @@
+2011-03-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.5.2 for changeset 93550dca4121
+	[5132c59e6e3b] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 585d3733441e
+	[93550dca4121] [v1.5.2]
+
+	* spec/treequel/model_spec.rb:
+	Fixing identity comparison failure under FreeBSD.
+	[585d3733441e]
+
+	* History.md, README.md, Rakefile, lib/treequel.rb:
+	Prep for release.
+	[ea0680256a65]
+
+	* docs/Treequel Manual Diagrams.graffle, docs/openldap-oids.txt, docs
+	/treequel-blue.svgz, docs/treequel-favicon.png, docs/treequel-red-
+	medium.png, docs/treequel-red-small.png, docs/treequel-red.png, docs
+	/treequel-red.svg, docs/treequel.svg, docs/treequel.svgz,
+	manual/layouts/default.erb, manual/resources/css/manual.css,
+	manual/resources/images/Treequel Manual Diagrams.graffle,
+	manual/resources/images/treequel-blue.svgz, manual/resources/images
+	/treequel-favicon.png, manual/resources/images/treequel-red-
+	medium.png, manual/resources/images/treequel-red-small.png,
+	manual/resources/images/treequel-red.png, manual/resources/images
+	/treequel-red.svg, manual/resources/images/treequel.svg,
+	manual/resources/images/treequel.svgz,
+	manual/resources/js/manual.js, manual/resources/js/sh.js,
+	manual/resources/swf/clipboard.swf, manual/src/models.page:
+	More work on the manual
+	[38a9eb41200a]
+
+	* manual/lib/api-filter.rb, manual/lib/editorial-filter.rb, manual/lib
+	/examples-filter.rb, manual/lib/links-filter.rb:
+	Updated for hoe-manualgen 0.1.0
+	[eccf310a6e3b]
+
+2011-03-15  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/treequel/monkeypatches_spec.rb:
+	Fixing bad time tests uncovered by the DST switch
+	[63ac5e6f0b10] [master]
+
+2011-03-08  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/data/ad_schema.yml:
+	Adding an ActiveDirectory schema dump for testing
+	[8fe97e62d953]
+
+	* lib/treequel/branch.rb, lib/treequel/model/schemavalidations.rb,
+	lib/treequel/schema/attributetype.rb, spec/treequel/schema_spec.rb:
+	Fix for Github issue [ged/treequel GH-1] (closes #7)
+	[46745dfb2504]
+
 2011-02-25  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v1.5.1 for changeset b0945a1e6ee0
-	[f3dbf7033b58] [master, tip]
+	[f3dbf7033b58] [github/master]
 
 	* .hgsigs:
 	Added signature for changeset 01662c7a2a07
@@ -49,7 +106,7 @@
 	* lib/treequel/model/objectclass.rb,
 	spec/treequel/model/objectclass_spec.rb:
 	Make Treequel::Model::ObjectClass Enumerable, fix a spec error.
-	[76473835cff3] [github/master]
+	[76473835cff3]
 
 	* lib/treequel.rb, lib/treequel/branch.rb, lib/treequel/model.rb,
 	lib/treequel/model/objectclass.rb,

data/History.md

@@ -1,3 +1,38 @@
+## 1.5.2 [2011-03-17] Michael Granger <ged@FaerieMUD.org>
+
+* Manual updates
+* Fixing bad time tests uncovered by the DST switch
+* Adding an ActiveDirectory schema dump for testing
+* Fix for Github issue [ged/treequel GH-1] (closes #7)
+
+
+## 1.5.1 [2011-02-25] Michael Granger <ged@FaerieMUD.org>
+
+* Adding handling of operational attributes to Treequel::Model schema
+  validations, updated the subschema test data to a recent OpenLDAP.
+
+
+## 1.5.0 [2011-02-24] Michael Granger <ged@FaerieMUD.org>
+
+* Make Treequel::Model::ObjectClass Enumerable
+* Add a default directory to Treequel::Model for creating and
+  searching
+* Fix delegation to a method that takes a block for
+  Treequel::Delegation
+* Consistently delete the DN from the entry hash when constructing
+  branches and model objects
+* Fix Treequel::Branch#-
+* Fix Treequel::Branchset#to_hash
+* Make dependencies not so pessimistic.
+
+
+## 1.4.4 [2011-02-10] Michael Granger <ged@FaerieMUD.org>
+
+* Add the .gemtest and Manifest to the manifest, bump patch version.
+* Make Treequel testable via Gem Testers
+* Hack to work around the pointer-mismanagement of LDAP::Mod
+
+
 ## 1.4.3 [2011-02-10] Michael Granger <ged@FaerieMUD.org>
 
 * Added gem-testers support

data/README.md

@@ -110,6 +110,10 @@ the following license terms:
 A special thanks to Ben Bleything, who was part of the initial brainstorm that
 led to the creation of this library.
 
+Thanks also to Ben Cooksley of the KDE project, who has been full of great 
+ideas for the Model side of Treequel; it's vastly better for his
+suggestions.
+
 
 [examples]:http://deveiate.org/projects/Treequel/browser/examples
 [hgrepo]:http://repo.deveiate.org/Treequel

data/Rakefile

@@ -3,7 +3,6 @@
 require 'hoe'
 
 Hoe.plugin :mercurial
-Hoe.plugin :yard
 Hoe.plugin :signing
 Hoe.plugin :manualgen
 

data/lib/treequel.rb

@@ -25,7 +25,7 @@ end
 
 # A library for interacting with LDAP modelled after Sequel.
 #
-# @version 1.5.1
+# @version 1.5.2
 # 
 # @example
 #   # Connect to the directory at the specified URL
@@ -53,10 +53,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.5.1'
+	VERSION = '1.5.2'
 
 	# VCS revision
-	REVISION = %q$Revision: 01662c7a2a07 $
+	REVISION = %q$Revision: ea0680256a65 $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/lib/treequel/branch.rb

@@ -806,7 +806,7 @@ class Treequel::Branch
 		value = self.entry ? self.entry[ attrsym.to_s ] : nil
 
 		if attribute = self.directory.schema.attribute_types[ attrsym ]
-			syntax_oid = attribute.syntax.oid
+			syntax_oid = attribute.syntax_oid
 
 			if attribute.single?
 				value = self.directory.convert_to_object( syntax_oid, value.first ) if value
@@ -828,8 +828,8 @@ class Treequel::Branch
 	def get_converted_attribute( attrsym, object )
 		if attribute = self.directory.schema.attribute_types[ attrsym ]
 			self.log.debug "converting %p object (a %p) to a %p attribute" %
-				[ attrsym, object.class, attribute.syntax.desc ]
-			return self.directory.convert_to_attribute( attribute.syntax.oid, object )
+				[ attrsym, object.class, attribute.syntax_oid ]
+			return self.directory.convert_to_attribute( attribute.syntax_oid, object )
 		else
 			self.log.info "no attributeType for %p" % [ attrsym ]
 			return object.to_s

data/lib/treequel/model/schemavalidations.rb

@@ -78,7 +78,8 @@ module Treequel::Model::SchemaValidations
 					self.log.error "validation for %p failed: %s: %s" %
 						[ attribute, err.class.name, err.message ]
 					attrtype = self.find_attribute_type( attribute )
-					self.errors.add( attribute, "isn't a valid %s value" % [attrtype.syntax.desc] )
+					self.errors.add( attribute, "isn't a valid %s value" %
+					 	[ attrtype.syntax ? attrtype.syntax.desc : attrtype.syntax_oid ] )
 				end
 			end
 		end

data/lib/treequel/schema/attributetype.rb

@@ -69,6 +69,7 @@ class Treequel::Schema::AttributeType
 		# Normalize the attributes
 		names = Treequel::Schema.parse_names( names )
 		desc  = Treequel::Schema.unquote_desc( desc )
+		# syntax_oid  = Treequel::Schema.unquote_desc( syntax_oid ) # For AD
 
 		sup_oid = Treequel::Schema.parse_oid( sup_oid ) if sup_oid
 		eqmatch_oid = Treequel::Schema.parse_oid( eqmatch_oid ) if eqmatch_oid
@@ -243,7 +244,7 @@ class Treequel::Schema::AttributeType
 			self.oid,
 			self.desc,
 			self.is_single? ? '(SINGLE) ' : '',
-			self.syntax,
+			self.syntax || self.syntax_oid,
 			self.syntax_len ? self.syntax_len : 'unlimited',
 		]
 	end

data/spec/treequel/model_spec.rb

@@ -340,7 +340,7 @@ describe Treequel::Model do
 		end
 
 		it "provides writers for valid singular attributes" do
-			@obj.logonTime.should equal( 1293167318 )
+			@obj.logonTime.should == 1293167318
 		end
 
 		it "provides writers for valid non-singular attributes that accept a non-array" do

data/spec/treequel/monkeypatches_spec.rb

@@ -130,7 +130,7 @@ describe Treequel::DateExtensions do
 	before( :all ) do
 		# Make the local timezone PDT so offsets show up correctly
 		@real_tz = ENV['TZ']
-		ENV['TZ'] = ':PST8PDT'
+		ENV['TZ'] = ':GMT'
 	end
 
 	before( :each ) do
@@ -144,19 +144,19 @@ describe Treequel::DateExtensions do
 	describe "RFC4517 LDAP Generalized Time method" do
 
 		it "returns the time in 'Generalized Time' format" do
-			@date.ldap_generalized.should == "20100805000001-0800"
+			@date.ldap_generalized.should == "20100805000001+0000"
 		end
 
 		it "can include fractional seconds if the optional fractional digits argument is given" do
-			@date.ldap_generalized( 3 ).should == "20100805000001.000-0800"
+			@date.ldap_generalized( 3 ).should == "20100805000001.000+0000"
 		end
 
 		it "doesn't include the decimal if fractional digits is specified but zero" do
-			@date.ldap_generalized( 0 ).should == "20100805000001-0800"
+			@date.ldap_generalized( 0 ).should == "20100805000001+0000"
 		end
 
 		it "zero-fills any digits after six in the fractional digits" do
-			@date.ldap_generalized( 11 ).should == "20100805000001.00000000000-0800"
+			@date.ldap_generalized( 11 ).should == "20100805000001.00000000000+0000"
 		end
 
 	end
@@ -164,7 +164,7 @@ describe Treequel::DateExtensions do
 	describe "RFC4517 UTC Time method" do
 
 		it "returns the time in 'UTC Time' format" do
-			@date.ldap_utc.should == "100805000001-0800"
+			@date.ldap_utc.should == "100805000001+0000"
 		end
 
 	end

data/spec/treequel/schema_spec.rb

@@ -44,42 +44,68 @@ describe Treequel::Schema do
 	TEST_DESCR      = 'objectClass'
 	TEST_OIDLIST    = %:( #{TEST_DESCR} $ objectCaste $ #{TEST_NUMERICOID} )  :
 
-	it "can parse the schema structure returned from LDAP::Conn#schema" do
-		schema_dumpfile = @datadir + 'schema.yml'
-		hash = YAML.load_file( schema_dumpfile )
-		schemahash = LDAP::Schema.new( hash )
-
-		schema = Treequel::Schema.new( schemahash )
-
-		schema.object_classes.should have( 308 ).members
-		schema.attribute_types.should have( 1193 ).members
-		schema.matching_rules.should have( 74 ).members
-		schema.matching_rule_uses.should have( 54 ).members
-		schema.ldap_syntaxes.should have( 32 ).members
-
-		schema.operational_attribute_types.should have( 34 ).members
+	context "OpenLDAP schema" do
+		before( :all ) do
+			@schema_dumpfile = @datadir + 'schema.yml'
+			@hash = YAML.load_file( @schema_dumpfile )
+			@schemahash = LDAP::Schema.new( @hash )
+			@schemahash.freeze
+			@schema = Treequel::Schema.new( @schemahash )
+		end
+
+		it "can parse the schema structure returned from LDAP::Conn#schema" do
+			@schema.object_classes.values.uniq.should have( @hash['objectClasses'].length ).members
+			@schema.attribute_types.values.uniq.should have( @hash['attributeTypes'].length ).members
+			@schema.matching_rules.values.uniq.should have( @hash['matchingRules'].length ).members
+			@schema.matching_rule_uses.values.uniq.should have( @hash['matchingRuleUse'].length ).members
+			@schema.ldap_syntaxes.values.uniq.should have( @hash['ldapSyntaxes'].length ).members
+
+			dirop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE directoryOperation') }
+			dsaop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE dSAOperation') }
+			distop_count = @hash['attributeTypes'].
+				count {|type| type.index('USAGE distributedOperation') }
+			op_attrcount = dirop_count + dsaop_count + distop_count
+
+			@schema.operational_attribute_types.should have( op_attrcount ).members
+		end
+
+
+		it "can parse the schema structure returned from LDAP::Conn#schema even under $SAFE >= 1" do
+			schema = nil
+			Thread.new do
+				Thread.current.abort_on_exception = true
+				$SAFE = 1
+				schemahash = LDAP::Schema.new( @hash )
+				schema = Treequel::Schema.new( schemahash )
+			end.join
+
+			schema.should be_an_instance_of( Treequel::Schema )
+		end
 	end
 
+	context "ActiveDirectory schema" do
+
+		before( :all ) do
+			@schema_dumpfile = @datadir + 'ad_schema.yml'
+			@hash = YAML.load_file( @schema_dumpfile )
+			@schemahash = LDAP::Schema.new( @hash )
+			@schema = Treequel::Schema.new( @schemahash )
+		end
 
-	it "can parse the schema structure returned from LDAP::Conn#schema even under $SAFE >= 1" do
-		schema_dumpfile = @datadir + 'schema.yml'
-		hash = YAML.load_file( schema_dumpfile )
+		it "can parse an ActiveDirectory schema structure, too" do
+			@schema.object_classes.values.uniq.should have( @hash['objectClasses'].length ).members
+			@schema.attribute_types.values.uniq.should have( @hash['attributeTypes'].length ).members
 
-		schema = nil
-		Thread.new do
-			Thread.current.abort_on_exception = true
-			$SAFE = 1
-			schemahash = LDAP::Schema.new( hash )
-			schema = Treequel::Schema.new( schemahash )
-		end.join
+			# AD doesn't have these in its subSchema
+			@schema.matching_rules.should be_empty()
+			@schema.matching_rule_uses.should be_empty()
+			@schema.ldap_syntaxes.should be_empty()
+			@schema.operational_attribute_types.should be_empty()
+		end
 
-		schema.object_classes.should have( 308 ).members
-		schema.attribute_types.should have( 1193 ).members
-		schema.matching_rules.should have( 74 ).members
-		schema.matching_rule_uses.should have( 54 ).members
-		schema.ldap_syntaxes.should have( 32 ).members
 
-		schema.operational_attribute_types.should have( 34 ).members
 	end
 
 

metadata

@@ -2,7 +2,7 @@
 name: treequel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Michael Granger
@@ -31,7 +31,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,94 +67,83 @@ dependencies:
         version: 1.2.1
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoe-yard
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-  type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.4"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ruby-termios
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.9"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-terminfo
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.1"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: columnize
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.3"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sysexits
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "3.20"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.9.1
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: |-
   Treequel is an LDAP toolkit for Ruby. It is intended to allow quick, easy
   access to LDAP directories in a manner consistent with LDAP's hierarchical,
@@ -173,7 +162,6 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
-- History.md
 files: 
 - .gemtest
 - ChangeLog
@@ -260,9 +248,8 @@ post_install_message: |-
   You can install them automatically if you use the --development flag when
   installing Treequel.
 rdoc_options: 
-- --title
-- Treequel Documentation
-- --quiet
+- --main
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement