jdbc-mssql 0.4.0-java → 0.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1905e680bc289554e8ee1aa9ed54c13cc5717e
-  data.tar.gz: bfb4fe98727e1f523aa613a7d5fb15d65ccb3f58
+  metadata.gz: 2be4956e64feaf7c3943ea69610463bbb6858253
+  data.tar.gz: fe476ecc04c85fcfc12da68d8042810838424cde
 SHA512:
-  metadata.gz: b7c622e5c256d25bf083e89b8df84916f9046176b8e395ef1d6e89be1414181fb8b8a604347d671b815124591e532e54493dfab4b47cf27fa6b4f0d81c39393e
-  data.tar.gz: c4eaa24b4d0ab33d6a41dc80e46a82a154ee1c7fd817eca4d8497047049ed1effc1a9298e81ae85c922cd0d071f7b7a08d0089a12afe794f4f76d2ddd5c0429c
+  metadata.gz: 10d37f102e327b9faa90c1186a1cb3c808fda5e295620fdadf66ac81663e37c08c7c78c81031137062619a406277d8f72ac95e9e67c7e2add3a5c791e56c7fd7
+  data.tar.gz: 600d89ba8c7558253ea0fe0aab0358d522ef8bac686e7439f87acc2fcc55179a03ba47fff8984708ccb423bed724f2c10585489aae57a860dad5b157d33b756b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jdbc-mssql (0.3.0-java)
+    jdbc-mssql (0.5.0-java)
 
 GEM
   remote: https://rubygems.org/
@@ -32,4 +32,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.1

data/lib/jdbc/mssql.rb

@@ -4,26 +4,42 @@ require 'jdbc/mssql/version'
 
 module Jdbc
   module Mssql
-    def self.jre_version
-      version = ENV_JAVA['java.specification.version']
-
-      return 7 if version == '1.7'
-
-      return 8 if version == '1.8'
+    JAVA_VERSIONS = {
+      '1.7' => 7,
+      '1.8' => 8,
+      '9'   => 9,
+      '10'  => 10
+    }.freeze
+
+    JAVA_DRIVER_VERSIONS = {
+      '1.7' => '6.4.0',
+      '1.8' => '7.0.0',
+      '9'   => '6.4.0',
+      '10'  => '7.0.0'
+    }.freeze
+
+    def self.java_specification_version
+      ENV_JAVA['java.specification.version']
+    end
 
-      return 9 if version == '9'
+    def self.jre_version
+      JAVA_VERSIONS[java_specification_version]
+    end
 
-      nil
+    def self.driver_version
+      JAVA_DRIVER_VERSIONS[java_specification_version]
     end
 
     def self.jar_file
-      "mssql-jdbc-#{DRIVER_VERSION}.jre#{jre_version}.jar"
+      "mssql-jdbc-#{driver_version}.jre#{jre_version}.jar"
     end
 
     def self.load_driver
       warn 'loading JDBC driver on require "jdbc/mssql"' if $VERBOSE
 
-      raise 'No JDBC driver for your java version' if jre_version.nil?
+      if jre_version.nil? || driver_version.nil?
+        raise 'No JDBC driver for your java version'
+      end
 
       require jar_file
     end

data/lib/jdbc/mssql/version.rb

@@ -1,7 +1,5 @@
 module Jdbc
   module Mssql
-    VERSION = '0.4.0'
-
-    DRIVER_VERSION = '6.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: jdbc-mssql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: java
 authors:
 - Jesse Chavez
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -74,16 +74,15 @@ files:
 - jdbc-mssql.gemspec
 - lib/jdbc/mssql.rb
 - lib/jdbc/mssql/version.rb
-- lib/mssql-jdbc-6.2.2.jre7.jar
-- lib/mssql-jdbc-6.2.2.jre8.jar
 - lib/mssql-jdbc-6.4.0.jre7.jar
-- lib/mssql-jdbc-6.4.0.jre8.jar
 - lib/mssql-jdbc-6.4.0.jre9.jar
+- lib/mssql-jdbc-7.0.0.jre10.jar
+- lib/mssql-jdbc-7.0.0.jre8.jar
 homepage: https://github.com/JesseChavez/jdbc-mssql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,9 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14.1
+signing_key:
 specification_version: 4
 summary: JDBC driver for Jruby and SQL Server
 test_files: []