blueprints 0.8.0 → 0.8.1

data/.gitignore

@@ -3,3 +3,4 @@
 html
 spec/active_record/fixtures/database.yml
 debug.log
+.bundle

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    blueprints (0.8.0)
+      activesupport (>= 2.3.0)
+      database_cleaner (~> 0.5.0)
+
+GEM
+  specs:
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
+    builder (2.1.2)
+    cucumber (0.7.3)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 1.0.27)
+      json_pure (>= 1.2.4)
+      term-ansicolor (>= 1.0.4)
+    database_cleaner (0.5.2)
+    diff-lcs (1.1.2)
+    gherkin (1.0.30)
+      trollop (>= 1.16.2)
+    json_pure (1.2.4)
+    mocha (0.9.8)
+      rake
+    rake (0.8.7)
+    rspec (1.3.0)
+    shoulda (2.10.3)
+    term-ansicolor (1.0.5)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 2.3.0)
+  activesupport (>= 2.3.0)
+  blueprints!
+  cucumber (>= 0.7.0)
+  database_cleaner (~> 0.5.0)
+  mocha (>= 0.9.8)
+  rspec (>= 1.3.0)
+  shoulda (>= 2.10.0)

data/Rakefile

@@ -12,6 +12,11 @@ begin
     gemspec.executables = ['blueprintify']
     gemspec.add_dependency 'activesupport', '>=2.3.0'
     gemspec.add_dependency 'database_cleaner', '~>0.5.0'
+    gemspec.add_development_dependency 'rspec', '>=1.3.0'
+    gemspec.add_development_dependency 'activerecord', '>=2.3.0'
+    gemspec.add_development_dependency 'mocha', '>=0.9.8'
+    gemspec.add_development_dependency 'shoulda', '>=2.10.0'
+    gemspec.add_development_dependency 'cucumber', '>=0.7.0'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/blueprints.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blueprints}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrius Chamentauskas"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-09-07}
   s.default_executable = %q{blueprintify}
   s.description = %q{Another replacement for factories and fixtures. The library that lazy typists will love}
   s.email = %q{sinsiliux@gmail.com}
@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -105,13 +107,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_runtime_dependency(%q<database_cleaner>, ["~> 0.5.0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.3.0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.7.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
       s.add_dependency(%q<database_cleaner>, ["~> 0.5.0"])
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.0"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.0"])
+      s.add_dependency(%q<cucumber>, [">= 0.7.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     s.add_dependency(%q<database_cleaner>, ["~> 0.5.0"])
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.0"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.0"])
+    s.add_dependency(%q<cucumber>, [">= 0.7.0"])
   end
 end
 

data/lib/blueprints/blueprint.rb

@@ -7,7 +7,7 @@ module Blueprints
       @file = file
       super(name)
 
-      ivname = :"@#{path}"
+      ivname = variable_name
       @block = block
       @demolish_block = lambda { instance_variable_get(ivname).destroy }
       @update_block = lambda { instance_variable_get(ivname).blueprint(options) }
@@ -19,7 +19,7 @@ module Blueprints
         if built? and build_once
           Namespace.root.context.instance_eval(&@update_block) if RootNamespace.root.context.options.present?
         elsif @block
-          @result = Namespace.root.context.instance_eval(&@block)
+          self.result = Namespace.root.context.instance_eval(&@block)
         end
       end
     end

data/lib/blueprints/buildable.rb

@@ -27,8 +27,8 @@ module Blueprints
     #
     # +options+ - list of options to be accessible in the body of a blueprint. Defaults to empty Hash.
     def build(build_once = true, options = {})
-      return @result if (built? or Namespace.root.executed_blueprints.include? self) and build_once and options.blank?
-      Namespace.root.executed_blueprints << self
+      return result if @building or (built? and build_once and options.blank?)
+      @building = true
 
       each_namespace {|namespace| namespace.build_parents }
       build_parents
@@ -39,17 +39,28 @@ module Blueprints
 
       build_self(build_once)
       Namespace.root.context.options, Namespace.root.context.attributes = old_options, old_attributes
-      Namespace.root.add_variable(path, @result)
+      Namespace.root.executed_blueprints << self
+      @building = false
+      result
+    end
+
+    # Returns the result of blueprint
+    def result
+      Namespace.root.context.instance_variable_get(variable_name)
+    end
+
+    # Sets the result of blueprint
+    def result=(value)
+      Namespace.root.add_variable(variable_name, value)
     end
 
     # Returns if blueprint has been built
     def built?
-      instance_variable_defined?(:@result)
+      Namespace.root.executed_blueprints.include?(self)
     end
 
     # Marks blueprint as not built
     def undo!
-      remove_instance_variable(:@result) if built?
       Namespace.root.executed_blueprints.delete self
     end
 
@@ -100,6 +111,10 @@ module Blueprints
       @path = (namespace.path + "_" unless namespace.nil? or namespace.path.empty?).to_s + @name.to_s
     end
 
+    def variable_name
+      :"@#{path}"
+    end
+
     def parse_name(name)
       case name
         when Hash

data/lib/blueprints/namespace.rb

@@ -31,7 +31,7 @@ module Blueprints
 
     # Builds all children and sets instance variable named by name of namespace with the results.
     def build_self(build_once = true)
-      @result = @children.collect {|p| p.last.build }.uniq
+      self.result = @children.collect {|p| p.last.build }.uniq
     end
 
     # Demolished all child blueprints and namespaces

data/lib/blueprints/root_namespace.rb

@@ -59,8 +59,7 @@ module Blueprints
     # 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] == "@"
-      if !@context.instance_variable_get(name) or @auto_iv_list.include?(name)
+      if not @context.instance_variable_defined?(name) or @auto_iv_list.include?(name)
         @auto_iv_list << name
         @context.instance_variable_set(name, value)
       end

data/spec/active_record/blueprints_spec.rb

@@ -107,6 +107,13 @@ describe Blueprints do
     end
   end
 
+  describe "updating" do
+    it "should allow updating prebuilt blueprints" do
+      build :big_cherry => {:species => 'updated cherry'}
+      @big_cherry.species.should == 'updated cherry'
+    end
+  end
+
   describe 'with many apples scenario' do
     before do
       build :many_apples, :cherry, :cherry_basket

data/spec/unit/blueprint_spec.rb

@@ -17,12 +17,7 @@ describe Blueprints::Blueprint do
       @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
+    it "should raise error if blueprint is not built" do
       @blueprint.demolish
       lambda { @blueprint.demolish }.should raise_error(Blueprints::DemolishError)
     end

data/spec/unit/spec_helper.rb

@@ -22,5 +22,6 @@ Spec::Runner.configure do |config|
 
   config.after do
     Blueprints::Namespace.root.children.clear
+    Blueprints::Namespace.root.executed_blueprints.clear
   end
 end

data/test/blueprints_test.rb

@@ -107,6 +107,13 @@ class BlueprintsTest < ActiveSupport::TestCase
     end
   end
 
+  context "updating" do
+    should "allow updating prebuilt blueprints" do
+      build :big_cherry => {:species => 'updated cherry'}
+      assert(@big_cherry.species == 'updated cherry')
+    end
+  end
+
   context 'with many apples scenario' do
     setup do
       build :many_apples, :cherry, :cherry_basket

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blueprints
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Andrius Chamentauskas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +03:00
+date: 2010-09-07 00:00:00 +03:00
 default_executable: blueprintify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,86 @@ dependencies:
         version: 0.5.0
   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: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id004 !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: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !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: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id006 !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: *id006
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id007 !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: *id007
 description: Another replacement for factories and fixtures. The library that lazy typists will love
 email: sinsiliux@gmail.com
 executables: 
@@ -61,6 +141,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile