ldaptic 0.2.1 → 0.2.2

data/lib/ldaptic/attribute_set.rb

@@ -297,7 +297,7 @@ module Ldaptic
     end
 
     def safe_array(attributes)
-      Array(attributes).flatten.compact.map {|x| format(x)}
+      [attributes].flatten.compact.map {|x| format(x)}
     end
 
     def typecast(value)

data/lib/ldaptic/entry.rb

@@ -7,16 +7,6 @@ module Ldaptic
   # contructed that mirrors the server's object classes.  Ldaptic::Entry
   # serves as the base class for this hierarchy.
   class Entry
-    # Constructs a deep copy of a set of LDAP attributes, normalizing them to
-    # arrays as appropriate.  The returned hash has a default value of [].
-    def self.clone_ldap_hash(attributes) #:nodoc:
-      hash = Hash.new
-      attributes.each do |k, v|
-        k = k.kind_of?(Symbol) ? k.to_s.tr('_', '-') : k.dup
-        hash[k] = Array(v).map {|x| x.dup rescue x}
-      end
-      hash
-    end
 
     # For Active Model compliance.  Delegates to #namespace.
     def self.model_name
@@ -161,7 +151,7 @@ module Ldaptic
           logger.warn "#{name}: invalid object class for #{attributes.inspect}"
         end
         obj = allocate
-        obj.instance_variable_set(:@dn, ::Ldaptic::DN(Array(attributes.delete('dn')).first, obj))
+        obj.instance_variable_set(:@dn, ::Ldaptic::DN([attributes.delete('dn')].flatten.first, obj))
         obj.instance_variable_set(:@original_attributes, attributes)
         obj.instance_variable_set(:@attributes, {})
         obj.instance_eval { common_initializations; after_load }
@@ -272,7 +262,7 @@ module Ldaptic
     end
 
     def to_s
-      "#<#{self.class} #{dn}>"
+      dn || ''
     end
 
     # Reads an attribute and typecasts it if neccessary.  If the argument given

data/lib/ldaptic/methods.rb

@@ -242,7 +242,7 @@ module Ldaptic
 
     def normalize_attributes(attributes)
       attributes.inject({}) do |h, (k, v)|
-        h.update(Ldaptic.encode(k) => v.respond_to?(:before_type_cast) ? v.before_type_cast : Array(v))
+        h.update(Ldaptic.encode(k) => v.respond_to?(:before_type_cast) ? v.before_type_cast : [v].flatten.compact)
       end
     end
     private :normalize_attributes
@@ -260,7 +260,7 @@ module Ldaptic
         attributes = normalize_attributes(attributes)
       else
         attributes = attributes.map do |(action, key, values)|
-          [action, Ldaptic.encode(key), values.respond_to?(:before_type_cast) ? values.before_type_cast : Array(values)]
+          [action, Ldaptic.encode(key), values.respond_to?(:before_type_cast) ? values.before_type_cast : [values].flatten.compact]
         end
       end
       log_dispatch(:modify, dn, attributes)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ldaptic
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tim Pope
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -05:00
+date: 2011-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
         segments: 
         - 0
         - 9
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 1
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -125,7 +121,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -134,7 +129,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"