rspec-parameterized 0.0.1 → 0.0.2

data/lib/rspec/parameterized/version.rb

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

data/lib/rspec/parameterized.rb

@@ -1,4 +1,6 @@
 require "rspec/parameterized/version"
+require 'ruby2ruby'
+require 'sourcify'
 
 module RSpec
   module Parameterized
@@ -17,8 +19,22 @@ module RSpec
       #     end
       #
       def where(*args, &b)
-        @arg_names = args
-        @param_sets = b.call
+        set_parameters(args, b.call)
+      end
+
+      # Set parameters to be bound in specs under this example group.
+      # You can separate fields with | like a cucumber table.
+      #
+      # ## Example
+      #
+      #     where(:a, :b, :answer) do
+      #       1 | 2 | 3
+      #       5 | 8 | 13
+      #       0 | 0 | 0
+      #     end
+      #
+      def where_table(*args, &b)
+        set_parameters(args, separate_table_like_block(b))
       end
 
       # Use parameters to execute the block.
@@ -31,9 +47,51 @@ module RSpec
       #       end
       #     end
       #
-      def with_them(*args, &block)
-        arg_names = @arg_names
-        @param_sets.each do |params|
+      def with_them(*args, &b)
+        if @arg_names.nil? || @param_sets.nil?
+          @parameterized_pending_cases ||= []
+          @parameterized_pending_cases << [args, b]
+        else
+          define_cases(@arg_names, @param_sets, *args, &b)
+        end
+      end
+
+      private
+      def set_parameters(arg_names, param_sets)
+        @arg_names = arg_names
+        @param_sets = param_sets
+        if @parameterized_pending_cases
+          @parameterized_pending_cases.each { |e|
+            define_cases(arg_names, param_sets, *e[0], &e[1])
+          }
+        end
+      end
+
+      def separate_table_like_block(b)
+        sexp = b.to_sexp(:strip_enclosure => true)
+
+        lines = sexp.find_nodes(:call)
+        lines.map do |l|
+          rev_insts = []
+          while l.sexp_type == :call and l[2] == :|
+            rev_insts << eval_sexp(l[3][1])
+            l = l[1]
+          end
+          rev_insts << eval_sexp(l)
+          rev_insts.reverse
+        end
+      end
+
+      def eval_sexp(sexp)
+        self.instance_eval(ruby2ruby.process(sexp))
+      end
+
+      def ruby2ruby
+        @ruby2ruby ||= Ruby2Ruby.new
+      end
+
+      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|
               let(n[0]) { n[1] }

data/rspec-parameterized.gemspec

@@ -10,6 +10,8 @@ I was inspired by [udzura's mock](https://gist.github.com/1881139).}
   gem.homepage      = ""
 
   gem.add_dependency('rspec', '~>2.10.0')
+  gem.add_dependency('sourcify', '~> 0.5.0')
+  gem.add_dependency('ruby2ruby', '~> 1.3.1')
   gem.add_development_dependency('rake')
 
   gem.files         = `git ls-files`.split($\)

data/spec/parametarized_spec.rb

@@ -11,27 +11,81 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 #         should do additions
 
 describe RSpec::Parameterized do
-  describe "Sample" do
-    describe "plus" do
-      where(:a, :b, :answer) do
-        [
-          [1 , 2 , 3],
-          [5 , 8 , 13],
-          [0 , 0 , 0]
-        ]
+  describe "where and with_them" do
+    where(:a, :b, :answer) do
+      [
+        [1 , 2 , 3],
+        [5 , 8 , 13],
+        [0 , 0 , 0]
+      ]
+    end
+
+    with_them do
+      it "should do additions" do
+        (a + b).should == answer
+      end
+    end
+
+    with_them :pending do
+      it "should do additions" do
+        (a + b).should == answer
       end
+    end
+  end
+
+  describe "table separated with pipe" do
+    where_table(:a, :b, :answer) do
+      1         | 2         | 3
+      "hello "  | "world"   | "hello world"
+      [1, 2, 3] | [4, 5, 6] | [1, 2, 3, 4, 5, 6]
+    end
 
-      with_them do
-        it "should do additions" do
-          (a + b).should == answer
-        end
+    with_them do
+      it "a plus b is answer" do
+        (a + b).should == answer
       end
+    end
+  end
 
-      with_them :pending do
-        it "should do additions" do
-          (a + b).should == answer
-        end
+  context "when the where block is after with_them" do
+    with_them do
+      it "should do additions" do
+        (a + b).should == answer
       end
     end
+
+    with_them do
+      subject { a }
+      it { should be_is_a Numeric }
+    end
+
+    where(:a, :b, :answer) do
+      [
+        [1 , 2 , 3],
+        [5 , 8 , 13],
+        [0 , 0 , 0]
+      ]
+    end
+  end
+
+  context "when the where block is between with_thems" do
+    with_them do
+      it "should do additions" do
+        (a + b).should == answer
+      end
+    end
+
+    where(:a, :b, :answer) do
+      [
+        [1 , 2 , 3],
+        [5 , 8 , 13],
+        [0 , 0 , 0]
+      ]
+    end
+
+    with_them do
+      subject { a }
+      it { should be_is_a Numeric }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.0
+- !ruby/object:Gem::Dependency
+  name: sourcify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -316469805
+      hash: -875834415
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -316469805
+      hash: -875834415
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24