transpec 1.8.0 → 1.9.0

data/spec/transpec/syntax/should_receive_spec.rb

@@ -937,6 +937,44 @@ module Transpec
         end
       end
 
+      describe '#remove_useless_and_return!' do
+        before do
+          should_receive_object.remove_useless_and_return!
+        end
+
+        context 'when it is `subject.should_receive(:method).and_return { value }` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'receives #foo and returns 1' do
+                  subject.should_receive(:foo).and_return { 1 }
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'receives #foo and returns 1' do
+                  subject.should_receive(:foo) { 1 }
+                end
+              end
+            END
+          end
+
+          it 'converts into `subject.should_receive(:method) { value }` form' do
+            rewritten_source.should == expected_source
+          end
+
+          it 'adds record ' \
+             '`obj.should_receive(:message).and_return { value }` -> `obj.should_receive(:message) { value }`' do
+            record.original_syntax.should  == 'obj.should_receive(:message).and_return { value }'
+            record.converted_syntax.should == 'obj.should_receive(:message) { value }'
+          end
+        end
+      end
+
       describe '#add_receiver_arg_to_any_instance_implementation_block!' do
         before do
           should_receive_object.add_receiver_arg_to_any_instance_implementation_block!

data/spec/transpec/syntax/should_spec.rb

@@ -12,7 +12,9 @@ module Transpec
       let(:record) { should_object.report.records.first }
 
       describe '#matcher_node' do
-        context 'when it is taking operator matcher' do
+        let(:matcher_name) { should_object.matcher_node.children[1] }
+
+        context 'when the matcher is operator' do
           let(:source) do
             <<-END
               describe 'example' do
@@ -23,22 +25,12 @@ module Transpec
             END
           end
 
-          # (block
-          #   (send nil :it
-          #     (str "is 1"))
-          #   (args)
-          #   (send
-          #     (send
-          #       (send nil :subject) :should) :==
-          #     (int 1)))
-
-          it 'returns its parent node' do
-            should_object.parent_node.children[1].should == :==
-            should_object.matcher_node.should == should_object.parent_node
+          it 'returns the matcher node' do
+            matcher_name.should == :==
           end
         end
 
-        context 'when it is taking non-operator matcher without argument' do
+        context 'when the matcher is not operator' do
           let(:source) do
             <<-END
               describe 'example' do
@@ -49,43 +41,40 @@ module Transpec
             END
           end
 
-          # (block
-          #   (send nil :it
-          #     (str "is empty"))
-          #   (args)
-          #   (send
-          #     (send nil :subject) :should
-          #     (send nil :be_empty)))
-
-          it 'returns its argument node' do
-            should_object.arg_node.children[1].should == :be_empty
-            should_object.matcher_node.should == should_object.arg_node
+          it 'returns the matcher node' do
+            matcher_name.should == :be_empty
           end
         end
 
-        context 'when it is taking non-operator matcher with argument' do
+        context 'when the matcher is chained by another method' do
           let(:source) do
             <<-END
               describe 'example' do
-                it 'is 1' do
-                  subject.should eq(1)
+                it 'has 2 items' do
+                  subject.should have(2).items
                 end
               end
             END
           end
 
-          # (block
-          #   (send nil :it
-          #     (str "is 1"))
-          #   (args)
-          #   (send
-          #     (send nil :subject) :should
-          #     (send nil :eq
-          #       (int 1))))
+          it 'returns the matcher node' do
+            matcher_name.should == :have
+          end
+        end
+
+        context 'when the matcher is chained by another method that is taking a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  subject.should have(2).items { }
+                end
+              end
+            END
+          end
 
-          it 'returns its argument node' do
-            should_object.arg_node.children[1].should == :eq
-            should_object.matcher_node.should == should_object.arg_node
+          it 'returns the first node of the chain' do
+            matcher_name.should == :have
           end
         end
       end

data/tasks/readme.rake

@@ -23,7 +23,21 @@ def generate_readme
   require 'erb'
   require 'transpec/cli'
 
-  text = File.read('README.md.erb')
-  erb = ERB.new(text, nil, '-')
+  readme = File.read('README.md.erb')
+  erb = ERB.new(readme, nil, '-')
   erb.result(binding)
 end
+
+def table_of_contents(lines, header_level)
+  header_pattern = /^#{'#' * header_level}[^#]/
+
+  titles = lines.map do |line|
+    next unless line.match(header_pattern)
+    line.sub(/^[#\s]*/, '').chomp
+  end.compact
+
+  titles.map do |title|
+    anchor = '#' + title.gsub(/[^\w_\- ]/, '').downcase.gsub(' ', '-')
+    "* [#{title}](#{anchor})"
+  end.join("\n")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -262,16 +262,18 @@ files:
 - lib/transpec/syntax/its.rb
 - lib/transpec/syntax/matcher_definition.rb
 - lib/transpec/syntax/method_stub.rb
-- lib/transpec/syntax/mixin/allow_no_message.rb
 - lib/transpec/syntax/mixin/any_instance_block.rb
 - lib/transpec/syntax/mixin/expect_base.rb
 - lib/transpec/syntax/mixin/expectizable.rb
 - lib/transpec/syntax/mixin/have_matcher_owner.rb
+- lib/transpec/syntax/mixin/messaging_host.rb
 - lib/transpec/syntax/mixin/monkey_patch.rb
 - lib/transpec/syntax/mixin/monkey_patch_any_instance.rb
+- lib/transpec/syntax/mixin/no_message_allowance.rb
 - lib/transpec/syntax/mixin/owned_matcher.rb
 - lib/transpec/syntax/mixin/send.rb
 - lib/transpec/syntax/mixin/should_base.rb
+- lib/transpec/syntax/mixin/useless_and_return.rb
 - lib/transpec/syntax/oneliner_should.rb
 - lib/transpec/syntax/operator_matcher.rb
 - lib/transpec/syntax/raise_error.rb