rspec-situations 0.0.2 → 0.0.4

data/Gemfile

@@ -1,13 +1,18 @@
 source 'https://rubygems.org'
 
+
 gemspec
 
+
 gem 'rake'
 gem 'rspec'
 gem 'bundler'
-gem 'growl'
-gem 'debugger'
-gem 'guard'
-gem 'guard-bundler'
-gem 'guard-rspec'
 
+
+group :development do
+	gem 'growl'
+	gem 'debugger'
+	gem 'guard'
+	gem 'guard-bundler'
+	gem 'guard-rspec'
+end

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/brett-richardson/rspec-situations.png?branch=master)](https://travis-ci.org/brett-richardson/rspec-situations)
+
 Using Rspec Situations
 ======================
 
@@ -16,16 +18,20 @@ describe Apple do
     subject( :apple ){ create :apple }
 
     situation( :bought ){ subject.bought_by = create :user }
-    situation( :red    ){ subject.color = :Red }
+    situation( :red    ){ subject.color = :red }
 
-    situation( :1yr_old, 'a year old' ){ subject.created_at = 2.years.ago }
+    situation( :one_yr_old, 'a year old' ){ subject.created_at = 1.years.ago } # With optional description
 
-    describe_situation :stolen, :red do
+    describe_situation :bought, :red do
         it{ should be_tasty }
     end
 
-    describe_situation :stolen, :1yr_old do
+    describe_situation :bought, :one_yr_old, 'bought a year ago' do # With optional description
         it{ should_not be_tasty }
     end
+
+    describe_situation :bought, :one_yr_old do
+      it{ should_not be_tasty }
+    end
 end
 ```

data/lib/rspec/situations/class_extensions.rb

@@ -42,7 +42,15 @@ module RSpec::Situations
 
 		# Combine each situation's description into a string
 		def _rsits_describe_name( *keys )
-			'when ' + _rsits( *keys ).map{ |k,v| v.description }.join( ' and ' )
+			hash = _rsits *keys
+
+			'when ' + keys.map do |key|
+				if hash[key]
+					hash[key].description
+				else # Fall back to simple key.to_s if the situation isn't found
+					key
+				end
+			end.join( ' and ' )
 		end
 
 
@@ -53,6 +61,7 @@ module RSpec::Situations
 
 		def _rsits_combined_hash
 			_rsits_hash # TODO: Combine with parents, not needed until you want parent and local situations to interact directly with each other.
+			# FIXME: How do we access previous contexts from here?
 		end
 
 

data/lib/rspec/situations/version.rb

@@ -4,10 +4,10 @@ module RSpec
 		VERSION_NUMBERS = [
 			VERSION_MAJOR = 0,
 			VERSION_MINOR = 0,
-			VERSION_BUILD = 2,
+			VERSION_BUILD = 4
 		]
 
-		VERSION = VERSION_NUMBERS.join(".")
+		VERSION = VERSION_NUMBERS.join '.'
 
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-situations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: