transpec 2.3.1 → 2.3.2

data/lib/transpec/syntax/mixin/should_base.rb

@@ -21,6 +21,10 @@ module Transpec
           add_matcher RaiseError
         end
 
+        def current_syntax_type
+          @current_syntax_type ||= :should
+        end
+
         def positive?
           method_name == :should
         end

data/lib/transpec/syntax/mixin/useless_and_return.rb

@@ -49,11 +49,7 @@ module Transpec
         end
 
         class RecordBuilder < Transpec::RecordBuilder
-          attr_reader :host
-
-          def initialize(host, *)
-            @host = host
-          end
+          param_names :host
 
           def old_syntax
             syntax = base_syntax

data/lib/transpec/syntax/oneliner_should.rb

@@ -14,13 +14,6 @@ module Transpec
     class OnelinerShould < Syntax
       include Mixin::ShouldBase, RSpecDSL, Util
 
-      attr_reader :current_syntax_type
-
-      def initialize(*)
-        super
-        @current_syntax_type = :should
-      end
-
       def dynamic_analysis_target?
         super && receiver_node.nil? && [:should, :should_not].include?(method_name)
       end
@@ -76,9 +69,8 @@ module Transpec
 
         @example = nil
 
-        node.each_ancestor_node do |node|
-          next unless node.block_type?
-          send_node = node.children[0]
+        node.each_ancestor(:block) do |block_node|
+          send_node = block_node.children[0]
 
           found = Syntax.all_syntaxes.find do |syntax_class|
             next unless syntax_class.ancestors.include?(Mixin::Examplish)
@@ -133,12 +125,7 @@ module Transpec
       end
 
       class ExpectRecordBuilder < RecordBuilder
-        attr_reader :should, :negative_form_of_to
-
-        def initialize(should, negative_form_of_to = nil)
-          @should = should
-          @negative_form_of_to = negative_form_of_to
-        end
+        param_names :should, :negative_form_of_to
 
         def old_syntax
           syntax = 'it { should'
@@ -154,13 +141,7 @@ module Transpec
       end
 
       class HaveRecordBuilder < Have::RecordBuilder
-        attr_reader :should, :negative_form_of_to
-
-        def initialize(should, have, negative_form_of_to = nil)
-          super(have)
-          @should = should
-          @negative_form_of_to = negative_form_of_to
-        end
+        param_names :should, :have, :negative_form_of_to
 
         def old_syntax
           syntax = should.example.description? ? "it '...' do" : 'it {'

data/lib/transpec/syntax/operator.rb

@@ -23,7 +23,7 @@ module Transpec
 
       def initialize(node, expectation, source_rewriter = nil, runtime_data = nil, report = nil)
         operator_node = if node == BE_NODE
-                          node.parent_node
+                          node.parent
                         else
                           node
                         end

data/lib/transpec/syntax/raise_error.rb

@@ -37,11 +37,7 @@ module Transpec
       end
 
       class RecordBuilder < Transpec::RecordBuilder
-        attr_reader :raise_error
-
-        def initialize(raise_error)
-          @raise_error = raise_error
-        end
+        param_names :raise_error
 
         def old_syntax
           syntax = 'expect { }.not_to raise_error('

data/lib/transpec/syntax/rspec_configure/config_modification.rb

@@ -32,9 +32,8 @@ module Transpec
 
           config_method_name = config_method_name.to_sym
 
-          block_node.each_descendent_node.find do |node|
-            next unless node.send_type?
-            receiver_node, method_name, = *node
+          block_node.each_descendant(:send).find do |send_node|
+            receiver_node, method_name, = *send_node
             next unless receiver_node == s(:lvar, block_arg_name)
             method_name == config_method_name
           end

data/lib/transpec/syntax/rspec_configure/framework.rb

@@ -27,9 +27,8 @@ module Transpec
         def block_node
           return @block_node if instance_variable_defined?(:@block_node)
 
-          @block_node = rspec_configure.block_node.each_descendent_node.find do |node|
-            next unless node.block_type?
-            send_node = node.children.first
+          @block_node = rspec_configure.block_node.each_descendant(:block).find do |block_node|
+            send_node = block_node.children.first
             receiver_node, method_name, *_ = *send_node
             next unless receiver_node == s(:lvar, rspec_configure.block_arg_name)
             method_name == block_method_name

data/lib/transpec/syntax/rspec_configure/mocks.rb

@@ -11,12 +11,8 @@ module Transpec
         end
 
         def yield_receiver_to_any_instance_implementation_blocks=(value)
-          # rubocop:disable LineLength
-          #
           # Based on the deprecation warning in RSpec 2.99:
           # https://github.com/rspec/rspec-mocks/blob/aab8dc9/lib/rspec/mocks/message_expectation.rb#L478-L491
-          #
-          # rubocop:enable LineLength
           comment = <<-END.gsub(/^\s+\|/, '').chomp
             |In RSpec 3, `any_instance` implementation blocks will be yielded the receiving
             |instance as the first block argument to allow the implementation block to use

data/lib/transpec/syntax/rspec_configure.rb

@@ -42,14 +42,10 @@ module Transpec
         return if infer_spec_type_from_file_location?
         return unless rspec_rails?
 
-        # rubocop:disable LineLength
-        #
         # Based on the deprecation warning in RSpec 2.99:
         # https://github.com/rspec/rspec-rails/blob/ab6313b/lib/rspec/rails/infer_type_configuration.rb#L13-L22
         # and the Myron's post:
         # http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#filetype_inference_disabled_by_default
-        #
-        # rubocop:enable LineLength
         comment = <<-END.gsub(/^\s+\|/, '').chomp
           |rspec-rails 3 will no longer automatically infer an example group's spec type
           |from the file location. You can explicitly opt-in to the feature using this

data/lib/transpec/syntax/should.rb

@@ -11,8 +11,6 @@ module Transpec
     class Should < Syntax
       include Mixin::ShouldBase, Mixin::MonkeyPatch, Mixin::Expectizable, Util
 
-      attr_reader :current_syntax_type
-
       define_dynamic_analysis do |rewriter|
         register_syntax_availability_analysis_request(
           rewriter,
@@ -21,11 +19,6 @@ module Transpec
         )
       end
 
-      def initialize(*)
-        super
-        @current_syntax_type = :should
-      end
-
       def dynamic_analysis_target?
         super && receiver_node && [:should, :should_not].include?(method_name)
       end
@@ -69,12 +62,7 @@ module Transpec
       end
 
       class RecordBuilder < Transpec::RecordBuilder
-        attr_reader :should, :negative_form_of_to
-
-        def initialize(should, negative_form_of_to)
-          @should = should
-          @negative_form_of_to = negative_form_of_to
-        end
+        param_names :should, :negative_form_of_to
 
         def old_syntax
           syntax = if should.proc_subject?

data/lib/transpec/syntax/should_receive.rb

@@ -162,12 +162,7 @@ module Transpec
       end
 
       class ExpectBaseRecordBuilder < RecordBuilder
-        attr_reader :should_receive, :negative_form_of_to
-
-        def initialize(should_receive, negative_form_of_to)
-          @should_receive = should_receive
-          @negative_form_of_to = negative_form_of_to
-        end
+        param_names :should_receive, :negative_form_of_to
 
         def syntax_name
           fail NotImplementedError
@@ -213,11 +208,7 @@ module Transpec
       end
 
       class StubRecordBuilder < RecordBuilder
-        attr_reader :should_receive
-
-        def initialize(should_receive)
-          @should_receive = should_receive
-        end
+        param_names :should_receive
 
         def old_syntax
           syntax = "obj.#{should_receive.method_name}(:message)"

data/lib/transpec/syntax.rb

@@ -179,7 +179,7 @@ module Transpec
     end
 
     def parent_node
-      node.parent_node
+      node.parent
     end
 
     def expression_range

data/lib/transpec/util.rb

@@ -67,7 +67,7 @@ module Transpec
     end
 
     def block_node_taken_by_method(node)
-      parent_node = node.parent_node
+      parent_node = node.parent
       return nil unless parent_node
       return nil unless parent_node.block_type?
       return nil unless parent_node.children.first.equal?(node)
@@ -104,8 +104,7 @@ module Transpec
 
       yield origin_node if mode == :include_origin
 
-      origin_node.each_ancestor_node.reduce(origin_node) do |child_node, parent_node|
-        return unless [:send, :block].include?(parent_node.type)
+      origin_node.each_ancestor(:send, :block).reduce(origin_node) do |child_node, parent_node|
         return unless parent_node.children.first.equal?(child_node)
 
         if mode == :child_as_second_arg

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/transpec/directory_cloner_spec.rb

@@ -0,0 +1,74 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/directory_cloner'
+
+module Transpec
+  describe DirectoryCloner do
+    include FileHelper
+    include_context 'isolated environment'
+
+    describe '#copy_recursively' do
+      it 'copies files recursively' do
+        [
+          'src/file1',
+          'src/file2',
+          'src/dir1/file',
+          'src/dir2/file'
+        ].each do |path|
+          create_file(path, '')
+        end
+
+        DirectoryCloner.copy_recursively('src', 'dst')
+
+        [
+          'dst/file1',
+          'dst/file2',
+          'dst/dir1/file',
+          'dst/dir2/file'
+        ].each do |path|
+          File.exist?(path).should be_true
+        end
+      end
+
+      it 'copies only directories, files and symlinks' do
+        create_file('src/file', '')
+        File.symlink('file', 'src/symlink')
+        Dir.mkdir('src/dir')
+        system('mkfifo', 'src/fifo')
+
+        DirectoryCloner.copy_recursively('src', 'dst')
+
+        File.file?('dst/file').should be_true
+        File.symlink?('dst/symlink').should be_true
+        File.directory?('dst/dir').should be_true
+        File.exist?('dst/fifo').should be_false
+      end
+
+      def permission(path)
+        format('%o', File.lstat(path).mode)[-4..-1]
+      end
+
+      it 'preserves permission' do
+        create_file('src/file', '')
+        File.chmod(0755, 'src/file')
+
+        File.symlink('file', 'src/symlink')
+
+        Dir.mkdir('src/dir')
+        File.chmod(0600, 'src/dir')
+
+        DirectoryCloner.copy_recursively('src', 'dst')
+
+        permission('dst/file').should == '0755'
+        permission('dst/dir').should == '0600'
+      end
+
+      it 'returns the copied directory path' do
+        Dir.mkdir('src')
+        path = DirectoryCloner.copy_recursively('src', 'dst')
+        path.should == File.expand_path('dst')
+      end
+    end
+  end
+end

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -247,62 +247,5 @@ module Transpec
         end
       end
     end
-
-    describe '#copy_recursively' do
-      it 'copies files recursively' do
-        [
-          'src/file1',
-          'src/file2',
-          'src/dir1/file',
-          'src/dir2/file'
-        ].each do |path|
-          create_file(path, '')
-        end
-
-        dynamic_analyzer.copy_recursively('src', 'dst')
-
-        [
-          'dst/file1',
-          'dst/file2',
-          'dst/dir1/file',
-          'dst/dir2/file'
-        ].each do |path|
-          File.exist?(path).should be_true
-        end
-      end
-
-      it 'copies only directories, files and symlinks' do
-        create_file('src/file', '')
-        File.symlink('file', 'src/symlink')
-        Dir.mkdir('src/dir')
-        system('mkfifo', 'src/fifo')
-
-        dynamic_analyzer.copy_recursively('src', 'dst')
-
-        File.file?('dst/file').should be_true
-        File.symlink?('dst/symlink').should be_true
-        File.directory?('dst/dir').should be_true
-        File.exist?('dst/fifo').should be_false
-      end
-
-      def permission(path)
-        format('%o', File.lstat(path).mode)[-4..-1]
-      end
-
-      it 'preserves permission' do
-        create_file('src/file', '')
-        File.chmod(0755, 'src/file')
-
-        File.symlink('file', 'src/symlink')
-
-        Dir.mkdir('src/dir')
-        File.chmod(0600, 'src/dir')
-
-        dynamic_analyzer.copy_recursively('src', 'dst')
-
-        permission('dst/file').should == '0755'
-        permission('dst/dir').should == '0600'
-      end
-    end
   end
 end

data/spec/transpec/spec_suite_spec.rb

@@ -84,8 +84,8 @@ module Transpec
         let(:main_rspec_configure_node) do
           spec_suite.specs.each do |spec|
             next unless spec.path == 'spec/spec_helper.rb'
-            spec.ast.each_node do |node|
-              return node if node.send_type? && node.children[1] == :configure
+            spec.ast.each_node(:send) do |send_node|
+              return send_node if send_node.children[1] == :configure
             end
           end
           fail 'Main RSpec.configure node not found!'

data/spec/transpec/static_context_inspector_spec.rb

@@ -160,11 +160,6 @@ module Transpec
       end
 
       def eval_with_rspec_in_context(eval_source, spec_source)
-        # Clear SPEC_OPTS environment variable so that this spec does not fail
-        # with dynamic analysis in self-testing.
-        original_spec_opts = ENV['SPEC_OPTS']
-        ENV['SPEC_OPTS'] = nil
-
         result_path = 'result'
 
         helper_source = <<-END
@@ -182,8 +177,6 @@ module Transpec
         `rspec #{source_path}`
 
         Marshal.load(File.read(result_path))
-      ensure
-        ENV['SPEC_OPTS'] = original_spec_opts
       end
 
       describe '#non_monkey_patch_expectation_available?' do

data/spec/transpec/syntax/current_example_spec.rb

@@ -13,13 +13,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            next unless method_name == :example
-            return node
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :example
           end
-          fail 'No #example node is found!'
         end
 
         let(:current_example_object) do

data/spec/transpec/syntax/double_spec.rb

@@ -11,13 +11,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            next unless method_name == :double
-            return node
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :double
           end
-          fail 'No #double node is found!'
         end
 
         let(:double_object) do

data/spec/transpec/syntax/example_group_spec.rb

@@ -2,10 +2,12 @@
 
 require 'spec_helper'
 require 'transpec/syntax/example_group'
+require 'ast'
 
 module Transpec
   class Syntax
     describe ExampleGroup do
+      include ::AST::Sexp
       include_context 'parsed objects'
       include_context 'syntax object', ExampleGroup, :example_group
 
@@ -182,6 +184,75 @@ module Transpec
         end
       end
 
+      describe '#metadata_key_nodes' do
+        subject { example_group.metadata_key_nodes }
+
+        context "with expression `describe 'something' { }`" do
+          let(:source) do
+            <<-END
+              describe 'example' do
+              end
+            END
+          end
+
+          it 'returns empty array' do
+            should be_empty
+          end
+        end
+
+        context "with expression `describe 'something', '#some_method' { }`" do
+          let(:source) do
+            <<-END
+              describe 'something', '#some_method' do
+              end
+            END
+          end
+
+          it 'returns empty array' do
+            should be_empty
+          end
+        end
+
+        context "with expression `describe 'something', :foo { }`" do
+          let(:source) do
+            <<-END
+              describe 'something', :foo do
+              end
+            END
+          end
+
+          it 'returns [(sym :foo)]' do
+            should == [s(:sym, :foo)]
+          end
+        end
+
+        context "with expression `describe 'something', foo: true { }`" do
+          let(:source) do
+            <<-END
+              describe 'something', foo: true do
+              end
+            END
+          end
+
+          it 'returns [(sym :foo)]' do
+            should == [s(:sym, :foo)]
+          end
+        end
+
+        context "with expression `describe 'something', :foo, :bar, baz: true { }`" do
+          let(:source) do
+            <<-END
+              describe 'something', :foo, :bar, baz: true do
+              end
+            END
+          end
+
+          it 'returns [s(:sym, :foo), s(:sym, :bar), s(:sym, :baz)]' do
+            should == [s(:sym, :foo), s(:sym, :bar), s(:sym, :baz)]
+          end
+        end
+      end
+
       describe '#add_explicit_type_metadata!' do
         before do
           example_group.add_explicit_type_metadata!
@@ -280,7 +351,31 @@ module Transpec
                 END
               end
 
-              it 'adds metadata ":type => :controller"' do
+              it 'adds metadata ":type => :controller" to the beginning of the hash metadata' do
+                rewritten_source.should == expected_source
+              end
+            end
+          end
+
+          context "and expression `describe 'something', '#some_method', :foo, :bar => true do ... end`" do
+            let(:source) do
+              <<-END
+                  describe 'something', '#some_method', :foo, :bar => true do
+                  end
+              END
+            end
+
+            context 'and the file path is "spec/controllers/some_spec.rb"' do
+              let(:source_path) { 'spec/controllers/some_spec.rb' }
+
+              let(:expected_source) do
+                <<-END
+                  describe 'something', '#some_method', :foo, :type => :controller, :bar => true do
+                  end
+                END
+              end
+
+              it 'adds metadata ":type => :controller" to the beginning of the hash metadata' do
                 rewritten_source.should == expected_source
               end
             end

data/spec/transpec/syntax/example_spec.rb

@@ -15,12 +15,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            return node if method_name == :pending
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :pending
           end
-          fail 'No #pending node is found!'
         end
 
         let(:example_object) do

data/spec/transpec/syntax/expect_spec.rb

@@ -11,13 +11,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:target_node) do
-          ast.each_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            next unless method_name == :expect
-            return node
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :expect
           end
-          fail 'No #expect node is found!'
         end
 
         let(:expect_object) do

data/spec/transpec/syntax/have_spec.rb

@@ -74,12 +74,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:should_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            return node if method_name == :should
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :should
           end
-          fail 'No #should node is found!'
         end
 
         let(:should_object) do

data/spec/transpec/syntax/its_spec.rb

@@ -13,12 +13,10 @@ module Transpec
 
       describe '#conversion_target?' do
         let(:its_node) do
-          ast.each_descendent_node do |node|
-            next unless node.send_type?
-            method_name = node.children[1]
-            return node if method_name == :its
+          ast.each_node(:send).find do |send_node|
+            method_name = send_node.children[1]
+            method_name == :its
           end
-          fail 'No #its node is found!'
         end
 
         let(:its_object) do