treequel 1.7.0 → 1.7.1

data/History.rdoc

@@ -1,3 +1,12 @@
+== v1.7.1 [2011-11-28] Michael Granger <ged@FaerieMUD.org>
+
+- Modified filter expressions to eliminate unnecessary ORing
+- Efficiency fixes for Treequel::Model#modifications (delete/add -> replace)
+- Fixing missing DN attribute/s on Treequel::Model objects created via
+  attribute traversal methods.
+- Log errors added during validation at ERROR level
+
+
 == v1.7.0 [2011-11-09] Michael Granger <ged@FaerieMUD.org>
 
 - Treat Treequel::Model#[]= with a nil value on a SINGLE-VALUE

data/README.rdoc

@@ -12,29 +12,6 @@ It's inspired by and modeled after [Sequel](http://sequel.rubyforge.org/), a
 kick-ass database library.
 
 
-== Examples
-
-Here are a few short examples to whet your appetite:
-
-    # Connect to the directory at the specified URL
-    dir = Treequel.directory( 'ldap://ldap.company.com/dc=company,dc=com' )
-    
-    # Get a list of email addresses of every person in the directory (as
-    # long as people are under ou=people)
-    dir.ou( :people ).filter( :mail ).map( :mail ).flatten
-    
-    # Get a list of all IP addresses for all hosts in any ou=hosts group
-    # in the whole directory:
-    dir.filter( :ou => :hosts ).collection.filter( :ipHostNumber ).
-      map( :ipHostNumber ).flatten
-    
-    # Get all people in the directory in the form of a hash of names 
-    # keyed by email addresses
-    dir.ou( :people ).filter( :mail ).to_hash( :mail, :cn )
-
-More elaborate examples of real-world usage can be found 
-{in the examples/ directory}[http://deveiate.org/projects/Treequel/browser/examples] 
-in the distribution.
 
 
 == Contributing

data/lib/treequel.rb

@@ -26,10 +26,10 @@ end
 module Treequel
 
 	# Library version
-	VERSION = '1.7.0'
+	VERSION = '1.7.1'
 
 	# VCS revision
-	REVISION = %q$Revision: c5b83ddad969 $
+	REVISION = %q$Revision: d2ba344f87e8 $
 
 	# Common paths for ldap.conf
 	COMMON_LDAP_CONF_PATHS = %w[

data/lib/treequel/filter.rb

@@ -499,13 +499,18 @@ class Treequel::Filter
 		filterlist = expression.collect do |key, expr|
 			Treequel.logger.debug "  adding %p => %p to the filter list" % [ key, expr ]
 			if expr.respond_to?( :fetch )
-				Treequel.logger.debug "    ORing together %d subfilters since %p has indices" %
-					[ expr.length, expr ]
-				subfilters = expr.collect {|val| Treequel::Filter.new(key, val) }
-				Treequel::Filter.new( :or, subfilters )
+				if expr.respond_to?( :length ) && expr.length > 1
+					Treequel.logger.debug "    ORing together %d subfilters since %p has indices" %
+						[ expr.length, expr ]
+					subfilters = expr.collect {|val| Treequel::Filter.new(key, val) }
+					Treequel::Filter.new( :or, subfilters )
+				else
+					Treequel.logger.debug "    unwrapping singular subfilter"
+					Treequel::Filter.new([ key.to_sym, expr.first ])
+				end
 			else
 				Treequel.logger.debug "    value is a scalar; creating a single filter"
-				Treequel::Filter.new([ key.to_sym, expr ])
+				Treequel::Filter.new( key.to_sym, expr )
 			end
 		end
 
@@ -655,8 +660,9 @@ class Treequel::Filter
 
 	### Create a new Treequel::Branchset::Filter with the specified +expression+.
 	def initialize( *expression_parts )
+		self.log.debug "New filter for expression: %p" % [ expression_parts ]
 		@component = self.class.parse_expression( expression_parts )
-		self.log.debug "created a filter with component: %p" % [ @component ]
+		self.log.debug "  expression parsed into component: %p" % [ @component ]
 
 		super()
 	end

data/lib/treequel/model.rb

@@ -212,7 +212,7 @@ class Treequel::Model < Treequel::Branch
 			@dirty = false
 		else
 			super( directory, dn )
-			@values = entry ? symbolify_keys( entry ) : {}
+			@values = symbolify_keys( entry ? entry : self.rdn_attributes )
 			@dirty  = true
 		end
 
@@ -233,6 +233,12 @@ class Treequel::Model < Treequel::Branch
 	public
 	######
 
+	attr_reader :values
+
+	# Unsaved attribute values hash
+	attr_reader :values
+
+
 	### Set up the empty hook methods
 	HOOKS.each do |hook|
 		define_method( hook ) do |*args|
@@ -406,42 +412,46 @@ class Treequel::Model < Treequel::Branch
 		self.log.debug "Gathering modifications..."
 
 		mods = []
-		entry = self.entry || {}
-		self.log.debug "  directory entry is: %p" % [ entry ]
-
 		@values.sort_by {|k, _| k.to_s }.each do |attribute, vals|
-			vals = [ vals ] unless vals.is_a?( Array )
-			vals = vals.compact
-			vals.collect! {|val| self.get_converted_attribute(attribute, val) }
-			self.log.debug "  comparing %s values to entry: %p vs. %p" %
-				[ attribute, vals, entry[attribute.to_s] ]
-
-			entryvals = (entry[attribute.to_s] || [])
-			attrmods = { :add => [], :delete => [] }
-
-			Diff::LCS.sdiff( entryvals.sort, vals.sort ) do |change|
-				self.log.debug "    found a change: %p" % [ change ]
-				if change.adding?
-					attrmods[:add] << change.new_element
-				elsif change.changed?
-					attrmods[:add] << change.new_element
-					attrmods[:delete] << change.old_element
-				elsif change.deleting?
-					attrmods[:delete] << change.old_element
-				# else
-				# 	self.log.debug "      no mod necessary for %p" % [ change.action ]
-				end
-			end
+			self.log.debug "  finding mods for %s" % [ attribute ]
+			mods += self.diff_with_entry( attribute, vals )
+		end
+
+		return mods
+	end
+
+
+	### Diff the specified +values+ for the given +attribute+ against those in the directory
+	### entry and return LDAP::Mod objects for any differences.
+	def diff_with_entry( attribute, values )
+		mods         = []
+		attribute    = attribute.to_s
+		entry        = self.entry || {}
+		entry_values = entry.key?( attribute ) ? entry[attribute] : []
 
-			self.log.debug "  attribute %p has %d adds and %d deletes" %
-				[ attribute, attrmods[:add].length, attrmods[:delete].length ]
-			mods << LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute.to_s, attrmods[:delete] ) unless
-				attrmods[:delete].empty?
-			mods << LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute.to_s, attrmods[:add] ) unless
-				attrmods[:add].empty?
+		values = Array( values ).compact.
+			collect {|val| self.get_converted_attribute(attribute, val) }
+		self.log.debug "  comparing %s values to entry: %p vs. %p" %
+			[ attribute, values, entry_values ]
+
+		Diff::LCS.sdiff( entry_values.sort, values.sort ) do |change|
+			if change.adding?
+				self.log.debug "    found an addition: %p" % [ change ]
+				mods << LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute, [change.new_element] )
+
+			elsif change.changed?
+				self.log.debug "    found a modification: %p" % [ change ]
+				mods << LDAP::Mod.new( LDAP::LDAP_MOD_REPLACE, attribute, 
+				                       [change.old_element, change.new_element] )
+
+			elsif change.deleting?
+				self.log.debug "    found a deletion: %p" % [ change ]
+				mods << LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute, [change.old_element] )
+			end
 		end
 
-		self.log.debug "  mods are: %p" % [ mods ]
+		self.log.debug "  attribute %p has modifications: %p" %
+			[ attribute, mods ] unless mods.empty?
 
 		return mods
 	end

data/lib/treequel/model/errors.rb

@@ -49,6 +49,7 @@ class Treequel::Model::Errors < ::Hash
 
 	### Adds an error for the given +subject+.
 	def add( subject, message )
+		self.log.error "%s: %s" % [ subject, message ]
 		self[ subject ] << message
 	end
 

data/spec/treequel/filter_spec.rb

@@ -123,6 +123,10 @@ describe Treequel::Filter do
 			should == '(|(uid=lar)(uid=bin)(uid=fon)(uid=guh))'
 	end
 
+	it "doesn't make an OR-hash if the expression is singular" do
+		Treequel::Filter.new( :uid => ['lar'] ).to_s.should == '(uid=lar)'
+	end
+
 	it "correctly includes OR subfilters in a Hash if the value is an Array" do
 		fstr = Treequel::Filter.new( :objectClass => 'inetOrgPerson', :uid => %w[lar bin fon guh] ).to_s
 

data/spec/treequel/model/schemavalidations_spec.rb

@@ -47,9 +47,11 @@ describe Treequel::Model::SchemaValidations do
 
 	it "adds an error if the object doesn't have at least one structural objectClass" do
 		@conn.stub( :search_ext2 ).and_return( [] )
-		@modelobj.object_class = ['ipHost', 'ieee802device']
-		@modelobj.cn = 'testhost'
-		@modelobj.ip_host_number = '127.0.0.1'
+		@modelobj.object_class = :posixAccount
+		@modelobj.cn = 'jrandom'
+		@modelobj.uid_number = 2881
+		@modelobj.gid_number = 761
+		@modelobj.home_directory = '/home/jrandom'
 
 		@modelobj.should_not be_valid()
 		@modelobj.errors.should have( 1 ).member
@@ -59,7 +61,7 @@ describe Treequel::Model::SchemaValidations do
 
 	it "adds an error if the object doesn't have at least one value for all of its MUST attributes" do
 		@conn.stub( :search_ext2 ).and_return( [] )
-		@modelobj.object_class = 'person'
+		@modelobj.object_class = [:person, :uidObject]
 
 		@modelobj.should_not be_valid()
 		@modelobj.errors.should have( 2 ).members

data/spec/treequel/model_spec.rb

@@ -308,6 +308,37 @@ describe Treequel::Model do
 	end
 
 
+	describe "created via attribute transition from their parent" do
+
+		before( :each ) do
+			@entry = TEST_HOSTS_ENTRY.dup
+			@parent = Treequel::Model.new_from_entry( @entry, @directory )
+		end
+
+
+		it "has its RDN attributes set when it's a simple RDN" do
+			@conn.stub( :search_ext2 ).
+				with( "cn=wafflebreaker,#{TEST_HOSTS_DN}", LDAP::LDAP_SCOPE_BASE, "(objectClass=*)").
+				and_return( [] )
+
+			host = @parent.cn( :wafflebreaker )
+			host.object_class = :ipHost
+			host.cn.should == ['wafflebreaker']
+		end
+
+		it "has its RDN attributes set when it's a multi-value RDN" do
+			@conn.stub( :search_ext2 ).
+				with( "cn=wiffle+l=downtown,#{TEST_HOSTS_DN}", LDAP::LDAP_SCOPE_BASE, "(objectClass=*)").
+				and_return( [] )
+
+			host = @parent.cn( :wiffle, :l => 'downtown' )
+			host.object_class = :ipHost
+
+			host.cn.should == ['wiffle']
+			host.l.should == ['downtown']
+		end
+	end
+
 	describe "objects loaded from entries" do
 
 		before( :each ) do
@@ -501,9 +532,8 @@ describe Treequel::Model do
 				result = @obj.modifications
 
 				result.should be_an( Array )
-				result.should have( 2 ).members
-				result.should include( ldap_mod_add 'uid', 'slippy' )
-				result.should include( ldap_mod_delete 'uid', 'slappy' )
+				result.should have( 1 ).members
+				result.should include( ldap_mod_replace 'uid', 'slappy', 'slippy' )
 			end
 
 			it "reverts the attribute if its #revert method is called" do
@@ -519,8 +549,7 @@ describe Treequel::Model do
 
 			it "updates the modified attribute when saved" do
 				@conn.should_receive( :modify ).
-					with( TEST_PERSON_DN, 
-					      [ ldap_mod_delete(:uid, 'slappy'),  ldap_mod_add(:uid, 'slippy') ] )
+					with( TEST_PERSON_DN, [ldap_mod_replace(:uid, 'slappy', 'slippy')] )
 				@obj.save
 			end
 
@@ -606,15 +635,13 @@ describe Treequel::Model do
 				result = @obj.modifications
 
 				result.should be_an( Array )
-				result.should have( 9 ).members
-				result.should include( ldap_mod_delete :uid, 'slappy' )
-				result.should include( ldap_mod_add :uid, 'fappy' )
-				result.should include( ldap_mod_delete :givenName, 'Slappy' )
-				result.should include( ldap_mod_add :givenName, 'Fappy' )
-				result.should include( ldap_mod_delete :displayName, 'Slappy the Frog' )
-				result.should include( ldap_mod_add :displayName, 'Fappy the Bear' )
-				result.should include( ldap_mod_add :description, 'The new mascot.' )
+				result.should have( 6 ).members
+				result.should include( ldap_mod_replace :uid, 'slappy', 'fappy' )
+				result.should include( ldap_mod_replace :givenName, 'Slappy', 'Fappy' )
+				result.should include( ldap_mod_replace :displayName, 'Slappy the Frog',
+				                       'Fappy the Bear' )
 				result.should include( ldap_mod_delete :description, 'Alright.' )
+				result.should include( ldap_mod_add :description, 'The new mascot.' )
 				result.should include( ldap_mod_delete :l, 'a forest in England' )
 
 			end
@@ -674,7 +701,9 @@ describe Treequel::Model do
 					ldap_mod_add("gidNumber", "200"),
 					ldap_mod_add("homeDirectory", "/u/j/jrandom"),
 					ldap_mod_add("l", "a forest in England"),
-					ldap_mod_add("objectClass", "inetOrgPerson", "person", "posixAccount"),
+					ldap_mod_add("objectClass", "inetOrgPerson"),
+					ldap_mod_add("objectClass", "person"),
+					ldap_mod_add("objectClass", "posixAccount"),
 					ldap_mod_add("sn", "Hacker"),
 					ldap_mod_add("uid", "jrandom"),
 					ldap_mod_add("uidNumber", "1121")

metadata

@@ -1,205 +1,231 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: treequel
-version: !ruby/object:Gem::Version
-  version: 1.7.0
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 1
+  - 7
+  - 1
+  version: 1.7.1
 platform: ruby
-authors:
+authors: 
 - Michael Granger
 - Mahlon E. Smith
 autorequire: 
 bindir: bin
-cert_chain:
-- ! '-----BEGIN CERTIFICATE-----
-
+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: 2011-11-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2011-11-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ruby-ldap
-  requirement: &70222008767240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :runtime
-  prerelease: false
-  version_requirements: *70222008767240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: diff-lcs
-  requirement: &70222008766820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *70222008766820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: hoe-mercurial
-  requirement: &70222008766400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
   prerelease: false
-  version_requirements: *70222008766400
-- !ruby/object:Gem::Dependency
-  name: hoe-manualgen
-  requirement: &70222008782300 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
   type: :development
-  prerelease: false
-  version_requirements: *70222008782300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: hoe-highline
-  requirement: &70222008781880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
   type: :development
-  prerelease: false
-  version_requirements: *70222008781880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70222008781420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.7'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
   type: :development
-  prerelease: false
-  version_requirements: *70222008781420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: ruby-termios
-  requirement: &70222008781000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *70222008781000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: ruby-terminfo
-  requirement: &70222008780580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
   type: :development
-  prerelease: false
-  version_requirements: *70222008780580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: columnize
-  requirement: &70222008780160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   type: :development
-  prerelease: false
-  version_requirements: *70222008780160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sysexits
-  requirement: &70222008779740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
-  prerelease: false
-  version_requirements: *70222008779740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: sequel
-  requirement: &70222008779320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.20'
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 3
+        - 20
+        version: "3.20"
   type: :development
-  prerelease: false
-  version_requirements: *70222008779320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &70222008778900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
   type: :development
-  prerelease: false
-  version_requirements: *70222008778900
-description: ! "Treequel is an LDAP toolkit for Ruby. It is intended to allow quick,
-  easy\naccess to LDAP directories in a manner consistent with LDAP's hierarchical,\nfree-form
-  nature. \n\nIt's inspired by and modeled after [Sequel](http://sequel.rubyforge.org/),
-  a\nkick-ass database library."
-email:
+  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,
+  free-form nature. 
+  
+  It's inspired by and modeled after [Sequel](http://sequel.rubyforge.org/), a
+  kick-ass database library.
+email: 
 - ged@FaerieMUD.org
 - mahlon@martini.nu
-executables:
+executables: 
 - treeirb
 - treequel
 - treewhat
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Manifest.txt
 - History.rdoc
 - README.rdoc
-files:
+files: 
 - .gemtest
 - ChangeLog
 - History.rdoc
@@ -273,33 +299,50 @@ files:
 - spec/treequel/schema_spec.rb
 - spec/treequel_spec.rb
 homepage: http://deveiate.org/projects/Treequel
-licenses:
+licenses: 
 - BSD
-post_install_message: ! "If you want to use the included 'treequel' LDAP shell, you'll
-  need to install\nthe following libraries as well:\n\n    - ruby-termios\n    - ruby-terminfo\n
-  \   - columnize\n    - sysexits\n\nYou can install them automatically if you use
-  the --development flag when\ninstalling Treequel."
-rdoc_options:
+post_install_message: |-
+  If you want to use the included 'treequel' LDAP shell, you'll need to install
+  the following libraries as well:
+  
+      - ruby-termios
+      - ruby-terminfo
+      - columnize
+      - sysexits
+  
+  You can install them automatically if you use the --development flag when
+  installing Treequel.
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: treequel
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Treequel is an LDAP toolkit for Ruby
 test_files: []
+