slacker 1.0.7 → 1.0.8

data/lib/slacker/command_line_formatter.rb

@@ -1,59 +1,59 @@
-require 'slacker/formatter'
-require 'rspec/core/formatters/progress_formatter'
-
-module Slacker
-  class CommandLineFormatter < RSpec::Core::Formatters::ProgressFormatter
-    include Slacker::Formatter
-
-    def initialize(output)
-      super(output)
-      @failed_examples_count = 0
-      @passed_examples_count = 0
-    end
-
-    def example_passed(example)
-      process_example_debug_output(example, false)
-      super(example)
-    end
-
-    def example_failed(example)
-      process_example_debug_output(example, true)
-      super(example)
-    end
-
-private
-
-    def process_example_debug_output(example, example_failed)
-      if example_failed
-        @failed_examples_count += 1
-        debug_output(example, Slacker.configuration.expand_path('debug/failed_examples'), @failed_examples_count, example_failed)
-      else
-        @passed_examples_count += 1
-        debug_output(example, Slacker.configuration.expand_path('debug/passed_examples'), @passed_examples_count, example_failed)
-      end
-    end
-
-    def debug_output(example, out_folder, file_number, example_failed)
-      # Write out the SQL
-      File.open("#{out_folder}/example_#{'%03d' % file_number}.sql", 'w') do |out_file|
-        out_file.write(get_formatted_example_sql(example, example_failed))
-      end
-    end
-
-    def get_formatted_example_sql(example, example_failed)
-      sql = <<EOF
--- Example "#{example.metadata[:full_description]}"
--- #{example.metadata[:location]}
--- Executed at #{example.metadata[:execution_result][:started_at]}
-
-#{example.metadata[:sql]}
-
---               SLACKER RESULTS
--- *******************************************
-#{example_failed ? example_failure_text(example).split("\n").collect{|line| '-- ' + line}.join("\n") : '--              Example Passed OK'}
--- *******************************************
-EOF
-      sql.strip
-    end
-  end
-end
+require 'slacker/formatter'
+require 'rspec/core/formatters/progress_formatter'
+
+module Slacker
+  class CommandLineFormatter < RSpec::Core::Formatters::ProgressFormatter
+    include Slacker::Formatter
+
+    def initialize(output)
+      super(output)
+      @failed_examples_count = 0
+      @passed_examples_count = 0
+    end
+
+    def example_passed(example)
+      process_example_debug_output(example, false)
+      super(example)
+    end
+
+    def example_failed(example)
+      process_example_debug_output(example, true)
+      super(example)
+    end
+
+private
+
+    def process_example_debug_output(example, example_failed)
+      if example_failed
+        @failed_examples_count += 1
+        debug_output(example, Slacker.configuration.expand_path('debug/failed_examples'), @failed_examples_count, example_failed)
+      else
+        @passed_examples_count += 1
+        debug_output(example, Slacker.configuration.expand_path('debug/passed_examples'), @passed_examples_count, example_failed)
+      end
+    end
+
+    def debug_output(example, out_folder, file_number, example_failed)
+      # Write out the SQL
+      File.open("#{out_folder}/example_#{'%03d' % file_number}.sql", 'w') do |out_file|
+        out_file.write(get_formatted_example_sql(example, example_failed))
+      end
+    end
+
+    def get_formatted_example_sql(example, example_failed)
+      sql = <<EOF
+-- Example "#{example.metadata[:full_description]}"
+-- #{example.metadata[:location]}
+-- Executed at #{example.metadata[:execution_result][:started_at]}
+
+#{example.metadata[:sql]}
+
+--               SLACKER RESULTS
+-- *******************************************
+#{example_failed ? example_failure_text(example).split("\n").collect{|line| '-- ' + line}.join("\n") : '--              Example Passed OK'}
+-- *******************************************
+EOF
+      sql.strip
+    end
+  end
+end

data/lib/slacker/configuration.rb

@@ -1,59 +1,59 @@
-module Slacker
-  class Configuration
-    attr_accessor :base_dir, :error_stream, :output_stream, :formatter, :db_server, :db_name, :db_user, :db_password, :console_enabled
-
-    def initialize
-      @console_enabled = true
-      @base_dir = Dir.pwd
-      @error_stream = nil
-      @output_stream = nil
-      @rspec_args = nil
-      @formatter = nil
-      @db_server = nil
-      @db_name = nil
-      @db_user = nil
-      @db_password = nil
-    end
-
-    def expand_path(path)
-      File.expand_path("#{@base_dir}/#{path}")
-    end
-
-    def console_enabled
-      @console_enabled
-    end
-
-    def console_enabled=(value)
-      @console_enabled = value
-      if @console_enabled
-        @error_stream = $stderr
-        @output_stream = $stdout
-        @rspec_args = ARGV
-      else
-        @error_stream = nil
-        @output_stream = nil
-        @rspec_args = []
-      end
-    end
-
-    def rspec_args
-      if @rspec_args.nil? || @rspec_args.empty?
-        Dir.glob(expand_path("spec/**/*.rb"))
-      else
-        @rspec_args
-      end
-    end
-
-    def rspec_args=(value)
-      @rspec_args = value
-    end
-
-    def dsn_string
-      "Driver={SQL Server};Server=#{@db_server};Database=#{@db_name};Uid=#{@db_user};Pwd=#{@db_password}"
-    end
-
-    def db_config
-      {:adapter => 'sqlserver', :mode => 'odbc', :dsn => dsn_string}
-    end
-  end
-end
+module Slacker
+  class Configuration
+    attr_accessor :base_dir, :error_stream, :output_stream, :formatter, :db_server, :db_name, :db_user, :db_password, :console_enabled
+
+    def initialize
+      @console_enabled = true
+      @base_dir = Dir.pwd
+      @error_stream = nil
+      @output_stream = nil
+      @rspec_args = nil
+      @formatter = nil
+      @db_server = nil
+      @db_name = nil
+      @db_user = nil
+      @db_password = nil
+    end
+
+    def expand_path(path)
+      File.expand_path("#{@base_dir}/#{path}")
+    end
+
+    def console_enabled
+      @console_enabled
+    end
+
+    def console_enabled=(value)
+      @console_enabled = value
+      if @console_enabled
+        @error_stream = $stderr
+        @output_stream = $stdout
+        @rspec_args = ARGV
+      else
+        @error_stream = nil
+        @output_stream = nil
+        @rspec_args = []
+      end
+    end
+
+    def rspec_args
+      if @rspec_args.nil? || @rspec_args.empty?
+        Dir.glob(expand_path("spec/**/*.rb"))
+      else
+        @rspec_args
+      end
+    end
+
+    def rspec_args=(value)
+      @rspec_args = value
+    end
+
+    def dsn_string
+      "Driver={SQL Server};Server=#{@db_server};Database=#{@db_name};Uid=#{@db_user};Pwd=#{@db_password}"
+    end
+
+    def db_config
+      {:adapter => 'sqlserver', :mode => 'odbc', :dsn => dsn_string}
+    end
+  end
+end

data/lib/slacker/formatter.rb

@@ -1,19 +1,19 @@
-require 'slacker'
-
-module Slacker
-  module Formatter
-    def example_failure_text(example)
-      text = ''
-      exception = example.execution_result[:exception]
-      text << "Failure/Error: #{read_failed_line(exception, example).strip}\n"
-      text << "#{long_padding}#{exception.class.name << ":"}\n" unless exception.class.name =~ /RSpec/
-      exception.message.split("\n").each { |line| text <<  "#{line}\n" }
-
-      format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
-        text << "# #{backtrace_info}\n"
-      end
-
-      text
-    end
-  end
-end
+require 'slacker'
+
+module Slacker
+  module Formatter
+    def example_failure_text(example)
+      text = ''
+      exception = example.execution_result[:exception]
+      text << "Failure/Error: #{read_failed_line(exception, example).strip}\n"
+      text << "#{long_padding}#{exception.class.name << ":"}\n" unless exception.class.name =~ /RSpec/
+      exception.message.split("\n").each { |line| text <<  "#{line}\n" }
+
+      format_backtrace(example.execution_result[:exception].backtrace, example).each do |backtrace_info|
+        text << "# #{backtrace_info}\n"
+      end
+
+      text
+    end
+  end
+end

data/lib/slacker/query_result_matcher.rb

@@ -1,178 +1,178 @@
-require 'csv'
-
-module Slacker
-  DATE_FORMAT = "%m/%d/%Y"
-
-  class QueryResultMatcher
-    def initialize(golden_master)
-      @golden_master = golden_master
-      @failure_message = ''
-    end
-
-    def matches?(subject)
-      does_match = false
-
-      subject = normalize_query_result_subject(subject)
-
-      catch :no_match do
-        test_type_match(subject)
-        test_value_match(subject)
-        does_match = true
-      end
-      
-      does_match
-    end
-
-    def failure_message_for_should
-      @failure_message
-    end
-
-    private
-
-    #test if the subject type is consistent with the golden master
-    def test_type_match(subject)
-      if !is_well_formed_query_result?(subject)
-        throw_no_match "Can perform query matches only against a well formed query result subject"
-      end
-      
-      if (@golden_master.kind_of? Array) && !is_well_formed_query_result?(@golden_master)
-        throw_no_match "Cannot match against a non-well formed golden master array"
-      end
-    end
-
-    def test_value_match(subject)
-      case @golden_master
-      when CSV::Table
-        test_csv_table_match(subject)
-      when Array
-        test_array_match(subject)
-      else
-        test_single_value_match(subject)
-      end
-    end
-
-    # Compare the golden master CSV table with the subject query result
-    def test_csv_table_match(subject)
-      # Compare the fields
-      if !subject.empty?
-        subject_fields = subject[0].keys
-        master_fields = @golden_master.headers
-
-        if subject_fields.count != master_fields.count
-          throw_no_match "Expected #{master_fields.count} field(s), got #{subject_fields.count}"
-        end
-
-        master_fields.each_with_index do |column, index|
-          if column != subject_fields[index]
-            throw_no_match "Expected field \"#{column}\", got field \"#{subject_fields[index]}\""
-          end
-        end
-      end
-
-      # Compare the number of records
-      subject_record_count = subject.count
-      master_record_count = @golden_master.inject(0){|count| count += 1}
-      if subject_record_count != master_record_count
-        throw_no_match "Expected #{master_record_count} record(s), got #{subject_record_count}"
-      end
-
-      # Compare the values of the golden master with the subject
-      current_row = 0
-      @golden_master.each do |row|
-        row.each do |field, master_string|
-          subject_value = subject[current_row][field]
-          if !match_values?(master_string, subject_value)
-            throw_no_match "Field \"#{field}\", Record #{current_row + 1}: Expected value #{master_string.nil? ? '<NULL>' : "\"#{master_string}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
-          end
-        end
-        current_row += 1
-      end
-    end
-
-    def match_types?(master_val, subject_val)
-      subject_val.kind_of? master_val.class
-    end
-
-    def match_values?(master_val, subject_val)
-      if master_val.nil?
-        master_val == subject_val
-      elsif master_val.kind_of?(String)
-        case subject_val
-        when ODBC::TimeStamp
-          (!!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
-        else
-          subject_val.to_s == master_val.to_s
-        end
-      else
-        subject_val.to_s == master_val.to_s
-      end
-    end
-
-    def test_array_match(subject)
-      # Compare the fields
-      if !(subject.empty? || @golden_master.empty?)
-        subject_fields = subject[0].keys
-        master_fields = @golden_master[0].keys
-
-        if subject_fields.count != master_fields.count
-          throw_no_match "Expected #{master_fields.count} field(s), got #{subject_fields.count}"
-        end
-
-        master_fields.each_with_index do |column, index|
-          if column != subject_fields[index]
-            throw_no_match "Expected field \"#{column}\", got field \"#{subject_fields[index]}\""
-          end
-        end
-      end
-
-      # Compare the number of records
-      subject_record_count = subject.count
-      master_record_count = @golden_master.count
-      if subject_record_count != master_record_count
-        throw_no_match "Expected #{master_record_count} record(s), got #{subject_record_count}"
-      end
-
-      # Compare the values of the golden master with the subject
-      current_row = 0
-      @golden_master.each do |row|
-        row.each do |field, master_value|
-          subject_value = subject[current_row][field]
-          if !match_values?(master_value, subject_value)
-            throw_no_match "Field \"#{field}\", Record #{current_row + 1}: Expected value #{master_value.nil? ? '<NULL>' : "\"#{master_value}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
-          end
-        end
-        current_row += 1
-      end
-    end
-
-    def is_well_formed_query_result?(arr)
-      return false unless arr.kind_of? Array
-      header =[]
-      arr.find{|row| !row.kind_of?(Hash) || (header = header.empty? ? row.keys : header) != row.keys || row.keys.empty?}.nil?
-    end
-
-    def test_single_value_match(subject)
-      subject_value = subject[0].values[0]
-      subject_field = subject[0].keys[0]
-      if !match_types?(@golden_master, subject_value)
-        throw_no_match "Field \"#{subject_field}\", Record 1: Expected type \"#{@golden_master.class}\", got \"#{subject_value.class}\""
-      end
-
-      if !match_values?(@golden_master, subject_value)
-        throw_no_match "Field \"#{subject_field}\", Record 1: Expected value #{@golden_master.nil? ? '<NULL>' : "\"#{@golden_master}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
-      end
-    end
-
-    # In case of a multi-resultset subject, extract the first result set
-    def normalize_query_result_subject(subject)
-      subject.kind_of?(Array) && !subject.empty? && is_well_formed_query_result?(subject[0]) ? subject[0] : subject
-    end
-
-    def throw_no_match(message)
-      @failure_message = message
-      throw :no_match
-    end
-  end
-end
+require 'csv'
+
+module Slacker
+  DATE_FORMAT = "%m/%d/%Y"
+
+  class QueryResultMatcher
+    def initialize(golden_master)
+      @golden_master = golden_master
+      @failure_message = ''
+    end
+
+    def matches?(subject)
+      does_match = false
+
+      subject = normalize_query_result_subject(subject)
+
+      catch :no_match do
+        test_type_match(subject)
+        test_value_match(subject)
+        does_match = true
+      end
+      
+      does_match
+    end
+
+    def failure_message_for_should
+      @failure_message
+    end
+
+    private
+
+    #test if the subject type is consistent with the golden master
+    def test_type_match(subject)
+      if !is_well_formed_query_result?(subject)
+        throw_no_match "Can perform query matches only against a well formed query result subject"
+      end
+      
+      if (@golden_master.kind_of? Array) && !is_well_formed_query_result?(@golden_master)
+        throw_no_match "Cannot match against a non-well formed golden master array"
+      end
+    end
+
+    def test_value_match(subject)
+      case @golden_master
+      when CSV::Table
+        test_csv_table_match(subject)
+      when Array
+        test_array_match(subject)
+      else
+        test_single_value_match(subject)
+      end
+    end
+
+    # Compare the golden master CSV table with the subject query result
+    def test_csv_table_match(subject)
+      # Compare the fields
+      if !subject.empty?
+        subject_fields = subject[0].keys
+        master_fields = @golden_master.headers
+
+        if subject_fields.count != master_fields.count
+          throw_no_match "Expected #{master_fields.count} field(s), got #{subject_fields.count}"
+        end
+
+        master_fields.each_with_index do |column, index|
+          if column != subject_fields[index]
+            throw_no_match "Expected field \"#{column}\", got field \"#{subject_fields[index]}\""
+          end
+        end
+      end
+
+      # Compare the number of records
+      subject_record_count = subject.count
+      master_record_count = @golden_master.inject(0){|count| count += 1}
+      if subject_record_count != master_record_count
+        throw_no_match "Expected #{master_record_count} record(s), got #{subject_record_count}"
+      end
+
+      # Compare the values of the golden master with the subject
+      current_row = 0
+      @golden_master.each do |row|
+        row.each do |field, master_string|
+          subject_value = subject[current_row][field]
+          if !match_values?(master_string, subject_value)
+            throw_no_match "Field \"#{field}\", Record #{current_row + 1}: Expected value #{master_string.nil? ? '<NULL>' : "\"#{master_string}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
+          end
+        end
+        current_row += 1
+      end
+    end
+
+    def match_types?(master_val, subject_val)
+      subject_val.kind_of? master_val.class
+    end
+
+    def match_values?(master_val, subject_val)
+      if master_val.nil?
+        master_val == subject_val
+      elsif master_val.kind_of?(String)
+        case subject_val
+        when ODBC::TimeStamp
+          (!!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
+        else
+          subject_val.to_s == master_val.to_s
+        end
+      else
+        subject_val.to_s == master_val.to_s
+      end
+    end
+
+    def test_array_match(subject)
+      # Compare the fields
+      if !(subject.empty? || @golden_master.empty?)
+        subject_fields = subject[0].keys
+        master_fields = @golden_master[0].keys
+
+        if subject_fields.count != master_fields.count
+          throw_no_match "Expected #{master_fields.count} field(s), got #{subject_fields.count}"
+        end
+
+        master_fields.each_with_index do |column, index|
+          if column != subject_fields[index]
+            throw_no_match "Expected field \"#{column}\", got field \"#{subject_fields[index]}\""
+          end
+        end
+      end
+
+      # Compare the number of records
+      subject_record_count = subject.count
+      master_record_count = @golden_master.count
+      if subject_record_count != master_record_count
+        throw_no_match "Expected #{master_record_count} record(s), got #{subject_record_count}"
+      end
+
+      # Compare the values of the golden master with the subject
+      current_row = 0
+      @golden_master.each do |row|
+        row.each do |field, master_value|
+          subject_value = subject[current_row][field]
+          if !match_values?(master_value, subject_value)
+            throw_no_match "Field \"#{field}\", Record #{current_row + 1}: Expected value #{master_value.nil? ? '<NULL>' : "\"#{master_value}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
+          end
+        end
+        current_row += 1
+      end
+    end
+
+    def is_well_formed_query_result?(arr)
+      return false unless arr.kind_of? Array
+      header =[]
+      arr.find{|row| !row.kind_of?(Hash) || (header = header.empty? ? row.keys : header) != row.keys || row.keys.empty?}.nil?
+    end
+
+    def test_single_value_match(subject)
+      subject_value = subject[0].values[0]
+      subject_field = subject[0].keys[0]
+      if !match_types?(@golden_master, subject_value)
+        throw_no_match "Field \"#{subject_field}\", Record 1: Expected type \"#{@golden_master.class}\", got \"#{subject_value.class}\""
+      end
+
+      if !match_values?(@golden_master, subject_value)
+        throw_no_match "Field \"#{subject_field}\", Record 1: Expected value #{@golden_master.nil? ? '<NULL>' : "\"#{@golden_master}\""}, got #{subject_value.nil? ? '<NULL>' : "\"#{subject_value}\""}"
+      end
+    end
+
+    # In case of a multi-resultset subject, extract the first result set
+    def normalize_query_result_subject(subject)
+      subject.kind_of?(Array) && !subject.empty? && is_well_formed_query_result?(subject[0]) ? subject[0] : subject
+    end
+
+    def throw_no_match(message)
+      @failure_message = message
+      throw :no_match
+    end
+  end
+end