slacker 1.0.6 → 1.0.7

data/Gemfile.lock

@@ -1,28 +1,28 @@
-PATH
-  remote: .
-  specs:
-    slacker (1.0.6)
-      bundler (~> 1.0.15)
-      rspec (~> 2.5.0)
-      ruby-odbc (= 0.99994)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-odbc (0.99994)
-
-PLATFORMS
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  slacker!
+PATH
+  remote: .
+  specs:
+    slacker (1.0.7)
+      bundler (~> 1.0.15)
+      rspec (~> 2.5.0)
+      ruby-odbc (= 0.99994)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    ruby-odbc (0.99994)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  slacker!

data/bin/slacker

@@ -1,29 +1,29 @@
-#!/usr/bin/env ruby
-require 'bundler/setup'
-require 'slacker'
-require 'yaml'
-require 'slacker/command_line_formatter'
-
-def db_config_from_file(file_path)
-  dbconfig = nil
-  File.open(file_path) do |dbconfig_file|
-    dbconfig = YAML::load(dbconfig_file)
-  end
-  dbconfig
-end
-
-# Preset the application to run on the console
-Slacker.configure do |config|
-  config.console_enabled = true
-  config.formatter = Slacker::CommandLineFormatter.new($stdout)
-
-  # Setup the target connection based on the contents in database.yml
-  db_config = db_config_from_file(config.expand_path('database.yml'))
-
-  config.db_server = db_config["server"]
-  config.db_name = db_config["database"]
-  config.db_user = db_config["user"]
-  config.db_password = db_config["password"]
-end
-
-Slacker.application.run
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'slacker'
+require 'yaml'
+require 'slacker/command_line_formatter'
+
+def db_config_from_file(file_path)
+  dbconfig = nil
+  File.open(file_path) do |dbconfig_file|
+    dbconfig = YAML::load(dbconfig_file)
+  end
+  dbconfig
+end
+
+# Preset the application to run on the console
+Slacker.configure do |config|
+  config.console_enabled = true
+  config.formatter = Slacker::CommandLineFormatter.new($stdout)
+
+  # Setup the target connection based on the contents in database.yml
+  db_config = db_config_from_file(config.expand_path('database.yml'))
+
+  config.db_server = db_config["server"]
+  config.db_name = db_config["database"]
+  config.db_user = db_config["user"]
+  config.db_password = db_config["password"]
+end
+
+Slacker.application.run

data/bin/slacker_new

@@ -1,34 +1,34 @@
-#!/usr/bin/env ruby
-require 'bundler/setup'
-require 'fileutils'
-
-def usage
-<<END
-Use slacker_new to create a new Slacker project:
-
-slacker_new <project_name>
-END
-end
-
-def project_template_path
-  File.expand_path("#{File.dirname(__FILE__)}/../lib/slacker_new/project")
-end
-
-def slacker_new(project_name)
-  files = Dir.glob("#{project_template_path}/**")
-  FileUtils.mkdir(project_name) unless File.exist?(project_name)
-  FileUtils.cp_r(files, project_name)
-end
-
-def project_template_files(project_name)
-  files = Dir.glob("#{project_template_path}/**/*").map{|file| file.gsub(/^#{Regexp.escape(project_template_path)}\//, "./#{project_name}/")}
-end
-
-if ARGV.count != 1
-  puts usage
-else
-  project_name = ARGV[0]
-  puts "Creating project #{project_name}..."
-  slacker_new(project_name)
-  puts project_template_files(project_name)
-end
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'fileutils'
+
+def usage
+<<END
+Use slacker_new to create a new Slacker project:
+
+slacker_new <project_name>
+END
+end
+
+def project_template_path
+  File.expand_path("#{File.dirname(__FILE__)}/../lib/slacker_new/project")
+end
+
+def slacker_new(project_name)
+  files = Dir.glob("#{project_template_path}/**")
+  FileUtils.mkdir(project_name) unless File.exist?(project_name)
+  FileUtils.cp_r(files, project_name)
+end
+
+def project_template_files(project_name)
+  files = Dir.glob("#{project_template_path}/**/*").map{|file| file.gsub(/^#{Regexp.escape(project_template_path)}\//, "./#{project_name}/")}
+end
+
+if ARGV.count != 1
+  puts usage
+else
+  project_name = ARGV[0]
+  puts "Creating project #{project_name}..."
+  slacker_new(project_name)
+  puts project_template_files(project_name)
+end

data/lib/slacker.rb

@@ -4,6 +4,7 @@ require 'slacker/application'
 require 'slacker/configuration'
 require 'slacker/sql'
 require 'slacker/formatter'
+require 'slacker/sql_preprocessor'
 require 'csv'
 require 'erb'
 
@@ -119,8 +120,12 @@ module Slacker
     # Run a SQL query against an example
     def query_script(example, sql, log_name=nil)
       log_name ||= 'Run SQL Script'
-      example.metadata[:sql] += ((example.metadata[:sql] == '' ? '' : "\n\n") + "-- #{log_name.split(/\r\n|\n/).join("\n-- ")}\n#{sql}")
-      application.query_script(sql)
+
+      debuggable_sql = SqlPreprocessor.debuggable_sql(sql)
+      executable_sql = SqlPreprocessor.executable_sql(sql, example)
+
+      example.metadata[:sql] += ((example.metadata[:sql] == '' ? '' : "\n\n") + "-- #{log_name.split(/\r\n|\n/).join("\n-- ")}\n#{debuggable_sql}")
+      application.query_script(executable_sql)
     end
 
     def load_csv(example, csv, table_name, log_name = nil)

data/lib/slacker/application.rb

@@ -107,9 +107,9 @@ EOF
           require file_name
           module_class = Slacker::StringHelper.constantize(Slacker::StringHelper.camelize(file_name.gsub(/\.rb$/,'')))
           RSpec.configure do |config|
-            config.include(module_class)
+            config.include(module_class )
           end
-          Slacker.mixin_module(module_class)
+          Slacker.mixin_module(module_class )
         end
       end
     end

data/lib/slacker/sql_preprocessor.rb

@@ -0,0 +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
+end

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
-module Slacker
-  VERSION = "1.0.6"
-end
+module Slacker
+  VERSION = "1.0.7"
+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.
+    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

data/lib/slacker_new/project/sql/sample_1/sysobjects_with_params.sql.erb

@@ -1,2 +1,2 @@
-<%# Every parameter passed to a SQL template appears in the options hash available to the template %>
+<%# Every parameter passed to a SQL template appears in the options hash available to the template %>
 select * from sysobjects where xtype = '<%= options[:xtype] %>';

data/slacker.gemspec

@@ -1,26 +1,26 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "slacker/version"
-
-Gem::Specification.new do |s|
-  s.name        = "slacker"
-  s.version     = Slacker::VERSION
-  s.authors     = ["Vassil Kovatchev"]
-  s.email       = ["vassil.kovatchev@gmail.com"]
-  s.homepage    = "https://github.com/vassilvk/slacker/wiki"
-  s.summary     = %q{Behavior Driven Development for SQL Server}
-  s.description = %q{RSpec-based framework for developing automated tests for SQL Server}
-
-  s.rubyforge_project = "slacker"
-
-  s.files = ['README.markdown', 'Rakefile', 'Gemfile', 'slacker.gemspec', 'Gemfile.lock'] + Dir.glob("{bin,lib,spec}/**/*")
-  s.test_files = Dir.glob("spec/**/*")
-  s.executables = ['slacker', 'slacker_new']
-  s.require_paths = ["lib"]
-
-  s.required_ruby_version = '>= 1.9.2'
- 
-  s.add_dependency 'bundler', '~> 1.0.15'
-  s.add_dependency 'ruby-odbc', '= 0.99994'
-  s.add_dependency 'rspec', '~> 2.5.0'
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "slacker/version"
+
+Gem::Specification.new do |s|
+  s.name        = "slacker"
+  s.version     = Slacker::VERSION
+  s.authors     = ["Vassil Kovatchev"]
+  s.email       = ["vassil.kovatchev@gmail.com"]
+  s.homepage    = "https://github.com/vassilvk/slacker/wiki"
+  s.summary     = %q{Behavior Driven Development for SQL Server}
+  s.description = %q{RSpec-based framework for developing automated tests for SQL Server}
+
+  s.rubyforge_project = "slacker"
+
+  s.files = ['README.markdown', 'Rakefile', 'Gemfile', 'slacker.gemspec', 'Gemfile.lock'] + Dir.glob("{bin,lib,spec}/**/*")
+  s.test_files = Dir.glob("spec/**/*")
+  s.executables = ['slacker', 'slacker_new']
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 1.9.2'
+ 
+  s.add_dependency 'bundler', '~> 1.0.15'
+  s.add_dependency 'ruby-odbc', '= 0.99994'
+  s.add_dependency 'rspec', '~> 2.5.0'
+end

data/spec/rspec_ext_spec.rb

@@ -1,88 +1,88 @@
-require 'slacker'
-require 'spec_helper'
-require 'ostruct'
-
-class RSpecSlackerHost
-  include Slacker::RSpecExt
-end
-
-describe Slacker::RSpecExt do
-  before(:each) do
-    Slacker::configure do |config|
-      config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
-    end
-
-    example = OpenStruct.new
-    example.metadata = {:sql => '', :example_group => {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_xyz.rb')}}
-
-    @instance = RSpecSlackerHost.new
-    @instance.stub(:example).and_return(example)
-  end
-
-  it 'responds to query' do
-    @instance.should respond_to(:query)
-  end
-
-  it 'responds to match' do
-    @instance.should respond_to(:match)
-  end
-
-  it 'responds to csv' do
-    @instance.should respond_to(:csv)
-  end
-
-  it 'responds to load_csv' do
-    @instance.should respond_to(:load_csv)
-  end
-
-  it 'responds to load_csv' do
-    @instance.should respond_to(:touch_csv)
-  end
-
-  it 'responds to sql' do
-    @instance.should respond_to(:sql)
-  end
-
-  context 'responds to ghost methods' do
-    before(:each) do
-      Slacker.application.stub(:query_script) {|sql| sql}
-    end
-
-    specify 'described as SQL files found in the sql/helpers folder' do
-      @instance.sql.respond_to?(:helpers).should be_true
-      @instance.sql.helpers.respond_to?(:helper_1).should be_true
-      @instance.sql.helpers.helper_1.should == 'helpers/helper_1.sql called'
-    end
-
-    specify 'described as SQL.ERB files found in the sql/helpers folder' do
-      @instance.sql.helpers.respond_to?(:helper_2).should be_true
-      @instance.sql.helpers.helper_2.should == 'helpers/helper_2.sql.erb called'
-    end
-
-    specify 'with SQL files taking priority over SQL.ERB files' do
-      @instance.sql.helpers.respond_to?(:helper_3).should be_true
-      @instance.sql.helpers.helper_3.should == 'helpers/helper_3.sql called'
-    end
-
-    specify 'but ignores non-existing methods' do
-      @instance.sql.helpers.respond_to?(:some_bogus_method).should be_false
-    end
-
-    specify 'but ignores files which are not with SQL or SQL.ERB extension' do
-      @instance.sql.helpers.respond_to?(:text_file_1).should be_false
-    end
-
-    specify 'from folders other than helpers' do
-      @instance.sql.respond_to?(:example_1).should be_true
-      @instance.sql.example_1.respond_to?(:helper_1).should be_true
-      @instance.sql.example_1.helper_1.should == 'example_1/helper_1.sql called'
-    end
-
-    specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
-      @instance.sql.respond_to?(:nest).should be_true
-      @instance.sql.nest.respond_to?(:example_1).should be_true
-      @instance.sql.nest.example_1.respond_to?(:helper_1).should be_true
-      @instance.sql.nest.example_1.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
-    end
-  end
+require 'slacker'
+require 'spec_helper'
+require 'ostruct'
+
+class RSpecSlackerHost
+  include Slacker::RSpecExt
+end
+
+describe Slacker::RSpecExt do
+  before(:each) do
+    Slacker::configure do |config|
+      config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
+    end
+
+    example = OpenStruct.new
+    example.metadata = {:sql => '', :example_group => {:file_path => SpecHelper.expand_test_files_path('test_slacker_project/spec/example_xyz.rb')}}
+
+    @instance = RSpecSlackerHost.new
+    @instance.stub(:example).and_return(example)
+  end
+
+  it 'responds to query' do
+    @instance.should respond_to(:query)
+  end
+
+  it 'responds to match' do
+    @instance.should respond_to(:match)
+  end
+
+  it 'responds to csv' do
+    @instance.should respond_to(:csv)
+  end
+
+  it 'responds to load_csv' do
+    @instance.should respond_to(:load_csv)
+  end
+
+  it 'responds to load_csv' do
+    @instance.should respond_to(:touch_csv)
+  end
+
+  it 'responds to sql' do
+    @instance.should respond_to(:sql)
+  end
+
+  context 'responds to ghost methods' do
+    before(:each) do
+      Slacker.application.stub(:query_script) {|sql| sql}
+    end
+
+    specify 'described as SQL files found in the sql/helpers folder' do
+      @instance.sql.respond_to?(:helpers).should be_true
+      @instance.sql.helpers.respond_to?(:helper_1).should be_true
+      @instance.sql.helpers.helper_1.should == 'helpers/helper_1.sql called'
+    end
+
+    specify 'described as SQL.ERB files found in the sql/helpers folder' do
+      @instance.sql.helpers.respond_to?(:helper_2).should be_true
+      @instance.sql.helpers.helper_2.should == 'helpers/helper_2.sql.erb called'
+    end
+
+    specify 'with SQL files taking priority over SQL.ERB files' do
+      @instance.sql.helpers.respond_to?(:helper_3).should be_true
+      @instance.sql.helpers.helper_3.should == 'helpers/helper_3.sql called'
+    end
+
+    specify 'but ignores non-existing methods' do
+      @instance.sql.helpers.respond_to?(:some_bogus_method).should be_false
+    end
+
+    specify 'but ignores files which are not with SQL or SQL.ERB extension' do
+      @instance.sql.helpers.respond_to?(:text_file_1).should be_false
+    end
+
+    specify 'from folders other than helpers' do
+      @instance.sql.respond_to?(:example_1).should be_true
+      @instance.sql.example_1.respond_to?(:helper_1).should be_true
+      @instance.sql.example_1.helper_1.should == 'example_1/helper_1.sql called'
+    end
+
+    specify "works with deeply nested example files reflecting their location in the lookup of SQL files in the SQL folder" do
+      @instance.sql.respond_to?(:nest).should be_true
+      @instance.sql.nest.respond_to?(:example_1).should be_true
+      @instance.sql.nest.example_1.respond_to?(:helper_1).should be_true
+      @instance.sql.nest.example_1.helper_1.should == 'nest/example_1/helper_1.sql.erb called'
+    end
+  end
 end

data/spec/test_files/matcher/test_1.csv

@@ -1,3 +1,3 @@
-"Field 1","Field_2","b"
-12,,""
-"test string",01/30/2011,8.9
+"Field 1","Field_2","b"
+12,,""
+"test string",01/30/2011,8.9

data/spec/test_files/test_slacker_project/data/test_1.csv

@@ -1,3 +1,3 @@
-"Field 1","Field_2","b"
-12,10,11
-"test string",01/01/2011,8.9
+"Field 1","Field_2","b"
+12,10,11
+"test string",01/01/2011,8.9

data/spec/test_files/test_slacker_project/sql/no_params.sql.erb

@@ -1,3 +1,3 @@
-<%2.times do |i|%>
-select <%=i+1%>;
+<%2.times do |i|%>
+select <%=i+1%>;
 <%end%>

metadata

@@ -1,61 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slacker
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.7
   prerelease: 
-  version: 1.0.6
 platform: ruby
-authors: 
+authors:
 - Vassil Kovatchev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.15
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-odbc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: "0.99994"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.15
+- !ruby/object:Gem::Dependency
+  name: ruby-odbc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.99994'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.99994'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: RSpec-based framework for developing automated tests for SQL Server
-email: 
+email:
 - vassil.kovatchev@gmail.com
-executables: 
+executables:
 - slacker
 - slacker_new
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.markdown
 - Rakefile
 - Gemfile
@@ -63,107 +75,104 @@ files:
 - Gemfile.lock
 - bin/slacker
 - bin/slacker_new
-- lib/slacker/string_helper.rb
+- lib/slacker/application.rb
 - lib/slacker/command_line_formatter.rb
-- lib/slacker/version.rb
-- lib/slacker/query_result_matcher.rb
 - lib/slacker/configuration.rb
 - lib/slacker/formatter.rb
+- lib/slacker/query_result_matcher.rb
 - lib/slacker/rspec_ext.rb
 - lib/slacker/rspec_monkey.rb
 - lib/slacker/sql.rb
-- lib/slacker/application.rb
+- lib/slacker/sql_preprocessor.rb
+- lib/slacker/string_helper.rb
+- lib/slacker/version.rb
 - lib/slacker.rb
-- lib/slacker_new/project/lib/helpers/my_helper.rb
 - lib/slacker_new/project/data/sample_1/my_table_expected_power_results.csv
 - lib/slacker_new/project/data/sample_1/my_table_initial_data.csv
 - lib/slacker_new/project/data/sample_1/numbers_expected_output.csv
-- lib/slacker_new/project/debug/failed_examples/example_001.sql
-- lib/slacker_new/project/debug/passed_examples/example_001.sql
+- lib/slacker_new/project/database.yml
+- lib/slacker_new/project/lib/helpers/my_helper.rb
+- lib/slacker_new/project/spec/sample_1.rb
+- lib/slacker_new/project/sql/sample_1/create_my_table.sql.erb
 - lib/slacker_new/project/sql/sample_1/my_table_on_power.sql.erb
 - lib/slacker_new/project/sql/sample_1/play_with_numbers.sql.erb
-- lib/slacker_new/project/sql/sample_1/sysobjects_with_params.sql.erb
-- lib/slacker_new/project/sql/sample_1/create_my_table.sql.erb
 - lib/slacker_new/project/sql/sample_1/sysobjects.sql.erb
-- lib/slacker_new/project/spec/sample_1.rb
-- lib/slacker_new/project/database.yml
-- spec/rspec_ext_spec.rb
+- lib/slacker_new/project/sql/sample_1/sysobjects_with_params.sql.erb
+- spec/application_spec.rb
 - spec/query_result_matcher_spec.rb
+- spec/rspec_ext_spec.rb
+- spec/slacker_spec.rb
 - spec/spec_helper.rb
+- spec/test_files/matcher/completely_blank.csv
+- spec/test_files/matcher/no_rows.csv
+- spec/test_files/matcher/test_1.csv
 - spec/test_files/test_slacker_project/data/test_1.csv
-- spec/test_files/test_slacker_project/sql/nest/nested_1.sql.erb
-- spec/test_files/test_slacker_project/sql/nest/example_1/helper_1.sql.erb
-- spec/test_files/test_slacker_project/sql/nest/nested_2.sql.erb
-- spec/test_files/test_slacker_project/sql/params.sql.erb
-- spec/test_files/test_slacker_project/sql/nested.sql.erb
-- spec/test_files/test_slacker_project/sql/test_1.sql
-- spec/test_files/test_slacker_project/sql/multi_nested.sql.erb
-- spec/test_files/test_slacker_project/sql/helpers/helper_3.sql.erb
+- spec/test_files/test_slacker_project/sql/example_1/helper_1.sql
+- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql
+- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql.erb
+- spec/test_files/test_slacker_project/sql/helpers/helper_1.sql
 - spec/test_files/test_slacker_project/sql/helpers/helper_2.sql.erb
 - spec/test_files/test_slacker_project/sql/helpers/helper_3.sql
-- spec/test_files/test_slacker_project/sql/helpers/helper_1.sql
+- spec/test_files/test_slacker_project/sql/helpers/helper_3.sql.erb
 - spec/test_files/test_slacker_project/sql/helpers/text_file_1.txt
-- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql
-- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql.erb
-- spec/test_files/test_slacker_project/sql/example_1/helper_1.sql
-- spec/test_files/test_slacker_project/sql/no_params.sql.erb
+- spec/test_files/test_slacker_project/sql/multi_nested.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/example_1/helper_1.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/nested_1.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/nested_2.sql.erb
+- spec/test_files/test_slacker_project/sql/nested.sql.erb
 - spec/test_files/test_slacker_project/sql/nested_with_params.sql.erb
-- spec/test_files/matcher/no_rows.csv
-- spec/test_files/matcher/completely_blank.csv
-- spec/test_files/matcher/test_1.csv
-- spec/slacker_spec.rb
-- spec/application_spec.rb
+- spec/test_files/test_slacker_project/sql/no_params.sql.erb
+- spec/test_files/test_slacker_project/sql/params.sql.erb
+- spec/test_files/test_slacker_project/sql/test_1.sql
 homepage: https://github.com/vassilvk/slacker/wiki
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: slacker
-rubygems_version: 1.8.4
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Behavior Driven Development for SQL Server
-test_files: 
-- spec/rspec_ext_spec.rb
+test_files:
+- spec/application_spec.rb
 - spec/query_result_matcher_spec.rb
+- spec/rspec_ext_spec.rb
+- spec/slacker_spec.rb
 - spec/spec_helper.rb
+- spec/test_files/matcher/completely_blank.csv
+- spec/test_files/matcher/no_rows.csv
+- spec/test_files/matcher/test_1.csv
 - spec/test_files/test_slacker_project/data/test_1.csv
-- spec/test_files/test_slacker_project/sql/nest/nested_1.sql.erb
-- spec/test_files/test_slacker_project/sql/nest/example_1/helper_1.sql.erb
-- spec/test_files/test_slacker_project/sql/nest/nested_2.sql.erb
-- spec/test_files/test_slacker_project/sql/params.sql.erb
-- spec/test_files/test_slacker_project/sql/nested.sql.erb
-- spec/test_files/test_slacker_project/sql/test_1.sql
-- spec/test_files/test_slacker_project/sql/multi_nested.sql.erb
-- spec/test_files/test_slacker_project/sql/helpers/helper_3.sql.erb
+- spec/test_files/test_slacker_project/sql/example_1/helper_1.sql
+- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql
+- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql.erb
+- spec/test_files/test_slacker_project/sql/helpers/helper_1.sql
 - spec/test_files/test_slacker_project/sql/helpers/helper_2.sql.erb
 - spec/test_files/test_slacker_project/sql/helpers/helper_3.sql
-- spec/test_files/test_slacker_project/sql/helpers/helper_1.sql
+- spec/test_files/test_slacker_project/sql/helpers/helper_3.sql.erb
 - spec/test_files/test_slacker_project/sql/helpers/text_file_1.txt
-- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql
-- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql.erb
-- spec/test_files/test_slacker_project/sql/example_1/helper_1.sql
-- spec/test_files/test_slacker_project/sql/no_params.sql.erb
+- spec/test_files/test_slacker_project/sql/multi_nested.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/example_1/helper_1.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/nested_1.sql.erb
+- spec/test_files/test_slacker_project/sql/nest/nested_2.sql.erb
+- spec/test_files/test_slacker_project/sql/nested.sql.erb
 - spec/test_files/test_slacker_project/sql/nested_with_params.sql.erb
-- spec/test_files/matcher/no_rows.csv
-- spec/test_files/matcher/completely_blank.csv
-- spec/test_files/matcher/test_1.csv
-- spec/slacker_spec.rb
-- spec/application_spec.rb
+- spec/test_files/test_slacker_project/sql/no_params.sql.erb
+- spec/test_files/test_slacker_project/sql/params.sql.erb
+- spec/test_files/test_slacker_project/sql/test_1.sql
+has_rdoc: