rspec_in_context 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5642e59dbebb5dbff148e8ae509607566bc308da
-  data.tar.gz: 9be37738f258a437096c8f7d96eff8d38f26c23e
+  metadata.gz: 6996caf5015fee4ad0b693cb7e89fc2e34afbf49
+  data.tar.gz: 9f9c259f3c10aad2b93fd7d7a9b51eef74d2d547
 SHA512:
-  metadata.gz: db08c47163993a7bfb142d3339ad4e1915f249f139216a346bf5c472466288a0fed029c624723a183053868a91720edc682d1c48acd70bce3582e9240b7e0a41
-  data.tar.gz: f771413d8739af72f3acbe88a2ff2ae6b75458fc6137d2f96836bf78f92f33c95df68f8bb00df9f119d7a8556023a9b6e151e02896fa6bb4fc10a44b6e38caa6
+  metadata.gz: 72b66d91112fbfcf6ebb2be0c524b531b8c77294988b9920da781070e2eea684501b458ab109122b50b5b89391183ccf4092e571b2db536c0ed5bfb934553dad
+  data.tar.gz: 4059ba675a52c63ae0213f1768dfc45446d6a3076a0fa47fe344b77d34cba5bfbc048a14f68b94cd28605889139a5063719ad58538b49914b8a3f6fe52c03799

data/README.md

@@ -8,8 +8,6 @@ This gem is here to help you write better shared_examples in Rspec.
 
 Ever been bothered by the fact that they don't really behave like methods and that you can't pass it a block ? There you go: `rspec_in_context`
 
-**NOTE**: This is an alpha version. For now context are globally scoped.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -49,7 +47,7 @@ end
 You can define in_context block that are reusable almost anywhere.
 They completely look like normal Rspec.
 
-##### Inside a Rspec block
+##### Inside a Rspec block (scoped)
 
 ```ruby
 # A in_context can be named with a symbol or a string
@@ -60,18 +58,22 @@ define_context :context_name do
 end
 ```
 
-##### Outside a Rspec block
+Those in_context will be scoped to their current `describe`/`context` block.
+
+##### Outside a Rspec block (globally)
 
-Outside of a test you have to use `RSpec.define_context`.
+Outside of a test you have to use `RSpec.define_context`. Those in_context will be defined globally in your tests.
 
 
 ### Use the context
 
-Anywhere in your test description, use a `in_context` block to use a predefined in_context. **They don't need to be in the same file.** Example:
+Anywhere in your test description, use a `in_context` block to use a predefined in_context.
+
+**Important**: in_context are scoped to their current `describe`/`context` block. If you need globally defined context see `RSpec.define_context`
 
 ```ruby
 # A in_context can be named with a symbol or a string
-define_context :context_name do
+RSpec.define_context :context_name do
   it 'works' do
     expect(true).to be_truthy
   end
@@ -86,6 +88,7 @@ end
 ### Things to know
 
 * You can chose exactly where your inside test will be used:
+
 By using `execute_tests` in your define context, the test passed when you *use* the context will be executed here
 
 ```ruby
@@ -109,8 +112,10 @@ in_context :context_name do
 end
 ```
 
-* You can add variable instantiation relative to your test where you exactly want
-It's an alias of `execute_tests` so you can't use both. But it let you describe what the block will do better.
+* You can add variable instantiation relative to your test where you exactly want:
+
+`instanciate_context` is an alias of `execute_tests` so you can't use both.
+But it let you describe what the block will do better.
 
 * You can use variable in the in_context definition
 

data/lib/rspec_in_context/context_management.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RspecInContext
+  module ContextManagement
+    def subclass(parent, description, args, registration_collection, &example_group_block)
+      subclass = super
+      RspecInContext::InContext.remove_context(subclass)
+      subclass
+    end
+  end
+end
+
+module RSpec
+  module Core
+    class ExampleGroup
+      class << self
+        prepend RspecInContext::ContextManagement
+      end
+    end
+  end
+end

data/lib/rspec_in_context/in_context.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module RspecInContext
+  class NoContextFound < StandardError; end
+  Context = Struct.new(:block, :owner)
   module InContext
     class << self
       def included(base)
@@ -11,15 +13,20 @@ module RspecInContext
         @contexts ||= ActiveSupport::HashWithIndifferentAccess.new
       end
 
-      def add_context(context_name, &block)
-        contexts[context_name] = block
+      def add_context(context_name, owner = nil, &block)
+        contexts[context_name] = Context.new(block, owner)
       end
 
       def find_context(context_name)
-        contexts[context_name] || raise("No context found with name #{context_name}")
+        contexts[context_name] ||
+          (raise NoContextFound, "No context found with name #{context_name}")
       end
 
-      def define_context(context_name, &block)
+      def remove_context(current_class)
+        contexts.delete_if{ |_, context| context.owner == current_class }
+      end
+
+      def outside_define_context(context_name, &block)
         InContext.add_context(context_name, &block)
       end
     end
@@ -27,7 +34,7 @@ module RspecInContext
     module ClassMethods
       def in_context(context_name, *args, &block)
         Thread.current[:test_block] = block
-        instance_exec(*args, &InContext.find_context(context_name))
+        instance_exec(*args, &InContext.find_context(context_name).block)
       end
 
       def execute_tests
@@ -36,7 +43,9 @@ module RspecInContext
       alias_method :instanciate_context, :execute_tests
 
       def define_context(context_name, &block)
-        InContext.add_context(context_name, &block)
+        instance_exec do
+          InContext.add_context(context_name, hooks.instance_variable_get(:@owner), &block)
+        end
       end
     end
   end

data/lib/rspec_in_context/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RspecInContext
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rspec_in_context.rb

@@ -3,6 +3,7 @@
 require 'active_support/all'
 require "rspec_in_context/version"
 require "rspec_in_context/in_context"
+require "rspec_in_context/context_management"
 
 module RspecInContext
   def self.included(base)
@@ -12,6 +13,6 @@ end
 
 module RSpec
   def self.define_context(name, &block)
-    RspecInContext::InContext.define_context(name, &block)
+    RspecInContext::InContext.outside_define_context(name, &block)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_in_context
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Denis <Zaratan> Pasin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,6 +170,7 @@ files:
 - bin/console
 - bin/setup
 - lib/rspec_in_context.rb
+- lib/rspec_in_context/context_management.rb
 - lib/rspec_in_context/in_context.rb
 - lib/rspec_in_context/version.rb
 - rspec_in_context.gemspec