slacker 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a49d641b5a1472c597ad1d9e43cd77d5123b8ff
-  data.tar.gz: 155efc3e2c4a0edf77d068bc0671cd4426b98c80
+  metadata.gz: e066024e6fc217c813e00bb3554ac60bf89dac3f
+  data.tar.gz: a51a29aeea274ca3324f483d285cc3fc4d807a97
 SHA512:
-  metadata.gz: 6cd59135f982ce7e95a99c4aba462dbb494e06414d8cb8c3e98e2c935fbd65272ab365bc4f3a52df985bf8f97bf318db6442482cb8692dfe24ca93904502f56c
-  data.tar.gz: 4be6cfd40fce2b90c6a51759ec1e302473a9688e86c77ccb37a1e176c83c8ba6fc06a7fbd4f2a62539bc3bf2f5a4decc81ad3413a78c0ceb88b2bfa2515bdc1e
+  metadata.gz: e0f12d147aa478cf430eae96ce578956602d87fae99b3df3b5ebbf9528a3b53edf6a6d7afe208b4e79cd41e68f58dc94e828ecdd362df950e120c288bc9c4f29
+  data.tar.gz: d11db9e0dd45aa62ffbca4033ac6db5cc64433e31ad745aa9c970b486749496d33e97686564c4f83fdc46367b29f6264672b0a6531a9237f685b47c297d1250a

data/bin/slacker

@@ -23,6 +23,12 @@ Slacker.configure do |config|
   config.db_name = db_config["database"]
   config.db_user = db_config["user"]
   config.db_password = db_config["password"]
+  if !!db_config["port"] 
+    config.db_port = db_config["port"] 
+  end
+  if !!db_config["driver"] 
+    config.db_driver = db_config["driver"] 
+  end
 end
 
 if Slacker.application.run

data/lib/slacker/application.rb

@@ -5,6 +5,7 @@ require 'slacker/rspec_monkey'
 require 'slacker/rspec_ext'
 require 'slacker/string_helper'
 require 'odbc'
+require 'tiny_tds'
 
 module Slacker
   class Application
@@ -25,12 +26,18 @@ set ansi_nulls on;
 set concat_null_yields_null on;
 EOF
 
+    ODBC_DRIVER = 'odbc'
+    TINYTDS_DRIVER = 'tiny_tds'
+
     def initialize(configuration)
       @configuration = configuration
       @temp_folders = ['debug/passed_examples', 'debug/failed_examples']
       @target_folder_structure = ['data', 'debug/passed_examples', 'debug/failed_examples', 'sql', 'spec', 'lib', 'lib/helpers']
       @error_message = ''
-      @database = ODBC::Database.new
+      case @configuration.db_driver
+      when ODBC_DRIVER
+        @database = ODBC::Database.new
+      end
     end
 
     def print_connection_message
@@ -49,8 +56,8 @@ EOF
           run_rspec
           false # Return false to be stored in error (effectively indicating no error).
         end
-      ensure
-        cleanup_after_run
+        ensure
+          cleanup_after_run
       end
 
       if @configuration.console_enabled
@@ -73,13 +80,23 @@ EOF
 
     # Configure Slacker
     def configure
-      configure_db
+      case @configuration.db_driver
+        when ODBC_DRIVER
+          configure_db_odbc
+        when TINYTDS_DRIVER
+          configure_db_tiny_tds
+      end
       configure_rspec
       configure_misc
     end
 
     def cleanup_after_run
-      @database.disconnect if (@database && @database.connected?)
+      case @configuration.db_driver
+        when ODBC_DRIVER
+          @database.disconnect if (@database && @database.connected?)
+        when TINYTDS_DRIVER
+          @database.close if (@database && @database.active?)
+      end
     end
 
     def cleanup_folders
@@ -121,7 +138,7 @@ EOF
     end
 
     # Configure database connection
-    def configure_db
+    def configure_db_odbc
       drv = ODBC::Driver.new
       drv.name = 'Driver1'
       drv.attrs.tap do |a|
@@ -140,8 +157,27 @@ EOF
       end
     end
 
+    def configure_db_tiny_tds
+      begin
+        @database = TinyTds::Client.new :username => @configuration.db_user, :password => @configuration.db_password, 
+                    :host => @configuration.db_server, :database => @configuration.db_name, :port => @configuration.db_port
+        @database.query_options[:symbolize_keys] = true
+      rescue TinyTds::Error => e
+        throw_error("#{e}")
+      end
+    end
+
     # Run a script against the currently configured database
     def query_script(sql)
+      case @configuration.db_driver
+      when ODBC_DRIVER
+        query_script_odbc(sql)
+      when TINYTDS_DRIVER
+        query_script_tiny_tds(sql)
+      end
+    end
+
+    def query_script_odbc(sql)
       results = []
       begin
         st = @database.run(sql)
@@ -152,12 +188,22 @@ EOF
             results << rows
           end
         end while(st.more_results)
-      ensure
-        st.drop unless st.nil?
+        ensure
+          st.drop unless st.nil?
       end
       results.count > 1 ? results : results.first
     end
 
+    def query_script_tiny_tds(sql)
+      results = []
+      st = @database.execute(sql)
+      if st.fields  
+        rows = st.each :as => :hash
+        results << rows
+      end 
+      results.count > 1 ? results : results.first
+    end
+
     # Customize RSpec
     def configure_rspec
       before_proc = lambda do |example|

data/lib/slacker/configuration.rb

@@ -1,6 +1,6 @@
 module Slacker
   class Configuration
-    attr_accessor :base_dir, :error_stream, :output_stream, :formatter, :db_server, :db_name, :db_user, :db_password, :console_enabled
+    attr_accessor :base_dir, :error_stream, :output_stream, :formatter, :db_server, :db_name, :db_user, :db_password, :db_port, :db_driver, :console_enabled
 
     def initialize
       @console_enabled = true
@@ -13,6 +13,8 @@ module Slacker
       @db_name = nil
       @db_user = nil
       @db_password = nil
+      @db_port = 1433
+      @db_driver = 'odbc'
     end
 
     def expand_path(path)

data/lib/slacker/query_result_matcher.rb

@@ -2,6 +2,7 @@ require 'csv'
 
 module Slacker
   DATE_FORMAT = "%m/%d/%Y"
+  DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S'
 
   class QueryResultMatcher
     def initialize(golden_master)
@@ -102,6 +103,10 @@ module Slacker
           (!!Time.strptime(master_val, DATE_FORMAT) rescue false) && Time.strptime(master_val, DATE_FORMAT) == ODBC::to_time(subject_val)
         when Float
           (!!Float(master_val) rescue false) && Float(master_val) == subject_val
+        when BigDecimal
+          (!!BigDecimal(master_val) rescue false) && BigDecimal(master_val) == BigDecimal(subject_val)
+        when Time
+          (!!DateTime.strptime(DateTime.parse(master_val).to_s, DATETIME_FORMAT) rescue false) && DateTime.strptime(DateTime.parse(master_val).to_s, DATETIME_FORMAT) == DateTime.strptime(DateTime.parse(subject_val.to_s).to_s, DATETIME_FORMAT)
         else
           subject_val.to_s == master_val.to_s
         end

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
 module Slacker
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

data/lib/slacker_new/project/database.yml

@@ -3,7 +3,12 @@
 
 # Replace the following with your connection information.
 # Note that at this point Slacker only works with SQL Server authentication.
+
+# Slacker supports odbc and tiny_tds drivers
+
 server: my_server
 database: my_database
 user: user_name
 password: password
+port: 1433
+driver: odbc #or tiny_tds

data/slacker.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
  
   s.add_dependency 'bundler', '~> 1.0', '>= 1.0.15'
-  s.add_dependency 'ruby-odbc', '= 0.99997'
+  s.add_dependency 'ruby-odbc', '= 0.99998'
   s.add_dependency 'rspec', '~> 3.0'
+  s.add_dependency 'tiny_tds', '~>2.0'
 end

data/spec/query_result_matcher_spec.rb

@@ -231,6 +231,17 @@ describe Slacker::QueryResultMatcher do
     it_behaves_like 'single-value-based matcher'
   end
 
+  describe 'BigDecimal point-based golden master' do
+    before(:each) do
+      @subject = [{'Field 1' => -3.12e-5, 'Field_2' => 12}]
+      @correct_golden_master = -0.0000312
+      @wrong_value_golden_master = -0.0000317
+      @wrong_type_golden_master = 15
+    end
+
+    it_behaves_like 'single-value-based matcher'
+  end
+
   describe 'Date-based golden master' do
     before(:each) do
       @subject = [{'Field 1' => Time.parse('1/1/2011'), 'Field_2' => 12}]
@@ -242,6 +253,19 @@ describe Slacker::QueryResultMatcher do
     it_behaves_like 'single-value-based matcher'
   end
 
+  describe 'DateTime2-based golden master' do
+    before(:each) do
+      @subject = [{'Field 1' => Time.parse('2017-01-01.000000'), 'Field_2' => 12}]
+      @correct_golden_master = Time.parse('2017-01-01 00:00:00')
+      @wrong_value_golden_master = Time.parse('2017-02-01.000000')
+      @wrong_type_golden_master = 'whatever'
+    end
+
+    it_behaves_like 'single-value-based matcher'
+  end
+
+  
+
   describe 'Nil-based golden master' do
     before(:each) do
       @subject = [{'Field 1' => nil, 'Field_2' => 12}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacker
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Vassil Kovatchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.99997'
+        version: '0.99998'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.99997'
+        version: '0.99998'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: tiny_tds
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: RSpec-based framework for developing automated tests for SQL Server
 email:
 - vassil.kovatchev@gmail.com
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slacker
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Behavior Driven Development for SQL Server