rspec-arguments 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383418f2f244c0de2f9c46c4d22e1c325cf8d28c
-  data.tar.gz: 249db8f96b9175a39407740dcfceefd9db94d7d9
+  metadata.gz: 7e76f0541e0551b3e211d1d0ff2e0e849cc04c3b
+  data.tar.gz: b573d640fdc5bec51d42d109d75f11a3e1af5f66
 SHA512:
-  metadata.gz: 1966c9c0c5d385c23100a13d06e01e9b5d12bfbe64e22dcbc2e057cfbf7b03bc4803e5272f613b3e7e5d4b5bf5e470b6204b47a191b80edf380b5573aca71b71
-  data.tar.gz: 8b703ff0cca9d0c53ee5859468afa1f372d1dc3198ae57689d18bfa1526512cb2cd97687c26d30e9cfa39bd15d057b21654fa9c9ac11fc35b1c0112982dbc83d
+  metadata.gz: b539bf7b07af9967f1d0229397efc54f8187ed6f6ae6ebc5f583655c0ff9af0a57fab3467c26025aedac23be42ad43e830528e6df40d35b19234c314a3cdaa0c
+  data.tar.gz: c51b4a98b404a13b55ef59da1844faac6356a64561bc277f02e798bf068c762dfabdda7f27900c3f938b7855719546fbb88d1e5e4ab8fc3ae5f347c2ba23f63d

data/lib/rspec/arguments/arguments.rb

@@ -15,17 +15,22 @@ module RSpec
     METHOD_KEYWORD_ARG = METHOD_ARG_PREFIX + KEYWORD_ARG_SUFFIX
     METHOD_BLOCK_ARG = METHOD_ARG_PREFIX + BLOCK_ARG_SUFFIX
 
-    def process_subject(clazz, &block)
+    def process_subject(clazz)
       class_method = method_under_test(:class_method)
 
       return call_method_with_args(clazz, class_method.to_sym) if class_method
 
-      process_instance_subject(clazz, &block)
+      process_instance_subject(clazz)
+    end
+
+    def process_instance(clazz)
+      __memoized.fetch_or_store(:instance) do
+        call_initializer_with_args(clazz)
+      end
     end
 
     def process_instance_subject(clazz)
-      instance = call_initializer_with_args(clazz)
-      yield(instance)
+      instance = process_instance(clazz)
 
       method = method_under_test(:method)
 

data/lib/rspec/arguments/monkey_patcher.rb

@@ -17,7 +17,7 @@ module RSpec
 
           if described.is_a?(Class)
             if metadata[:rspec_arguments] || metadata[:method] || metadata[:class_method]
-              process_subject(described) { |instance| __memoized.fetch_or_store(:instance) { instance } }
+              process_subject(described)
             else
               described.new
             end
@@ -31,8 +31,20 @@ module RSpec
       # Reference to the instantiated object, if testing an instance or instance method (but not class method).
       #
       def instance
-        subject # Ensures subject has been loaded
-        __memoized.fetch_or_store(:instance) { raise 'Instance is only available when testing class instances or instance methods' }
+        __memoized.fetch_or_store(:instance) do
+          metadata = self.class.metadata
+          described = described_class || metadata.fetch(:description_args).first
+
+          if described.is_a?(Class)
+            if metadata[:rspec_arguments] || metadata[:method] || metadata[:class_method]
+              raise 'Instance is only available when testing class instances or instance methods' if metadata[:class_method]
+
+              process_instance(described)
+            else
+              described.new
+            end
+          end
+        end
       end
     end
   end

data/lib/rspec/arguments/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Arguments
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-arguments
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Marco Costa