treequel 1.5.0pre445 → 1.5.0

data/ChangeLog

@@ -1,18 +1,46 @@
+2011-02-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v1.5.0 for changeset 6addc39b422a
+	[ae45276a5db6] [master, tip]
+
+	* .hgsigs:
+	Added signature for changeset 0efb57ad19ad
+	[6addc39b422a] [v1.5.0]
+
+	* Merged with a299917323f8
+	[0efb57ad19ad] [github/master]
+
+	* .hgsigs:
+	Added signature for changeset 76473835cff3
+	[bc46034261cc]
+
 2011-02-22  Michael Granger  <ged@FaerieMUD.org>
 
+	* lib/treequel/model/objectclass.rb,
+	spec/treequel/model/objectclass_spec.rb:
+	Make Treequel::Model::ObjectClass Enumerable, fix a spec error.
+	[76473835cff3]
+
 	* lib/treequel.rb, lib/treequel/branch.rb, lib/treequel/model.rb,
 	lib/treequel/model/objectclass.rb,
 	spec/treequel/model/objectclass_spec.rb,
 	spec/treequel/model_spec.rb:
 	Add a default directory to Treequel::Model for creating and
 	searching
-	[fb6b6fc03dea] [github/master, master, tip]
+	[fb6b6fc03dea]
 
 	* lib/treequel/mixins.rb, spec/treequel/mixins_spec.rb:
 	Fix delegation to a method that takes a block for
 	Treequel::Delegation
 	[23ea792e2b86]
 
+2011-02-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* Rakefile:
+	Adding the history file to the hoespec
+	[a299917323f8]
+
 2011-02-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* lib/treequel/branch.rb, lib/treequel/branchset.rb,
@@ -174,6 +202,12 @@
 	Merged with 411:ddbb3c3bdd00
 	[ba7895d4e64b]
 
+2011-01-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* History.md:
+	Updated History
+	[9c4db65b40d7]
+
 2011-01-18  Michael Granger  <ged@FaerieMUD.org>
 
 	* manual/layouts/default.erb, manual/resources/css/manual.css,
@@ -238,10 +272,6 @@
 
 2011-01-17  Michael Granger  <ged@FaerieMUD.org>
 
-	* History.md:
-	Updated History
-	[9c4db65b40d7]
-
 	* .hgtags:
 	Added tag v1.3.1 for changeset a6ea030fc88f
 	[4caac8976d00]
@@ -350,14 +380,14 @@
 	Automated merge with ssh://deveiate/Treequel
 	[62e7348050eb]
 
-	* bin/treequel:
-	More logging constant fixes for the treequel shell.
-	[6e159f32ed07]
-
 	* bin/treequel, lib/treequel/model/objectclass.rb:
 	Aesthetic cleanup
 	[78e65cb8f30a]
 
+	* bin/treequel:
+	More logging constant fixes for the treequel shell.
+	[6e159f32ed07]
+
 2011-01-04  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -1484,6 +1514,12 @@
 	* Re-sorted the OID constants to be in OID order
 	[8b2fb7415412]
 
+2010-01-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/treequel:
+	Make treequel shell's 'cat' command error for non-existant entries
+	[84087b01d473]
+
 2010-01-24  Michael Granger  <ged@FaerieMUD.org>
 
 	* bin/treequel:
@@ -1492,10 +1528,6 @@
 
 2010-01-13  Michael Granger  <ged@FaerieMUD.org>
 
-	* bin/treequel:
-	Make treequel shell's 'cat' command error for non-existant entries
-	[84087b01d473]
-
 	* bin/treequel:
 	Fix the 'grep' command in the Treequel shell.
 	[669a09149f48]
@@ -1526,19 +1558,6 @@
 	Updated build system
 	[00ac1bc4e917]
 
-2009-12-22  Michael Granger  <ged@FaerieMUD.org>
-
-	* bin/treequel:
-	Reworked LDIF display colors in the shell to be more visible.
-	[d77a0bf26034]
-
-	* bin/treequel:
-	Make the treequel shell fall back to plain connect (with a warning)
-	if TLS fails.
-	[9aeccec1ee84]
-
-2010-01-07  Michael Granger  <ged@FaerieMUD.org>
-
 	* bin/treequel, lib/treequel/branch.rb, lib/treequel/constants.rb,
 	lib/treequel/utils.rb:
 	Improvements to the treequel shell, fixes for 1.9.1.
@@ -1560,6 +1579,15 @@
 
 2009-12-22  Michael Granger  <ged@FaerieMUD.org>
 
+	* bin/treequel:
+	Reworked LDIF display colors in the shell to be more visible.
+	[d77a0bf26034]
+
+	* bin/treequel:
+	Make the treequel shell fall back to plain connect (with a warning)
+	if TLS fails.
+	[9aeccec1ee84]
+
 	* examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1580,27 +1608,6 @@
 	Automated merge with ssh://hg@deveiate/Treequel
 	[3bdd645530fe]
 
-2009-12-18  Michael Granger  <ged@FaerieMUD.org>
-
-	* Merged with 5fd4033e1556
-	[9571c9d8e4dd]
-
-2009-12-17  Michael Granger  <ged@FaerieMUD.org>
-
-	* docs/openldap-oids.txt, lib/treequel/constants.rb,
-	lib/treequel/controls/contentsync.rb,
-	lib/treequel/controls/persistentsearch.rb,
-	lib/treequel/directory.rb:
-	More controls work, started several more control modules.
-	* Adding a breakdown of all the controls the OpenLDAP server I have
-	has, so I know which controls I can test against.
-	* Added some control constants.
-	* Added the ContentSyncControl and the PersistentSearchControl.
-	* Added a Directory#supported_controls method.
-	[ffc2ebacdfd0]
-
-2009-12-22  Michael Granger  <ged@FaerieMUD.org>
-
 	* bin/treequel, examples/ldap-monitor.rb, examples/ldap-
 	monitor/public/css/master.css, examples/ldap-
 	monitor/public/images/card_small.png, examples/ldap-
@@ -1629,6 +1636,25 @@
 	* Bumped the version to 1.0.2.
 	[31c326800cc6]
 
+2009-12-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* Merged with 5fd4033e1556
+	[9571c9d8e4dd]
+
+2009-12-17  Michael Granger  <ged@FaerieMUD.org>
+
+	* docs/openldap-oids.txt, lib/treequel/constants.rb,
+	lib/treequel/controls/contentsync.rb,
+	lib/treequel/controls/persistentsearch.rb,
+	lib/treequel/directory.rb:
+	More controls work, started several more control modules.
+	* Adding a breakdown of all the controls the OpenLDAP server I have
+	has, so I know which controls I can test against.
+	* Added some control constants.
+	* Added the ContentSyncControl and the PersistentSearchControl.
+	* Added a Directory#supported_controls method.
+	[ffc2ebacdfd0]
+
 2009-12-16  Michael Granger  <ged@FaerieMUD.org>
 
 	* Rakefile, lib/treequel/mixins.rb, project.yml:
@@ -2723,16 +2749,6 @@
 	Merged. Someday I'll get the hang of this.
 	[a5e715f5f877]
 
-2009-07-28  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore, Rakefile:
-	Merged with 34cc97817266
-	[395b7bf6f248]
-
-	* .hgignore, Rakefile, docs/manual/src/index.page:
-	Manual rewording, .hgignore updates
-	[89f74035c67d]
-
 2009-07-29  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile, docs/manual/src/index.page,
@@ -2743,6 +2759,16 @@
 	 * Made Treequel::Branch#filter treat a Hash like an array of tuples.
 	[46e6dce0c011]
 
+2009-07-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile:
+	Merged with 34cc97817266
+	[395b7bf6f248]
+
+	* .hgignore, Rakefile, docs/manual/src/index.page:
+	Manual rewording, .hgignore updates
+	[89f74035c67d]
+
 2009-07-27  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgignore, Rakefile:
@@ -2754,6 +2780,10 @@
 
 2009-07-24  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgsub, .hgsubstate:
+	Unlinking the subrepo, as it doesn't behave well enough quite yet.
+	[fc3c3bac2c22]
+
 	* .hgsub, .hgsubstate:
 	Merging build system fixes
 	[b7a919b2ad5d]
@@ -2766,10 +2796,6 @@
 	Removing subrepo, as it doesn't work quite the way I'd hoped.
 	[f631900a9ad8] <build-system-fixes>
 
-	* .hgsub, .hgsubstate:
-	Unlinking the subrepo, as it doesn't behave well enough quite yet.
-	[fc3c3bac2c22]
-
 	* .hgignore, .hgsubstate, Rakefile, Rakefile.local, project.yml:
 	Initial commit of Mercurial-based tasks
 	[65236b2101e5] <build-system-fixes>

data/Rakefile

@@ -12,6 +12,7 @@ Hoe.plugins.delete :rubyforge
 hoespec = Hoe.spec 'treequel' do
 	self.name = 'treequel'
 	self.readme_file = 'README.md'
+	self.history_file = 'History.md'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	self.developer 'Mahlon E. Smith', 'mahlon@martini.nu'

data/lib/treequel/model/objectclass.rb

@@ -9,7 +9,9 @@ require 'treequel/constants'
 
 # Mixin that provides Treequel::Model characteristics to a mixin module.
 module Treequel::Model::ObjectClass
-	include Treequel::HashUtilities
+	include Enumerable,
+	        Treequel::HashUtilities
+
 	extend Treequel::Delegation
 
 
@@ -38,6 +40,7 @@ module Treequel::Model::ObjectClass
 	# Delegate Branchset methods through #search to allow ObjectClass.filter as a shortcut for
 	# ObjectClass.search.filter
 	def_method_delegators :search, 
+		:find, # Delegated directly to avoid 'LocalJumpError: break from proc-closure'
 		:collection, :map, :to_hash, :each, :first, 
 		:filter, :scope, :select, :limit, :timeout, :as, :from
 

data/spec/treequel/model/objectclass_spec.rb

@@ -220,7 +220,22 @@ describe Treequel::Model::ObjectClass do
 
 		it "delegates Branchset Enumerable methods through the Branchset returned by its " +
 		   "#search method" do
-			
+			@conn.stub( :bound? ).and_return( true )
+			@conn.should_receive( :search_ext2 ).
+				with( TEST_BASE_DN, LDAP::LDAP_SCOPE_SUBTREE, "(objectClass=inetOrgPerson)",
+			          [], false, [], [], 0, 0, 1, "", nil ).
+				and_return([ TEST_PERSON_ENTRY ])
+
+			mixin = Module.new do
+				extend Treequel::Model::ObjectClass
+				model_objectclasses :inetOrgPerson
+			end
+
+			result = mixin.first
+
+			result.should be_a( Treequel::Model )
+			result.should be_a( mixin )
+			result.dn.should == TEST_PERSON_ENTRY['dn'].first
 		end
 
 	end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 1923832739
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 5
   - 0
-  - pre
-  - 445
-  version: 1.5.0pre445
+  version: 1.5.0
 platform: ruby
 authors: 
 - Michael Granger
@@ -38,7 +36,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,26 +101,10 @@ dependencies:
         version: 0.1.2
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe-manualgen
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: columnize
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,11 +115,11 @@ dependencies:
         - 3
         version: "0.3"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-termios
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -148,11 +130,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-terminfo
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -163,11 +145,11 @@ dependencies:
         - 1
         version: "0.1"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -178,11 +160,11 @@ dependencies:
         - 4
         version: "2.4"
   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: 
     - - ~>
@@ -193,11 +175,11 @@ dependencies:
         - 20
         version: "3.20"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sysexits
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -208,23 +190,23 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 2
         - 9
-        - 0
-        version: 2.9.0
+        - 1
+        version: 2.9.1
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 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,
@@ -360,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: treequel
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby

metadata.gz.sig

@@ -1,3 +1,2 @@
-*�7\�gē'R�"������c�u�D�J�ߕ1
-T�5�(�*Tw��d�O�"���8��H��K2� �Ȯ�ˡ�h��;�^R��da���t��(���lw^	 wێ�b��T��ۘf.�e)�%|d-�9�G���P��)��9Pd�5U�_oB�#.�-Y��6
-���gQ���H`���)��Ȟ�*…2@�h-w
+*Y�=z��{!9 �Gӯ߆Z�)���Pk�T�5�ֻo�t8��m8�Ӻ�%�jVw�zp8��|���@���h�T�]-�	ԕs�:���:n�	�-`�t�	I
�X�?9[��<�8ا�B����4P>�
+�G	!��+��[�=j���p~�������ef���+Ei��n�R �K!�LϨ;M� �=\h�;�E�(��W�c	D<�w��g�hͤ�j�W�j(y���Xi��R�V�ŕ�c�P