distinguished_name 0.0.3 → 0.0.4

data/lib/distinguished_name/transform.rb

@@ -6,15 +6,48 @@ class DistinguishedName::Transform
 
     def slashify(dn_string)
       x509_parsed_dn = parse_dn(dn_string)
-      x509_parsed_dn.to_a.map {|piece| "/#{piece[0]}=#{piece[1]}" }.reverse.join
+      prefix = '/'
+      separator = ''
+      if in_slash_format?(dn_string)
+        big_endian(x509_parsed_dn, prefix, separator)
+      else
+        little_endian(x509_parsed_dn, prefix, separator)
+      end
     end
 
     def ldapify(dn_string)
       x509_parsed_dn = parse_dn(dn_string)
-      x509_parsed_dn.to_a.map {|piece| "#{piece[0]}=#{piece[1]}" }.reverse.join(",")
+      prefix = ''
+      separator = ','
+      if in_ldap_format?(dn_string)
+        big_endian(x509_parsed_dn, prefix, separator)
+      else
+        little_endian(x509_parsed_dn, prefix, separator)
+      end
     end
 
 private 
+
+    def big_endian(x509_parsed_dn, prefix, separator)
+      x509_parsed_dn.to_a.map {|piece| "#{prefix}#{piece[0]}=#{piece[1]}" }.join(separator)
+    end
+
+    def little_endian(x509_parsed_dn, prefix, separator)
+      x509_parsed_dn.to_a.map {|piece| "#{prefix}#{piece[0]}=#{piece[1]}" }.reverse.join(separator)
+    end
+
+    def in_slash_format?(dn_string)
+      !in_ldap_format?(dn_string)
+    end
+
+    def in_ldap_format?(dn_string)
+      begin
+        OpenSSL::X509::Name.parse_rfc2253(dn_string)
+      rescue OpenSSL::X509::NameError
+        return false
+      end
+      return true
+    end
     
     def parse_dn(dn_string)
       begin 

data/lib/distinguished_name/version.rb

@@ -1,3 +1,3 @@
 module DistinguishedName
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test_helper.rb

@@ -1,2 +1,7 @@
 require 'test/unit'
-require_relative "../lib/distinguished_name"
+
+if Kernel.respond_to?(:require_relative)
+  require_relative "../lib/distinguished_name"
+else
+  require File.join(File.dirname(caller[0]), "../lib/distinguished_name")
+end

data/test/transform_test.rb

@@ -9,7 +9,6 @@ class TransformTest < Test::Unit::TestCase
     super
   end
 
-=begin
   def test_ldapify_doesnt_modify_ldap_dn
     assert_equal(@ldap_dn, DistinguishedName::Transform.ldapify(@ldap_dn))
   end
@@ -17,7 +16,6 @@ class TransformTest < Test::Unit::TestCase
   def test_slashify_doesnt_modify_slash_dn
     assert_equal(@slash_dn, DistinguishedName::Transform.slashify(@slash_dn))
   end
-=end
 
   def test_slashify_accepts_a_comma_separated_version_and_returns_a_slash_separated_version_of_the_dn
     assert_equal(@slash_dn, DistinguishedName::Transform.slashify(@ldap_dn))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distinguished_name
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies: []
 description: This is a gem for interacting with the string representation of distinguished names, per the RFC-1779 (http://www.ietf.org/rfc/rfc1779.txt)
 email: