blueprints 0.4.2 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/blueprints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blueprints}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrius Chamentauskas"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-02-17}
   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 = [
@@ -63,15 +63,15 @@ Gem::Specification.new do |s|
   s.summary = %q{Another replacement for factories and fixtures}
   s.test_files = [
     "spec/no_db/fixtures/fruit.rb",
-     "spec/no_db/blueprint.rb",
-     "spec/no_db/blueprints_spec.rb",
      "spec/no_db/spec_helper.rb",
-     "spec/active_record/fixtures/tree.rb",
+     "spec/no_db/blueprints_spec.rb",
+     "spec/no_db/blueprint.rb",
      "spec/active_record/fixtures/fruit.rb",
+     "spec/active_record/fixtures/tree.rb",
      "spec/active_record/fixtures/schema.rb",
-     "spec/active_record/blueprint.rb",
-     "spec/active_record/blueprints_spec.rb",
      "spec/active_record/spec_helper.rb",
+     "spec/active_record/blueprints_spec.rb",
+     "spec/active_record/blueprint.rb",
      "test/test_helper.rb",
      "test/blueprints_test.rb"
   ]

data/lib/blueprints/context.rb

@@ -2,5 +2,9 @@ module Blueprints
   # Class that blueprint blocks are evaluated against. Allows you to access options that were passed to build method.
   class Context
     attr_accessor :options
+
+    def build(*names)
+      Namespace.root.build(*names)
+    end
   end
 end

data/lib/blueprints/database_backends/active_record.rb

@@ -69,12 +69,10 @@ module Blueprints
         end
 
         module Instance
-          # Updates attributes of object and calls save!. Bypasses attr_protected ant attr_accessible.
+          # Updates attributes of object and calls save!. Bypasses attr_protected anduep attr_accessible.
           def blueprint(attributes)
-            attributes.each do |attr, value|
-              value = Blueprints::Namespace.root.context.instance_variable_get(value) if value.is_a? Symbol and value.to_s =~ /^@.+$/
-              send("#{attr}=", value)
-            end
+            attributes.each {|attr, value| attributes[attr] = Blueprints::Namespace.root.context.instance_variable_get(value) if value.is_a? Symbol and value.to_s =~ /^@.+$/ }
+            send(:attributes=, attributes, false)
             save!
           end
         end

data/lib/blueprints/helper.rb

@@ -7,11 +7,12 @@ module Blueprints
     #   build :apple, :orange
     #
     #   # build :apple scenario with additional options
-    #   build :apple, :color => 'red'
+    #   build :apple => {:color => 'red'}
+    #
+    #   # options can also be passed for several blueprints
+    #   build :pear, :apple => {:color => 'red'}, :orange => {:color => 'orange'}
     def build_plan(*names)
-      result = Namespace.root.build(*names).last
-      Namespace.root.copy_ivars(self)
-      result
+      returning(Namespace.root.build(*names)) { Namespace.root.copy_ivars(self) }
     end
 
     alias :build :build_plan

data/lib/blueprints/plan.rb

@@ -19,6 +19,12 @@ module Blueprints
       @result
     end
 
+    # 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 }
+    end
+
     private
 
     def surface_errors

data/lib/blueprints/root_namespace.rb

@@ -9,6 +9,7 @@ module Blueprints
     def initialize
       @executed_plans = Set.new
       @global_executed_plans = Set.new
+      @auto_iv_list = Set.new
 
       super ''
     end
@@ -38,14 +39,23 @@ module Blueprints
 
     # Builds blueprints that are passed against current context.
     def build(*names)
-      options = names.extract_options!
-      names.map {|name| self[name].build(options) }
+      names.inject(nil) do |result, member|
+        if member.is_a?(Hash)
+          member.map {|name, options| self[name].build(options) }.last
+        else
+          self[member].build
+        end
+      end
     end
 
-    # Sets instance variable in current context to passed value.
+    # Sets instance variable in current context to passed value. If instance variable with same name already exists, it
+    # is set only if it was set using this same method
     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)
+      if !@context.instance_variable_get(name) or @auto_iv_list.include?(name)
+        @auto_iv_list << name
+        @context.instance_variable_set(name, value)
+      end
     end
 
     @@root = RootNamespace.new

data/spec/active_record/blueprint.rb

@@ -35,12 +35,17 @@ end
 blueprint :parent_not_existing => :not_existing
 
 Tree.blueprint :oak, :name => 'Oak', :size => 'large'
+blueprint(:huge_oak).extends(:oak, :size => 'huge')
 
 blueprint :pine do
   @the_pine = Tree.blueprint :name => 'Pine', :size => 'medium'
 end
 
 Fruit.blueprint(:acorn, :species => 'Acorn', :tree => :@oak).depends_on(:oak)
+blueprint :small_acorn do
+  build :acorn => {:average_diameter => 1}
+end
+blueprint(:huge_acorn => :huge_oak).extends(:acorn, :average_diameter => 100)
 
 namespace :pitted => :pine do
   Tree.blueprint :peach_tree, :name => 'pitted peach tree'
@@ -53,5 +58,5 @@ namespace :pitted => :pine do
 end
 
 blueprint :apple_with_params do
-  Fruit.create! options.merge(:species => 'apple')
+  Fruit.create! options.reverse_merge(:species => 'apple')
 end

data/spec/active_record/blueprints_spec.rb

@@ -254,7 +254,7 @@ describe Blueprints do
     end
 
     it "should automatically merge passed options" do
-      build :oak, :size => 'optional'
+      build :oak => {:size => 'optional'}
       @oak.name.should == 'Oak'
       @oak.size.should == 'optional'
     end
@@ -309,7 +309,7 @@ describe Blueprints do
 
   describe 'extra parameters' do
     it "should allow passing extra parameters when building" do
-      build :apple_with_params, :average_diameter => 14
+      build :apple_with_params => {:average_diameter => 14}
       @apple_with_params.average_diameter.should == 14
       @apple_with_params.species.should == 'apple'
     end
@@ -321,9 +321,48 @@ describe Blueprints do
     end
 
     it "should use extra params only on blueprints specified" do
-      build :acorn, :average_diameter => 5
+      build :acorn => {:average_diameter => 5}
       @acorn.average_diameter.should == 5
     end
+
+    it "should allow passing extra params for each blueprint individually" do
+      build :acorn => {:average_diameter => 3}, :apple_with_params => {:average_diameter => 2}
+      @acorn.average_diameter.should == 3
+      @apple_with_params.average_diameter.should == 2
+    end
+
+    it "should allow passing options for some blueprints only" do
+      build(:acorn, :apple_with_params => {:average_diameter => 2}).should == @apple_with_params
+      @acorn.average_diameter.should == nil
+      @apple_with_params.average_diameter.should == 2
+    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
+      @small_acorn.average_diameter.should == 1
+      @small_acorn.should == @acorn
+    end
+
+    it "should allow to use shortcut to extend blueprint" do
+      build :huge_acorn
+      @huge_acorn.average_diameter.should == 100
+    end
+
+    it "should allow extended blueprint be dependency and associated object" do
+      build :huge_acorn
+      @huge_acorn.tree.size.should == 'huge'
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 +02:00
+date: 2010-02-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -91,14 +91,14 @@ specification_version: 3
 summary: Another replacement for factories and fixtures
 test_files: 
 - spec/no_db/fixtures/fruit.rb
-- spec/no_db/blueprint.rb
-- spec/no_db/blueprints_spec.rb
 - spec/no_db/spec_helper.rb
-- spec/active_record/fixtures/tree.rb
+- spec/no_db/blueprints_spec.rb
+- spec/no_db/blueprint.rb
 - spec/active_record/fixtures/fruit.rb
+- spec/active_record/fixtures/tree.rb
 - spec/active_record/fixtures/schema.rb
-- spec/active_record/blueprint.rb
-- spec/active_record/blueprints_spec.rb
 - spec/active_record/spec_helper.rb
+- spec/active_record/blueprints_spec.rb
+- spec/active_record/blueprint.rb
 - test/test_helper.rb
 - test/blueprints_test.rb