transpec 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d51fbf6111c8bb052b53353d56c3f50016252f70
-  data.tar.gz: 79b7518a8f6b3f70cc019196e874ef342a4b3b69
+  metadata.gz: e4b8ad9709db52ce5becc1fe21c78454138667a5
+  data.tar.gz: 91977cdc9490c4fd3878769d0308cc01f551a7ff
 SHA512:
-  metadata.gz: cb6b058d22be9aa35e1503982c4527ebe44ea19d87f8f2574190d025a9d2721e7ea1bee327be30dcba0ba4bdaf7395d658def09682d4349aa58476b4fc46564c
-  data.tar.gz: de624193ea2e966b865e4c1102ff0be66fd813b8af4a3843ee650401122eb1607fcaee113050c1d12972f77e66263eccf0a5c70f7583d3ed5083c6f894edfd23
+  metadata.gz: 1656fc0b87a530e09d986213f76cb3ec52efd78d7fc5106ddb4d555461f8699ad10f2bd23c4fe4b8ca49a3fe78bd926b2123231e95a9cefc6ce69bf9cc5ec6db
+  data.tar.gz: efa265154035cc620e19e4b7ce0e87345337c152f34f737a87c85820d96e02421002b5f596292ab9ceba1810292f8dfb3b53314168050719c69e195905eef2b3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## v1.1.2
+
+* Allow use of non monkey patch syntaxes in non example group contexts by including `RSpec::Matchers` ([#15](https://github.com/yujinakayama/transpec/issues/15))
+
 ## v1.1.1
 
 * Fix failure of dynamic analysis when cwd was changed at exit of rspec

data/README.md

@@ -295,14 +295,26 @@ end
 ### Reason
 
 * `should` is defined on `BasicObject` class, so you can use `should` everywhere.
-* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods).
+* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that include `RSpec::Matchers`.
 
 With the above example, in the context of `1.should == 1`, the `self` is an instance of `MyAwesomeTestRunner`.
 Transpec tracks contexts and skips conversion if the target syntax cannot be converted in a case like this.
 
 ### Solution
 
-You need to rewrite the spec by yourself.
+Include or extend `RSpec::Matchers` module to make `expect` available in the context:
+
+```ruby
+  class MyAwesomeTestRunner
+    include RSpec::Matchers
+
+    def run
+      1.should == 1
+    end
+  end
+```
+
+Then run `transpec` again.
 
 ## Supported Conversions
 

data/README.md.erb

@@ -291,14 +291,26 @@ end
 ### Reason
 
 * `should` is defined on `BasicObject` class, so you can use `should` everywhere.
-* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods).
+* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that include `RSpec::Matchers`.
 
 With the above example, in the context of `1.should == 1`, the `self` is an instance of `MyAwesomeTestRunner`.
 Transpec tracks contexts and skips conversion if the target syntax cannot be converted in a case like this.
 
 ### Solution
 
-You need to rewrite the spec by yourself.
+Include or extend `RSpec::Matchers` module to make `expect` available in the context:
+
+```ruby
+  class MyAwesomeTestRunner
+    include RSpec::Matchers
+
+    def run
+      1.should == 1
+    end
+  end
+```
+
+Then run `transpec` again.
 
 ## Supported Conversions
 

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

@@ -5,7 +5,7 @@ module Transpec
     module Mixin
       module MonkeyPatch
         def register_request_of_syntax_availability_inspection(rewriter, key, methods)
-          code = "self.class.name.start_with?('RSpec::')"
+          code = "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') }"
 
           methods.each do |method|
             code << " && respond_to?(#{method.inspect})"

data/lib/transpec/syntax/operator_matcher.rb

@@ -24,7 +24,7 @@ module Transpec
         rewriter.register_request(arg_node, :arg_is_enumerable?, 'is_a?(Enumerable)')
       end
 
-      def correct_operator!(parenthesize_arg = true)
+      def convert_operator!(parenthesize_arg = true)
         case method_name
         when :==
           convert_to_eq!(parenthesize_arg)

data/lib/transpec/syntax/should.rb

@@ -59,7 +59,7 @@ module Transpec
         @current_syntax_type = :expect
         register_record(negative_form)
 
-        operator_matcher.correct_operator!(parenthesize_matcher_arg) if operator_matcher
+        operator_matcher.convert_operator!(parenthesize_matcher_arg) if operator_matcher
       end
 
       def operator_matcher

data/lib/transpec/version.rb

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

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -28,7 +28,7 @@ module Transpec
           <<-END
             describe 'example' do
               it 'is foo' do
-                transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 79, 86).should be(foo)), self, { :expect_available? => [:context, "self.class.name.start_with?('RSpec::') && respond_to?(:expect)"] }, __FILE__, 79, 101)
+                transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 79, 86).should be(foo)), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 79, 101)
               end
             end
           END
@@ -57,7 +57,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'matches to foo' do
-                  transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 93, 100).should), self, { :expect_available? => [:context, "self.class.name.start_with?('RSpec::') && respond_to?(:expect)"] }, __FILE__, 93, 107) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')
+                  transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 93, 100).should), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 93, 107) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')
                   foo
                   HEREDOC
                   ), self, { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] }, __FILE__, 111, 188)

data/spec/transpec/syntax/operator_matcher_spec.rb

@@ -70,9 +70,9 @@ module Transpec
         end
       end
 
-      describe '#correct_operator!' do
+      describe '#convert_operator!' do
         before do
-          matcher.correct_operator!(parenthesize_arg)
+          matcher.convert_operator!(parenthesize_arg)
         end
 
         let(:parenthesize_arg) { true }

data/spec/transpec/syntax/should_spec.rb

@@ -189,8 +189,8 @@ module Transpec
           END
         end
 
-        it 'invokes OperatorMatcher#correct_operator!' do
-          should_object.operator_matcher.should_receive(:correct_operator!)
+        it 'invokes OperatorMatcher#convert_operator!' do
+          should_object.operator_matcher.should_receive(:convert_operator!)
           should_object.expectize!
         end
 
@@ -226,6 +226,40 @@ module Transpec
             record.converted_syntax.should == 'expect(obj).to'
           end
 
+          context 'and #expect is available in the context by including RSpec::Matchers' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  class TestRunner
+                    include RSpec::Matchers
+
+                    def run
+                      1.should == 1
+                    end
+                  end
+
+                  it 'is 1' do
+                    TestRunner.new.run
+                  end
+                end
+              END
+            end
+
+            context 'with runtime information' do
+              include_context 'dynamic analysis objects'
+
+              it 'does not raise InvalidContextError' do
+                -> { should_object.expectize! }.should_not raise_error
+              end
+            end
+
+            context 'without runtime information' do
+              it 'raises InvalidContextError' do
+                -> { should_object.expectize! }.should raise_error(InvalidContextError)
+              end
+            end
+          end
+
           context 'and #expect is not available in the context' do
             context 'and the context is determinable statically' do
               let(:source) do

data/transpec.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.version       = Transpec::Version.to_s
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
-  spec.summary       = 'RSpec syntax converter'
-  spec.description   = 'Transpec automatically converts your specs into latest RSpec syntax ' +
+  spec.summary       = 'A RSpec syntax converter'
+  spec.description   = 'Transpec converts your specs into latest RSpec syntax ' +
                        'with static and dynamic code analysis.'
   spec.homepage      = 'https://github.com/yujinakayama/transpec'
   spec.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -164,8 +164,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-description: Transpec automatically converts your specs into latest RSpec syntax with
-  static and dynamic code analysis.
+description: Transpec converts your specs into latest RSpec syntax with static and
+  dynamic code analysis.
 email:
 - nkymyj@gmail.com
 executables:
@@ -281,7 +281,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: RSpec syntax converter
+summary: A RSpec syntax converter
 test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb