treequel 1.7.1 → 1.7.2

data/History.rdoc

@@ -1,3 +1,11 @@
+== v1.7.2 [2011-11-29] Michael Granger <ged@FaerieMUD.org>
+
+- Add a workaround for Time objects used in generalizedTime fields,
+  since Time has a #to_ary.
+- Columns down in treewhat output instead of columns across
+- Fix inheritance of syntax for datatype conversion
+
+
 == v1.7.1 [2011-11-28] Michael Granger <ged@FaerieMUD.org>
 
 - Modified filter expressions to eliminate unnecessary ORing

data/bin/treewhat

@@ -239,7 +239,7 @@ class Treequel::What
 
 		pr.say( "\n" )
 		pr.say( pr.color(subheading, :subheader) )
-		pr.say( pr.list(items.sort_by(&:downcase), :columns_across) )
+		pr.say( pr.list(items.sort_by(&:downcase), :columns_down) )
 	end
 
 

data/lib/treequel/branch.rb

@@ -724,7 +724,8 @@ 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 = attribute.syntax
+			syntax_oid = syntax.oid if syntax
 
 			if attribute.single?
 				value = self.directory.convert_to_object( syntax_oid, value.first ) if value

data/lib/treequel/model.rb

@@ -429,6 +429,10 @@ class Treequel::Model < Treequel::Branch
 		entry        = self.entry || {}
 		entry_values = entry.key?( attribute ) ? entry[attribute] : []
 
+		# Workaround for the fact that Time has a #to_ary, causing it to become an
+		# Array of integers when cast via Array().
+		values = [ values ] if values.is_a?( Time )
+
 		values = Array( values ).compact.
 			collect {|val| self.get_converted_attribute(attribute, val) }
 		self.log.debug "  comparing %s values to entry: %p vs. %p" %

data/lib/treequel.rb

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

data/spec/treequel/branch_spec.rb

@@ -865,6 +865,22 @@ describe Treequel::Branch do
 				branch[ :ipServicePort ].should be_a( Fixnum )
 			end
 
+			it "respects syntax inherited from supertype in object conversion" do
+				test_dn = "cn=authorized_users,#{TEST_HOSTS_DN}"
+				entry = {
+					'cn' => ['authorized_users'],
+					'member' => [TEST_PERSON_DN]
+				}
+				@conn.should_receive( :search_ext2 ).
+					with( test_dn, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					and_return([ entry ])
+
+				branch = Treequel::Branch.new( @directory, test_dn )
+
+				branch[ :member ].first.should be_a( Treequel::Branch )
+				branch[ :member ].first.dn.should == TEST_PERSON_DN
+			end
+
 		end
 
 		### Attribute writer

data/spec/treequel/model_spec.rb

@@ -662,6 +662,20 @@ describe Treequel::Model do
 
 		end
 
+		it "avoids Arrayifying Time objects when converting them to generalized time strings" do
+			entry = {
+				'dn' => ["cn=something,#{TEST_BASE_DN}"],
+				'objectClass' => ['dhcpLeases'],
+				'cn' => ['something'],
+				'dhcpAddressState' => ['ACTIVE'],
+			}
+			obj = Treequel::Model.new_from_entry( entry, @directory )
+
+			obj.dhcp_start_time_of_state = Time.utc( 1322607981 )
+
+			obj.modifications.should include( ldap_mod_add :dhcpStartTimeOfState, '13226079810101000000Z' )
+		end
+
 	end
 
 	describe "objects created in memory" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: treequel
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 7
-  - 1
-  version: 1.7.1
+  - 2
+  version: 1.7.2
 platform: ruby
 authors: 
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-ldap