distinguished_name 0.0.4 → 0.1.0

data/lib/distinguished_name/canonicalize.rb

@@ -1,10 +1,11 @@
-require File.join(File.dirname(__FILE__), '..', 'distinguished_name')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'distinguished_name'))
 
 class DistinguishedName::Canonicalize
 
   class << self
 
     def reverse(dn, order=['CN','OU','O','C'])
+      STDERR.puts "Warning!  DistinguishedName::Canonicalize is deprecated.  Use DistinguishedName::Transform instead."
       @dn = dn
       @order = []
       order.each {|o| @order << o + '='}

data/lib/distinguished_name/transform.rb

@@ -52,11 +52,18 @@ private
     def parse_dn(dn_string)
       begin 
         OpenSSL::X509::Name.parse(dn_string)
-      rescue Java::JavaLang::NullPointerException #MRI can throw a TypeError
+      rescue parse_exception
         raise OpenSSL::X509::NameError
       end
     end
 
-  end
+    def parse_exception
+      if defined?(JRUBY_VERSION) 
+        JRUBY_VERSION >= "1.7.1" ? TypeError : Java::JavaLang::NullPointerException  
+      else
+        TypeError
+      end
+    end
 
+  end
 end

data/lib/distinguished_name/version.rb

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

data/test/test_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distinguished_name
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease:
 platform: ruby
 authors: