scenarios 0.1.0 → 0.1.1

data/VERSION

@@ -0,0 +1 @@
+0.1.1

data/lib/scenarios.rb

@@ -2,18 +2,11 @@ module Scenarios
 
   #
   # Register a Scenario instance with the module.
-  # Scenarios are stored inside of scenario groups.
   # 
-  # When multple scenarios are registerd in a single
-  # group, it looks like this:
-  #
-  #   { :user_scenarios => { :no_users => [Scenario], :admin_users => [Scenario] }}
-  #
-  # @param [String, Symbol] group_name 
   # @param [Scenarios::Scenario] obj 
   #
-  def self.register(group_name, obj)
-    ( store[group_name.to_sym] ||= {} )[obj.name.to_sym] = obj
+  def self.register(obj)
+    store[obj.name.to_sym] = obj
   end
 
   #

data/lib/scenarios/base.rb

@@ -8,15 +8,6 @@ module Scenarios
 
     class << self
 
-      #
-      # Define the name for this scenario group
-      # 
-      # @param [String, Symbol] group_name
-      #
-      def name(group_name)
-        @group_name = group_name
-      end
-
       #
       # Create a new instance of `Scenario` and register it.
       # 
@@ -25,10 +16,8 @@ module Scenarios
       # @return [Scenairos::Scenario] the new scenario
       #
       def scenario(name, &block)
-        raise "You must call `name` before you can call `scenario`" unless @group_name
-
         obj = Scenario.new(name, &block)
-        Scenarios.register(@group_name.to_sym, obj)
+        Scenarios.register(obj)
         obj
       end
     end

data/lib/scenarios/scenario.rb

@@ -2,7 +2,7 @@ module Scenarios
 
   class Scenario
 
-    attr_reader :name, :definitions
+    attr_reader :name
 
     #
     # Initialize the new instance using the block
@@ -12,59 +12,16 @@ module Scenarios
     #
     def initialize(name, &block)
       @name = name
-      @definitions = {}
-      block.bind(self).call if block_given?
+      @block = block
     end
 
     #
-    # Save a setup block to be called later
+    # Run the initialization block
     #
-    # Example:
-    #
-    #   setup do
-    #     @resorce = User.create(...)
-    #   end
-    #
-    # @param [Proc] block
-    #
-    def setup(&block)
-      @setup_block = block
-    end
-
-    #
-    # Call the setup block
-    #
-    def setup!
-      @setup_block.call if @setup_block.is_a?(Proc)
-    end
-
-    #
-    # Save a block that will be used later to
-    # create a particular dataset.
-    #
-    # Example:
-    #
-    #   define :params do
-    #     { :valid_id => @resource.id }
-    #   end
-    #
-    # @param [String, Symbol] key
     # @param [Proc] block
     #
-    def define(key, &block)
-      @definitions[key.to_sym] = block
-    end
-
-
-    #
-    # Evaluate a particular definition and
-    # return the results
-    #
-    # @param [String, Symbol] key Name of definition to eval
-    #
-    def [](key)
-      d = @definitions[key.to_sym]
-      d.is_a?(Proc) ? d.call : nil
+    def generate
+      @block.bind(self).call if @block.is_a?(Proc)
     end
 
   end

data/scenarios.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{scenarios}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Starr Horne"]
+  s.date = %q{2010-06-13}
+  s.description = %q{Factories on steroids.}
+  s.email = %q{starr@chromahq.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/scenarios.rb",
+     "lib/scenarios/base.rb",
+     "lib/scenarios/proc_extensions.rb",
+     "lib/scenarios/scenario.rb",
+     "scenarios.gemspec",
+     "test/base_test.rb",
+     "test/helper.rb",
+     "test/scenario_test.rb",
+     "test/scenarios_test.rb",
+     "test/system_test.rb"
+  ]
+  s.homepage = %q{http://github.com/starrhorne/scenarios}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Manage scenarios for testing}
+  s.test_files = [
+    "test/base_test.rb",
+     "test/helper.rb",
+     "test/scenario_test.rb",
+     "test/scenarios_test.rb",
+     "test/system_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+  end
+end
+

data/test/base_test.rb

@@ -2,73 +2,17 @@ require 'helper'
 
 class TestBase < Test::Unit::TestCase
 
-  context "no name" do
-
-    setup do
-      Scenarios.clear
-      Scenarios::Base.name(nil)
-    end
-
-    should "raise an exception when `scenario` called" do
-      assert_raise RuntimeError do
-        Scenarios::Base.scenario("X"){}
-      end
-    end
-
-  end
-
-  context "a name" do
-
-    setup do
-      Scenarios.clear
-      Scenarios::Base.name(:sample)
-    end
-
-    should "not raise an exception when `scenario` called" do
-      Scenarios::Base.scenario("X"){}
-    end
-
-  end
-
   context "a few empty scenarios" do
 
     setup do
       Scenarios.clear
-      Scenarios::Base.name(:sample)
       @one = Scenarios::Base.scenario(:one){}
       @two = Scenarios::Base.scenario(:two){}
     end
 
-    should "register group with Scenarios module" do
-      assert Scenarios[:sample].kind_of?(Hash)
-    end
-
-    should "register both scenarios" do
-      assert_equal 2, Scenarios[:sample].size
-    end
-
-    should "register correct scenarios" do
-      assert_equal({@one.name.to_sym => @one, @two.name.to_sym => @two}, Scenarios[:sample])
-    end
-
-  end
-
-  context "a scenario with a definition" do
-    setup do
-      Scenarios.clear
-      Scenarios::Base.name(:sample)
-      @one = Scenarios::Base.instance_eval %[
-        scenario(:one) do
-          define :foo do
-            { :bar => :baz }
-          end
-        end
-      ]
-    end
-
-    should "add definition to scenerio object" do
-      assert_equal 1, @one.definitions.size
-      assert_equal({ :bar => :baz }, @one.definitions[:foo].call)
+    should "register with Scenarios module" do
+      assert_equal @one, Scenarios[:one]
+      assert_equal @two, Scenarios[:two]
     end
 
   end

data/test/scenario_test.rb

@@ -2,75 +2,22 @@ require 'helper'
 
 class TestScenario < Test::Unit::TestCase
 
-  context "an empty scenario" do
+  context "a scenario" do
 
     setup do
-      @resource = Scenarios::Scenario.new("test")
+      @resource = Scenarios::Scenario.new("test") do
+        "hi"
+      end
     end
 
     should "have name set" do
       assert_equal('test', @resource.name)
     end
 
-    should "have an empty definitions" do
-      assert_equal({}, @resource.definitions)
-    end
-
-    should "return nil on setup" do
-      assert_equal nil, @resource.setup!
-    end
-
-  end
-
-  context "a scenario with a setup block" do
-
-    setup do
-      @resource = Scenarios::Scenario.new("test")
-      @resource.setup do 
-        @setup_called = true
-      end
-    end
-
-    should "not call setup block automatically" do
-      assert !@setup_called
-    end
-
-    should "call setup block manually, in scope of caller" do
-      @resource.setup!
-      assert @setup_called
+    should "generate correctly" do
+      assert_equal('hi', @resource.generate)
     end
 
   end
 
-  context "a scenario with a definition" do
-
-    setup do
-      @resource = Scenarios::Scenario.new("test")
-      @resource.define(:params) do
-        @definition_called = true
-        {}
-      end
-      @resource.define(:other) do
-        {}
-      end
-    end
-
-    should "not call definition block automatically" do
-      assert !@definition_called
-    end
-
-    should "call definition block when referenced" do
-      assert_equal({}, @resource[:params])
-      assert @definition_called
-    end
-
-    should "return nil when referencing an invalid definition" do
-      assert_equal(nil, @resource[:winny])
-    end
-
-  end
-
-
-
-
 end

data/test/scenarios_test.rb

@@ -23,21 +23,19 @@ class TestScenarios < Test::Unit::TestCase
 
     setup do
       Scenarios.clear
-      @world = stub(:name => :world)
       @baz = stub(:name => :baz)
       @foo = stub(:name => :foo)
-      Scenarios.register("foo", @foo)
-      Scenarios.register("foo", @baz)
-      Scenarios.register("hello", @world)
+      Scenarios.register(@foo)
+      Scenarios.register(@baz)
     end
 
     should "return correct store" do
-      assert_equal({:foo => {:foo => @foo, :baz => @baz}, :hello => {:world => @world}}, Scenarios.store)
+      assert_equal({:foo => @foo, :baz => @baz}, Scenarios.store)
     end
 
     should "return correct vals for keys" do
-      assert_equal({:foo => @foo, :baz => @baz}, Scenarios[:foo])
-      assert_equal({:world => @world}, Scenarios[:hello])
+      assert_equal(@foo, Scenarios[:foo])
+      assert_equal(@baz, Scenarios[:baz])
     end
 
   end

data/test/system_test.rb

@@ -10,63 +10,22 @@ class TestSystem < Test::Unit::TestCase
       Scenarios.clear
 
       class SampleScenarios < Scenarios::Base
-        name "sample"
-        
         scenario :one do
-          setup do
-            @foo = :bar
-          end
-
-          define :params do
-            { :foo => @foo }
-          end
-
-          define :env do
-            { :one => 1, :two => 2, :three => 3 }
-          end
-
-        end.setup!
-
-        scenario :two do
-          setup do
-            @foo = :baz
-          end
-
-          define :params do
-            { :foo => @foo }
-          end
-
-        end.setup!
+          1
+        end
       end
 
       class MoreScenarios < Scenarios::Base
-        name "more"
-        
-        scenario :three do
-          setup do
-            @foo = :what
-          end
-
-          define :params do
-            { :foo => @foo }
-          end
-        end.setup!
+        scenario :two do
+          2
+        end
       end
 
     end
 
-    should "register group with module" do
-      assert Scenarios[:sample]
-    end
-
     should "register scenarios with module" do
-      assert_equal 2, Scenarios[:sample].size
-    end
-
-    should "have scenarios return correct values " do
-      assert_equal({:foo => :bar}, Scenarios[:sample][:one][:params])
-      assert_equal({ :one => 1, :two => 2, :three => 3 }, Scenarios[:sample][:one][:env])
-      assert_equal({:foo => :baz}, Scenarios[:sample][:two][:params])
+      assert_equal 1, Scenarios[:one].generate
+      assert_equal 2, Scenarios[:two].generate
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Starr Horne
@@ -56,10 +56,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- VERSION
 - lib/scenarios.rb
 - lib/scenarios/base.rb
 - lib/scenarios/proc_extensions.rb
 - lib/scenarios/scenario.rb
+- scenarios.gemspec
 - test/base_test.rb
 - test/helper.rb
 - test/scenario_test.rb