sinsiliux-hornsby 0.2.0 → 0.2.1

data/lib/hornsby.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'hornsby_context')
+
 class Hornsby
   @@delete_sql = "DELETE FROM %s"
 
@@ -6,21 +8,27 @@ class Hornsby
   end
 
   cattr_reader :scenarios
+  # @@namespaces = {}
   @@scenarios = {}
   @@executed_scenarios = Set.new
-  cattr_reader :global_scenarios
-  # @@namespaces = {}
+  @@global_executed_scenarios = []
+
+  @@global_context = HornsbyContext
+  @@context = nil
 
   def self.configure_rspec(config, options = {})
     load(options[:filename])
 
+    @@context = @@global_context
     @@global_scenarios = Hornsby.build(options[:scenarios]) if options[:scenarios]
+    @@global_executed_scenarios = @@executed_scenarios.to_a
 
     config.include(HornsbySpecHelper)
 
     config.before do
-      @@executed_scenarios = Set.new(@@global_scenarios.collect {|s| s.scenario })
-      @@global_scenarios.each {|s| s.copy_ivars(self, true)} if @@global_scenarios
+      @@context = @@global_context.clone
+      @@executed_scenarios = Set.new(@@global_executed_scenarios)
+      Hornsby.copy_ivars(self, true)
       ActiveRecord::Base.connection.increment_open_transactions
       ActiveRecord::Base.connection.transaction_joinable = false
       ActiveRecord::Base.connection.begin_db_transaction
@@ -53,13 +61,6 @@ class Hornsby
     self.new(scenario, &block)
   end
 
-  def self.namespace(name, &block)
-  end
-
-  def self.reset!
-    @@scenarios = {}
-  end
-
   def self.delete_tables
     tables.each { |t| ActiveRecord::Base.connection.delete(@@delete_sql % t)  }
   end
@@ -72,6 +73,10 @@ class Hornsby
     %w( schema_info )
   end
 
+  def self.copy_ivars(to, reload = false)
+    @@context.copy_ivars(to, reload)
+  end
+
   attr_reader :scenario
 
   def initialize(scenario, &block)
@@ -97,32 +102,13 @@ class Hornsby
   end
 
   def build
-    @context = context = Module.new
-
-    # TODO move this elsewhere
-    context.module_exec do
-      def self.method_missing(meth_id, *args, &block)
-        begin
-          rec = meth_id.to_s.classify.constantize.send(:create!, *args)
-          yield(rec) if block_given?
-        rescue
-          super
-        end
-      end
-    end
-
-    ivars = context.instance_variables
-
-    build_parent_scenarios(context)
-    build_scenario(context)
-
-    @context_ivars = context.instance_variables - ivars
-
+    build_parent_scenarios(@@context)
+    build_scenario(@@context)
     self
   end
 
   def build_scenario(context)
-    surface_errors { context.module_eval(&@block) } unless @@executed_scenarios.include?(@scenario)
+    surface_errors { context.execute(@@context == @@global_context, &@block) } unless @@executed_scenarios.include?(@scenario)
     @@executed_scenarios << @scenario
   end
 
@@ -145,19 +131,12 @@ class Hornsby
     puts
     raise error
   end
-
-  def copy_ivars(to, reload = false)
-    @context_ivars.each do |iv|
-      v = @context.instance_variable_get(iv)
-      v.reload if reload and v.respond_to?(:reload)
-      to.instance_variable_set(iv, v)
-    end
-  end
 end
 
 
 module HornsbySpecHelper
   def hornsby_scenario(*names)
-    Hornsby.build(*names).each {|s| s.copy_ivars(self)}
+    Hornsby.build(*names)
+    Hornsby.copy_ivars(self)
   end
 end

data/spec/hornsby_scenario.rb

@@ -25,6 +25,14 @@ scenario(:cherry) do
   @cherry = Fruit.create! :species => 'cherry', :average_diameter => 3
 end
 
+scenario(:big_cherry => :cherry) do
+  @big_cherry = Fruit.create! :species => @cherry.species, :average_diameter => 7
+end
+
+scenario(:cherry_basket => [:big_cherry, :cherry]) do
+  @basket = [@cherry, @big_cherry]
+end
+
 # Hornsby.namespace(:pitted_fruit) do
 #   scenario(:peach) do
 #     @peach = Fruit.create! :species => 'peach'

data/spec/hornsby_spec.rb

@@ -70,20 +70,27 @@ describe Hornsby, 'with preloaded cherry scenario' do
     @cherry.update_attribute(:average_diameter, 5)
     @cherry.average_diameter.should == 5
   end
+
+  it "should create big cherry" do
+    @big_cherry.species.should == 'cherry'
+  end
 end
 
 describe Hornsby, 'with many apples scenario' do
   before do
-    hornsby_scenario :many_apples, :cherry
+    hornsby_scenario :many_apples, :cherry, :cherry_basket
   end
 
   it "should create only one apple" do
-    puts Hornsby.send(:class_variable_get, :@@executed_scenarios).inspect
     Fruit.all(:conditions => 'species = "apple"').count.should == 1
   end
 
-  it "should create only one cherry even if it was preloaded" do
-    Fruit.all(:conditions => 'species = "cherry"').count.should == 1
+  it "should create only two cherries even if they were preloaded" do
+    Fruit.all(:conditions => 'species = "cherry"').count.should == 2
+  end
+
+  it "should contain cherries in basket if basket is loaded in test and cherries preloaded" do
+    @basket.should == [@cherry, @big_cherry]
   end
 end
 

data/spec/spec_helper.rb

@@ -4,17 +4,17 @@ require 'activerecord'
 spec_dir = File.dirname(__FILE__)
 Dir.chdir spec_dir
 
-ActiveRecord::Base.logger = Logger.new(spec_dir + "/debug.log")
+ActiveRecord::Base.logger = Logger.new("debug.log")
 
-databases = YAML::load(IO.read(spec_dir + "/db/database.yml"))
+databases = YAML::load(IO.read("db/database.yml"))
 db_info = databases[ENV["DB"] || "test"]
 ActiveRecord::Base.establish_connection(db_info)
-load(File.join(spec_dir, "db", "schema.rb"))
+load(File.join("db", "schema.rb"))
 
 require 'spec/autorun'
 require '../lib/hornsby'
 require 'db/fruit'
 
 Spec::Runner.configure do |config|
-  Hornsby.configure_rspec(config, :filename => File.join(spec_dir, 'hornsby_scenario.rb'), :scenarios => :cherry)
+  Hornsby.configure_rspec(config, :filename => File.join('hornsby_scenario.rb'), :scenarios => :big_cherry)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinsiliux-hornsby
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Andrius Chamentauskas