blueprints 0.9.0 → 1.0.0

data/spec/unit/context_spec.rb

@@ -46,6 +46,7 @@ describe Blueprints::Context do
         Blueprints::Context.current.dependencies.should == [:within_dep]
       end
       Blueprints::Context.current.should == context
+      Blueprints::Context.send(:class_variable_get, :@@chain).pop
     end
   end
 
@@ -84,7 +85,7 @@ describe Blueprints::Context do
       bp        = nil
       namespace = subject.namespace(:namespace) { bp = self.blueprint :blueprint }
       bp.namespace.should == namespace
-      namespace.children.should == {:blueprint => bp}
+      namespace.children.should == [bp]
     end
 
     it "should allow creating blueprint with inferred name" do
@@ -96,5 +97,11 @@ describe Blueprints::Context do
       dep = context.d(:bp, :option => 'val')
       dep.should be_instance_of(Blueprints::Dependency)
     end
+
+    it "should allow finding blueprint you define" do
+      blueprint = subject.blueprint :blueprint
+      subject.find(:blueprint).should == blueprint
+      subject[:blueprint].should == blueprint
+    end
   end
 end

data/spec/unit/dependency_spec.rb

@@ -6,12 +6,8 @@ describe Blueprints::Dependency do
     options_blueprint
   end
 
-  let :stage do
-    Blueprints::Namespace.root.eval_context
-  end
-
   def value(dep)
-    stage.instance_eval(context, {}, &dep)
+    stage.instance_eval(&dep)
   end
 
   it "should allow getting instance variable value" do

data/spec/unit/fixtures.rb

@@ -1,61 +1,83 @@
-def file
-  __FILE__
-end
+require 'mocha'
+module Fixtures
+  include Mocha::API
 
-def mock1
-  @mock ||= Mocha::Mockery.instance.unnamed_mock
-end
+  def file
+    __FILE__
+  end
 
-def mock2
-  @mock2 ||= Mocha::Mockery.instance.unnamed_mock
-end
+  def mock1
+    @mock ||= mock('mock1')
+  end
 
-def stage
-  @stage ||= Blueprints::EvalContext.new
-end
+  def mock2
+    @mock2 ||= mock('mock2')
+  end
 
-def context
-  @context ||= Blueprints::Context.new(:file => file, :namespace => Blueprints::Namespace.root)
-end
+  def mock_default
+    @mock2 ||= mock('default')
+  end
 
-def context2
-  @context2 ||= Blueprints::Context.new(:parent => context, :namespace => namespace)
-end
+  def stage
+    @stage ||= Object.new.tap { |o| o.extend Blueprints::Helper }
+  end
 
-def context_with_attrs_and_deps
-  @context_with_attrs_and_deps ||= Blueprints::Context.new(:attributes => {:attr1 => 1, :attr2 => 2}, :dependencies => [:dep1, :dep2], :file => file, :namespace => namespace)
-end
+  def context
+    @context ||= Blueprints::Context.new(:file => file, :namespace => Blueprints::Namespace.root)
+  end
 
-def blueprint(&block)
-  result = mock1
-  block ||= proc { result }
-  @blueprint ||= context.blueprint(:blueprint, &block)
-end
+  def context2
+    @context2 ||= Blueprints::Context.new(:parent => context, :namespace => namespace)
+  end
 
-def blueprint2(&block)
-  result = mock1
-  block ||= proc { result }
-  @blueprint2 ||= context.blueprint(:blueprint2, &block)
-end
+  def context_with_attrs_and_deps
+    @context_with_attrs_and_deps ||= Blueprints::Context.new(:attributes => {:attr1 => 1, :attr2 => 2}, :dependencies => [:dep1, :dep2], :file => file, :namespace => namespace)
+  end
 
-def options_blueprint
-  result, value = mock1, mock2
-  @options_blueprint ||= Blueprints::Blueprint.new(:options_blueprint, context) do
-    @value = value
-    options.present? ? options : result
+  def blueprint(&block)
+    result = mock1
+    block ||= proc { result }
+    @blueprint ||= context.blueprint(:blueprint, &block)
   end
-end
 
-def namespace
-  @namespace ||= context.namespace(:namespace)
-end
+  def blueprint2(&block)
+    result = mock1
+    block ||= proc { result }
+    @blueprint2 ||= context.blueprint(:blueprint2, &block)
+  end
 
-def namespace_blueprint
-  result = mock1
-  @namespace_blueprint ||= context2.blueprint(:blueprint) { result }
-end
+  def blueprint3(&block)
+    @blueprint3 ||= context.blueprint(:blueprint3, &block)
+  end
+
+  def options_blueprint
+    result, value = mock1, mock2
+    @options_blueprint ||= Blueprints::Blueprint.new(:options_blueprint, context) do
+      @value = value
+      options.present? ? options : result
+    end
+  end
+
+  def namespace
+    @namespace ||= context.namespace(:namespace)
+  end
+
+  def namespace_default_blueprint
+    result = mock_default
+    @namespace_default_blueprint ||= context2.blueprint(:default) { result }
+  end
+
+  def namespace_blueprint
+    result = mock1
+    @namespace_blueprint ||= context2.blueprint(:blueprint) { result }
+  end
+
+  def namespace_blueprint2
+    result = mock2
+    @namespace_blueprint2 ||= context2.blueprint(:blueprint2) { result }
+  end
 
-def namespace_blueprint2
-  result = mock2
-  @namespace_blueprint2 ||= context2.blueprint(:blueprint2) { result }
+  def namespace_regexp_blueprint(name = /^regexp_(.*)/)
+    @namespace_regexp_blueprint ||= context2.blueprint(name) { options }
+  end
 end

data/spec/unit/namespace_spec.rb

@@ -9,10 +9,16 @@ describe Blueprints::Namespace do
 
     it "should warn when adding children overwrites existing one" do
       namespace_blueprint
-      Blueprints.expects(:warn).with("Overwriting existing blueprint", blueprint)
+      $stderr.expects(:puts).with("**WARNING** Overwriting existing blueprint: 'blueprint'")
+      $stderr.expects(:puts).with(regexp_matches(/namespace_spec\.rb:14/))
       namespace.add_child(blueprint)
     end
 
+    it "should return children" do
+      namespace_blueprint
+      namespace.children.should == [namespace_blueprint]
+    end
+
     it "should allow recursive finding of children" do
       namespace_blueprint
       Blueprints::Namespace.root['namespace.blueprint'].should == namespace_blueprint
@@ -24,6 +30,12 @@ describe Blueprints::Namespace do
         Blueprints::Namespace.root['namespace.blueprint2']
       }.to raise_error(Blueprints::BlueprintNotFoundError)
     end
+
+    it "should find children with regexp names" do
+      namespace_regexp_blueprint
+      namespace['regexp_bp'].instance_variable_get(:@buildable).should == namespace_regexp_blueprint
+      namespace.instance_variable_get(:@children).should have_key(:regexp_bp)
+    end
   end
 
   describe "children context" do
@@ -50,10 +62,16 @@ describe Blueprints::Namespace do
       result.should =~ [mock1, mock2]
     end
 
-    it "should pass build once and eval context params" do
-      namespace_blueprint.expects(:build).with(instance_of(Blueprints::EvalContext), false, :option => 'value')
-      namespace_blueprint2.expects(:build).with(instance_of(Blueprints::EvalContext), false, :option => 'value')
-      namespace.build(stage, false, :option => 'value')
+    it "should pass options and eval context params" do
+      namespace_blueprint.expects(:build).with(stage, :option => 'value')
+      namespace_blueprint2.expects(:build).with(stage, :option => 'value')
+      namespace.build(stage, :option => 'value')
+    end
+
+    it "should build default blueprint if one exists" do
+      namespace_default_blueprint.expects(:build)
+      namespace_blueprint.expects(:build).never
+      namespace.build(stage)
     end
   end
 

data/spec/unit/root_namespace_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Blueprints::RootNamespace do
+  it "should allow building blueprints with regexp name" do
+    namespace_regexp_blueprint
+    Blueprints::Namespace.root.build(['namespace.regexp_blueprint'], stage)
+    stage.instance_variable_get(:@namespace_regexp_blueprint).should == {:arg0 => "blueprint"}
+  end
+end

data/spec/unit/spec_helper.rb

@@ -2,15 +2,14 @@ Root = Pathname.new(__FILE__).dirname.join('..', '..')
 $: << Root.join('lib').to_s
 
 require 'rspec'
+require 'active_record'
+require File.dirname(__FILE__) + '/../support/active_record/initializer'
 require 'blueprints'
 require File.dirname(__FILE__) + '/fixtures'
 
 RSpec.configure do |config|
   config.mock_with :mocha
-
-  config.before do
-    Blueprints::Namespace.root.eval_context = Blueprints::EvalContext.new
-  end
+  config.include Fixtures
 
   config.after do
     Blueprints::Namespace.root.instance_variable_get(:@children).clear

data/test/blueprints_test.rb

@@ -1,4 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
+if RUBY_VERSION.start_with?('1.9')
+  require_relative 'test_helper'
+else
+  require File.dirname(__FILE__) + '/test_helper'
+end
 
 class BlueprintsTest < ActiveSupport::TestCase
   should "return result of built scenario when calling build" do
@@ -70,6 +74,7 @@ class BlueprintsTest < ActiveSupport::TestCase
   context "build per describe" do
     unless File.dirname(__FILE__) =~ /test$/
       build_blueprint :apple
+      build :acorn => {:tree => d(:pine)}
 
       should "have cherry" do
         assert(!(@apple.nil?))
@@ -78,6 +83,10 @@ class BlueprintsTest < ActiveSupport::TestCase
       should "have correct cherry species" do
         assert(@apple.species == 'apple')
       end
+
+      should "set tree to pine" do
+        assert(@acorn.tree == @pine)
+      end
     end
   end
 
@@ -371,4 +380,12 @@ class BlueprintsTest < ActiveSupport::TestCase
   should "allow inferring blueprint name" do
     assert(build(:infered).name == 'infered')
   end
+
+  should "allow building with :new strategy" do
+    build_with(:new, :oak)
+    assert(@oak.instance_of?(Tree))
+    assert(@oak.new_record?)
+    assert(@oak.name == 'Oak')
+    assert(@oak.size == 'large')
+  end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'pathname'
 require 'logger'
 require 'active_record'
 require 'test/unit'

data/test_all.sh

@@ -8,38 +8,11 @@ function e {
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
-e "Normal spec"
-rspec -c spec/blueprints_spec.rb
-rspec -c spec/unit/*_spec.rb
+e "Ruby 1.8.7"
+rvm 1.8.7 rake
 
-e "With no db"
-ORM=none rspec -c spec/blueprints_spec.rb
+e "Ruby 1.9.2"
+rvm 1.9.2 rake
 
-e "With mongoid"
-ORM=mongoid rspec -c spec/blueprints_spec.rb
-
-e "With mongo_mapper"
-ORM=mongo_mapper rspec -c spec/blueprints_spec.rb
-
-e "With Test::Unit"
-rake rspec_to_test
-ruby test/blueprints_test.rb
-
-e "With Cucumber"
-cucumber features/blueprints.feature -f progress
-
-e "With Rails 2 and RSpec 1.3.0"
-rvm 1.8.7@rails2
-ORM="active_record.2.3.0" spec "_1.3.1_" -c spec/blueprints_spec.rb
-
-e "With ruby 1.9.2"
-rvm 1.9.2
-rspec -c spec/blueprints_spec.rb
-rspec -c spec/unit/*_spec.rb
-
-e "With rubinius"
-rvm rbx
-rspec -c spec/blueprints_spec.rb
-rspec -c spec/unit/*_spec.rb
-
-rvm system
+e "Rubinius"
+rvm rbx rake

metadata

@@ -1,275 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blueprints
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andrius Chamentauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-14 00:00:00 +02:00
-default_executable: blueprintify
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19036960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19036960
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &19034320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql2
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31098209
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        version: 2.0.0.beta
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: dm-transactions
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: dm-mysql-adapter
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 2
-        - 10
-        - 0
-        version: 2.10.0
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id015
-description: Awesome replacement for factories and fixtures that focuses on being DRY and making developers type as little as possible.
+  version_requirements: *19034320
+description: Awesome replacement for factories and fixtures that focuses on being
+  DRY and making developers type as little as possible.
 email: sinsiliux@gmail.com
-executables: 
+executables:
 - blueprintify
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -282,23 +57,24 @@ files:
 - install.rb
 - lib/blueprints.rb
 - lib/blueprints/blueprint.rb
+- lib/blueprints/blueprint_name_proxy.rb
 - lib/blueprints/buildable.rb
 - lib/blueprints/configuration.rb
 - lib/blueprints/context.rb
 - lib/blueprints/convertable.rb
 - lib/blueprints/convertable/fixtures.rb
-- lib/blueprints/database_cleaner_fix.rb
 - lib/blueprints/dependency.rb
 - lib/blueprints/errors.rb
-- lib/blueprints/eval_context.rb
 - lib/blueprints/extensions.rb
 - lib/blueprints/extensions/cucumber.rb
 - lib/blueprints/extensions/rspec.rb
 - lib/blueprints/extensions/test_unit.rb
 - lib/blueprints/helper.rb
 - lib/blueprints/namespace.rb
+- lib/blueprints/railtie.rb
 - lib/blueprints/root_namespace.rb
 - lib/blueprints/version.rb
+- lib/generators/blueprints/model/model_generator.rb
 - spec/blueprint.rb
 - spec/blueprints_spec.rb
 - spec/spec_helper.rb
@@ -312,55 +88,46 @@ files:
 - spec/support/mongoid/initializer.rb
 - spec/support/none/initializer.rb
 - spec/unit/active_record_spec.rb
+- spec/unit/blueprint_name_proxy_spec.rb
 - spec/unit/blueprint_spec.rb
 - spec/unit/blueprints_spec.rb
 - spec/unit/buildable_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/context_spec.rb
 - spec/unit/dependency_spec.rb
-- spec/unit/eval_context_spec.rb
 - spec/unit/fixtures.rb
 - spec/unit/namespace_spec.rb
+- spec/unit/root_namespace_spec.rb
 - spec/unit/spec_helper.rb
 - test/blueprints_test.rb
 - test/test_helper.rb
 - test_all.sh
 - uninstall.rb
-has_rdoc: true
 homepage: http://sinsiliux.github.com/blueprints
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1254164282344174203
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: blueprints
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Awesome replacement for factories and fixtures
 test_files: []
-