remarkable 3.0.9 → 3.0.10

data/CHANGELOG

@@ -1,3 +1,5 @@
+* Pending groups show proper backtrace and run by default in execute mode [#49]
+
 * Added support to blocks configuration. All Remarkable matcher and macros can
   now be configured using a block:
 

data/lib/remarkable/macros.rb

@@ -16,8 +16,14 @@ module Remarkable
         end
       end
 
-      def should_or_should_not_method_missing(should_or_should_not, method, calltrace, *args, &block) #:nodoc:
-        it {
+      def should_or_should_not_method_missing(should_or_should_not, method, calltrace, *args, &block) #:nodoc:
+        description = if @_pending_group
+          get_description_from_matcher(should_or_should_not, method, *args, &block)
+        else
+          nil
+        end
+
+        example(description){
           begin
             send(should_or_should_not, send(method, *args, &block))
           rescue Exception => e

data/lib/remarkable/matchers.rb

@@ -9,8 +9,9 @@ module Remarkable
   # If the module to be included responds to :after_include, it's called with the
   # target as argument.
   #
-  def self.include_matchers!(base, target)
-    target.send :extend, Remarkable::Macros
+  def self.include_matchers!(base, target)
+    target.send :extend, Remarkable::Pending
+    target.send :extend, Remarkable::Macros
 
     if defined?(base::Matchers)
       target.send :include, base::Matchers

data/lib/remarkable/pending.rb

@@ -1,42 +1,62 @@
 module Remarkable
-  module Macros
-
-    protected
+  module Pending
 
-      # Adds a pending block to your specs.
-      #
-      # == Examples
-      #
-      #   pending 'create manager resource' do
-      #     should_have_one :manager
-      #     should_validate_associated :manager
-      #   end
-      #
-      def pending(description='TODO', &block)
-        PendingSandbox.new(description, self).instance_eval(&block)
-      end
-
-      class PendingSandbox < Struct.new(:description, :spec) #:nodoc:
-        include Macros
-
-        def example(mather_description=nil)
-          method_caller = caller.detect{ |c| c !~ /method_missing'/ }
-
-          error = begin
-            ::Spec::Example::ExamplePendingError.new(description, method_caller)
-          rescue # For rspec <= 1.1.12 and rspec => 1.2.4
-            ::Spec::Example::ExamplePendingError.new(description)
-          end
-
-          spec.send(:example, mather_description){ raise error }
-        end
-        alias :it      :example
-        alias :specify :example
+    # We cannot put the alias method in the module because it's a Ruby 1.8 bug
+    # http://coderrr.wordpress.com/2008/03/28/alias_methodmodule-bug-in-ruby-18/
+    #
+    def self.extended(base) #:nodoc:
+      class << base
+        alias :it :example
+        alias :specify :example
+      end
+    end
+
+    # Adds a pending block to your specs.
+    #
+    # == Examples
+    #
+    #   pending 'create manager resource' do
+    #     should_have_one :manager
+    #     should_validate_associated :manager
+    #   end
+    #
+    # By default, it executes the examples inside the pending block. So as soon
+    # as you add the has_one :manager relationship to your model, your specs
+    # will say that this was already fixed and there is no need to be treated
+    # as pending. To disable this behavior, you can give :execute => false:
+    #
+    #   pending 'create manager resource', :execute => false
+    #
+    def pending(*args, &block)
+      options = { :execute => true }.merge(args.extract_options!)
+
+      @_pending_group = true
+      @_pending_group_description = args.first || "TODO"
+      @_pending_group_execute = options.delete(:execute)
+
+      self.instance_eval(&block)
+
+      @_pending_group = false
+      @_pending_group_description = nil
+      @_pending_group_execute = nil
+    end
 
-        def should_or_should_not_method_missing(should_or_should_not, method, calltrace, *args, &block)
-          example(get_description_from_matcher(should_or_should_not, method, *args, &block))
-        end
-      end
+    def example(description=nil, options={}, backtrace=nil, &implementation) #:nodoc:
+      if block_given? && @_pending_group
+        pending_caller      = caller.detect{ |c| c !~ /method_missing'/ }
+        pending_description = @_pending_group_description
+
+        pending_block = if @_pending_group_execute
+          proc{ pending(pending_description, &implementation) }
+        else
+          proc{ pending(pending_description) }
+        end
+
+        super(description, options, backtrace || pending_caller, &pending_block)
+      else
+        super(description, options, backtrace || caller(0)[1], &implementation)
+      end
+    end
 
   end
 end

data/lib/remarkable/version.rb

@@ -1,3 +1,3 @@
 module Remarkable
-  VERSION = '3.0.9' unless self.const_defined?('VERSION')
+  VERSION = '3.0.10' unless self.const_defined?('VERSION')
 end

data/spec/pending_spec.rb

@@ -1,12 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Remarkable::Macros do
+describe Remarkable::Pending do
+
+  it "should create pending groups" do
+    spec = self
+
+    self.class.pending "pending examples" do
+      self.instance_variable_get("@_pending_group").should spec.be_true
+      self.instance_variable_get("@_pending_group_description").should spec.eql("pending examples")
+      self.instance_variable_get("@_pending_group_execute").should spec.be_true
+    end
+
+    self.instance_variable_get("@_pending_group").should be_nil
+    self.instance_variable_get("@_pending_group_description").should be_nil
+    self.instance_variable_get("@_pending_group_execute").should be_nil
+  end
 
-  describe "with pending examples" do
-    pending "pending examples" do
-      should_contain(5)
-      it("should not be run"){ true.should be_false }
-    end
+  pending "pending examples" do
+#    example "should show as not implemented"
+#
+#    specify "should show as pending" do
+#      raise "oops"
+#    end
+#
+#    it "should show as fixed" do
+#      # success ...
+#    end
+
+    should_contain(5)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 +02:00
+date: 2009-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency