rspec-parameterized 0.0.2 → 0.0.3

data/lib/rspec/parameterized/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Parameterized
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rspec/parameterized.rb

@@ -27,7 +27,7 @@ module RSpec
       #
       # ## Example
       #
-      #     where(:a, :b, :answer) do
+      #     where_table(:a, :b, :answer) do
       #       1 | 2 | 3
       #       5 | 8 | 13
       #       0 | 0 | 0
@@ -59,7 +59,13 @@ module RSpec
       private
       def set_parameters(arg_names, param_sets)
         @arg_names = arg_names
-        @param_sets = param_sets
+
+        @param_sets = if arg_names.count == 1 && !param_sets[0].is_a?(Array)
+                        param_sets.map { |x| Array[x] }
+                      else
+                        param_sets
+                      end
+
         if @parameterized_pending_cases
           @parameterized_pending_cases.each { |e|
             define_cases(arg_names, param_sets, *e[0], &e[1])
@@ -70,7 +76,12 @@ module RSpec
       def separate_table_like_block(b)
         sexp = b.to_sexp(:strip_enclosure => true)
 
-        lines = sexp.find_nodes(:call)
+        if sexp.sexp_type == :block
+          lines = sexp.find_nodes(:call)
+        else
+          lines = [sexp]
+        end
+
         lines.map do |l|
           rev_insts = []
           while l.sexp_type == :call and l[2] == :|
@@ -92,8 +103,10 @@ module RSpec
 
       def define_cases(arg_names, param_sets, *args, &block)
         param_sets.each do |params|
-          describe(params.inspect, *args) do
-            [arg_names, params].transpose.each do |n|
+          pairs = [arg_names, params].transpose
+          pretty_params = pairs.map {|t| "#{t[0]}: #{params_inspect(t[1])}"}.join(", ")
+          describe(pretty_params, *args) do
+            pairs.each do |n|
               let(n[0]) { n[1] }
             end
 
@@ -101,6 +114,14 @@ module RSpec
           end
         end
       end
+
+      def params_inspect(obj)
+        begin
+          obj.is_a?(Proc) ? obj.to_raw_source : obj.inspect
+        rescue Sourcify::NoMatchingProcError
+          return obj.inspect
+        end
+      end
     end
   end
 

data/spec/parametarized_spec.rb

@@ -33,6 +33,24 @@ describe RSpec::Parameterized do
     end
   end
 
+  describe "lambda parameter" do
+    where(:a, :b, :answer) do
+      [
+        [1 , 2 , -> {should == 3}],
+        [5 , 8 , -> {should == 13}],
+        [0 , 0 , -> {should == 0}]
+      ]
+    end
+
+    with_them do
+      subject {a + b}
+      it "should do additions" do
+        self.instance_exec(&answer)
+      end
+    end
+  end
+
+
   describe "table separated with pipe" do
     where_table(:a, :b, :answer) do
       1         | 2         | 3
@@ -88,4 +106,28 @@ describe RSpec::Parameterized do
       it { should be_is_a Numeric }
     end
   end
+
+  context "when the where has only one parameter to be set" do
+    where(:x) do
+      [1, 2, 3]
+    end
+
+    with_them do
+      it 'can take an array of elements' do
+        x.should == x
+      end
+    end
+  end
+
+  context "when the table has only a row" do
+    where_table(:a, :b, :answer) do
+      1         | 2         | 3
+    end
+
+    with_them do
+      it "a plus b is answer" do
+        (a + b).should == answer
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -875834415
+      hash: -139463347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -875834415
+      hash: -139463347
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24