slacker 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    slacker (0.0.10)
+    slacker (0.0.11)
       bundler (~> 1.0.15)
-      rspec (= 2.5.0)
+      rspec (~> 2.5.0)
       ruby-odbc (= 0.99994)
 
 GEM

data/lib/slacker.rb

@@ -135,5 +135,31 @@ module Slacker
       end
       query_script(example, sql, log_name) unless sql.nil?
     end
+
+    def touch_csv(csv_file_or_object, fields, field_generators = {})
+      csv_obj = csv_file_or_object.kind_of?(String) ? get_csv(csv_file_or_object) : csv_file_or_object
+      fields = fields.is_a?(Array) ? fields : [fields]
+
+      # Adjust the csv if we are providing more records than there are in the csv
+      csv_row_count = csv_obj.to_a.count - 1
+
+      (fields.count - csv_row_count).times do |index|
+        csv_obj << csv_obj[index % csv_row_count].fields
+      end
+
+      # Add the field generators to the hard-coded fields
+      field_generators.each do |key, value|
+        fields.each_with_index do |record, index|
+          record[key] = value.to_s + index.to_s
+        end
+      end
+
+      fields.each_with_index do |record, index|
+        record.each do |key, value|
+          csv_obj[index][key.to_sym.downcase] = value
+        end
+      end
+      csv_obj
+    end
   end
 end

data/lib/slacker/rspec_ext.rb

@@ -9,37 +9,13 @@ module Slacker
       sql = Slacker.sql_from_query_string(query_string, options)
       @results = Slacker.query_script(example, sql, log_name)
       if block_given?
-        yield
+        yield @results
       end
       @results
     end
 
-    def results
-      @results
-    end
-
-    def result(index = 1, options = {})
-      # Flatten the result in case we're getting a multi-result-set response
-      res = case !@results.empty? && @results[0].kind_of?(Array)
-      when true
-        raise "The query result contains only #{@results.count} result set(s)" unless @results.count >= index
-        @results[index - 1]
-      else
-        raise "The query result contains a single result set" unless index == 1
-        @results
-      end
-
-      #Optionally extract the record and or the field
-      if options[:record] != nil
-        raise "The result set contains only #{res.count} record(s)" unless res.count >= options[:record]
-        res = res[options[:record] - 1]
-        if options[:field] != nil
-          raise "The result set does not contain field \"#{options[:field]}\"" unless res[options[:field]] != nil
-          res = res[options[:field]]
-        end
-      end
-
-      res
+    def sql
+      Slacker.sql(self)
     end
 
     # Get a matcher which will compare the query results to a golden master
@@ -47,6 +23,14 @@ module Slacker
       QueryResultMatcher.new(Slacker.filter_golden_master(golden_master))
     end
 
+    def csv(csv_file)
+      Slacker.get_csv(csv_file)
+    end
+
+    def touch_csv(csv_file_or_object, fields, field_generators = {})
+      Slacker.touch_csv(csv_file_or_object, fields, field_generators)
+    end
+
     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
@@ -58,14 +42,6 @@ module Slacker
       Slacker.load_csv(example, csv_object, table_name, log_name)
     end
 
-    def csv(csv_file)
-      Slacker.get_csv(csv_file)
-    end
-
-    def sql
-      Slacker.sql(self)
-    end
-
     def yes?(val)
       val != nil && val.downcase == 'yes'
     end

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
 module Slacker
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

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

@@ -51,7 +51,7 @@ describe 'My database' do
     # Note that this time we're calling the template with a block.
     # When called with a block, a template is executed and its results are accessible
     # from within the block through the "results" object.
-    sql.sample_1.play_with_numbers(:x => 2, :y => 12) do
+    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]
 
@@ -79,7 +79,7 @@ describe 'My database' do
   # 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
+    sql.sample_1.play_with_numbers(:x => 10, :y => 34) do |results|
       results[2].should match('sample_1/numbers_expected_output.csv')
     end
   end

data/slacker.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   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'
+  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

@@ -35,12 +35,8 @@ describe Slacker::RSpecExt do
     @instance.should respond_to(:load_csv)
   end
 
-  it 'responds to result' do
-    @instance.should respond_to(:result)
-  end
-
-  it 'responds to results' do
-    @instance.should respond_to(:results)
+  it 'responds to load_csv' do
+    @instance.should respond_to(:touch_csv)
   end
 
   it 'responds to sql' do

metadata

@@ -2,7 +2,7 @@
 name: slacker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Vassil Kovatchev
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :runtime