blueprints 0.3.1 → 0.3.2

data/lib/blueprints/buildable.rb

@@ -7,7 +7,7 @@ module Blueprints
       @name, parents = parse_name(name)
       depends_on(*parents)
 
-      Namespace.root.add_child(self) if Namespace.root 
+      Namespace.root.add_child(self) if Namespace.root
     end
 
     def depends_on(*scenarios)
@@ -15,7 +15,8 @@ module Blueprints
     end
 
     def build
-      namespace.build_parent_plans
+      namespace = self
+      namespace.build_parent_plans while namespace = namespace.namespace
       build_parent_plans
       build_plan
     end
@@ -34,8 +35,7 @@ module Blueprints
           Namespace.root[p]
         end
 
-        parent.build_parent_plans
-        parent.build_plan
+        parent.build
       end
     end
 

data/lib/blueprints/helper.rb

@@ -14,9 +14,9 @@ module Blueprints
       if options[:undo] == :all
         Namespace.root.executed_plans.clear
       else
-        undo = [options[:undo]].flatten.compact
+        undo = [options[:undo]].flatten.compact.collect {|bp| bp.to_s }
         unless (not_found = undo - Namespace.root.executed_plans.to_a).blank?
-          raise(ArgumentError, "Scenario(s) #{not_found} not found")
+          raise(PlanNotFoundError, not_found)
         end
         Namespace.root.executed_plans -= undo
       end

data/lib/blueprints/plan.rb

@@ -11,8 +11,8 @@ module Blueprints
           @result = Namespace.root.context.module_eval(&@block)
           Namespace.root.add_variable(path, @result)
         end
-      end unless Namespace.root.executed_plans.include?(@name)
-      Namespace.root.executed_plans << @name
+      end unless Namespace.root.executed_plans.include?(path)
+      Namespace.root.executed_plans << path
       @result
     end
 

data/lib/blueprints/root_namespace.rb

@@ -24,7 +24,7 @@ module Blueprints
 
     def prebuild(plans)
       @context = @global_context
-      @global_scenarios = build(plans) if plans
+      @global_scenarios = build(*plans) if plans
       @global_executed_plans = @executed_plans
       @global_context = YAML.dump(@global_context)
     end
@@ -40,4 +40,4 @@ module Blueprints
 
     @@root = RootNamespace.new
   end
-end
+end

data/spec/active_record/blueprint.rb

@@ -47,7 +47,7 @@ namespace :pitted => :pine do
   Fruit.blueprint(:peach, :species => 'pitted peach', :tree => :@peach_tree).depends_on(:peach_tree)
   Fruit.blueprint(:acorn, :species => 'pitted acorn', :tree => :@oak).depends_on(:oak)
 
-  namespace :red do
+  namespace :red => :orange do
     Fruit.blueprint(:apple, :species => 'pitted red apple')
   end
 end

data/spec/active_record/blueprints_spec.rb

@@ -123,7 +123,7 @@ describe Blueprints do
     it "should raise error when not executed scenarios passed to :undo option" do
       lambda {
         demolish :undo => :orange
-      }.should raise_error(ArgumentError)
+      }.should raise_error(Blueprints::PlanNotFoundError, "Plan/namespace not found 'orange'")
     end
   end
 
@@ -242,7 +242,7 @@ describe Blueprints do
       build 'pitted.peach_tree'
       @pitted_peach_tree.name.should == 'pitted peach tree'
     end
-    
+
     it "should allow adding dependencies from same namespace" do
       build 'pitted.peach'
       @pitted_peach.species.should == 'pitted peach'
@@ -257,7 +257,6 @@ describe Blueprints do
 
     it "should allow building whole namespace" do
       build :pitted
-      p instance_variables
       @pitted_peach_tree.should_not be_nil
       @pitted_peach.should_not be_nil
       @pitted_acorn.should_not be_nil
@@ -265,12 +264,19 @@ describe Blueprints do
       @pitted.should =~ [@pitted_peach_tree, @pitted_peach, @pitted_acorn, [@pitted_red_apple]]
     end
 
-    it "should load dependencies when building namespaced blueprint if namespace has any" do
-      build 'pitted.peach'
-      @the_pine.should_not be_nil
-    end
-
     describe "with red namespace" do
+      it "should allow building blueprint with same name in different namespaces" do
+        build :apple, 'pitted.red.apple'
+        @apple.species.should == 'apple'
+        @pitted_red_apple.species.should == 'pitted red apple'
+      end
+
+      it "should load dependencies when building namespaced blueprint if parent namespaces have any" do
+        build 'pitted.red.apple'
+        @the_pine.should_not be_nil
+        @orange.should_not be_nil
+      end
+
       it "should allow building nested namespaces scenarios" do
         build 'pitted.red.apple'
         @pitted_red_apple.species.should == 'pitted red apple'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +03:00
+date: 2009-10-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,17 +31,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/blueprints.rb
 - lib/blueprints/file_context.rb
+- lib/blueprints/ar_extensions.rb
+- lib/blueprints/test_unit_extensions.rb
 - lib/blueprints/helper.rb
 - lib/blueprints/buildable.rb
-- lib/blueprints/root_namespace.rb
 - lib/blueprints/plan.rb
 - lib/blueprints/rspec_extensions.rb
-- lib/blueprints/ar_extensions.rb
-- lib/blueprints/test_unit_extensions.rb
+- lib/blueprints/root_namespace.rb
 - lib/blueprints/namespace.rb
 - lib/blueprints/errors.rb
-- lib/blueprints.rb
 - README.rdoc
 - LICENSE
 has_rdoc: true