riot 0.11.1 → 0.11.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.11.2*
+
+* [ISSUE] Options were not nesting. Now fixed. [jaknowlden]
+
 *0.11.1*
 
 * Middleware can now acts more like you would expect. Middleware now know the next neighbor in the chain and can do stuff to the context before and after the user-defined context is prepared. Removes support for the handle? method. Now we act more like a Rack app. [jaknowlden]

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/lib/riot/context.rb

@@ -1,5 +1,5 @@
 module Riot
-  RootContext = Struct.new(:setups, :teardowns, :detailed_description)
+  RootContext = Struct.new(:setups, :teardowns, :detailed_description, :options)
 
   module ContextClassOverrides
     def assertion_class; Assertion; end
@@ -20,7 +20,10 @@ module Riot
     #
     # @return [Object]
     def option(key) options[key]; end
-  private
+
+    # Returns the has of defined options.
+    #
+    # @return [Hash]
     def options; @options ||= {}; end
   end # ContextOptions
 
@@ -47,9 +50,10 @@ module Riot
     attr_reader :parent
 
     def initialize(description, parent=nil, &definition)
-      @parent = parent || RootContext.new([],[], "")
+      @parent = parent || RootContext.new([],[], "", {})
       @description = description
       @contexts, @setups, @assertions, @teardowns = [], [], [], []
+      @options = @parent.options
       prepare_middleware(&definition)
     end
 

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-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 = [

data/test/core/context_with_options_test.rb

@@ -13,4 +13,21 @@ context "Context with options" do
   asserts("option :foo") { topic.option(:foo) }.equals("bar")
   asserts("option \"foo\"") { topic.option("foo") }.nil
   asserts("option \"bar\"") { topic.option("bar") }.equals(2)
+
+  context "and with a nested context" do
+    setup do
+      Riot::Context.new("Foo", topic) do
+        set :goo, "car"
+        set "car", 3
+      end
+    end
+
+    asserts_topic.responds_to(:option)
+
+    asserts("option :foo") { topic.option(:foo) }.equals("bar")
+    asserts("option \"bar\"") { topic.option("bar") }.equals(2)
+
+    asserts("option :goo") { topic.option(:goo) }.equals("car")
+    asserts("option \"car\"") { topic.option("car") }.equals(3)
+  end # and with a nested context
 end # Context with options

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency