slacker 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacker (1.0.1)
+    slacker (1.0.2)
       bundler (~> 1.0.15)
       rspec (~> 2.5.0)
       ruby-odbc (= 0.99994)

data/README.markdown

@@ -34,7 +34,7 @@ If all is good, you should see something like this:
     .....
 
     Finished in 0.05222 seconds
-    7 examples, 0 failures
+    5 examples, 0 failures
 
 Next, check out sample file `my_project\spec\sample_1.rb` to see the BDD specification you just executed.
 

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
 module Slacker
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

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

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

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

@@ -4,8 +4,7 @@ describe 'My database' do
   it 'contains system tables' do
     # Select all system objects in the database.
     # We should have at least one of those.
-    query_result = query("select * from sysobjects where xtype = 'S';")
-    query_result.count.should > 0
+    query("select * from sysobjects where xtype = 'S';").count.should > 0
   end
 
   # The same query, this time using a SQL template.
@@ -18,9 +17,7 @@ describe 'My database' do
     # For example, the file sysobjects.sql.erb is located in "sql/sample_1/",
     # so it is accessible like this:
     # sql.sample_1.sysobjects
-    
-    query_result = sql.sample_1.sysobjects
-    query_result.count.should > 0
+    sql.sample_1.sysobjects.count.should > 0
   end
 
   # This time we'll use a parameterized template.
@@ -28,22 +25,7 @@ describe 'My database' do
   it 'contains system tables (take three)' do
     # You can pass a hash to any SQL template - this hash becomes available to the
     # template through the "options" object - see file sql/sample_1/sysobject_with_params.sql.erb as an example.
-    query_result = sql.sample_1.sysobjects_with_params(:xtype => 'S')
-    query_result.count.should > 0
-  end
-
-  # Let's create a table and count our user objects which match this table name.
-  # Every "it" (example) is executed in a transaction which is rolled back once the example is complete.
-  # This ensures that every example starts at the same state of the database as any other example in the spec.
-  # No example can ever interfere witht the results of another example.
-  it 'contains a user table when one is created' do
-    # Use inline query to create the table
-    query('create table MyTable(id int, name varchar(100));')
-
-    # Now lookup the table by type and name using a more elaborate dynamic SQL template.
-    # See template sql/sample_1/sysobject_with_params_2.sql.erb
-    query_result = sql.sample_1.sysobjects_with_params_2(:xtype => 'U', :name => 'MyTable')
-    query_result.count.should == 1
+    sql.sample_1.sysobjects_with_params(:xtype => 'S').count.should > 0
   end
 
   # SQL Templates can contain multiple statements and can return multiple resultsets.
@@ -53,37 +35,29 @@ describe 'My database' do
     # from within the block through the "results" object.
     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.
-      first_resultset = results[0]
-
       # A resultset contains an array of records.
       # Each record is a hash of field => value pairs.
-      first_resultset[0][:product].should == 24
+      results[0][0][:product].should == 24
 
       # A resultset can be matched directly against an array of hashes using the "match" method.
-      second_resultset = results[1]
-      second_resultset.should match([{:x => 2, :y => 12, :sum => 14}])
-
-      # Of course this works too:
       results[1].should match([{:x => 2, :y => 12, :sum => 14}])
 
+      # Or against a CSV file stored in the data folder (see file data/sample_1/numbers_expected_output.csv)
+      results[2].should match('sample_1/numbers_expected_output.csv')
+
       # Or a resultset's values can be matched one-by-one.
       # Note that the third resultset contains two records:
-      third_resultset = results[2]
-      third_resultset[0][:p].should == 2
-      third_resultset[0][:s].should == 34
-      third_resultset[1][:p].should == 12
-      third_resultset[1][:s].should == 44
-    end
-  end
-
-  # The results of a query can also be compared against the contents
-  # of a CSV file located in the data folder - see file data/sample_1/numbers_expected_output.csv
-  it 'can play with numbers (take two)' do
-    sql.sample_1.play_with_numbers(:x => 10, :y => 34) do |results|
-      results[2].should match('sample_1/numbers_expected_output.csv')
+      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 transaction which is rolled back once the example is complete.
+  # This ensures that every example starts at the same state of the database as any other example in the spec.
+  # No example can ever interfere witht 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

metadata

@@ -2,7 +2,7 @@
 name: slacker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Vassil Kovatchev
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -81,7 +81,6 @@ files:
 - lib/slacker_new/project/debug/failed_examples/example_001.sql
 - lib/slacker_new/project/debug/passed_examples/example_001.sql
 - lib/slacker_new/project/sql/sample_1/my_table_on_power.sql.erb
-- lib/slacker_new/project/sql/sample_1/sysobjects_with_params_2.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

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

@@ -1,5 +0,0 @@
-<%# Query sysobjects by a dynamic criteria depending on the presence of parameters %>
-select * from sysobjects
-where 1 = 1
-<%= options[:xtype].nil? ? '' : " and xtype = '#{options[:xtype]}'" %>
-<%= options[:name].nil? ? '' : " and name = '#{options[:name]}'" %>;