riot 0.11.4 → 0.12.0.pre

data/lib/riot/assertion_macros/respond_to.rb

@@ -1,7 +1,12 @@
 module Riot
   # Asserts that the result of the test is an object that responds to the given method
+  #
   #   asserts("test") { "foo" }.respond_to(:to_s)
   #   should("test") { "foo" }.respond_to(:to_s)
+  #
+  # If you want to test that the result does not respond to something:
+  #
+  #   denies("test") { "foo" }.responds_to(:harassment)
   class RespondToMacro < AssertionMacro
     register :respond_to
     register :responds_to
@@ -13,5 +18,14 @@ module Riot
         fail(expected_message.method(expected).is_not_defined)
       end
     end
+    
+    def devaluate(actual, expected)
+      if actual.respond_to?(expected)
+        fail(expected_message.method(expected).is_defined)
+      else
+        pass new_message.does_not_respond_to(expected)
+      end
+    end
+    
   end
 end

data/lib/riot/assertion_macros/same_elements.rb

@@ -1,14 +1,25 @@
 module Riot
   # Asserts that two arrays contain the same elements, the same number of times.
+  #
   #   asserts("test") { ["foo", "bar"] }.same_elements(["bar", "foo"])
   #   should("test") { ["foo", "bar"] }.same_elements(["bar", "foo"])
+  #
+  # Maybe you just want to make sure two sets arent't the same:
+  #
+  #  denies("test") { ["foo", "bar"] }.same_elements(["baz", "boo"])
   class SameElementsMacro < AssertionMacro
     register :same_elements
-
+    require 'set'
+    
     def evaluate(actual, expected)
-      require 'set'
       same = (Set.new(expected) == Set.new(actual))
       same ? pass : fail(expected_message.elements(expected).to_match(actual))
     end
+
+    def devaluate(actual, expected)
+      same = (Set.new(expected) == Set.new(actual))
+      same ? fail(expected_message.elements(expected).not_to_match(actual)) : pass
+    end
+
   end
 end

data/lib/riot/assertion_macros/size.rb

@@ -1,9 +1,16 @@
 module Riot
   # Asserts that result's size is as expected. Expected size can be specified as
   # a number or a range.
+  #
   #   asserts("a string") { 'washington' }.size(9..12)
   #   asserts("an array") { [1, 2, 3] }.size(3)
   #   asserts("a hash") { {:name => 'washington'} }.size(1)
+  #
+  # To ensure that the result is not of a specific size:
+  #
+  #   denies("a string") { 'washington' }.size(4)
+  #   denies("an array") { [1, 2, 3] }.size(6..10)
+  #   denies("a hash") { {:name => 'washington'} }.size(2)
   class SizeMacro < AssertionMacro
     register :size
 
@@ -11,5 +18,10 @@ module Riot
       failure_message = expected_message.size_of(actual).to_be(expected).not(actual.size)
       expected === actual.size ? pass(new_message.is_of_size(expected)) : fail(failure_message)
     end
+
+    def devaluate(actual, expected)
+      failure_message = expected_message.size_of(actual).to_not_be(expected).not(actual.size)
+      expected === actual.size ? fail(failure_message) : pass(new_message.is_not_size(expected))
+    end
   end
 end

data/lib/riot/context.rb

@@ -1,3 +1,6 @@
+require 'riot/context_options'
+require 'riot/context_helpers'
+
 module Riot
   RootContext = Struct.new(:setups, :teardowns, :detailed_description, :options)
 
@@ -6,33 +9,13 @@ module Riot
     def situation_class; Situation; end
   end # ContextClassOverrides
 
-  module ContextOptions
-    # Set options for the specific context. These options will generally be used for context middleware.
-    # Riot::Context does not currently look at any options.
-    #
-    #   context "Foo" do
-    #     set :transactional, true
-    #   end
-    def set(key, value) options[key] = value; end
-
-    # Returns the value of a set option. The key must match exactly, symbols and strings are not
-    # interchangeable.
-    #
-    # @return [Object]
-    def option(key) options[key]; end
-
-    # Returns the has of defined options.
-    #
-    # @return [Hash]
-    def options; @options ||= {}; end
-  end # ContextOptions
-
   # You make your assertions within a Context. The context stores setup and teardown blocks, and allows for
   # nesting and refactoring into helpers. Extension developers may also configure ContextMiddleware objects
   # in order to extend the functionality of a Context.
   class Context
     include ContextClassOverrides
     include ContextOptions
+    include ContextHelpers
 
     # The set of middleware helpers configured for the current test space.
     #
@@ -78,100 +61,6 @@ module Riot
     def teardowns
       @parent.teardowns + @teardowns
     end
-    
-    # Add a setup block.
-    #
-    # A setup block defines the topic of the context. There can be multiple setup
-    # blocks; each can access the previous topic through the +topic+ attribute.
-    #
-    #   context "A string" do
-    #     setup { "foo" }
-    #     setup { topic * 2 }
-    #     asserts(:length).equals(6)
-    #   end
-    #
-    # If you provide +true+ as the first argument, the setup will be unshifted onto the list of setups,
-    # ensuring it will be run before any other setups. This is really only useful for context middlewares.
-    def setup(premium=false, &definition)
-      setup = Setup.new(&definition)
-      premium ? @setups.unshift(setup) : @setups.push(setup)
-      setup
-    end
-
-    # Helpers are essentially methods accessible within a situation.
-    #
-    # They're not setup methods, but can be called from setups or from assetions. Each time called, the
-    # helper will be evaluated. It's not currently memoized.
-    #
-    #   context "A string" do
-    #     helper(:foo) { "bar" }
-    #     asserts("a foo") { foo }.equals("bar")
-    #   end
-    def helper(name, &block)
-      (@setups << Helper.new(name, &block)).last
-    end
-
-    # A setup shortcut that returns the original topic so you don't have to. Good for nested setups. Instead
-    # of doing this in your context:
-    #
-    #   setup do
-    #     topic.do_something
-    #     topic
-    #   end
-    #
-    # You would do this:
-    #
-    #   hookup { topic.do_something } # Yay!
-    def hookup(&definition)
-      setup { self.instance_eval(&definition); topic }
-    end
-
-    # Add a teardown block. You may define multiple of these as well.
-    #
-    #  teardown { Bombs.drop! }
-    def teardown(&definition)
-      (@teardowns << Setup.new(&definition)).last
-    end
-
-    # Makes an assertion.
-    #
-    # In the most basic form, an assertion requires a descriptive name and a block.
-    #
-    #   asserts("#size is equals to 2") { topic.size == 2 }
-    #
-    # However, several shortcuts are available. Assertion macros can be added to the
-    # end, automating a number of common assertion patterns, e.g.
-    #
-    #   asserts("#size") { topic.size }.equals(2)
-    #
-    # Furthermore, the pattern of testing an attribute on the topic is codified as
-    #
-    #   asserts(:size).equals(2)
-    #
-    # Passing a Symbol to +asserts+ enables this behaviour. For more information on
-    # assertion macros, see {Riot::AssertionMacro}.
-    #
-    # @param [String, Symbol] the property being tested
-    def asserts(what, &definition)
-      new_assertion("asserts", what, &definition)
-    end
-
-    # Same as #asserts, except it uses the phrase "should" in the report output. Sometimes you feel like a
-    # nut, sometimes you don't.
-    #
-    #   should("ensure expected") { "bar" }.equals("bar")
-    #
-    # @param [String, Symbol] the property being tested
-    def should(what, &definition)
-      new_assertion("should", what, &definition)
-    end
-
-    # Makes an assertion on the topic itself, e.g.
-    #
-    #   asserts_topic.matches(/^ab+/)
-    def asserts_topic(what="that it")
-      asserts(what) { topic }
-    end
 
     def run(reporter)
       reporter.describe_context(self) unless @assertions.empty?
@@ -208,16 +97,5 @@ module Riot
       (@contexts << klass.new(description, self, &definition)).last
     end
 
-    def new_assertion(scope, what, &definition)
-      if what.kind_of?(Symbol)
-        definition ||= proc { topic.send(what) }
-        description = "#{scope} ##{what}"
-      else
-        description = "#{scope} #{what}"
-      end
-
-      (@assertions << assertion_class.new(description, &definition)).last
-    end
   end # Context
-
 end # Riot

data/lib/riot/context_helpers.rb

@@ -0,0 +1,132 @@
+module Riot
+  module ContextHelpers
+
+    # Add a setup block.
+    #
+    # A setup block defines the topic of the context. There can be multiple setup
+    # blocks; each can access the previous topic through the +topic+ attribute.
+    #
+    #   context "A string" do
+    #     setup { "foo" }
+    #     setup { topic * 2 }
+    #     asserts(:length).equals(6)
+    #   end
+    #
+    # If you provide +true+ as the first argument, the setup will be unshifted onto the list of setups,
+    # ensuring it will be run before any other setups. This is really only useful for context middlewares.
+    def setup(premium=false, &definition)
+      setup = Setup.new(&definition)
+      premium ? @setups.unshift(setup) : @setups.push(setup)
+      setup
+    end
+
+    # Helpers are essentially methods accessible within a situation.
+    #
+    # They're not setup methods, but can be called from setups or from assetions. Each time called, the
+    # helper will be evaluated. It's not currently memoized.
+    #
+    #   context "A string" do
+    #     helper(:foo) { "bar" }
+    #     asserts("a foo") { foo }.equals("bar")
+    #   end
+    def helper(name, &block)
+      (@setups << Helper.new(name, &block)).last
+    end
+
+    # A setup shortcut that returns the original topic so you don't have to. Good for nested setups. Instead
+    # of doing this in your context:
+    #
+    #   setup do
+    #     topic.do_something
+    #     topic
+    #   end
+    #
+    # You would do this:
+    #
+    #   hookup { topic.do_something } # Yay!
+    def hookup(&definition)
+      setup { self.instance_eval(&definition); topic }
+    end
+
+    # Add a teardown block. You may define multiple of these as well.
+    #
+    #  teardown { Bombs.drop! }
+    def teardown(&definition)
+      (@teardowns << Setup.new(&definition)).last
+    end
+
+    # Makes an assertion.
+    #
+    # In the most basic form, an assertion requires a descriptive name and a block.
+    #
+    #   asserts("#size is equals to 2") { topic.size == 2 }
+    #
+    # However, several shortcuts are available. Assertion macros can be added to the
+    # end, automating a number of common assertion patterns, e.g.
+    #
+    #   asserts("#size") { topic.size }.equals(2)
+    #
+    # Furthermore, the pattern of testing an attribute on the topic is codified as
+    #
+    #   asserts(:size).equals(2)
+    #
+    # Passing a Symbol to +asserts+ enables this behaviour. For more information on
+    # assertion macros, see {Riot::AssertionMacro}.
+    #
+    # @param [String, Symbol] the property being tested
+    def asserts(what, &definition)
+      new_assertion("asserts", what, &definition)
+    end
+
+    # Same as #asserts, except it uses the phrase "should" in the report output. Sometimes you feel like a
+    # nut, sometimes you don't.
+    #
+    #   should("ensure expected") { "bar" }.equals("bar")
+    #
+    # @param [String, Symbol] the property being tested
+    def should(what, &definition)
+      new_assertion("should", what, &definition)
+    end
+
+    # Like an assertion, but expects negative results.
+    #
+    # In the most basic form, a denial requires a descriptive name and a block.
+    #
+    #   denies("#size is equals to 2") { topic.size != 2 }
+    #
+    # Several shortcuts are available here as well. Assertion macros can be added to the
+    # end, automating a number of common assertion patterns, e.g.
+    #
+    #   denies("#size") { topic.size }.equals(2)
+    #
+    # Furthermore, the pattern of testing an attribute on the topic is codified as
+    #
+    #   denies(:size).equals(2)
+    #
+    # Passing a Symbol to +denies+ enables this behaviour. For more information on
+    # assertion macros, see {Riot::AssertionMacro}.
+    #
+    # @param [String, Symbol] the property being tested
+    def denies(what, &definition)
+      new_assertion("denies", what, true, &definition)
+    end
+
+    # Makes an assertion on the topic itself, e.g.
+    #
+    #   asserts_topic.matches(/^ab+/)
+    def asserts_topic(what="that it")
+      asserts(what) { topic }
+    end
+  private
+    def new_assertion(scope, what, negative=false, &definition)
+      if what.kind_of?(Symbol)
+        definition ||= proc { topic.send(what) }
+        description = "#{scope} ##{what}"
+      else
+        description = "#{scope} #{what}"
+      end
+
+      (@assertions << assertion_class.new(description, negative, &definition)).last
+    end
+  end # AssertionHelpers
+end # Riot

data/lib/riot/context_options.rb

@@ -0,0 +1,24 @@
+module Riot
+  module ContextOptions
+
+    # Set options for the specific context. These options will generally be used for context middleware.
+    # Riot::Context does not currently look at any options.
+    #
+    #   context "Foo" do
+    #     set :transactional, true
+    #   end
+    def set(key, value) options[key] = value; end
+
+    # Returns the value of a set option. The key must match exactly, symbols and strings are not
+    # interchangeable.
+    #
+    # @return [Object]
+    def option(key) options[key]; end
+
+    # Returns the has of defined options.
+    #
+    # @return [Hash]
+    def options; @options ||= {}; end
+
+  end # ContextOptions
+end # Riot

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.11.4"
+  s.version = "0.12.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2010-10-14}
   s.description = %q{An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
@@ -42,6 +42,8 @@ Gem::Specification.new do |s|
      "lib/riot/assertion_macros/same_elements.rb",
      "lib/riot/assertion_macros/size.rb",
      "lib/riot/context.rb",
+     "lib/riot/context_helpers.rb",
+     "lib/riot/context_options.rb",
      "lib/riot/message.rb",
      "lib/riot/middleware.rb",
      "lib/riot/reporter.rb",
@@ -49,12 +51,12 @@ Gem::Specification.new do |s|
      "lib/riot/runnable.rb",
      "lib/riot/situation.rb",
      "riot.gemspec",
+     "test.watchr",
      "test/benchmark/colorize.rb",
      "test/benchmark/message_concatenation.rb",
      "test/benchmark/riot_vs_minitest.rb",
      "test/benchmark/same_elements_vs_set.rb",
      "test/benchmark/simple_context_and_assertions.rb",
-     "test/core/assertion_macro_test.rb",
      "test/core/assertion_macros/any_test.rb",
      "test/core/assertion_macros/assigns_test.rb",
      "test/core/assertion_macros/empty_test.rb",
@@ -63,24 +65,33 @@ Gem::Specification.new do |s|
      "test/core/assertion_macros/exists_test.rb",
      "test/core/assertion_macros/includes_test.rb",
      "test/core/assertion_macros/kind_of_test.rb",
-     "test/core/assertion_macros/matching_test.rb",
+     "test/core/assertion_macros/matches_test.rb",
      "test/core/assertion_macros/nil_test.rb",
      "test/core/assertion_macros/not_borat_test.rb",
      "test/core/assertion_macros/raises_test.rb",
      "test/core/assertion_macros/respond_to_test.rb",
      "test/core/assertion_macros/same_elements_test.rb",
      "test/core/assertion_macros/size_test.rb",
-     "test/core/assertion_test.rb",
-     "test/core/chained_context_middleware_test.rb",
-     "test/core/context_middleware_test.rb",
-     "test/core/context_test.rb",
-     "test/core/context_with_options_test.rb",
-     "test/core/message_test.rb",
+     "test/core/context/asserts_topic_test.rb",
+     "test/core/context/context_test.rb",
+     "test/core/context/context_with_options_test.rb",
+     "test/core/context/deny_test.rb",
+     "test/core/context/helper_test.rb",
+     "test/core/context/hookup_test.rb",
+     "test/core/context/nested_contexts_test.rb",
+     "test/core/context/premium_setup_test.rb",
+     "test/core/context/should_test.rb",
+     "test/core/context/using_describe_in_a_test.rb",
+     "test/core/middleware/chained_context_middleware_test.rb",
+     "test/core/middleware/context_middleware_test.rb",
      "test/core/report_test.rb",
-     "test/core/setup_test.rb",
-     "test/core/situation_test.rb",
-     "test/core/teardown_test.rb",
-     "test/core/using_describe_in_a_test.rb",
+     "test/core/runnable/assertion_macro_test.rb",
+     "test/core/runnable/assertion_test.rb",
+     "test/core/runnable/message_test.rb",
+     "test/core/runnable/negative_assertion_test.rb",
+     "test/core/runnable/setup_test.rb",
+     "test/core/runnable/situation_test.rb",
+     "test/core/runnable/teardown_test.rb",
      "test/extensions/rrriot_test.rb",
      "test/teststrap.rb"
   ]
@@ -95,7 +106,6 @@ Gem::Specification.new do |s|
      "test/benchmark/riot_vs_minitest.rb",
      "test/benchmark/same_elements_vs_set.rb",
      "test/benchmark/simple_context_and_assertions.rb",
-     "test/core/assertion_macro_test.rb",
      "test/core/assertion_macros/any_test.rb",
      "test/core/assertion_macros/assigns_test.rb",
      "test/core/assertion_macros/empty_test.rb",
@@ -104,24 +114,33 @@ Gem::Specification.new do |s|
      "test/core/assertion_macros/exists_test.rb",
      "test/core/assertion_macros/includes_test.rb",
      "test/core/assertion_macros/kind_of_test.rb",
-     "test/core/assertion_macros/matching_test.rb",
+     "test/core/assertion_macros/matches_test.rb",
      "test/core/assertion_macros/nil_test.rb",
      "test/core/assertion_macros/not_borat_test.rb",
      "test/core/assertion_macros/raises_test.rb",
      "test/core/assertion_macros/respond_to_test.rb",
      "test/core/assertion_macros/same_elements_test.rb",
      "test/core/assertion_macros/size_test.rb",
-     "test/core/assertion_test.rb",
-     "test/core/chained_context_middleware_test.rb",
-     "test/core/context_middleware_test.rb",
-     "test/core/context_test.rb",
-     "test/core/context_with_options_test.rb",
-     "test/core/message_test.rb",
+     "test/core/context/asserts_topic_test.rb",
+     "test/core/context/context_test.rb",
+     "test/core/context/context_with_options_test.rb",
+     "test/core/context/deny_test.rb",
+     "test/core/context/helper_test.rb",
+     "test/core/context/hookup_test.rb",
+     "test/core/context/nested_contexts_test.rb",
+     "test/core/context/premium_setup_test.rb",
+     "test/core/context/should_test.rb",
+     "test/core/context/using_describe_in_a_test.rb",
+     "test/core/middleware/chained_context_middleware_test.rb",
+     "test/core/middleware/context_middleware_test.rb",
      "test/core/report_test.rb",
-     "test/core/setup_test.rb",
-     "test/core/situation_test.rb",
-     "test/core/teardown_test.rb",
-     "test/core/using_describe_in_a_test.rb",
+     "test/core/runnable/assertion_macro_test.rb",
+     "test/core/runnable/assertion_test.rb",
+     "test/core/runnable/message_test.rb",
+     "test/core/runnable/negative_assertion_test.rb",
+     "test/core/runnable/setup_test.rb",
+     "test/core/runnable/situation_test.rb",
+     "test/core/runnable/teardown_test.rb",
      "test/extensions/rrriot_test.rb",
      "test/teststrap.rb"
   ]