sc_analytics 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9864de13fe26767611a76fd94a91784a65324a1
-  data.tar.gz: bcfbff3d11d421936d8177b84d4b27a1398690ca
+  metadata.gz: 06117d6a47148c891d4af3938f92aa4bffefb7e5
+  data.tar.gz: 3faa62b4852ae7c19a4f6f2b5d9af9ff83c516af
 SHA512:
-  metadata.gz: 3236feb06cd93fd8372584f57827e3c8e7f937e686b379cb469635487c4a4aa400ec38ba9777499442c6139188283095d274316cb5bf948d632f8713c2c2a3cb
-  data.tar.gz: a2ac15fd5052a069b2c1952c66fb98c2fcbc34205cf00198aac7d0a69bd31228bb5195b6fe57d319e164c51ab08875b87c41d78f64db155c67d929e7d5553166
+  metadata.gz: 4ce36305a428e1f3588a74b2ef0d1f6436e89d8b2d9fee0431f7a44f3b5181820294c326f3601a7bc3768f6ca72584a63521757d367e6c61dc1f8352ca3e066d
+  data.tar.gz: 6673bc0d9c2db54470fbc30735a3d879fb2f6602f0799eaa9bd95a3d44f223fdce01def57207f14ad3cc1e62b060edb0487f397f1b43108eace7dfdcac545008

data/lib/sc_analytics/connections/connection.rb

@@ -4,15 +4,12 @@ module SCAnalytics
 		Struct.new("QueryResult",:headers,:rows)
 
 		class Connection
-			attr_reader :host, :port, :service, :username
+			attr_reader :host, :port, :username
 
-			def initialize(connection_name, options)
+			def initialize(connection_name, config)
 				@connection_name = connection_name
-				@host = options[:connection][:host]
-				@port = options[:connection][:port]
-				@service = options[:connection][:service]
-				@username = options[:credentials][:username]
-				@password = options[:credentials][:password]
+				@username = config[:username]
+				@password = config[:password]
 			end
 
 			private
@@ -22,7 +19,6 @@ module SCAnalytics
 				yield
 				alert "Successfully connected to #{@connection_name.to_s} as user #{@username.to_s}!"
 			end
-
 		end
 	end
 end

data/lib/sc_analytics/connections/credentials.rb

@@ -20,7 +20,7 @@ module SCAnalytics
 			@credentials = symbolize_keys_for @credentials
 
 			def self.connection_type(db_name)
-				@credentials[db_name.downcase.to_sym][:connection][:type].downcase
+				@credentials[db_name.downcase.to_sym][:type].downcase
 			end
 
 			def self.connection_details(db_name)

data/lib/sc_analytics/connections/oracle.rb

@@ -1,13 +1,20 @@
 module SCAnalytics
 	module Connections
 		class Oracle < Connection
+			attr_reader :connect_string, :service_name, :sid
+
 			require 'oci8'
 			OCI8::BindType::Mapping[:number_unknown_prec] = OCI8::BindType::BasicNumberType
 
-			def initialize(connection_name, options)
+			def initialize(connection_name, config)
 				super
 
-				parse_db_url
+				@host = config[:connection][:description][:address][:host]
+				@port = config[:connection][:description][:address][:port]
+				@service_name = config[:connection][:description][:connect_data][:service_name]
+				@sid = config[:connection][:description][:connect_data][:sid]
+
+				@connect_string = generate_connect_string_for(config[:connection])
 				connect
 			end
 
@@ -39,18 +46,18 @@ module SCAnalytics
 
 			def connect
 				super do
-					@client = OCI8.new @username, @password, @db_url
+					@client = OCI8.new @username, @password, @connect_string
 				end
 			end
 
-			def parse_db_url
-				url = []
-				url << "//#{@host}" if @host
-				url << ":#{@port}" if @port
-				url << "/" if @host
-				url << @service
-
-				@db_url = url.join
+			def generate_connect_string_for(conn_hsh, conn_str = "")
+				conn_hsh.each_pair do |descriptor,detail|
+					conn_str << "("
+					conn_str << "#{descriptor.to_s}="
+					detail.is_a?(Hash) ? conn_str = generate_connect_string_for(detail, conn_str) : conn_str << detail.to_s
+					conn_str << ")"
+				end
+				conn_str
 			end
 
 		end

data/lib/sc_analytics/version.rb

@@ -1,3 +1,3 @@
 module SCAnalytics
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sc_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Rowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler