rspec-parameterized 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff30f7544b6df92c5886fa92c44d40f49c602ce
-  data.tar.gz: 31b86112cf15b6540876b2d31f2c5a84ef701889
+  metadata.gz: 5b1e47f21d0fa2e6268bb78df5922518f9adb747
+  data.tar.gz: 8897c535ddd9f8fec343989981e1939c43b32ddf
 SHA512:
-  metadata.gz: 5edaf41862d9f151f14364f981ea9c44423b1134956ee788e1675ce9f3902a2932ddced532d6a588a59be3527c9212114910d144d29588a494a40a39edfefa39
-  data.tar.gz: f51339e6c2bf33e5d579f044199515bb92600043a8975ea981512d4ceb3f32969d9eff12d12d63af810524f9a589305915093806e39cff28462734927228fdde
+  metadata.gz: febab443a471a5a06141f9b3d995c68d19d62ac9eabc3a892114f777910f5bcf9403153c1cf4ac6d80b22b23c7feb091ada7fb3d004d8fd99c3997ef33a3a140
+  data.tar.gz: 4fdb021af367becb415dfa560b530a34b8003c774b40c9fe75728c1d2ee3a0959b3cfddb2ab872ec1a46f220762fcf27a9bab9926dcd0fe35afa65549711a7a8

data/.travis.yml

@@ -1,10 +1,9 @@
 sudo: false
 rvm:
-  - 2.1
   - 2.2
+  - 2.3.0
 
 gemfile:
   - gemfiles/rspec2.gemfile
-  - gemfiles/rspec3.gemfile
-  - gemfiles/rspec3.2.gemfile
   - gemfiles/rspec3.3.gemfile
+  - gemfiles/rspec3.4.gemfile

data/README.md

@@ -18,6 +18,14 @@ describe "plus" do
       expect(a + b).to eq answer
     end
   end
+
+  with_them do
+    # Can browse parameters via `params` method in with_them block
+    # Can browse all parameters via `all_params` method in with_them block
+    it "#{params[:a]} + #{params[:b]} == #{params[:answer]}" do
+      expect(a + b).to eq answer
+    end
+  end
 end
 
 # Hash and Array Style

data/Rakefile

@@ -11,17 +11,19 @@ begin
 end
 
 namespace :spec do
-  %w(rspec2 rspec3 rspec3.2).each do |gemfile|
+  %w(rspec2 rspec3.3 rspec3.4).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"
+      Bundler.with_clean_env do
+        sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle install --path .bundle"
+        sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      end
     end
   end
 
   desc "Run All Tests"
   task :all do
-    %w(rspec2 rspec3 rspec3.2).each do |gemfile|
+    %w(rspec2 rspec3.3 rspec3.4).each do |gemfile|
       Rake::Task["spec:#{gemfile}"].invoke
     end
   end

data/gemfiles/{rspec3.2.gemfile → rspec3.4.gemfile}

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

data/lib/rspec/parameterized.rb

@@ -10,10 +10,10 @@ module RSpec
     module ExampleGroupMethods
       # capsulize parameter attributes
       class Parameter
-        attr_reader :arg_names, :table_format, :block
+        attr_reader :arg_names, :block
 
-        def initialize(arg_names, table_format, &block)
-          @arg_names, @table_format, @block = arg_names, table_format, block
+        def initialize(arg_names, &block)
+          @arg_names, @block = arg_names, block
         end
       end
 
@@ -43,31 +43,14 @@ module RSpec
           params = args[0]
           first, *rest = params.values
 
-          set_parameters(params.keys, false) {
+          set_parameters(params.keys) {
             first.product(*rest)
           }
         else
-          set_parameters(args, false, &b)
+          set_parameters(args, &b)
         end
       end
 
-      # Set parameters to be bound in specs under this example group.
-      # You can separate fields with | like a cucumber table.
-      #
-      # ## Example
-      #
-      #     where_table(:a, :b, :answer) do
-      #       1 | 2 | 3
-      #       5 | 8 | 13
-      #       0 | 0 | 0
-      #     end
-      #
-      def where_table(*args, &b)
-        warn "deprecated: `where_table` method is deprecated. Please use `using RSpec::Parameterized::TableSyntax`"
-        warn caller.first
-        set_parameters(args, true, &b)
-      end
-
       # Use parameters to execute the block.
       # The given block is converted into +describe+s for each parameter set.
       #
@@ -88,8 +71,8 @@ module RSpec
       end
 
       private
-      def set_parameters(arg_names, table_format, &b)
-        @parameter = Parameter.new(arg_names, table_format, &b)
+      def set_parameters(arg_names, &b)
+        @parameter = Parameter.new(arg_names, &b)
 
         if @parameterized_pending_cases
           @parameterized_pending_cases.each { |e|
@@ -98,68 +81,42 @@ module RSpec
         end
       end
 
-      def separate_table_like_block(b)
-        ast = b.to_ast
-        inner_ast = ast.children[2]
-        if inner_ast.type == :send
-          lines = [inner_ast]
-        else
-          lines = inner_ast.children
-        end
-
-        lines.map do |node|
-          if node.type == :send
-            buf = []
-            extract_value(node, buf)
-            buf.reverse
-          end
-        end
-      end
-
-      def extract_value(node, buf)
-        receiver, method, arg = node.children
-
-        if method == :|
-          buf << eval_source_fragment(Unparser.unparse(arg))
-        end
-
-        if receiver.is_a?(AST::Node) && receiver.type == :send && receiver.children[1] == :|
-          extract_value(receiver, buf)
-        else
-          buf << eval_source_fragment(Unparser.unparse(receiver))
-        end
-      end
-
-      def eval_source_fragment(source_fragment)
-        instance = new  # for evaluate let methods.
-        if defined?(self.superclass::LetDefinitions)
-          instance.extend self.superclass::LetDefinitions
-        end
-        instance.instance_eval(source_fragment)
-      end
-
       def define_cases(parameter, *args, &block)
         instance = new  # for evaluate let methods.
         if defined?(self.superclass::LetDefinitions)
           instance.extend self.superclass::LetDefinitions
         end
 
-        if parameter.table_format
-          param_sets = separate_table_like_block(parameter.block)
-        else
-          extracted = instance.instance_eval(&parameter.block)
-          param_sets = extracted.is_a?(Array) ? extracted : extracted.to_params
-        end
+        extracted = instance.instance_eval(&parameter.block)
+        param_sets = extracted.is_a?(Array) ? extracted : extracted.to_params
 
         # for only one parameters
         param_sets = param_sets.map { |x| Array[x] } if !param_sets[0].is_a?(Array)
 
-        param_sets.each do |params|
-          pairs = [parameter.arg_names, params].transpose
-          pretty_params = pairs.map {|t| "#{t[0]}: #{params_inspect(t[1])}"}.join(", ")
+        param_sets.each do |param_set|
+          pairs = [parameter.arg_names, param_set].transpose.to_h
+          pretty_params = pairs.map {|name, val| "#{name}: #{params_inspect(val)}"}.join(", ")
           describe(pretty_params, *args) do
-            pairs.each do |n|
-              let(n[0]) { n[1] }
+            pairs.each do |name, val|
+              let(name) { val }
+            end
+
+            singleton_class.module_eval do
+              if respond_to?(:params)
+                warn "ExampleGroup.params method is overrided."
+              end
+
+              define_method(:params) do
+                pairs
+              end
+
+              if respond_to?(:all_params)
+                warn "ExampleGroup.all_params method is overrided."
+              end
+
+              define_method(:all_params) do
+                param_sets
+              end
             end
 
             module_eval(&block)

data/lib/rspec/parameterized/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Parameterized
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/parametarized_spec.rb

@@ -26,6 +26,12 @@ describe RSpec::Parameterized do
       end
     end
 
+    with_them do
+      it "#{params[:a]} + #{params[:b]} == #{params[:answer]}" do
+        expect(a + b).to eq answer
+      end
+    end
+
     with_them pending: "PENDING" do
       it "should do additions" do
         expect(a + b).to == answer
@@ -60,20 +66,6 @@ describe RSpec::Parameterized do
     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 "a plus b is answer" do
-        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
@@ -162,18 +154,6 @@ describe RSpec::Parameterized do
     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
-        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
@@ -224,19 +204,6 @@ describe RSpec::Parameterized do
         end
       end
 
-      describe "child 2 (where_table)" do
-        where_table(: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
-
       if RUBY_VERSION >= "2.1"
         describe "child 3 (Using TableSyntax)" do
           using RSpec::Parameterized::TableSyntax

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tomykaira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,9 +115,8 @@ files:
 - README.md
 - Rakefile
 - gemfiles/rspec2.gemfile
-- gemfiles/rspec3.2.gemfile
 - gemfiles/rspec3.3.gemfile
-- gemfiles/rspec3.gemfile
+- gemfiles/rspec3.4.gemfile
 - lib/rspec-parameterized.rb
 - lib/rspec/parameterized.rb
 - lib/rspec/parameterized/table.rb
@@ -145,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec::Parameterized supports simple parameterized test syntax in rspec.

data/gemfiles/rspec3.gemfile

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