slacker 1.0.14 → 1.0.15

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/slacker_spec.rb

@@ -1,60 +1,60 @@
-require 'slacker'
-require 'spec_helper'
-
-describe Slacker do
-  it 'exposes a singleton application object' do
-    app = Slacker::application
-    app.should equal(Slacker::application)
-  end
-
-  it 'and it''s base folder can be configured through a call to configure' do
-    Slacker.configure do |config|
-      config.base_dir = 'xyz'
-    end
-
-    Slacker.configuration.base_dir.should == 'xyz'
-  end
-
-  it 'converts a hash array to csv' do
-    csv = Slacker.hash_array_to_csv [{'a' => 1, 'b' => 2}, {'a' => 3, 'b' => 4}]
-    csv.to_csv.should == "a,b\n1,2\n3,4\n"
-  end
-
-  context 'provides SQL resolution' do
-    before(:each) do
-      Slacker.configure do |config|
-        config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
-      end
-    end
-
-    specify 'which resolves to a SQL string when a non-file is sent to it' do
-      Slacker.sql_from_query_string("select 'abc' as xyz").should == "select 'abc' as xyz"
-    end
-
-    specify 'which resolves to the correct contents of a SQL file' do
-      Slacker.sql_from_query_string("test_1.sql").should == "select 1;"
-    end
-
-    context 'of an ERB file' do
-      specify 'with no params' do
-        Slacker.sql_from_query_string("no_params.sql.erb").should == "select 1;\nselect 2;\n"
-      end
-
-      specify 'with params' do
-        Slacker.sql_from_query_string("params.sql.erb", {:param1 => 11, :param2 => 12}).should == "select 11;\nselect 12;"
-      end
-
-      specify 'which calls another ERB file with no params' do
-        Slacker.sql_from_query_string("nested.sql.erb").should == "select 1;\nselect 2;\n"
-      end
-
-      specify 'which calls another ERB file with params' do
-        Slacker.sql_from_query_string("nested_with_params.sql.erb", {:param1 => 21, :param2 => 22}).should == "select 21;\nselect 22;"
-      end
-
-      specify 'which calls complex multi-nested file' do
-        Slacker.sql_from_query_string("multi_nested.sql.erb", {:seed => 1}).should == "seed 1;\nselect 3;\nselect 4;"
-      end
-    end
-  end
+require 'slacker'
+require 'spec_helper'
+
+describe Slacker do
+  it 'exposes a singleton application object' do
+    app = Slacker::application
+    app.should equal(Slacker::application)
+  end
+
+  it 'and it''s base folder can be configured through a call to configure' do
+    Slacker.configure do |config|
+      config.base_dir = 'xyz'
+    end
+
+    Slacker.configuration.base_dir.should == 'xyz'
+  end
+
+  it 'converts a hash array to csv' do
+    csv = Slacker.hash_array_to_csv [{'a' => 1, 'b' => 2}, {'a' => 3, 'b' => 4}]
+    csv.to_csv.should == "a,b\n1,2\n3,4\n"
+  end
+
+  context 'provides SQL resolution' do
+    before(:each) do
+      Slacker.configure do |config|
+        config.base_dir = SpecHelper.expand_test_files_path('test_slacker_project')
+      end
+    end
+
+    specify 'which resolves to a SQL string when a non-file is sent to it' do
+      Slacker.sql_from_query_string("select 'abc' as xyz").should == "select 'abc' as xyz"
+    end
+
+    specify 'which resolves to the correct contents of a SQL file' do
+      Slacker.sql_from_query_string("test_1.sql").should == "select 1;"
+    end
+
+    context 'of an ERB file' do
+      specify 'with no params' do
+        Slacker.sql_from_query_string("no_params.sql.erb").should == "select 1;\nselect 2;\n"
+      end
+
+      specify 'with params' do
+        Slacker.sql_from_query_string("params.sql.erb", {:param1 => 11, :param2 => 12}).should == "select 11;\nselect 12;"
+      end
+
+      specify 'which calls another ERB file with no params' do
+        Slacker.sql_from_query_string("nested.sql.erb").should == "select 1;\nselect 2;\n"
+      end
+
+      specify 'which calls another ERB file with params' do
+        Slacker.sql_from_query_string("nested_with_params.sql.erb", {:param1 => 21, :param2 => 22}).should == "select 21;\nselect 22;"
+      end
+
+      specify 'which calls complex multi-nested file' do
+        Slacker.sql_from_query_string("multi_nested.sql.erb", {:seed => 1}).should == "seed 1;\nselect 3;\nselect 4;"
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
-module SpecHelper
-  def self.expand_test_files_path(path)
-    File.expand_path("#{File.dirname(__FILE__)}/test_files/#{path}")
-  end
-
-  def self.load_csv(file)
-    CSV.read(expand_test_files_path(file), {:headers => true, :encoding => 'Windows-1252'})
-  end
-end
+module SpecHelper
+
+  RSpec.configure do |config|
+    config.expect_with :rspec do |c|
+      c.syntax = :should
+    end
+    config.mock_with :rspec do |c|
+      c.syntax = :should
+    end    
+  end
+
+  def self.expand_test_files_path(path)
+    File.expand_path("#{File.dirname(__FILE__)}/test_files/#{path}")
+  end
+
+  def self.load_csv(file)
+    CSV.read(expand_test_files_path(file), {:headers => true, :encoding => 'Windows-1252'})
+  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/nest/nested_1.sql.erb

@@ -1,2 +1,2 @@
-seed <%= options[:seed] %>;
+seed <%= options[:seed] %>;
 <%= render 'nested_2.sql.erb',  {:seed => options[:seed] + 1}%>

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%>

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

@@ -1,2 +1,2 @@
-select <%= options[:param1] %>;
+select <%= options[:param1] %>;
 select <%= options[:param2] %>;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacker
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Vassil Kovatchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,34 +144,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slacker
-rubygems_version: 2.6.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Behavior Driven Development for SQL Server
 test_files:
-- 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/example_1/helper_2.sql.erb
-- spec/test_files/test_slacker_project/sql/example_1/helper_2.sql
+- 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/example_1/helper_1.sql
-- spec/test_files/test_slacker_project/sql/no_params.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/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.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/params.sql.erb
-- spec/test_files/test_slacker_project/sql/nested_with_params.sql.erb
-- spec/test_files/test_slacker_project/sql/nested.sql.erb
-- spec/test_files/test_slacker_project/sql/nest/nested_2.sql.erb
+- 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/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/data/test_1.csv
-- spec/test_files/matcher/no_rows.csv
-- spec/test_files/matcher/completely_blank.csv
-- spec/test_files/matcher/test_1.csv
-- spec/spec_helper.rb
-- spec/slacker_spec.rb
-- spec/rspec_ext_spec.rb
-- spec/application_spec.rb
-- spec/query_result_matcher_spec.rb
+- 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/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