blueprints 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/blueprints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blueprints}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrius Chamentauskas"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-07-17}
   s.default_executable = %q{blueprintify}
   s.description = %q{Another replacement for factories and fixtures. The library that lazy typists will love}
   s.email = %q{sinsiliux@gmail.com}

data/lib/blueprints.rb

@@ -59,7 +59,6 @@ module Blueprints
       root_sub = /^#{config.root}[\\\/]/
       blueprints_path = File.dirname(__FILE__).sub(root_sub, '')
 
-      bc.add_filter {|line| line.sub('(eval)', @@file) }
       bc.add_filter {|line| line.sub(root_sub, '') }
 
       bc.add_silencer {|line| File.dirname(line).starts_with?(blueprints_path) }
@@ -68,31 +67,20 @@ module Blueprints
   end
 
   def self.warn(message, blueprint)
-    $stderr.puts("**WARNING** #{message}: '#{blueprint}'")
-    $stderr.puts(backtrace_cleaner.clean(caller).first)
+    $stderr.puts("**WARNING** #{message}: '#{blueprint.name}'")
+    $stderr.puts(backtrace_cleaner.clean(blueprint.backtrace(caller)).first)
   end
 
   protected
 
   # Loads blueprints file and creates blueprints from data it contains. Is run by setup method
-  def self.load_scenarios_files(*patterns)
-    FileContext.evaluating = true
-
-    patterns.flatten!
-    patterns.collect! {|pattern| File.join(config.root, pattern)} if config.root
-
+  def self.load_scenarios_files(patterns)
     patterns.each do |pattern|
-      unless (files = Dir.glob(pattern)).empty?
-        files.each do |f|
-          @@file = f
-          FileContext.module_eval File.read(f)
-        end
-        FileContext.evaluating = false
-        return
-      end
+      pattern = config.root.join(pattern)
+      Dir[pattern].each {|f| FileContext.new f }
+      return if Dir[pattern].size > 0
     end
 
-    FileContext.evaluating = false
     raise "Blueprints file not found! Put blueprints in #{patterns.join(' or ')} or pass custom filename pattern with :filename option"
   end
 end

data/lib/blueprints/blueprint.rb

@@ -1,26 +1,17 @@
 module Blueprints
   # Class for actual blueprints. Allows building itself by executing block passed against current context.
   class Blueprint < Buildable
+    attr_reader :file
     # Initializes blueprint by name and block
-    def initialize(name, &block)
+    def initialize(name, file, &block)
+      @file = file
       super(name)
       @block = block
     end
 
     # Builds blueprint and adds it to executed blueprint hash. Setups instance variable with same name as blueprint if it is not defined yet.
     def build_self(build_once = true)
-      if build_once and Namespace.root.executed_blueprints.include?(path)
-        Blueprints.warn("Building with options, but blueprint was already built", @name) if Namespace.root.context.options.present?
-      else
-        surface_errors do
-          if @block
-            @result = Namespace.root.context.instance_eval(&@block)
-            Namespace.root.add_variable(path, @result)
-          end
-        end
-      end
-      Namespace.root.executed_blueprints << path
-      @result
+      surface_errors { @result = Namespace.root.context.instance_eval(&@block) if @block }
     end
 
     # Changes blueprint block to build another blueprint by passing additional options to it. Usually used to dry up
@@ -30,12 +21,16 @@ module Blueprints
       @block = Proc.new { build parent => attributes }
     end
 
+    def backtrace(trace)
+      trace.collect {|line| line.sub(/^\(eval\):(\d+).*/, "#{@file}:\\1:in blueprint '#{@name}'") }
+    end
+
     private
 
     def surface_errors
       yield
     rescue StandardError => error
-      puts "\n=> There was an error building scenario '#{@name}'", error.inspect, '', error.backtrace
+      error.set_backtrace(backtrace(error.backtrace))
       raise error
     end
   end

data/lib/blueprints/buildable.rb

@@ -19,7 +19,7 @@ module Blueprints
       @name, parents = parse_name(name)
       depends_on(*parents)
 
-      Blueprints.warn("Overwriting existing blueprint", @name) if Namespace.root and Namespace.root.children[@name]
+      Blueprints.warn("Overwriting existing blueprint", self) if Namespace.root and Namespace.root.children[@name]
       Namespace.root.add_child(self) if Namespace.root
     end
 
@@ -35,39 +35,48 @@ module Blueprints
     #
     # +options+ - list of options to be accessible in the body of a blueprint. Defaults to empty Hash.
     def build(build_once = true, options = {})
+      if build_once and Namespace.root.executed_blueprints.include?(path)
+        Blueprints.warn("Building with options, but blueprint was already built", self) if options.present?
+        return @result
+      end
+      Namespace.root.executed_blueprints << path
+
       each_namespace {|namespace| namespace.build_parents }
       build_parents
 
       old_options, old_attributes = Namespace.root.context.options, Namespace.root.context.attributes
-      Namespace.root.context.options, Namespace.root.context.attributes = options, attributes.merge(options)
-      each_namespace {|namespace| Namespace.root.context.attributes.reverse_merge! namespace.attributes }
+      Namespace.root.context.options, Namespace.root.context.attributes = options, normalized_attributes.merge(options)
+      each_namespace {|namespace| Namespace.root.context.attributes.reverse_merge! namespace.normalized_attributes }
 
-      build_self(build_once).tap do
-        Namespace.root.context.options, Namespace.root.context.attributes = old_options, old_attributes
-      end
+      build_self(build_once)
+      Namespace.root.context.options, Namespace.root.context.attributes = old_options, old_attributes
+      Namespace.root.add_variable(path, @result)
     end
 
     # If value is passed then it sets attributes for this buildable object.
     # Otherwise returns attributes (defaulting to empty Hash)
-    def attributes(value = nil)
-      if value
-        raise value.inspect + @name if @name == ''
-        @attributes = value
-        self
-      else
-        @attributes ||= {}
-      end
+    def attributes(value)
+      @attributes = value
+      self
     end
 
-    protected
-
-    def each_namespace
-      namespace = self
-      yield(namespace) while namespace = namespace.namespace
+    # Returns normalized attributes for that particular blueprint.
+    def normalized_attributes
+      Buildable.normalize_attributes(@attributes ||= {})
     end
 
-    def path
-      @path = (namespace.path + "_" unless namespace.nil? or namespace.path.empty?).to_s + @name.to_s
+    # Normalizes attributes by changing all :@var to values of @var, and all dependencies to the result of that blueprint.
+    def self.normalize_attributes(attributes)
+      attributes = attributes.dup
+      attributes.each do |attr, value|
+        if value.is_a?(Blueprints::Buildable::Dependency)
+          iv_name = value.iv_name
+          Blueprints::Namespace.root.build(value.name)
+        end
+        iv_name = value if value.is_a? Symbol and value.to_s =~ /^@.+$/
+
+        attributes[attr] = Blueprints::Namespace.root.context.instance_variable_get(iv_name) if iv_name
+      end
     end
 
     def build_parents
@@ -82,6 +91,17 @@ module Blueprints
       end
     end
 
+    protected
+
+    def each_namespace
+      namespace = self
+      yield(namespace) while namespace = namespace.namespace
+    end
+
+    def path
+      @path = (namespace.path + "_" unless namespace.nil? or namespace.path.empty?).to_s + @name.to_s
+    end
+
     def parse_name(name)
       case name
         when Hash

data/lib/blueprints/configuration.rb

@@ -2,11 +2,11 @@ module Blueprints
   class Configuration
     SUPPORTED_ORMS = [nil, :active_record]
     # Allows passing custom filename pattern in case blueprints are held in place other than spec/blueprint, test/blueprint, blueprint.
-    attr_accessor :filename
+    attr_reader :filename
     # Allows passing scenarios that should be prebuilt and available in all tests. Works similarly to fixtures.
     attr_accessor :prebuild
     # Allows passing custom root folder to use in case of non rails project. Defaults to RAILS_ROOT or current folder if RAILS_ROOT is not defined.
-    attr_accessor :root
+    attr_reader :root
     # By default blueprints runs each test in it's own transaction. This may sometimes be not desirable so this options allows to turn this off.
     attr_accessor :transactions
     # Returns ORM that is used, default is :active_record
@@ -14,7 +14,7 @@ module Blueprints
 
     # Sets default attributes for all attributes
     def initialize
-      @filename = [nil, "spec", "test"].map do |dir|
+      self.filename = [nil, "spec", "test"].map do |dir|
         ["blueprint"].map do |file|
           path = File.join([dir, file].compact)
           ["#{path}.rb", File.join(path, "*.rb")]
@@ -23,11 +23,7 @@ module Blueprints
       @orm = :active_record
       @prebuild = []
       @transactions = true
-      @root = if defined?(RAILS_ROOT)
-        RAILS_ROOT
-      else
-        nil
-      end
+      @root = defined?(Rails) ? Rails.root : Pathname.pwd
     end
 
     # Allows specifying what ORM should be used. See SUPPORTED_ORMS to check what values it can contain.
@@ -38,5 +34,13 @@ module Blueprints
         raise ArgumentError, "Unsupported ORM #{value.inspect}. Blueprints supports only #{SUPPORTED_ORMS.collect(&:inspect).join(', ')}"
       end
     end
+
+    def filename=(value)
+      @filename = Array(value).flatten.collect {|path| Pathname.new(path) }
+    end
+
+    def root=(value)
+      @root = Pathname.new(value)
+    end
   end
 end

data/lib/blueprints/database_backends/active_record.rb

@@ -17,10 +17,10 @@ module Blueprints
       # or like this:
       #   Post.blueprint({:post => :user}, :title => 'first post', :text => 'My first post', :user => :@user)
       def blueprint(name_or_attrs, attrs = {})
-        if Blueprints::FileContext.evaluating
+        if Blueprints::FileContext.current
           klass = self
-          blueprint = Blueprints::Blueprint.new(name_or_attrs) { klass.blueprint attributes }
-          blueprint.depends_on(*attrs.values.select {|attr| attr.is_a?(Blueprints::Buildable::Dependency) }).attributes(attrs)
+          blueprint = Blueprints::Blueprint.new(name_or_attrs, Blueprints::FileContext.current.file) { klass.blueprint attributes }
+          blueprint.attributes(attrs)
           blueprint
         else
           if name_or_attrs.is_a?(Array)
@@ -37,12 +37,7 @@ module Blueprints
     module InstanceMethods
       # Updates attributes of object and calls save!. Bypasses attr_protected and attr_accessible.
       def blueprint(attributes)
-        attributes.each do |attr, value|
-          iv_name = value.iv_name if value.is_a?(Blueprints::Buildable::Dependency)
-          iv_name = value if value.is_a? Symbol and value.to_s =~ /^@.+$/
-          attributes[attr] = Blueprints::Namespace.root.context.instance_variable_get(iv_name) if iv_name
-        end
-        send(:attributes=, attributes, false)
+        send(:attributes=, Blueprints::Blueprint.normalize_attributes(attributes.dup), false)
         save!
       end
     end

data/lib/blueprints/file_context.rb

@@ -1,15 +1,25 @@
 module Blueprints
   # Module that blueprints file is executed against. Defined <tt>blueprint</tt> and <tt>namespace</tt> methods.
-  module FileContext
-    mattr_accessor :evaluating
+  class FileContext
+    @@current = nil
+    cattr_accessor :current
+    attr_reader :file
+
+    def initialize(file)
+      file = Pathname.new(file)
+      @file = file.relative_path_from(Blueprints.config.root)
+      FileContext.current = self
+      instance_eval(File.read(file))
+      FileContext.current = nil
+    end
 
     # Creates a new blueprint by name and block passed
-    def self.blueprint(name, &block)
-      Blueprint.new(name, &block)
+    def blueprint(name, &block)
+      Blueprint.new(name, @file, &block)
     end
 
     # Creates new namespace by name, and evaluates block against it.
-    def self.namespace(name)
+    def namespace(name)
       old_namespace = Namespace.root
       namespace = Namespace.new(name)
       Namespace.root = namespace
@@ -21,7 +31,7 @@ module Blueprints
 
     # Creates dependency for current blueprint on some other blueprint and marks that instance variable with same name
     # should be used for value of column. Only works on "Class.blueprint :name" type of blueprints
-    def self.d(name)
+    def d(name)
       Buildable::Dependency.new(name)
     end
   end

data/lib/blueprints/helper.rb

@@ -26,7 +26,8 @@ module Blueprints
     #     Fruit.build attributes
     #   end.attributes(:name => 'apple')
     def build_attributes(name)
-      Namespace.root[name].attributes
+      Namespace.root[name].build_parents
+      Namespace.root[name].normalized_attributes.tap { Blueprints::Namespace.root.copy_ivars(self) }
     end
 
     alias :build :build_blueprint
@@ -45,7 +46,7 @@ module Blueprints
       if options[:undo] == :all
         Namespace.root.executed_blueprints.clear
       else
-        undo = [options[:undo]].flatten.compact.collect {|bp| bp.to_s }
+        undo = [options[:undo]].flatten.compact.collect(&:to_s)
         unless (not_found = undo - Namespace.root.executed_blueprints.to_a).blank?
           raise(BlueprintNotFoundError, not_found)
         end

data/lib/blueprints/namespace.rb

@@ -31,7 +31,7 @@ module Blueprints
 
     # Builds all children and sets instance variable named by name of namespace with the results.
     def build_self(build_once = true)
-      Namespace.root.add_variable(path, @children.collect {|p| p.last.build }.uniq)
+      @result = @children.collect {|p| p.last.build }.uniq
     end
   end
 end

data/spec/active_record/blueprint.rb

@@ -1,3 +1,7 @@
+blueprint :error do
+  raise 'error'
+end
+
 blueprint :apple do
   Fruit.create! :species => 'apple'
 end
@@ -69,4 +73,9 @@ namespace :attributes do
   end.attributes(:species => 'cherry')
 
   Fruit.blueprint :shortened_cherry, :species => 'cherry'
+
+  Fruit.blueprint :dependent_cherry1, :tree => d(:pine)
+  Fruit.blueprint(:dependent_cherry2, :tree => :@the_pine).depends_on(:pine)
 end.attributes(:average_diameter => 10, :species => 'fruit with attributes')
+
+blueprint :circular_reference => :circular_reference

data/spec/active_record/blueprints_spec.rb

@@ -106,7 +106,7 @@ describe Blueprints do
       build :fruit
       demolish :undo => [:apple]
       Fruit.count.should == 0
-      build :fruit
+      build :apple
       Fruit.count.should == 1
     end
 
@@ -178,7 +178,7 @@ describe Blueprints do
 
     it 'should raise TypeError when scenario name is not symbol or string' do
       lambda {
-        Blueprints::Blueprint.new(1)
+        Blueprints::Blueprint.new(1, __FILE__)
       }.should raise_error(TypeError, "Pass blueprint names as strings or symbols only, cannot define blueprint 1")
     end
   end
@@ -211,6 +211,12 @@ describe Blueprints do
       @oak.reload.size.should == 'updated'
     end
 
+    it "should normalize attributes when updating with blueprint method" do
+      build :cherry, :oak
+      @cherry.blueprint(:tree => :@oak)
+      @cherry.tree.should == @oak
+    end
+
     it "should automatically merge passed options" do
       build :oak => {:size => 'optional'}
       @oak.name.should == 'Oak'
@@ -254,6 +260,7 @@ describe Blueprints do
       @pitted_acorn.should_not be_nil
       @pitted_red_apple.should_not be_nil
       @pitted.should =~ [@pitted_peach_tree, @pitted_peach, @pitted_acorn, [@pitted_red_apple]]
+      build(:pitted).should == @pitted
     end
 
     describe "with red namespace" do
@@ -353,8 +360,8 @@ describe Blueprints do
   it "should warn when blueprint with same name exists" do
     STDERR.expects(:puts).with("**WARNING** Overwriting existing blueprint: 'overwritten'")
     STDERR.expects(:puts).with(regexp_matches(/blueprints_(spec|test)\.rb:\d+:in `new'/))
-    Blueprints::Blueprint.new(:overwritten)
-    Blueprints::Blueprint.new(:overwritten)
+    Blueprints::Blueprint.new(:overwritten, __FILE__)
+    Blueprints::Blueprint.new(:overwritten, __FILE__)
   end
 
   it "should warn when building with options and blueprint is already built" do
@@ -384,6 +391,29 @@ describe Blueprints do
       build 'attributes.cherry'
       @attributes_cherry.average_diameter.should == 10
     end
+
+    it "should return build attributes for dependencies" do
+      attrs = build_attributes('attributes.dependent_cherry1')
+      @pine.should_not be_nil
+      attrs[:tree].should == @pine
+    end
+
+    it "should return build attributes for :@var" do
+      attrs = build_attributes('attributes.dependent_cherry2')
+      @pine.should_not be_nil
+      attrs[:tree].should == @pine
+    end
+  end
+
+  it "should not fail with circular reference" do
+    build :circular_reference
   end
-end
 
+  it "should rewrite trace" do
+    begin
+      build :error
+    rescue RuntimeError => e
+      e.backtrace[0].should == "spec/active_record/blueprint.rb:2:in blueprint 'error'"
+    end
+  end
+end

data/spec/active_record/spec_helper.rb

@@ -31,7 +31,8 @@ config_class.configure do |config|
 end
 
 Blueprints.enable do |config|
-  config.root = File.expand_path(File.join(File.dirname(__FILE__)))
+  config.root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+  config.filename = 'spec/active_record/blueprint.rb'
   config.prebuild = :big_cherry
   config.transactions = !ENV["NO_TRANSACTIONS"]
 end

data/spec/unit/configuration_spec.rb

@@ -6,20 +6,26 @@ describe Blueprints::Configuration do
   end
 
   it "should have filename with default value" do
-    @config.filename.should == ["blueprint.rb", "blueprint/*.rb", "spec/blueprint.rb", "spec/blueprint/*.rb", "test/blueprint.rb", "test/blueprint/*.rb"]
+    @config.filename.should == %w{blueprint.rb blueprint/*.rb spec/blueprint.rb spec/blueprint/*.rb test/blueprint.rb test/blueprint/*.rb}.collect do |f|
+      Pathname.new(f)
+    end
   end
 
   it "should have correct attribute values" do
     @config.orm.should == :active_record
     @config.prebuild.should == []
     @config.transactions.should be_true
-    @config.root.should be_nil
+    @config.root.should == Pathname.pwd
   end
 
-  it "should use RAILS_ROOT for root if it's defined" do
-    Object::RAILS_ROOT = 'rails/root'
-    Blueprints::Configuration.new.root.should == 'rails/root'
-    Object.send(:remove_const, :RAILS_ROOT)
+  it "should use Rails root for root if it's defined" do
+    module Rails
+      def self.root
+        Pathname.new('rails/root')
+      end
+    end
+    Blueprints::Configuration.new.root.should == Pathname.new('rails/root')
+    Object.send(:remove_const, :Rails)
   end
 
   it "should allow to set only supported orm" do
@@ -31,4 +37,14 @@ describe Blueprints::Configuration do
       @config.orm = :not_existing
     }.should raise_error(ArgumentError, 'Unsupported ORM :not_existing. Blueprints supports only nil, :active_record')
   end
+
+  it "should set root to pathname" do
+    @config.root = "root"
+    @config.root.should == Pathname.new("root")
+  end
+
+  it "should automatically set filename to array of path names" do
+    @config.filename = "my_file.rb"
+    @config.filename.should == [Pathname.new("my_file.rb")]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +03:00
+date: 2010-07-17 00:00:00 +03:00
 default_executable: blueprintify
 dependencies: 
 - !ruby/object:Gem::Dependency