rspec-parameterized 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d776a568792d33ea0eaa01f39705ca68cff76078
-  data.tar.gz: fdbb572188d277665e6dd1f6d163464c6cb26425
+  metadata.gz: 24dea93292aa96d393a92768be187af611221e77
+  data.tar.gz: 68e63fb870c354828faf43f206bec637409fe720
 SHA512:
-  metadata.gz: 46bd4b1d00517f8cc4a68fe57e31615ec2495d6cb28c6e0c384aa40d5494debe0518ed531eeafbea37cde2c5dfa80f0d2ec18ea9a5a9e2aaead35a7e98e2582f
-  data.tar.gz: d7c3acaff5f7e3cf2f9878d58022399bdf0107892cfe0dd65dfd5a7ffab00a116c6b3dc7940be9c0b8633e62e16664d11b146b27abb87bdaeb3baffefa53750c
+  metadata.gz: 628f3013962c640461b7924e464b53a756baaf2d1a609662b72b8492daa7947eb565229bcff5eca7aa84a0713afe4d9b88c5d9ab8ec796ee40be6e7c590c48a5
+  data.tar.gz: c3d753b0284206cf8e659078a153cce04cdecbaa786c3592ce644a0c7e969a2373b00f7bbb39928d0114f67051c476aef6ce06c5c2eab31cf2b0886e50cfb20f

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+gemfiles/*.lock
+gemfiles/.bundle

data/.travis.yml

@@ -2,6 +2,11 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
+
+gemfile:
+  - gemfiles/rspec2.gemfile
+  - gemfiles/rspec3.gemfile
+
 matrix:
   allow_failures:
    - rvm: 1.9.3

data/README.md

@@ -2,21 +2,39 @@
 
 Support simple parameterized test syntax in rspec.
 
-    describe "plus" 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
+```ruby
+describe "plus" 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
+end
+
+describe "plus" do
+  using RSpec::Parameterized::TableSyntax
+
+  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
+end
+```
 
 I was inspired by [udzura's mock](https://gist.github.com/1881139).
 

data/Rakefile

@@ -6,6 +6,23 @@ begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = 'spec/**/*_spec.rb'
-    spec.rspec_opts = ['-cfs']
+    spec.rspec_opts = ['-c -f d']
+  end
+end
+
+namespace :spec do
+  %w(rspec2 rspec3).each do |gemfile|
+    desc "Run Tests by #{gemfile}.gemfile"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle install --path .bundle"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+    end
+  end
+
+  desc "Run All Tests"
+  task :all do
+    %w(rspec2 rspec3).each do |gemfile|
+      Rake::Task["spec:#{gemfile}"].invoke
+    end
   end
 end

data/gemfiles/rspec2.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rspec", "~> 2.14"
+
+gemspec path: "../"

data/gemfiles/rspec3.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rspec", ">= 3.0.0.rc1", "< 3.1"
+
+gemspec path: "../"

data/lib/rspec/parameterized.rb

@@ -5,8 +5,9 @@ require 'proc_to_ast'
 
 module RSpec
   module Parameterized
-    module ExampleGroupMethods
+    autoload :TableSyntax, 'rspec/parameterized/table_syntax'
 
+    module ExampleGroupMethods
       # capsulize parameter attributes
       class Parameter
         attr_reader :arg_names, :table_format, :block
@@ -18,7 +19,7 @@ module RSpec
 
       # Set parameters to be bound in specs under this example group.
       #
-      # ## Example
+      # ## Example1
       #
       #     where(:a, :b, :answer) do
       #       [
@@ -28,6 +29,14 @@ module RSpec
       #       ]
       #     end
       #
+      # ## Example2
+      #     using RSpec::Parameterized::TableSyntax
+      #     where(:a, :b, :answer) do
+      #       1 | 2 | 3 >
+      #       5 | 8 | 13 >
+      #       0 | 0 | 0
+      #     end
+      #
       def where(*args, &b)
         set_parameters(args, false, &b)
       end
@@ -117,10 +126,6 @@ module RSpec
         instance.instance_eval(source_fragment)
       end
 
-      def ruby2ruby
-        @ruby2ruby ||= Ruby2Ruby.new
-      end
-
       def define_cases(parameter, *args, &block)
         instance = new  # for evaluate let methods.
         if defined?(self.superclass::LetDefinitions)
@@ -130,7 +135,8 @@ module RSpec
         if parameter.table_format
           param_sets = separate_table_like_block(parameter.block)
         else
-          param_sets = instance.instance_eval(&parameter.block)
+          extracted = instance.instance_eval(&parameter.block)
+          param_sets = extracted.is_a?(Array) ? extracted : extracted.to_params
         end
 
         # for only one parameters

data/lib/rspec/parameterized/table.rb

@@ -0,0 +1,49 @@
+module RSpec
+  module Parameterized
+    class Table
+      attr_reader :last_row
+
+      def initialize
+        @rows = []
+        @last_row = nil
+      end
+
+      def add_row(row)
+        unless @rows.find {|r| r.object_id == row.object_id}
+          @rows << row
+          @last_row = row
+        end
+        self
+      end
+
+      def add_param_to_last_row(param)
+        last_row.add_param(param)
+        self
+      end
+      alias :| :add_param_to_last_row
+
+      def to_a
+        @rows.map(&:to_a)
+      end
+      alias :to_params :to_a
+
+      class Row
+        def initialize(param)
+          @params = [param]
+        end
+
+        def add_param(param)
+          @params << param
+        end
+
+        def to_a
+          @params
+        end
+
+        def to_params
+          [@params]
+        end
+      end
+    end
+  end
+end

data/lib/rspec/parameterized/table_syntax.rb

@@ -0,0 +1,43 @@
+require 'binding_of_caller'
+require 'rspec/parameterized/table'
+
+module RSpec
+  module Parameterized
+    module TableSyntaxImplement
+      def |(other)
+        where_binding = binding.of_caller(1)          # get where block binding
+        caller_instance = eval("self", where_binding) # get caller instance (ExampleGroup)
+
+        if caller_instance.instance_variable_defined?(:@__parameter_table)
+          table = caller_instance.instance_variable_get(:@__parameter_table)
+        else
+          table = RSpec::Parameterized::Table.new
+          caller_instance.instance_variable_set(:@__parameter_table, table)
+        end
+
+        row = Table::Row.new(self)
+        table.add_row(row)
+        row.add_param(other)
+        table
+      end
+    end
+
+    module TableSyntax
+      refine Object do
+        include TableSyntaxImplement
+      end
+
+      refine Fixnum do
+        include TableSyntaxImplement
+      end
+
+      refine Bignum do
+        include TableSyntaxImplement
+      end
+
+      refine Array do
+        include TableSyntaxImplement
+      end
+    end
+  end
+end

data/lib/rspec/parameterized/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Parameterized
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

data/rspec-parameterized.gemspec

@@ -9,10 +9,11 @@ Gem::Specification.new do |gem|
 I was inspired by [udzura's mock](https://gist.github.com/1881139).}
   gem.homepage      = ""
 
-  gem.add_dependency('rspec', '~> 2.13')
+  gem.add_dependency('rspec', '>= 2.13', '< 4')
   gem.add_dependency('parser')
   gem.add_dependency('unparser')
   gem.add_dependency('proc_to_ast')
+  gem.add_dependency('binding_of_caller')
   gem.add_development_dependency('rake')
 
   gem.files         = `git ls-files`.split($\)

data/spec/parametarized_spec.rb

@@ -22,13 +22,13 @@ describe RSpec::Parameterized do
 
     with_them do
       it "should do additions" do
-        (a + b).should == answer
+        expect(a + b).to eq answer
       end
     end
 
-    with_them :pending do
+    with_them pending: "PENDING" do
       it "should do additions" do
-        (a + b).should == answer
+        expect(a + b).to == answer
       end
     end
   end
@@ -50,7 +50,6 @@ describe RSpec::Parameterized do
     end
   end
 
-
   describe "table separated with pipe" do
     where_table(:a, :b, :answer) do
       1         | 2         | 3
@@ -60,7 +59,41 @@ describe RSpec::Parameterized do
 
     with_them do
       it "a plus b is answer" do
-        (a + b).should == answer
+        expect(a + b).to eq answer
+      end
+    end
+  end
+
+  if RUBY_VERSION >= "2.1"
+    describe "table separated with pipe (using TableSyntax)" do
+      using RSpec::Parameterized::TableSyntax
+
+      where(: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 "a plus b is answer" do
+          expect(a + b).to eq answer
+        end
+      end
+    end
+
+    describe "table separated with pipe and lambda parameter (using TableSyntax)" do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:a, :b, :matcher) do
+        1         | 2         | -> { eq(3) }
+        "hello "  | "world"   | -> { eq("hello world") }
+        [1, 2, 3] | [4, 5, 6] | -> { be_a(Array) }
+      end
+
+      with_them do
+        it "a plus b is answer" do
+          expect(a + b).to instance_exec(&matcher)
+        end
       end
     end
   end
@@ -68,13 +101,13 @@ describe RSpec::Parameterized do
   context "when the where block is after with_them" do
     with_them do
       it "should do additions" do
-        (a + b).should == answer
+        expect(a + b).to eq answer
       end
     end
 
     with_them do
       subject { a }
-      it { should be_is_a Numeric }
+      it { should be_a Numeric }
     end
 
     where(:a, :b, :answer) do
@@ -89,7 +122,7 @@ describe RSpec::Parameterized do
   context "when the where block is between with_thems" do
     with_them do
       it "should do additions" do
-        (a + b).should == answer
+        expect(a + b).to eq answer
       end
     end
 
@@ -103,7 +136,7 @@ describe RSpec::Parameterized do
 
     with_them do
       subject { a }
-      it { should be_is_a Numeric }
+      it { should be_a Numeric }
     end
   end
 
@@ -114,7 +147,7 @@ describe RSpec::Parameterized do
 
     with_them do
       it 'can take an array of elements' do
-        x.should == x
+        expect(x).to eq x
       end
     end
   end
@@ -126,7 +159,23 @@ describe RSpec::Parameterized do
 
     with_them do
       it "a plus b is answer" do
-        (a + b).should == answer
+        expect(a + b).to eq answer
+      end
+    end
+  end
+
+  if RUBY_VERSION >= "2.1"
+    context "when the table has only a row (using TableSyntax)" do
+      using RSpec::Parameterized::TableSyntax
+
+      where(:a, :b, :answer) do
+        1         | 2         | 3
+      end
+
+      with_them do
+        it "a plus b is answer" do
+          expect(a + b).to eq answer
+        end
       end
     end
   end
@@ -146,7 +195,7 @@ describe RSpec::Parameterized do
 
         with_them do
           it "a plus b is answer" do
-            (a + b).should == answer
+            expect(a + b).to eq answer
           end
         end
       end
@@ -159,21 +208,40 @@ describe RSpec::Parameterized do
 
         with_them do
           it "a plus b is answer" do
-            (a + b).should == answer
+            expect(a + b).to eq answer
+          end
+        end
+      end
+
+      if RUBY_VERSION >= "2.1"
+        describe "child 3 (Using TableSyntax)" do
+          using RSpec::Parameterized::TableSyntax
+
+          where(:a, :b, :answer) do
+            1         | 2         | 3
+            five      | eight     | 13
+          end
+
+          with_them do
+            it "a plus b is answer" do
+              expect(a + b).to eq answer
+            end
           end
         end
       end
 
       let(:eq_matcher) { eq(13) }
       describe "child 3 (use matcher)" do
-        where_table(:a, :b, :answer) do
-          1         | 2         | eq(3)
-          five      | eight     | eq_matcher
+        where(:a, :b, :matcher) do
+          [
+            [1    , 2     , eq(3) ],
+            [five , eight , eq_matcher],
+          ]
         end
 
         with_them do
           it "a plus b is answer" do
-            (a + b).should answer
+            expect(a + b).to matcher
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rspec-parameterized'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :current
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - tomykaira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +114,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rspec2.gemfile
+- gemfiles/rspec3.gemfile
 - lib/rspec-parameterized.rb
 - lib/rspec/parameterized.rb
+- lib/rspec/parameterized/table.rb
+- lib/rspec/parameterized/table_syntax.rb
 - lib/rspec/parameterized/version.rb
 - rspec-parameterized.gemspec
 - spec/parametarized_spec.rb