blueprints 0.2.4 → 0.3.0

data/README.rdoc

@@ -80,16 +80,10 @@ And if you also need it to depend on other blueprints:
 === Blueprints file ===
 
 Blueprints searches for blueprints files in this particular order in Rails (Merb) root:
-* blueprints.rb
-* blueprints/*.rb
 * blueprint.rb
 * blueprint/*.rb
-* spec/blueprints.rb
-* spec/blueprints/*.rb
 * spec/blueprint.rb
 * spec/blueprint/*.rb
-* test/blueprints.rb
-* test/blueprints/*.rb
 * test/blueprint.rb
 * test/blueprint/*.rb
 You can pass :root option to override framework root and :filename option to pass custom filename pattern 

data/lib/blueprints.rb

@@ -1,4 +1,7 @@
 require 'activesupport'
+require File.join(File.dirname(__FILE__), 'blueprints/buildable')
+require File.join(File.dirname(__FILE__), 'blueprints/namespace')
+require File.join(File.dirname(__FILE__), 'blueprints/root_namespace')
 require File.join(File.dirname(__FILE__), 'blueprints/plan')
 require File.join(File.dirname(__FILE__), 'blueprints/file_context')
 require File.join(File.dirname(__FILE__), 'blueprints/helper')
@@ -11,7 +14,7 @@ end
 
 module Blueprints
   PLAN_FILES = [nil, "spec", "test"].map do |dir|
-    ["blueprint", "blueprints"].map do |file|
+    ["blueprint"].map do |file|
       path = File.join([dir, file].compact)
       ["#{path}.rb", File.join(path, "*.rb")]
     end
@@ -25,8 +28,8 @@ module Blueprints
   end
 
   def self.setup(current_context)
-    Plan.setup
-    Plan.copy_ivars(current_context)
+    Namespace.root.setup
+    Namespace.root.copy_ivars(current_context)
     unless @@orm == :none
       ActiveRecord::Base.connection.increment_open_transactions
       ActiveRecord::Base.connection.transaction_joinable = false
@@ -44,7 +47,7 @@ module Blueprints
   def self.load(options = {})
     options.assert_valid_keys(:delete_policy, :filename, :prebuild, :root, :orm)
     options.symbolize_keys!
-    return unless Plan.plans.empty?
+    return unless Namespace.root.empty?
 
     @@orm = (options.delete(:orm) || :active_record).to_sym
     raise ArgumentError, "Unsupported ORM #{@@orm}. Blueprints supports only #{SUPPORTED_ORMS.join(', ')}" unless SUPPORTED_ORMS.include?(@@orm)
@@ -56,7 +59,7 @@ module Blueprints
     @@framework_root = options[:root] if options[:root]
     load_scenarios_files(options[:filename] || PLAN_FILES)
 
-    Plan.prebuild(options[:prebuild])
+    Namespace.root.prebuild(options[:prebuild])
   end
 
   def self.load_scenarios_files(*patterns)

data/lib/blueprints/ar_extensions.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'activerecord'
 
 module ActiveRecord
   class Base
@@ -12,7 +12,7 @@ module ActiveRecord
       else
         returning(self.new) do |object|
           options.each do |attr, value|
-            value = Blueprints::Plan.context.instance_variable_get(value) if value.is_a? Symbol and value.to_s =~ /^@.+$/
+            value = Blueprints::Namespace.root.context.instance_variable_get(value) if value.is_a? Symbol and value.to_s =~ /^@.+$/
             object.send("#{attr}=", value)
           end
           object.save!

data/lib/blueprints/buildable.rb

@@ -0,0 +1,50 @@
+module Blueprints
+  class Buildable
+    attr_reader :name
+    attr_accessor :namespace
+
+    def initialize(name)
+      @name, parents = parse_name(name)
+      depends_on(*parents)
+
+      Namespace.root.add_child(self) if Namespace.root 
+    end
+
+    def depends_on(*scenarios)
+      @parents = (@parents || []) + scenarios.map{|s| s.to_sym}
+    end
+
+    def build
+      namespace.build_parent_plans
+      build_parent_plans
+      build_plan
+    end
+
+    protected
+
+    def build_parent_plans
+      @parents.each do |p|
+        parent = begin
+          namespace[p]
+        rescue PlanNotFoundError
+          Namespace.root[p]
+        end
+
+        parent.build_parent_plans
+        parent.build_plan
+      end
+    end
+
+    def parse_name(name)
+      case name
+        when Hash
+          return name.keys.first.to_sym, [name.values.first].flatten.map{|sc| parse_name(sc).first}
+        when Symbol, String
+          name = name.to_sym unless name == ''
+          return name, []
+        else
+          raise TypeError, "Pass plan names as strings or symbols only, cannot build plan #{name.inspect}"
+      end
+    end
+  end
+end

data/lib/blueprints/errors.rb

@@ -5,7 +5,7 @@ module Blueprints
     end
 
     def to_s
-      "Plan(s) not found '#{@plans.join(',')}'"
+      "Plan/namespace not found '#{@plans.join(',')}'"
     end
   end
 end

data/lib/blueprints/file_context.rb

@@ -3,5 +3,14 @@ module Blueprints
     def self.blueprint(plan, &block)
       Plan.new(plan, &block)
     end
+
+    def self.namespace(name)
+      old_namespace = Namespace.root
+      namespace = Namespace.new(name)
+      Namespace.root = namespace
+      yield
+      old_namespace.add_child(namespace)
+      Namespace.root = old_namespace
+    end
   end
 end

data/lib/blueprints/helper.rb

@@ -1,8 +1,8 @@
 module Blueprints
   module Helper
     def build_plan(*names)
-      Plan.build(*names)   
-      Plan.copy_ivars(self)
+      Namespace.root.build(*names)
+      Namespace.root.copy_ivars(self)
     end
 
     alias :build :build_plan
@@ -12,13 +12,13 @@ module Blueprints
       Blueprints.delete_tables(*args)
 
       if options[:undo] == :all
-        Plan.executed_plans.clear
+        Namespace.root.executed_plans.clear
       else
         undo = [options[:undo]].flatten.compact
-        unless (not_found = undo - Plan.executed_plans.to_a).blank?
+        unless (not_found = undo - Namespace.root.executed_plans.to_a).blank?
           raise(ArgumentError, "Scenario(s) #{not_found} not found")
         end
-        Plan.executed_plans -= undo
+        Namespace.root.executed_plans -= undo
       end
     end
   end

data/lib/blueprints/namespace.rb

@@ -0,0 +1,31 @@
+module Blueprints
+  class Namespace < Buildable
+    cattr_accessor :root
+    delegate :empty?, :size, :to => :@children
+
+    def initialize(name)
+      super(name)
+      @children = {}
+    end
+
+    def add_child(child)
+      #TODO: Raise error for duplicate children!
+      @children[child.name] = child
+      child.namespace = self
+    end
+
+    def [](path)
+      child_name, path = path.to_s.split('.', 2)
+      child = @children[child_name.to_sym] or raise PlanNotFoundError, child_name
+      if path
+        child[path]
+      else
+        child
+      end
+    end
+
+    def build_plan
+      Namespace.root.add_variable(name, @children.collect {|p| p.last.build }.uniq)
+    end
+  end
+end

data/lib/blueprints/plan.rb

@@ -1,102 +1,27 @@
 module Blueprints
-  class Plan
-    cattr_reader :plans, :context
-    cattr_accessor :executed_plans
-    @@plans = {}
-    @@executed_plans = Set.new
-    @@global_executed_plans = Set.new
-
-    @@global_context = Module.new
-    @@context = nil
-
-    def self.setup
-      @@context = YAML.load(@@global_context)
-      @@executed_plans = @@global_executed_plans.clone
-    end
-
-    def self.copy_ivars(to)
-      @@context.instance_variables.each do |iv|
-        to.instance_variable_set(iv, @@context.instance_variable_get(iv))
-      end
-    end
-
-    def self.prebuild(plans)
-      @@context = @@global_context
-      @@global_scenarios = Plan.build(plans) if plans
-      @@global_executed_plans = @@executed_plans
-      @@global_context = YAML.dump(@@global_context)
-    end
-
-    def self.build(*names)
-      names.map {|name| @@plans[name.to_sym] or raise PlanNotFoundError, name}.each {|p| p.build}
-    end
-
-    # Instance
-
-    attr_reader :name
-
-    def initialize(*scenario, &block)
-      @name, parents = parse_name(*scenario)
-      depends_on(*parents)
+  class Plan < Buildable
+    def initialize(name, &block)
+      super(name)
       @block = block
-
-      @@plans[@name] = self
-    end
-
-    def build
-      build_parent_plans(@@context)
-      build_plan(@@context)   
-    end
-
-    def depends_on(*scenarios)
-      @parents = (@parents || []) + scenarios.map{|s| s.to_sym} 
-    end
-
-    protected
-
-    def parse_name(name)
-      case name
-        when Hash
-          return name.keys.first.to_sym, [name.values.first].flatten.map{|sc| parse_name(sc).first}
-        when Symbol, String
-          return name.to_sym, []
-        else
-          raise TypeError, "Pass plan names as strings or symbols only, cannot build plan #{name.inspect}"
-      end
-    end
-
-    def say(*messages)
-      puts messages.map { |message| "=> #{message}" }
     end
 
-    def build_plan(context)
+    def build_plan
       surface_errors do
         if @block
-          result = context.module_eval(&@block)
-          iv_name = :"@#{@name}"
-          context.instance_variable_set(iv_name, result) unless context.instance_variable_get(iv_name)
+          @result = Namespace.root.context.module_eval(&@block)
+          Namespace.root.add_variable(@name, @result)
         end
-      end unless @@executed_plans.include?(@name)
-      @@executed_plans << @name
+      end unless Namespace.root.executed_plans.include?(@name)
+      Namespace.root.executed_plans << @name
+      @result
     end
 
-    def build_parent_plans(context)
-      @parents.each do |p|
-        parent = @@plans[p] or raise PlanNotFoundError, p
-
-        parent.build_parent_plans(context)
-        parent.build_plan(context)
-      end
-    end
+    private
 
     def surface_errors
       yield
     rescue StandardError => error
-      puts
-      say "There was an error building scenario '#{@name}'", error.inspect
-      puts
-      puts error.backtrace
-      puts
+      puts "\n=> There was an error building scenario '#{@name}'", error.inspect, '', error.backtrace
       raise error
     end
   end

data/lib/blueprints/root_namespace.rb

@@ -0,0 +1,43 @@
+module Blueprints
+  class RootNamespace < Namespace
+    attr_reader :context, :plans
+    attr_accessor :executed_plans
+    
+    def initialize
+      @executed_plans = Set.new
+      @global_executed_plans = Set.new
+      @global_context = Module.new
+
+      super ''
+    end
+
+    def setup
+      @context = YAML.load(@global_context)
+      @executed_plans = @global_executed_plans.clone
+    end
+
+    def copy_ivars(to)
+      @context.instance_variables.each do |iv|
+        to.instance_variable_set(iv, @context.instance_variable_get(iv))
+      end
+    end
+
+    def prebuild(plans)
+      @context = @global_context
+      @global_scenarios = build(plans) if plans
+      @global_executed_plans = @executed_plans
+      @global_context = YAML.dump(@global_context)
+    end
+
+    def build(*names)
+      names.map {|name| self[name].build}
+    end
+
+    def add_variable(name, value)
+      name = "@#{name}" unless name.to_s[0, 1] == "@" 
+      @context.instance_variable_set(name, value) unless @context.instance_variable_get(name)
+    end
+
+    @@root = RootNamespace.new
+  end
+end

data/spec/active_record/{blueprints.rb → blueprint.rb}

@@ -40,4 +40,14 @@ blueprint :pine do
   @the_pine = Tree.blueprint :name => 'Pine', :size => 'medium'
 end
 
-Fruit.blueprint(:acorn, :species => 'Acorn', :tree => :@oak).depends_on(:oak)
+Fruit.blueprint(:acorn, :species => 'Acorn', :tree => :@oak).depends_on(:oak)
+
+namespace :pitted => :pine do
+  Tree.blueprint :peach_tree, :name => 'pitted peach tree'
+  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
+    Fruit.blueprint(:apple, :species => 'pitted red apple')
+  end
+end

data/spec/active_record/blueprints_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Blueprints do
   describe "constants" do
     it "should be loaded from specified dirs" do
-      Blueprints::PLAN_FILES.should == ["blueprint.rb", "blueprint/*.rb", "blueprints.rb", "blueprints/*.rb", "spec/blueprint.rb", "spec/blueprint/*.rb", "spec/blueprints.rb", "spec/blueprints/*.rb", "test/blueprint.rb", "test/blueprint/*.rb", "test/blueprints.rb", "test/blueprints/*.rb"]
+      Blueprints::PLAN_FILES.should == ["blueprint.rb", "blueprint/*.rb", "spec/blueprint.rb", "spec/blueprint/*.rb", "test/blueprint.rb", "test/blueprint/*.rb"]
     end
 
     it "should support required ORMS" do
@@ -129,9 +129,9 @@ describe Blueprints do
 
   describe 'delete policies' do
     before do
-      Blueprints::Plan.plans.expects(:empty?).returns(true)
+      Blueprints::Namespace.root.expects(:empty?).returns(true)
       Blueprints.expects(:load_scenarios_files).with(Blueprints::PLAN_FILES)
-      Blueprints::Plan.expects(:prebuild).with(nil)
+      Blueprints::Namespace.root.expects(:prebuild).with(nil)
     end
 
     it "should allow using custom delete policy" do
@@ -191,13 +191,13 @@ describe Blueprints do
     it 'should raise ScenarioNotFoundError when scenario could not be found' do
       lambda {
         build :not_existing
-      }.should raise_error(Blueprints::PlanNotFoundError, "Plan(s) not found 'not_existing'")
+      }.should raise_error(Blueprints::PlanNotFoundError, "Plan/namespace not found 'not_existing'")
     end
 
     it 'should raise ScenarioNotFoundError when scenario parent could not be found' do
       lambda {
         build :parent_not_existing
-      }.should raise_error(Blueprints::PlanNotFoundError, "Plan(s) not found 'not_existing'")
+      }.should raise_error(Blueprints::PlanNotFoundError, "Plan/namespace not found 'not_existing'")
     end
 
     it 'should raise TypeError when scenario name is not symbol or string' do
@@ -207,7 +207,7 @@ describe Blueprints do
     end
 
     it "should raise ArgumentError when unknown ORM specified" do
-      Blueprints::Plan.plans.expects(:empty?).returns(true)
+      Blueprints::Namespace.root.expects(:empty?).returns(true)
       lambda {
         Blueprints.load(:orm => :unknown)
       }.should raise_error(ArgumentError, "Unsupported ORM unknown. Blueprints supports only none, active_record")
@@ -237,14 +237,44 @@ describe Blueprints do
     end
   end
 
-#describe "with pitted namespace" do
-#  before do
-#    Hornsby.build('pitted:peach').copy_ivars(self)
-#  end
+  describe "with pitted namespace" do
+    it "should allow building namespaced scenarios" do
+      build 'pitted.peach_tree'
+      @peach_tree.name.should == 'pitted peach tree'
+    end
+    
+    it "should allow adding dependencies from same namespace" do
+      build 'pitted.peach'
+      @peach.species.should == 'pitted peach'
+      @peach_tree.should_not be_nil
+    end
+
+    it "should allow adding dependencies from root namespace" do
+      build 'pitted.acorn'
+      @acorn.species.should == 'pitted acorn'
+      @oak.should_not be_nil
+    end
 
-#  it "should have @peach" do
-#    @peach.species.should == 'peach'
-#  end
-#end
+    it "should allow building whole namespace" do
+      build :pitted
+      @peach_tree.should_not be_nil
+      @peach.should_not be_nil
+      @acorn.should_not be_nil
+      @apple.should_not be_nil
+      @pitted.should =~ [@peach_tree, @peach, @acorn, [@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 nested namespaces scenarios" do
+        build 'pitted.red.apple'
+        @apple.species.should == 'pitted red apple'
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +03:00
+date: 2009-10-17 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: activesupport
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: 
+description: Another replacement for factories and fixtures. The library that lazy typists will love
 email: sinsiliux@gmail.com
 executables: []
 
@@ -31,14 +31,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/blueprints.rb
-- lib/blueprints/errors.rb
 - lib/blueprints/file_context.rb
 - lib/blueprints/helper.rb
+- lib/blueprints/buildable.rb
+- lib/blueprints/root_namespace.rb
 - lib/blueprints/plan.rb
-- lib/blueprints/ar_extensions.rb
 - lib/blueprints/rspec_extensions.rb
+- lib/blueprints/ar_extensions.rb
 - lib/blueprints/test_unit_extensions.rb
+- lib/blueprints/namespace.rb
+- lib/blueprints/errors.rb
+- lib/blueprints.rb
 - README.rdoc
 - LICENSE
 has_rdoc: true
@@ -72,11 +75,11 @@ summary: Another replacement for factories and fixtures
 test_files: 
 - spec/no_db/spec_helper.rb
 - spec/no_db/blueprints_spec.rb
-- spec/no_db/blueprints.rb
+- spec/no_db/blueprint.rb
 - spec/no_db/fixtures/fruit.rb
 - spec/active_record/spec_helper.rb
 - spec/active_record/blueprints_spec.rb
-- spec/active_record/blueprints.rb
+- spec/active_record/blueprint.rb
 - spec/active_record/fixtures/fruit.rb
 - spec/active_record/fixtures/tree.rb
 - spec/active_record/fixtures/database.yml.example