blueprints 0.7.3 → 0.8.0

data/spec/active_record/blueprints_spec.rb

@@ -91,37 +91,19 @@ describe Blueprints do
     end
 
     it "should clear scenarios when calling demolish" do
-      demolish
-      Fruit.count.should == 0
-    end
-
-    it "should clear only tables passed" do
-      Tree.create!(:name => 'oak')
-      demolish :fruits
-      Tree.count.should == 1
-      Fruit.count.should == 0
-    end
-
-    it "should mark scenarios as undone when passed :undone option" do
-      build :fruit
-      demolish :undo => [:apple]
-      Fruit.count.should == 0
+      demolish :apple
+      Fruit.all.should_not include(@apple)
       build :apple
-      Fruit.count.should == 1
+      Fruit.last.should == @apple
     end
 
-    it "should mark all scenarios as undone when passed :undone option as :all" do
-      build :fruit
-      demolish :undo => :all
-      Fruit.count.should == 0
-      build :fruit
-      Fruit.count.should == 2
-    end
+    it "should overwrite auto created instance variable with another auto created one" do
+      build :acorn => {:average_diameter => 3}
+      demolish :acorn
+      @acorn.average_diameter.should == 3
 
-    it "should raise error when not executed scenarios passed to :undo option" do
-      lambda {
-        demolish :undo => :orange
-      }.should raise_error(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'orange'")
+      build :acorn => {:average_diameter => 5}
+      @acorn.average_diameter.should == 5
     end
   end
 
@@ -167,13 +149,13 @@ describe Blueprints do
     it 'should raise ScenarioNotFoundError when scenario could not be found' do
       lambda {
         build :not_existing
-      }.should raise_error(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'not_existing'")
+      }.should raise_error(Blueprints::BlueprintNotFoundError)
     end
 
     it 'should raise ScenarioNotFoundError when scenario parent could not be found' do
       lambda {
         build :parent_not_existing
-      }.should raise_error(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'not_existing'")
+      }.should raise_error(Blueprints::BlueprintNotFoundError)
     end
 
     it 'should raise TypeError when scenario name is not symbol or string' do
@@ -314,15 +296,6 @@ describe Blueprints do
     end
   end
 
-  it "should overwrite auto created instance variable with another auto created one" do
-    build :acorn => {:average_diameter => 3}
-    demolish :fruits, :undo => :acorn
-    @acorn.average_diameter.should == 3
-
-    build :acorn => {:average_diameter => 5}
-    @acorn.average_diameter.should == 5
-  end
-
   describe "extending blueprints" do
     it "should allow to call build method inside blueprint body" do
       build :small_acorn
@@ -364,12 +337,6 @@ describe Blueprints do
     Blueprints::Blueprint.new(:overwritten, __FILE__)
   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|test)\.rb:\d+/))
-    build :big_cherry => {:species => 'some species'}
-  end
-
   describe 'attributes' do
     it "should allow to extract attributes from blueprint" do
       build_attributes('attributes.cherry').should == {:species => 'cherry'}
@@ -394,14 +361,14 @@ describe Blueprints do
 
     it "should return build attributes for dependencies" do
       attrs = build_attributes('attributes.dependent_cherry1')
-      @pine.should_not be_nil
-      attrs[:tree].should == @pine
+      @the_pine.should_not be_nil
+      attrs[:tree].should == @the_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
+      @the_pine.should_not be_nil
+      attrs[:tree].should == @the_pine
     end
   end
 

data/spec/active_record/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'fileutils'
 require 'logger'
 version = ENV['RAILS']

data/spec/no_db/blueprint.rb

@@ -4,4 +4,6 @@ end
 
 blueprint :big_cherry do
   Fruit.new('cherry', 10)
-end
+end
+
+Fruit.blueprint :apple, :species => 'apple', :size => 3

data/spec/no_db/blueprints_spec.rb

@@ -23,4 +23,23 @@ describe Blueprints do
       @big_cherry.size = 13
     end
   end
-end
+
+  describe "build per describe" do
+    build_blueprint :cherry
+
+    it "should have cherry" do
+      @cherry.should_not be_nil
+    end
+
+    it "should have correct cherry species" do
+      @cherry.species.should == 'cherry'
+    end
+  end
+
+  it "should allow shortened forms of blueprint for any type of object" do
+    build :apple
+    @apple.should_not be_nil
+    @apple.species.should == 'apple'
+    @apple.size.should == 3
+  end
+end

data/spec/no_db/fixtures/fruit.rb

@@ -1,8 +1,15 @@
 class Fruit
   attr_accessor :species, :size
+  include Blueprints::Blueprintable
 
   def initialize(species, size = 5)
     @species = species
     @size = size
   end
+
+  private
+
+  def self.blueprint_object(attrs)
+    new(attrs[:species], attrs[:size])
+  end
 end

data/spec/no_db/spec_helper.rb

@@ -11,5 +11,4 @@ end
 Blueprints.enable do |config|
   config.root = File.expand_path(File.join(File.dirname(__FILE__)))
   config.prebuild = :big_cherry
-  config.orm = nil
 end

data/spec/test_all.sh

@@ -6,6 +6,8 @@ function e {
     echo '----------------------------------------'
 }
 
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
 e "Normal spec"
 spec spec/active_record/blueprints_spec.rb
 
@@ -16,6 +18,7 @@ e "With no db"
 spec spec/no_db/blueprints_spec.rb
 
 e "With Test::Unit"
+rake rspec_to_test
 ruby test/blueprints_test.rb
 
 e "With Cucumber"
@@ -26,11 +29,11 @@ rvm 1.8.7
 RAILS=3 rspec spec/active_record/blueprints_spec.rb
 
 e "With ruby 1.9.1"
-rvm use 1.9.1
+rvm 1.9.1
 spec spec/active_record/blueprints_spec.rb
 
 e "With ruby 1.8.6"
-rvm use 1.8.6
+rvm 1.8.6
 spec spec/active_record/blueprints_spec.rb
 
-rvm use system
+rvm system

data/spec/unit/active_record_spec.rb

@@ -0,0 +1,17 @@
+require 'active_record'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec/active_record/fixtures/fruit'
+require 'spec/active_record/fixtures/tree'
+
+databases = YAML::load(IO.read("spec/active_record/fixtures/database.yml"))
+db_info = databases[ENV["DB"] || "test"]
+ActiveRecord::Base.establish_connection(db_info)
+
+describe ActiveRecord::Base do
+  it "should allow calling blueprint on associations" do
+    tree = Tree.blueprint(:name => 'tree')
+    fruit = tree.fruits.blueprint(:species => 'fruit')
+    fruit.should be_instance_of(Fruit)
+    fruit.species.should == 'fruit'
+  end
+end

data/spec/unit/blueprint_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Blueprints::Blueprint do
+  before do
+    mock = @mock
+    @blueprint = Blueprints::Blueprint.new(:blueprint, __FILE__) { mock }
+    Blueprints::Namespace.root.build :blueprint
+  end
+
+  describe "demolish" do
+    before do
+      @mock.stubs(:destroy)
+    end
+
+    it "should allow to demolish blueprint" do
+      @mock.expects(:destroy)
+      @blueprint.demolish
+    end
+
+    it "should unset @result after demolish" do
+      @blueprint.demolish
+      @blueprint.instance_variable_defined?(:@result).should be_false
+    end
+
+    it "should raise error if @result is not set" do
+      @blueprint.demolish
+      lambda { @blueprint.demolish }.should raise_error(Blueprints::DemolishError)
+    end
+
+    it "should set blueprint as not built" do
+      @blueprint.demolish
+      Blueprints::Namespace.root.executed_blueprints.should_not include(@blueprint)
+    end
+
+    it "should allow to customize demolishing" do
+      @mock.expects(:demolish)
+      @blueprint.demolish { @blueprint.demolish }
+      @blueprint.demolish
+    end
+  end
+
+  describe "updating" do
+    it "should allow building blueprint with different parameters" do
+      @mock.expects(:blueprint).with(:option => 'value')
+      Blueprints::RootNamespace.root.build(:blueprint => {:option => 'value'})
+    end
+
+    it "should allow customizing update block" do
+      @blueprint.update { @blueprint.update_attributes(options) }
+      @mock.expects(:update_attributes).with(:option => 'value')
+      Blueprints::RootNamespace.root.build(:blueprint => {:option => 'value'})
+    end
+
+    it "should not update if build_once is false" do
+      Blueprints::RootNamespace.root.build({:blueprint => {:option => 'value'}}, nil, false)
+    end
+  end
+end

data/spec/unit/buildable_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Blueprints::Buildable do
+  before do
+    mock = @mock
+    @blueprint = Blueprints::Blueprint.new(:blueprint, __FILE__) { mock }
+  end
+
+  describe "normalize attributes" do
+    it "should allow passing dependent normalize Blueprints::Dependency object" do
+      Blueprints::Buildable.normalize_attributes(:name => Blueprints::Dependency.new(:blueprint)).should == {:name => @mock} 
+    end
+  end
+end

data/spec/unit/configuration_spec.rb

@@ -11,8 +11,7 @@ describe Blueprints::Configuration do
     end
   end
 
-  it "should have correct attribute values" do
-    @config.orm.should == :active_record
+  it "should have correct attribute values" do\
     @config.prebuild.should == []
     @config.transactions.should be_true
     @config.root.should == Pathname.pwd
@@ -28,16 +27,6 @@ describe Blueprints::Configuration do
     Object.send(:remove_const, :Rails)
   end
 
-  it "should allow to set only supported orm" do
-    Blueprints::Configuration::SUPPORTED_ORMS.should == [nil, :active_record]
-    @config.orm = nil
-    @config.orm.should be_nil
-
-    lambda {
-      @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")

data/spec/unit/dependency_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Blueprints::Dependency do
+  before do
+    Blueprints::RootNamespace.root.context.instance_eval do
+      @value = :value
+    end
+
+    mock = @mock
+    @value = value = Mocha::Mockery.instance.unnamed_mock
+    @blueprint = Blueprints::Blueprint.new(:blueprint, __FILE__) do
+      @value = value
+      options.present? ? options : mock
+    end
+  end
+
+  it "should allow getting instance variable value" do
+    Blueprints::Dependency.new(:blueprint).value.should == @mock
+  end
+
+  it "should allow getting another instance variable" do
+    Blueprints::Dependency.new(:blueprint, :value).value.should == @value
+  end
+
+  it "should allow passing options for building" do
+    Blueprints::Dependency.new(:blueprint, :option => 'value').value.should == {:option => 'value'}
+  end
+
+  it "should record all missing methods" do
+    dependency = Blueprints::Dependency.new(:blueprint)
+    dependency.method1.method2(1).method3 {|val| val.method4 }
+
+    @mock.expects(:method1).with().returns(mock1 = mock)
+    mock1.expects(:method2).with(1).returns(mock2 = mock)
+    mock2.expects(:method3).with().yields(mock(:method4 => true)).returns(result = mock)
+
+    dependency.value.should == result
+  end
+end

data/spec/unit/namespace_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Blueprints::Namespace do
+  before do
+    mock = @mock
+
+    old_root = Blueprints::Namespace.root
+    @namespace = Blueprints::Namespace.root = Blueprints::Namespace.new(:namespace)
+    Blueprints::Blueprint.new(:blueprint1, __FILE__) { mock }
+    Blueprints::Blueprint.new(:blueprint2, __FILE__) { mock }
+    Blueprints::Namespace.root = old_root
+
+    Blueprints::Blueprint.new(:outside_namespace, __FILE__) { mock }
+    Blueprints::Namespace.root.build :namespace
+  end
+
+  describe "demolish" do
+    it "should allow to demolish namespace" do
+      @mock.expects(:destroy).twice
+      @namespace.demolish
+    end
+  end
+end

data/spec/unit/spec_helper.rb

@@ -14,4 +14,13 @@ require 'lib/blueprints'
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
+
+  config.before do
+    Blueprints::Namespace.root.instance_variable_set(:@context, Blueprints::Context.new)
+    @mock = Mocha::Mockery.instance.unnamed_mock
+  end
+
+  config.after do
+    Blueprints::Namespace.root.children.clear
+  end
 end

data/test/blueprints_test.rb

@@ -91,37 +91,19 @@ class BlueprintsTest < ActiveSupport::TestCase
     end
 
     should "clear scenarios when calling demolish" do
-      demolish
-      assert(Fruit.count == 0)
-    end
-
-    should "clear only tables passed" do
-      Tree.create!(:name => 'oak')
-      demolish :fruits
-      assert(Tree.count == 1)
-      assert(Fruit.count == 0)
-    end
-
-    should "mark scenarios as undone when passed :undone option" do
-      build :fruit
-      demolish :undo => [:apple]
-      assert(Fruit.count == 0)
-      build :fruit
-      assert(Fruit.count == 1)
+      demolish :apple
+      assert(!Fruit.all.include?(@apple))
+      build :apple
+      assert(Fruit.last == @apple)
     end
 
-    should "mark all scenarios as undone when passed :undone option as :all" do
-      build :fruit
-      demolish :undo => :all
-      assert(Fruit.count == 0)
-      build :fruit
-      assert(Fruit.count == 2)
-    end
+    should "overwrite auto created instance variable with another auto created one" do
+      build :acorn => {:average_diameter => 3}
+      demolish :acorn
+      assert(@acorn.average_diameter == 3)
 
-    should "raise error when not executed scenarios passed to :undo option" do
-      assert_raise(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'orange'") do
-        demolish :undo => :orange
-      end
+      build :acorn => {:average_diameter => 5}
+      assert(@acorn.average_diameter == 5)
     end
   end
 
@@ -165,20 +147,20 @@ class BlueprintsTest < ActiveSupport::TestCase
 
   context 'errors' do
     should 'raise ScenarioNotFoundError when scenario could not be found' do
-      assert_raise(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'not_existing'") do
+      assert_raise(Blueprints::BlueprintNotFoundError) do
         build :not_existing
       end
     end
 
     should 'raise ScenarioNotFoundError when scenario parent could not be found' do
-      assert_raise(Blueprints::BlueprintNotFoundError, "Blueprint/namespace not found 'not_existing'") do
+      assert_raise(Blueprints::BlueprintNotFoundError) do
         build :parent_not_existing
       end
     end
 
     should 'raise TypeError when scenario name is not symbol or string' do
       assert_raise(TypeError, "Pass blueprint names as strings or symbols only, cannot define blueprint 1") do
-        Blueprints::Blueprint.new(1)
+        Blueprints::Blueprint.new(1, __FILE__)
       end
     end
   end
@@ -211,6 +193,12 @@ class BlueprintsTest < ActiveSupport::TestCase
       assert(@oak.reload.size == 'updated')
     end
 
+    should "normalize attributes when updating with blueprint method" do
+      build :cherry, :oak
+      @cherry.blueprint(:tree => :@oak)
+      assert(@cherry.tree == @oak)
+    end
+
     should "automatically merge passed options" do
       build :oak => {:size => 'optional'}
       assert(@oak.name == 'Oak')
@@ -254,6 +242,7 @@ class BlueprintsTest < ActiveSupport::TestCase
       assert(!(@pitted_acorn.nil?))
       assert(!(@pitted_red_apple.nil?))
       assert_similar(@pitted, [@pitted_peach_tree, @pitted_peach, @pitted_acorn, [@pitted_red_apple]])
+      assert(build(:pitted) == @pitted)
     end
 
     context "with red namespace" do
@@ -307,15 +296,6 @@ class BlueprintsTest < ActiveSupport::TestCase
     end
   end
 
-  should "overwrite auto created instance variable with another auto created one" do
-    build :acorn => {:average_diameter => 3}
-    demolish :fruits, :undo => :acorn
-    assert(@acorn.average_diameter == 3)
-
-    build :acorn => {:average_diameter => 5}
-    assert(@acorn.average_diameter == 5)
-  end
-
   context "extending blueprints" do
     should "allow to call build method inside blueprint body" do
       build :small_acorn
@@ -353,14 +333,8 @@ class BlueprintsTest < ActiveSupport::TestCase
   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)
-  end
-
-  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|test)\.rb:\d+/))
-    build :big_cherry => {:species => 'some species'}
+    Blueprints::Blueprint.new(:overwritten, __FILE__)
+    Blueprints::Blueprint.new(:overwritten, __FILE__)
   end
 
   context 'attributes' do
@@ -384,6 +358,29 @@ class BlueprintsTest < ActiveSupport::TestCase
       build 'attributes.cherry'
       assert(@attributes_cherry.average_diameter == 10)
     end
+
+    should "return build attributes for dependencies" do
+      attrs = build_attributes('attributes.dependent_cherry1')
+      assert(!(@the_pine.nil?))
+      assert(attrs[:tree] == @the_pine)
+    end
+
+    should "return build attributes for :@var" do
+      attrs = build_attributes('attributes.dependent_cherry2')
+      assert(!(@the_pine.nil?))
+      assert(attrs[:tree] == @the_pine)
+    end
+  end
+
+  should "not fail with circular reference" do
+    build :circular_reference
   end
-end
 
+  should "rewrite trace" do
+    begin
+      build :error
+    rescue RuntimeError => e
+      assert(e.backtrace[0] == "spec/active_record/blueprint.rb:2:in blueprint 'error'")
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 +03:00
+date: 2010-08-13 00:00:00 +03:00
 default_executable: blueprintify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,10 +79,10 @@ files:
 - lib/blueprints/context.rb
 - lib/blueprints/convertable.rb
 - lib/blueprints/convertable/fixtures.rb
-- lib/blueprints/database_backends/active_record.rb
+- lib/blueprints/core_ext.rb
+- lib/blueprints/dependency.rb
 - lib/blueprints/errors.rb
 - lib/blueprints/extensions/cucumber.rb
-- lib/blueprints/extensions/deprecated.rb
 - lib/blueprints/extensions/rspec.rb
 - lib/blueprints/extensions/test_unit.rb
 - lib/blueprints/file_context.rb
@@ -101,7 +101,12 @@ files:
 - spec/no_db/fixtures/fruit.rb
 - spec/no_db/spec_helper.rb
 - spec/test_all.sh
+- spec/unit/active_record_spec.rb
+- spec/unit/blueprint_spec.rb
+- spec/unit/buildable_spec.rb
 - spec/unit/configuration_spec.rb
+- spec/unit/dependency_spec.rb
+- spec/unit/namespace_spec.rb
 - spec/unit/spec_helper.rb
 - test/blueprints_test.rb
 - test/test_helper.rb
@@ -145,8 +150,13 @@ test_files:
 - spec/no_db/spec_helper.rb
 - spec/no_db/blueprints_spec.rb
 - spec/no_db/blueprint.rb
+- spec/unit/active_record_spec.rb
+- spec/unit/blueprint_spec.rb
 - spec/unit/spec_helper.rb
 - spec/unit/configuration_spec.rb
+- spec/unit/namespace_spec.rb
+- spec/unit/buildable_spec.rb
+- spec/unit/dependency_spec.rb
 - spec/active_record/fixtures/fruit.rb
 - spec/active_record/fixtures/tree.rb
 - spec/active_record/fixtures/schema.rb

data/lib/blueprints/database_backends/active_record.rb

@@ -1,48 +0,0 @@
-module Blueprints
-  # Extensions for active record class
-  module ActiveRecordExtensions
-    module ClassMethods
-      # Two forms of this method can be used. First one is typically used inside blueprint block. Essentially it does
-      # same as <tt>create!</tt>, except it does bypass attr_protected and attr_accessible. It accepts only a hash or attributes,
-      # same as <tt>create!</tt> does.
-      #   blueprint :post => :user do
-      #     @user.posts.blueprint(:title => 'first post', :text => 'My first post')
-      #   end
-      # The second form is used when you want to define new blueprint. It takes first argument as name of blueprint
-      # and second one as hash of attributes. As you cannot use instance variables outside of blueprint block, you need
-      # to prefix them with colon. So the example above could be rewritten like this:
-      #   Post.blueprint(:post, :title => 'first post', :text => 'My first post', :user => d(:user))
-      # or like this:
-      #   Post.blueprint(:post, :title => 'first post', :text => 'My first post', :user => :@user).depends_on(:user)
-      # 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.current
-          klass = self
-          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)
-            name_or_attrs.collect { |attrs| blueprint(attrs) }
-          else
-            object = new
-            object.blueprint(name_or_attrs)
-            object
-          end
-        end
-      end
-    end
-
-    module InstanceMethods
-      # Updates attributes of object and calls save!. Bypasses attr_protected and attr_accessible.
-      def blueprint(attributes)
-        send(:attributes=, Blueprints::Blueprint.normalize_attributes(attributes.dup), false)
-        save!
-      end
-    end
-  end
-end
-
-::ActiveRecord::Base.send(:include, Blueprints::ActiveRecordExtensions::InstanceMethods)
-::ActiveRecord::Base.extend(Blueprints::ActiveRecordExtensions::ClassMethods)