Merge pull request #100 from kerrizor/fix-for-font-detection-under-jruby

Fix for font detection under JRuby

Author: kerrizor

CHANGES.md

@@ -1,3 +1,8 @@
+1.2.1
+-----
+
+* Fixes a bug in OS detection for JRuby (and newer MRI Rubies, too)
+
 1.2.0
 -----
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-erd (1.2.0)
+    rails-erd (1.2.1)
       activerecord (~> 3.2)
       activesupport (~> 3.2)
       choice (~> 0.1.6)

lib/rails_erd/config.rb

@@ -77,13 +77,13 @@ def normalize_value(key, value)
 
     def self.use_os_x_fonts?
       host = RbConfig::CONFIG['host_os']
+      return true if host == "darwin"
 
       if host.include? "darwin"
         darwin_version_array = host.split("darwin").last.split(".").map(&:to_i)
 
-        if darwin_version_array[0] == 12 and darwin_version_array[1] >= 5
-          return true
-        end
+        return true if darwin_version_array[0] >= 13
+        return true if darwin_version_array[0] == 12 && darwin_version_array[1] >= 5
       end
 
       false

lib/rails_erd/version.rb

@@ -1,4 +1,4 @@
 module RailsERD
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
   BANNER = "RailsERD #{VERSION}"
 end