blueprints 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/blueprints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blueprints}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrius Chamentauskas"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-28}
   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

@@ -78,16 +78,20 @@ module Blueprints
 
   # 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(framework_root, pattern)} if framework_root
 
     patterns.each do |pattern|
       unless (files = Dir.glob(pattern)).empty?
         files.each{|f| FileContext.module_eval File.read(f)}
+        FileContext.evaluating = false
         return
       end
     end
 
+    FileContext.evaluating = false
     raise "Plans file not found! Put plans in #{patterns.join(' or ')} or pass custom filename pattern with :filename option"
   end
 end

data/lib/blueprints/database_backends/active_record.rb

@@ -57,18 +57,17 @@ module Blueprints
           #   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(*args)
-            attrs = args.pop
-            if args.present?
+          def blueprint(name_or_attrs, attrs = {})
+            if Blueprints::FileContext.evaluating
               klass = self
-              blueprint = Blueprints::Plan.new(*args) { klass.blueprint attributes }
+              blueprint = Blueprints::Plan.new(name_or_attrs) { klass.blueprint attributes }
               blueprint.depends_on(*attrs.values.select {|attr| attr.is_a?(Blueprints::Buildable::Dependency) }).attributes(attrs)
               blueprint
             else
-              if attrs.is_a?(Array)
-                attrs.collect { |attr| blueprint(attr) }
+              if name_or_attrs.is_a?(Array)
+                name_or_attrs.collect { |attrs| blueprint(attrs) }
               else
-                returning(self.new) { |object| object.blueprint(attrs) }
+                returning(self.new) { |object| object.blueprint(name_or_attrs) }
               end
             end
           end

data/lib/blueprints/file_context.rb

@@ -1,6 +1,8 @@
 module Blueprints
   # Module that blueprints file is executed against. Defined <tt>blueprint</tt> and <tt>namespace</tt> methods.
   module FileContext
+    mattr_accessor :evaluating
+
     # Creates a new plan by name and block passed
     def self.blueprint(plan, &block)
       Plan.new(plan, &block)

data/spec/active_record/blueprint.rb

@@ -36,6 +36,7 @@ blueprint :parent_not_existing => :not_existing
 
 Tree.blueprint :oak, :name => 'Oak', :size => 'large'
 blueprint(:huge_oak).extends(:oak, :size => 'huge')
+Tree.blueprint(:oak_without_attributes)
 
 blueprint :pine do
   @the_pine = Tree.blueprint :name => 'Pine', :size => 'medium'

data/spec/active_record/blueprints_spec.rb

@@ -264,6 +264,11 @@ describe Blueprints do
       fruits = Fruit.blueprint([{:species => 'fruit1'}, {:species => 'fruit2'}])
       fruits.collect(&:species).should == %w{fruit1 fruit2}
     end
+
+    it "should allow to build oak without attributes" do
+      build :oak_without_attributes
+      @oak_without_attributes.should be_instance_of(Tree)
+    end
   end
 
   describe "with pitted namespace" do

metadata

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