jfb 0.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60d3ea1ea12007e0d4128277b0640d80c852769
-  data.tar.gz: f4df550f787308acbbe0a3c949cfdea048e80ae6
+  metadata.gz: ddffa666ab2bb112b134de99e1c54cabdb8b9e75
+  data.tar.gz: 60f9f399ec5857e4715c96108ce0e95ee2a3e323
 SHA512:
-  metadata.gz: 4563efb6b3ad43960ba8198772cffa12b4c0a051ced04a9bcfd397e316bb9f38cdd24f3e0c3696e0efc41b63513649281c5ddf1a7746be871a6d6bac25d7edad
-  data.tar.gz: b0db32403e886f08b3ea90354c70a29db0702e6f1802cd0cd0d390b29679a4d67369d41510031649dc914bc7cb28ff1cf289ac62583014d0054d90bfd1469e0a
+  metadata.gz: 6804aab158b603e0047d0da61a641750ba0b7caa9b6bc6a9870f3e62956f30763a2d15bffe012f13ee53e859bcebf6aec6034557f4de201c41c1213be6faff05
+  data.tar.gz: 6eb7afff495bc169c26a2193d34ee55719ffda6fba02fdc473a9d922cc5bd43351006d82f1ed83a915a892e03689099cd82e5972c688f28a7c1e7c56e924451a

data/jfb.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "jdbc/firebird", "~>2.2"
 end

data/lib/jfb/jfb.rb

@@ -1,6 +1,5 @@
 require_relative 'rs'
-require 'jdbc/firebird'
-java_import 'java.sql.DriverManager'
+require './jaybird-2.2.10.jar'
 java_import 'java.sql.ResultSet'
 java_import 'java.sql.SQLRecoverableException'
 
@@ -9,21 +8,33 @@ class JFB
 	@closed = true
 
 	def initialize(db_url, usr, pwd)
-		begin
-			if Jdbc::Firebird.load_driver then
-				@con = DriverManager.getConnection("jdbc:firebirdsql:" + db_url, usr, pwd)
+		Java::JavaClass.for_name("org.firebirdsql.jdbc.FBDriver")
+		fbd = org.firebirdsql.jdbc.FBDriver
 
-				@con.setAutoCommit false
+		if fbd.acceptsURL("jdbc:firebirdsql:#{db_url}") then
+			Java::JavaClass.for_name("java.util.Properties")
+
+			props = java.util.Properties.new
+			props.set_property :user, usr
+			props.set_property :password, pwd
+
+			begin
+				@con = fbd.connect("jdbc:firebirdsql:#{db_url}", props)
+				@con.setAutocommit false
 				@con.setHoldability ResultSet.HOLD_CURSORS_OVER_COMMIT
 				@closed = false
-			else
-				puts "Failure to load driver."
-			end
 
-		rescue SQLRecoverableException => erro
+			rescue SQLRecoverableException => erro
+				@con = nil
+				@closed = true
+				puts "Error connecting!\n#{erro}"
+			end	
+		else
 			@con = nil
 			@closed = true
-			puts "Error connecting!\n#{erro}"
+			puts "Database URI #{db_url} isn't acceptable. 
+			      You don't have to supply the 'jdbc:firebirsql:' part, 
+			      we already do that. Please check your URI."
 		end
 	end
 

data/lib/jfb/version.rb

@@ -1,5 +1,5 @@
 module Jfb
-  VERSION = "0.1.3"
+  VERSION = "0.2.3"
 
 #Version 0.1.0
 # Creates proper interface with jdbc
@@ -14,4 +14,10 @@ module Jfb
 
 #Version 0.1.3
 # Adds ResultSet class import for jfb
+
+#Version 0.2.3
+# Removes jdbc/firebird dependency
+# Adds jaybird version 2.2.10 to gem
+# Makes connection idependent from standard java.sql, as to prevent 'no suitable driver' related errors
+# Better handling and detection plausible connections
 end

metadata

@@ -1,73 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: jfb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - rCamposCruz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !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
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: jdbc/firebird
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-description: A very simple gem which interfaces JDBC's connections and ResultSet,
-  making easier for simple usage of it's resources.
+        version: '3.0'
+description: A very simple gem which interfaces JDBC's connections and ResultSet, making easier for simple usage of it's resources.
 email:
 - rafaelcpcruz@hotmail.com
 executables: []
@@ -87,6 +72,7 @@ files:
 - bin/setup
 - jfb.gemspec
 - lib/jfb.rb
+- lib/jfb/jaybird-2.2.10.jar
 - lib/jfb/jfb.rb
 - lib/jfb/rs.rb
 - lib/jfb/version.rb
@@ -94,7 +80,7 @@ homepage: https://github.com/rCamposCruz/jfb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,9 +95,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
 summary: Gem which interfaces ruby and JDBC.
 test_files: []