slacker 1.0.14 → 1.0.15

data/lib/slacker/rspec_ext.rb

@@ -1,57 +1,57 @@
-require 'slacker'
-require 'slacker/query_result_matcher'
-require 'csv'
-
-module Slacker
-  module RSpecExt
-    
-    # Execute a SQL query or the contents of a query template query file
-    # In case of a query file, it passes the options to the template
-    def query(query_string, options = {}, log_name = nil)
-      log_name ||= Slacker.construct_log_name('query', query_string, options)
-      sql = Slacker.sql_from_query_string(query_string, options)
-      @results = Slacker.query_script(example, sql, log_name)
-      if block_given?
-        yield @results
-      end
-      @results
-    end
-
-    # Exposes a reference to the sql object, which represents the contents of the SQL folder
-    def sql
-      Slacker.sql(self)
-    end
-
-    # Get a matcher which will compare the query results to a golden master
-    def match(golden_master)
-      QueryResultMatcher.new(Slacker.filter_golden_master(golden_master))
-    end
-
-    # Loads a CSV file and returns a reference to it
-    # The file is relative to the data folder of the Slacker project
-    def csv(csv_file)
-      Slacker.get_csv(csv_file)
-    end
-
-    # Generate CSV::Table objects with an arbitrary number of records populated with data based on a template CSV file
-    def touch_csv(csv_file_or_object, fields, field_generators = {})
-      Slacker.touch_csv(csv_file_or_object, fields, field_generators)
-    end
-
-    # Load a CSV file directly into a table in the target database
-    def load_csv(csv_file_or_object, table_name, log_name = nil)
-      log_name ||= "load_csv '#{csv_file_or_object.kind_of?(CSV::Table) ? 'CSV Object' : csv_file_or_object }', 'table_name'"
-      csv_object = case csv_file_or_object
-      when String then Slacker.get_csv(csv_file_or_object)
-      when CSV::Table then csv_file_or_object
-      when Array then Slacker.hash_array_to_csv(csv_file_or_object)
-      end
-
-      Slacker.load_csv(example, csv_object, table_name, log_name)
-    end
-
-    def yes?(val)
-      val != nil && val.downcase == 'yes'
-    end
-  end
-end
+require 'slacker'
+require 'slacker/query_result_matcher'
+require 'csv'
+
+module Slacker
+  module RSpecExt
+    
+    # Execute a SQL query or the contents of a query template query file
+    # In case of a query file, it passes the options to the template
+    def query(query_string, options = {}, log_name = nil)
+      log_name ||= Slacker.construct_log_name('query', query_string, options)
+      sql = Slacker.sql_from_query_string(query_string, options)
+      @results = Slacker.query_script(example, sql, log_name)
+      if block_given?
+        yield @results
+      end
+      @results
+    end
+
+    # Exposes a reference to the sql object, which represents the contents of the SQL folder
+    def sql
+      Slacker.sql(self)
+    end
+
+    # Get a matcher which will compare the query results to a golden master
+    def match(golden_master)
+      QueryResultMatcher.new(Slacker.filter_golden_master(golden_master))
+    end
+
+    # Loads a CSV file and returns a reference to it
+    # The file is relative to the data folder of the Slacker project
+    def csv(csv_file)
+      Slacker.get_csv(csv_file)
+    end
+
+    # Generate CSV::Table objects with an arbitrary number of records populated with data based on a template CSV file
+    def touch_csv(csv_file_or_object, fields, field_generators = {})
+      Slacker.touch_csv(csv_file_or_object, fields, field_generators)
+    end
+
+    # Load a CSV file directly into a table in the target database
+    def load_csv(csv_file_or_object, table_name, log_name = nil)
+      log_name ||= "load_csv '#{csv_file_or_object.kind_of?(CSV::Table) ? 'CSV Object' : csv_file_or_object }', 'table_name'"
+      csv_object = case csv_file_or_object
+      when String then Slacker.get_csv(csv_file_or_object)
+      when CSV::Table then csv_file_or_object
+      when Array then Slacker.hash_array_to_csv(csv_file_or_object)
+      end
+
+      Slacker.load_csv(example, csv_object, table_name, log_name)
+    end
+
+    def yes?(val)
+      val != nil && val.downcase == 'yes'
+    end
+  end
+end

data/lib/slacker/rspec_monkey.rb

@@ -1,7 +1,7 @@
-# Monkeypatch a method to reset RSpec
-module RSpec
-  def self.slacker_reset
-    @world = nil
-    @configuration = nil
-  end
-end
+# Monkeypatch a method to reset RSpec
+module RSpec
+  def self.slacker_reset
+    @world = nil
+    @configuration = nil
+  end
+end

data/lib/slacker/sql.rb

@@ -1,39 +1,39 @@
-require 'slacker'
-require 'slacker/rspec_ext'
-
-module Slacker
-  class Sql < BasicObject
-    attr_accessor :base_folder, :rspec_ext
-
-    def initialize(base_folder, rspec_ext)
-      @base_folder = base_folder
-      @rspec_ext = rspec_ext
-    end
-
-    def method_missing(method_name, *params, &block)
-      ::Kernel.raise "Slacker::Sql.rspec_ext not initialized" if rspec_ext.nil?
-      ::Kernel.raise "Missing folder #{base_folder}" if !::File.directory?(base_folder)
-
-      method_name = method_name.to_s
-      
-      if ::File.directory?(::File.join(base_folder, method_name))
-        ::Slacker::Sql.new(::File.join(base_folder, method_name), rspec_ext)
-      else
-        sql_file = ::Slacker.sql_file_from_method_name(base_folder, method_name)
-        case sql_file
-        when nil
-          ::Kernel.raise "No SQL file found corresponding to method '#{method_name}' in folder #{base_folder}"
-        else
-          rspec_ext.query sql_file, *params, &block
-        end
-      end
-    end
-
-    def respond_to?(method_name)
-      method_name = method_name.to_s
-      ::Kernel.raise "Slacker::Sql.rspec_ext not initialized" if rspec_ext.nil?
-      ::File.directory?(::File.join(base_folder, method_name)) ||
-        !(::Slacker.sql_file_from_method_name(base_folder, method_name).nil?)
-    end
-  end
-end
+require 'slacker'
+require 'slacker/rspec_ext'
+
+module Slacker
+  class Sql < BasicObject
+    attr_accessor :base_folder, :rspec_ext
+
+    def initialize(base_folder, rspec_ext)
+      @base_folder = base_folder
+      @rspec_ext = rspec_ext
+    end
+
+    def method_missing(method_name, *params, &block)
+      ::Kernel.raise "Slacker::Sql.rspec_ext not initialized" if rspec_ext.nil?
+      ::Kernel.raise "Missing folder #{base_folder}" if !::File.directory?(base_folder)
+
+      method_name = method_name.to_s
+      
+      if ::File.directory?(::File.join(base_folder, method_name))
+        ::Slacker::Sql.new(::File.join(base_folder, method_name), rspec_ext)
+      else
+        sql_file = ::Slacker.sql_file_from_method_name(base_folder, method_name)
+        case sql_file
+        when nil
+          ::Kernel.raise "No SQL file found corresponding to method '#{method_name}' in folder #{base_folder}"
+        else
+          rspec_ext.query sql_file, *params, &block
+        end
+      end
+    end
+
+    def respond_to?(method_name)
+      method_name = method_name.to_s
+      ::Kernel.raise "Slacker::Sql.rspec_ext not initialized" if rspec_ext.nil?
+      ::File.directory?(::File.join(base_folder, method_name)) ||
+        !(::Slacker.sql_file_from_method_name(base_folder, method_name).nil?)
+    end
+  end
+end

data/lib/slacker/sql_preprocessor.rb

@@ -1,24 +1,24 @@
-module Slacker
-  module SqlPreprocessor
-    IVAR_REX = /%{\s*(.*?)\s*}/
-
-    def self.executable_sql(sql, example)
-      # Replace all appearances of %{} with the values of the corresponding example instance variables
-      sql.gsub(IVAR_REX) do
-        ivar = $1.to_sym
-        instance = example.example_group_instance
-
-        if instance.instance_variable_defined?(ivar)
-          instance.instance_variable_get(ivar).to_s
-        else
-          raise "Example is missing instance variable #{ivar}"
-        end
-      end
-    end
-
-    def self.debuggable_sql(sql)
-      # Replace all appearances of %{} with the names of the sql variables
-      sql.gsub(IVAR_REX) {$1}
-    end
-  end
+module Slacker
+  module SqlPreprocessor
+    IVAR_REX = /%{\s*(.*?)\s*}/
+
+    def self.executable_sql(sql, example)
+      # Replace all appearances of %{} with the values of the corresponding example instance variables
+      sql.gsub(IVAR_REX) do
+        ivar = $1.to_sym
+        instance = example.example_group_instance
+
+        if instance.instance_variable_defined?(ivar)
+          instance.instance_variable_get(ivar).to_s
+        else
+          raise "Example is missing instance variable #{ivar}"
+        end
+      end
+    end
+
+    def self.debuggable_sql(sql)
+      # Replace all appearances of %{} with the names of the sql variables
+      sql.gsub(IVAR_REX) {$1}
+    end
+  end
 end

data/lib/slacker/string_helper.rb

@@ -1,17 +1,17 @@
-module Slacker
-  module StringHelper
-    class << self
-      def camelize(lower_case_and_underscored_word)
-        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      end
-
-      def constantize(camel_cased_word)
-        unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
-          raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
-        end
-
-        Object.module_eval("::#{$1}", __FILE__, __LINE__)
-      end
-    end
-  end
+module Slacker
+  module StringHelper
+    class << self
+      def camelize(lower_case_and_underscored_word)
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      end
+
+      def constantize(camel_cased_word)
+        unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
+          raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
+        end
+
+        Object.module_eval("::#{$1}", __FILE__, __LINE__)
+      end
+    end
+  end
 end

data/lib/slacker/version.rb

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

data/lib/slacker_new/project/data/sample_1/my_table_expected_power_results.csv

@@ -1,11 +1,11 @@
-"x","y","power"
-"2","1","2"
-"3","2","9"
-"4","3","64"
-"5","4","625"
-"4","2","16"
-"3","3","27"
-"2","4","16"
-"1","5","1"
-"-1","2","1"
-"-2","5","-32"
+"x","y","power"
+"2","1","2"
+"3","2","9"
+"4","3","64"
+"5","4","625"
+"4","2","16"
+"3","3","27"
+"2","4","16"
+"1","5","1"
+"-1","2","1"
+"-2","5","-32"

data/lib/slacker_new/project/data/sample_1/my_table_initial_data.csv

@@ -1,11 +1,11 @@
-"x","y"
-2,1
-3,2
-4,3
-5,4
-4,2
-3,3
-2,4
-1,5
--1,2
--2,5
+"x","y"
+2,1
+3,2
+4,3
+5,4
+4,2
+3,3
+2,4
+1,5
+-1,2
+-2,5

data/lib/slacker_new/project/data/sample_1/numbers_expected_output.csv

@@ -1,3 +1,3 @@
-"p","s"
-2,34
-12,44
+"p","s"
+2,34
+12,44

data/lib/slacker_new/project/database.yml

@@ -1,9 +1,9 @@
-# Database connection.
-# When Slacker is executed, it will attempt to connect to this database.
-
-# Replace the following with your connection information.
-# Note that at this point Slacker only works with SQL Server authentication.
-server: my_server
-database: my_database
-user: user_name
-password: password
+# Database connection.
+# When Slacker is executed, it will attempt to connect to this database.
+
+# Replace the following with your connection information.
+# Note that at this point Slacker only works with SQL Server authentication.
+server: my_server
+database: my_database
+user: user_name
+password: password

data/lib/slacker_new/project/lib/helpers/my_helper.rb

@@ -1,2 +1,2 @@
-module MyHelper
+module MyHelper
 end

data/lib/slacker_new/project/spec/sample_1.rb

@@ -1,66 +1,66 @@
-# Method "describe" opens up an example group.
-describe 'My database' do
-  # Simple inline query example.
-  it 'contains system tables' do
-    # Make sure we have at least one system object in the database.
-    query("select * from sysobjects where xtype = 'S';").count.should > 0
-  end
-
-  # The same query, this time using a SQL template stored in file "sql/sample_1/sysobject.sql.erb".
-  it 'contains system tables (take two)' do
-    # Every (*.sql.erb) file in folder "sql" can be called as a method on object "sql".
-    # Subfolders of folder "sql" appear as children of object "sql" with their (*.sql.erb) files automatically available as methods.
-    sql.sample_1.sysobjects.count.should > 0
-  end
-
-  # This time we'll use a parameterized template.
-  it 'contains system tables (take three)' do
-    # Every template can accept parameters; see file "sql/sample_1/sysobject_with_params.sql.erb".
-    sql.sample_1.sysobjects_with_params(:xtype => 'S').count.should > 0
-  end
-
-  # SQL Templates can contain multiple statements and can return multiple resultsets.
-  it 'can play with numbers' do
-    # Note that this time we're calling the template with a block which receives the results as a block parameter.
-    sql.sample_1.play_with_numbers(:x => 2, :y => 12) do |results|
-      # The results object contains an array of all the resultsets generated by the query script.
-      # A resultset contains an array of records. Each record is a hash of field => value pairs.
-      
-      # First resultset; First record; Column "product".
-      results[0][0][:product].should == 24
-
-      # A resultset can be matched directly against an array of hashes using method "match".
-      results[1].should match([{:x => 2, :y => 12, :sum => 14}])
-
-      # Or against a CSV file stored in project's "data" folder (see file "data/sample_1/numbers_expected_output.csv").
-      results[2].should match('sample_1/numbers_expected_output.csv')
-
-      # A resultset's values can be matched one-by-one.
-      results[2][0][:p].should == 2
-      results[2][0][:s].should == 34
-      results[2][1][:p].should == 12
-      results[2][1][:s].should == 44
-    end
-  end
-
-  # Every "it" (example) is executed in a T-SQL transaction which is rolled back once the example is complete.
-  # No example can ever interfere with the results of another example.
-  # 
-  # CSV files can be used to load data directly into a table.
-  # In this example, we will create a table, populate it with data,
-  # calculate the exponentiation of one column based on another column
-  # and verify the results against an expected resultset stored in a CSV file.
-  it 'can play with numbers (take two)' do
-    # Create the table - see file "sql/sample_1/create_my_table.sql.erb".
-    sql.sample_1.create_my_table
-    # We can populate any table with data from the "data" folder by calling method "load_csv".
-    # See file "data/sample_1/my_table_initial_data.csv".
-    load_csv('sample_1/my_table_initial_data.csv', 'MyTable')
-
-    # Now let's test the system scalar function Power.
-    # We will use it in a query expression executed agaings MyTable and we
-    # will compare the results against a CSV file - we should expect them to match.
-    # See files "sql/sample_1/my_table_on_power.sql.erb" and "data/sample_1/my_table_expected_power_results.csv".
-    sql.sample_1.my_table_on_power.should match('sample_1/my_table_expected_power_results.csv')
-  end
-end
+# Method "describe" opens up an example group.
+describe 'My database' do
+  # Simple inline query example.
+  it 'contains system tables' do
+    # Make sure we have at least one system object in the database.
+    expect(query("select * from sysobjects where xtype = 'S';").count).to be > 0
+  end
+
+  # The same query, this time using a SQL template stored in file "sql/sample_1/sysobject.sql.erb".
+  it 'contains system tables (take two)' do
+    # Every (*.sql.erb) file in folder "sql" can be called as a method on object "sql".
+    # Subfolders of folder "sql" appear as children of object "sql" with their (*.sql.erb) files automatically available as methods.
+    expect(sql.sample_1.sysobjects.count).to be > 0
+  end
+
+  # This time we'll use a parameterized template.
+  it 'contains system tables (take three)' do
+    # Every template can accept parameters; see file "sql/sample_1/sysobject_with_params.sql.erb".
+    expect(sql.sample_1.sysobjects_with_params(:xtype => 'S').count).to be > 0
+  end
+
+  # SQL Templates can contain multiple statements and can return multiple resultsets.
+  it 'can play with numbers' do
+    # Note that this time we're calling the template with a block which receives the results as a block parameter.
+    sql.sample_1.play_with_numbers(:x => 2, :y => 12) do |results|
+      # The results object contains an array of all the resultsets generated by the query script.
+      # A resultset contains an array of records. Each record is a hash of field => value pairs.
+      
+      # First resultset; First record; Column "product".
+      expect(results[0][0][:product]).to be == 24
+
+      # A resultset can be matched directly against an array of hashes using method "match".
+      expect(results[1]).to match([{:x => 2, :y => 12, :sum => 14}])
+
+      # Or against a CSV file stored in project's "data" folder (see file "data/sample_1/numbers_expected_output.csv").
+      expect(results[2]).to match('sample_1/numbers_expected_output.csv')
+
+      # A resultset's values can be matched one-by-one.
+      expect(results[2][0][:p]).to be == 2
+      expect(results[2][0][:s]).to be == 34
+      expect(results[2][1][:p]).to be == 12
+      expect(results[2][1][:s]).to be == 44
+    end
+  end
+
+  # Every "it" (example) is executed in a T-SQL transaction which is rolled back once the example is complete.
+  # No example can ever interfere with the results of another example.
+  # 
+  # CSV files can be used to load data directly into a table.
+  # In this example, we will create a table, populate it with data,
+  # calculate the exponentiation of one column based on another column
+  # and verify the results against an expected resultset stored in a CSV file.
+  it 'can play with numbers (take two)' do
+    # Create the table - see file "sql/sample_1/create_my_table.sql.erb".
+    sql.sample_1.create_my_table
+    # We can populate any table with data from the "data" folder by calling method "load_csv".
+    # See file "data/sample_1/my_table_initial_data.csv".
+    load_csv('sample_1/my_table_initial_data.csv', 'MyTable')
+
+    # Now let's test the system scalar function Power.
+    # We will use it in a query expression executed agaings MyTable and we
+    # will compare the results against a CSV file - we should expect them to match.
+    # See files "sql/sample_1/my_table_on_power.sql.erb" and "data/sample_1/my_table_expected_power_results.csv".
+    expect(sql.sample_1.my_table_on_power).to match('sample_1/my_table_expected_power_results.csv')
+  end
+end