blueprints 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/blueprints.gemspec

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

data/lib/blueprints.rb

@@ -3,7 +3,7 @@ files = %w{
 context buildable namespace root_namespace plan file_context helper errors
 database_backends/abstract database_backends/active_record database_backends/none
 }
-files << if defined? Spec or $0 =~ /script.spec$/
+files << if defined? Spec or $0 =~ /script.spec$/ or defined? RSpec
   'extensions/rspec'
 else
   'extensions/test_unit'
@@ -70,8 +70,22 @@ module Blueprints
     @@orm.delete_tables(@@delete_policy, *tables)
   end
 
+  def self.backtrace_cleaner
+    @backtrace_cleaner ||= ActiveSupport::BacktraceCleaner.new.tap do |bc|
+      root_sub = /^#{@@framework_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) }
+      bc.add_silencer {|line| Gem.path.any? {|path| File.dirname(line).starts_with?(path) } }
+    end
+  end
+
   def self.warn(message, blueprint)
     $stderr.puts("**WARNING** #{message}: '#{blueprint}'")
+    $stderr.puts(backtrace_cleaner.clean(caller).first)
   end
 
   protected
@@ -85,7 +99,10 @@ module Blueprints
 
     patterns.each do |pattern|
       unless (files = Dir.glob(pattern)).empty?
-        files.each{|f| FileContext.module_eval File.read(f)}
+        files.each do |f|
+          @@file = f
+          FileContext.module_eval File.read(f)
+        end
         FileContext.evaluating = false
         return
       end

data/lib/blueprints/buildable.rb

@@ -30,13 +30,12 @@ module Blueprints
       each_namespace {|namespace| namespace.build_parents }
       build_parents
 
-      Namespace.root.context.options = options
-      Namespace.root.context.attributes = attributes.merge(options)
+      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 }
 
       build_self(build_once).tap do
-        Namespace.root.context.options = {}
-        Namespace.root.context.attributes = {}
+        Namespace.root.context.options, Namespace.root.context.attributes = old_options, old_attributes
       end
     end
 

data/lib/blueprints/database_backends/active_record.rb

@@ -67,7 +67,9 @@ module Blueprints
               if name_or_attrs.is_a?(Array)
                 name_or_attrs.collect { |attrs| blueprint(attrs) }
               else
-                returning(self.new) { |object| object.blueprint(name_or_attrs) }
+                object = new
+                object.blueprint(name_or_attrs)
+                object
               end
             end
           end

data/lib/blueprints/extensions/rspec.rb

@@ -1,20 +1,18 @@
-module Spec #:nodoc:
-  module Runner #:nodoc:
-    class Configuration
-      # Enables blueprints in rspec. Is automatically added if <tt>Spec</tt> is defined at loading time or <tt>script/spec</tt>
-      # is used. You might need to require it manually in certain case (eg. running specs from metrics).
-      # Accepts options hash. For supported options please check Blueprints.load.
-      def enable_blueprints(options = {})
-        Blueprints.load(options)
+extend_class = defined?(RSpec) ? RSpec::Core::Configuration : Spec::Runner::Configuration
 
-        include(Blueprints::Helper)
-        before do
-          Blueprints.setup(self)
-        end
-        after do
-          Blueprints.teardown
-        end
-      end
+extend_class.class_eval do
+  # Enables blueprints in rspec. Is automatically added if <tt>Spec</tt> is defined at loading time or <tt>script/spec</tt>
+  # is used. You might need to require it manually in certain case (eg. running specs from metrics).
+  # Accepts options hash. For supported options please check Blueprints.load.
+  def enable_blueprints(options = {})
+    Blueprints.load(options)
+
+    include(Blueprints::Helper)
+    before do
+      Blueprints.setup(self)
+    end
+    after do
+      Blueprints.teardown
     end
   end
 end

data/lib/blueprints/plan.rb

@@ -26,7 +26,8 @@ module Blueprints
     # Changes blueprint block to build another blueprint by passing additional options to it. Usually used to dry up
     # blueprints that are often built with some options.
     def extends(parent, options)
-      @block = Proc.new { build parent => options }
+      attributes(options)
+      @block = Proc.new { build parent => attributes }
     end
 
     private

data/spec/active_record/blueprint.rb

@@ -44,7 +44,8 @@ end
 
 Fruit.blueprint(:acorn, :species => 'Acorn', :tree => d(:oak))
 blueprint :small_acorn do
-  build :acorn => {:average_diameter => 1}
+  @small_acorn = build :acorn => {:average_diameter => 1}
+  @small_acorn_options = options
 end
 blueprint(:huge_acorn => :huge_oak).extends(:acorn, :average_diameter => 100)
 

data/spec/active_record/blueprints_spec.rb

@@ -365,6 +365,11 @@ describe Blueprints do
       @small_acorn.should == @acorn
     end
 
+    it "should not reset options after call to build" do
+      build :small_acorn => {:option => 'value'}
+      @small_acorn_options.should == {:option => 'value'}
+    end
+
     it "should allow to use shortcut to extend blueprint" do
       build :huge_acorn
       @huge_acorn.average_diameter.should == 100
@@ -374,6 +379,11 @@ describe Blueprints do
       build :huge_acorn
       @huge_acorn.tree.size.should == 'huge'
     end
+
+    it "should allow to pass options when building extended blueprint" do
+      build :huge_acorn => {:average_diameter => 200}
+      @huge_acorn.average_diameter.should == 200
+    end
   end
 
   it "should allow to build! without checking if it was already built" do
@@ -383,13 +393,15 @@ describe Blueprints do
   end
 
   it "should warn when blueprint with same name exists" do
-    $stderr.expects(:puts).with("**WARNING** Overwriting existing blueprint: 'overwritten'")
+    STDERR.expects(:puts).with("**WARNING** Overwriting existing blueprint: 'overwritten'")
+    STDERR.expects(:puts).with(regexp_matches(/^blueprints_spec\.rb:\d+:in `new'$/))
     Blueprints::Plan.new(:overwritten)
     Blueprints::Plan.new(:overwritten)
   end
 
   it "should warn when building with options and blueprint is already built" do
     STDERR.expects(:puts).with("**WARNING** Building with options, but blueprint was already built: 'big_cherry'")
+    STDERR.expects(:puts).with(regexp_matches(/^blueprints_spec\.rb:\d+$/))
     build :big_cherry => {:species => 'some species'}
   end
 

data/spec/active_record/spec_helper.rb

@@ -1,10 +1,9 @@
 require 'rubygems'
 require 'fileutils'
+require 'logger'
+version = ENV['RAILS']
+gem 'activerecord', version == '3' ? '>= 3.0.0.beta' : "~> #{version}" if version
 require 'active_record'
-begin
-  require 'mysqlplus'
-rescue LoadError
-end
 
 Dir.chdir File.join(File.dirname(__FILE__), '..', '..')
 
@@ -14,12 +13,20 @@ databases = YAML::load(IO.read("spec/active_record/fixtures/database.yml"))
 db_info = databases[ENV["DB"] || "test"]
 ActiveRecord::Base.establish_connection(db_info)
 
-require 'spec/autorun'
+config_class = if version.to_s[0, 1] == '3'
+  gem 'rspec', '>= 2.0.0.beta'
+  require 'rspec'
+  RSpec
+else
+  require 'spec'
+  Spec::Runner
+end
+
 require 'lib/blueprints'
 require 'spec/active_record/fixtures/fruit'
 require 'spec/active_record/fixtures/tree'
 
-Spec::Runner.configure do |config|
+config_class.configure do |config|
   config.mock_with :mocha
   config.enable_blueprints :root => File.expand_path(File.join(File.dirname(__FILE__))), :prebuild => :big_cherry
 end

metadata

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