rspec-versioned 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYwNDcxZjRmNzdhMTdkZDczOWVhNzgxOWQyOTRhY2E0YWQ0ZGZkOQ==
+    NzViYjliNWZlMjI1NjQyNTEwNzFmMjJkNzFiMTIyMmI3YWFkZDQ3MA==
   data.tar.gz: !binary |-
-    MDQ2MGM4MWQzODA1MTViMjUwODBiMDdkNTE3MTY0NDQ2OWVhNzI0Ng==
+    MDFjMmE4NzRkMmI4YTYxZDYxNTdlY2U4ZjRhODE1ZjJhZWZhNjUzMA==
 SHA512:
   metadata.gz: !binary |-
-    MWRiOGIxNTgwZDI1MDJkNGFjNzZmOWI4NmFmZTU1ZWIwYzE1ZGI4NTkxZmVi
-    NDQ0YWRhN2Q1OWZmN2I0YTFhMzRiYjAwNzE4MjM5YjQ3YzZmYjRlYjFlMjMw
-    NGQ2ODZkOWFhODUzNTZmMzZkNjFmNzdiNTYxNTcxYzlmZGM5YTk=
+    NmVkNzYyNjgzMDhmMzM3YjgwZTc5ODhlYjM4ZmI5NzNkY2E3YTZiZTRiNmU5
+    M2FiZjk0Mzk5OTI2OTE0ZDU0YzYyMmU3OTY3ODRkNGZlYTFkMjhjMjIwYzhi
+    OTAyYjQ4YzQzN2NkN2VjOGI1YTE4N2M1M2QxYzFhMWJmYThlNzM=
   data.tar.gz: !binary |-
-    MmUxODYxOTI5MTdhNDI5ZWVkOTA3ZDg5MDZmN2UxYjc2MTkzODExYTkzMGE5
-    MzdjNGI1ZTI3MmZiNTBhOWI1NjBjZjY3NDI0MjU3NTA5Nzk1NDUzOWU1YjIx
-    ZTAwYjUzZjkxYzU1ODYxZjJlNDE2Yzk3YjdlYTY2ZWNhNjMzZGE=
+    NWJmZDE3MDVjMzAwMjVmZjhhZGI0MGUwNDdlYWFkYWU0NzY3ZDY2YTJlNTI5
+    YzkyMWY1NzdkNzJkMDNmNjUyMGRjZjQyMWNkNTZjMzQ5Mzg5MzA4ZjZjMjMw
+    ZmI3OGJkNzhhOGEyNTg0OWY1NTMwODc4ODM2YWY4YmZkNTA2Y2E=

data/lib/rspec/versioned.rb

@@ -1,6 +1,5 @@
 require "rspec/versioned/version"
 require 'rspec/core'
-require 'rspec_ext/rspec_ext'
 require 'versioned_blocks'
 
 module RSpec
@@ -13,31 +12,29 @@ module RSpec
         fetch_current_example = RSpec.respond_to?(:current_example) ?
           proc { RSpec.current_example } : proc { |context| context.example }
 
-        config.around(:each) do |ex| # ex is a Procsy
-          notify_version_number = ex.metadata[:notify_version_number] || RSpec.configuration.notify_version_number
-
-          example = fetch_current_example.call(self)
-          example.new_version_info
+        config.around(:each) do |p| # example is a Proc extended with Procsy
+          notify_version_number = p.metadata[:notify_version_number] || RSpec.configuration.notify_version_number
 
           run_example = Proc.new do |v, uri|
-            example.clear_exception
-            example.version.set(v, uri)
-            ex.run
+            current_example = fetch_current_example.call(self)
+            current_example.clear_exceptions
+            p.metadata[:versioned] = {number:v, uri:uri}
+            p.run
             RSpec.configuration.reporter.message("RSpec::Versioned testing /v#{v}") if notify_version_number
           end
 
-          if ex.metadata.has_key?(:versions)
-            if ex.metadata[:versions][:base_uri] || (VersionedBlocks.base_uri && VersionedBlocks.base_uri!='') # we have a URI
-              versioned_block(ex.metadata[:versions]) do |v, uri|
+          if p.metadata.has_key?(:versions)
+            if p.metadata[:versions][:base_uri] || (VersionedBlocks.base_uri && VersionedBlocks.base_uri!='') # we have a URI
+              versioned_block(p.metadata[:versions]) do |v, uri|
                 run_example.call v,uri
               end
             else # we don't have a URI
-              versioned_block(ex.metadata[:versions]) do |v|
+              versioned_block(p.metadata[:versions]) do |v|
                 run_example.call v
               end
             end
           else # didn't specify any versions...just run the test!
-            ex.run
+            p.run
           end
           self.clear_lets if clear_lets
         end
@@ -46,41 +43,21 @@ module RSpec
   end
 end
 
-module HasVersionInfo
-  def new_version_info
-    @version_info = VersionInfoHolder.new
-  end
-
-  def version
-    @version_info
-  end
-
-  def clear_exception
-    @exception = nil
-  end
-end
-
 module RSpec
   module Core
     class Example
-      @version_info
-
-      include HasVersionInfo
-    end
-  end
-end
-
-class VersionInfoHolder
-  attr_reader :number
+      def clear_exceptions
+        @exceptions = nil
+      end
 
-  def uri
-    return @uri if !@uri.nil?
-    raise VersionedBlocksException, "Undefined URI!"
-  end
+      def version
+        @metadata[:versioned]
+      end
 
-  def set(v_number, uri=nil)
-    @number = v_number
-    @uri = uri
+      def clear_exceptions
+        @exceptions = nil
+      end
+    end
   end
 end
 

data/lib/rspec/versioned/version.rb

@@ -1,5 +1,5 @@
 module Rspec
   module Versioned
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/rspec-versioned.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_runtime_dependency "rspec"
   spec.add_runtime_dependency "versioned_blocks"
   spec.add_runtime_dependency "rspec-core"
-  spec.add_runtime_dependency "rspec_ext-rspec_ext"
+  spec.add_runtime_dependency 'pry', '>= 0', '>= 0'
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'pry'
 require_relative '../lib/rspec/versioned'
 
 RSpec.configure do |config|

data/spec/versioned_spec.rb

@@ -11,11 +11,11 @@ describe 'rspec/versioned' do
     end
 
     it 'can run an example and get a version number', versions:{only:1} do |ex|
-      expect(ex.version.number).to eq 1
+      expect(ex.version[:number]).to eq 1
     end
 
     it 'can run an example and get version numbers for a range of versions', versions:{to:3} do |ex|
-      expect(ex.version.number).to eq(@count)
+      expect(ex.version[:number]).to eq(@count)
       @count += 1
     end
   end
@@ -27,17 +27,17 @@ describe 'rspec/versioned' do
     end
 
     it 'can run an example and get a version number', versions:{only:1} do |ex|
-      expect(ex.version.uri).to include ex.version.number.to_s
+      expect(ex.version[:uri]).to include ex.version[:number].to_s
     end
 
     it 'can override base_uri', versions:{only:1, base_uri:'http://api2.com', override:true} do |ex|
-      expect(ex.version.uri).to include 'http://api2.com'
+      expect(ex.version[:uri]).to include 'http://api2.com'
     end
 
     it 'can run an example and get version numbers and URIs for a range of versions', versions:{to:3} do |ex|
-      expect(ex.version.uri).to include('api.com')
-      expect(ex.version.uri).to include(ex.version.number.to_s)
-      expect(ex.version.number).to eq(@count)
+      expect(ex.version[:uri]).to include('api.com')
+      expect(ex.version[:uri]).to include(ex.version[:number].to_s)
+      expect(ex.version[:number]).to eq(@count)
       @count += 1
     end
   end
@@ -51,7 +51,7 @@ describe 'rspec/versioned' do
     context 'nested', versions:{from:2, to:4} do
       it 'runs the correct amount of times' do |ex|
         @outer_count += 1
-        expect(@outer_count).to eq ex.version.number
+        expect(@outer_count).to eq ex.version[:number]
       end
 
       it 'only runs once for this one', versions:{only:1} do
@@ -66,7 +66,7 @@ describe 'rspec/versioned' do
 
         it 'runs the correct amount of times' do |ex|
           @inner_count += 1
-          expect(@inner_count).to eq ex.version.number
+          expect(@inner_count).to eq ex.version[:number]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-versioned
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - devend711
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: versioned_blocks
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_ext-rspec_ext
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='