machinist 2.0.0.beta2 → 2.0

data/lib/generators/machinist/install/templates/machinist.rb.erb

@@ -5,6 +5,3 @@ require "#{Rails.root}/spec/support/blueprints"
 # Load the blueprints from over in test.
 require "#{Rails.root}/test/blueprints"
 <%- end -%>
-
-# Reset the Machinist cache before each scenario.
-Before { Machinist.reset_before_test }

data/lib/machinist.rb

@@ -1,17 +1,5 @@
 require 'machinist/blueprint'
-require 'machinist/configuration'
 require 'machinist/exceptions'
 require 'machinist/lathe'
 require 'machinist/machinable'
-require 'machinist/shop'
-require 'machinist/warehouse'
-
-module Machinist
-
-  # Call this before each test to get Machinist ready.
-  def self.reset_before_test
-    Shop.instance.restock
-  end
-
-end
 

data/lib/machinist/active_record/blueprint.rb

@@ -8,31 +8,6 @@ module Machinist::ActiveRecord
       object.reload
     end
 
-    # Box an object for storage in the warehouse.
-    def box(object)
-      object.id
-    end
-   
-    # Unbox an object from the warehouse.
-    def unbox(id)
-      @klass.find(id)
-    end
-
-    # Execute a block on a separate database connection, so that any database
-    # operations happen outside any open transactions.
-    def outside_transaction
-      # ActiveRecord manages connections per-thread, so the only way to
-      # convince it to open another connection is to start another thread.
-      thread = Thread.new do
-        begin
-          yield
-        ensure
-          ::ActiveRecord::Base.connection_pool.checkin(::ActiveRecord::Base.connection)
-        end
-      end
-      thread.value
-    end
-
     def lathe_class #:nodoc:
       Machinist::ActiveRecord::Lathe
     end

data/lib/machinist/blueprint.rb

@@ -5,7 +5,7 @@ module Machinist
 
     # Construct a blueprint for the given +klass+.
     #
-    # Pass in the +:parent+ option do define a parent blueprint to apply after
+    # Pass in the +:parent+ option to define a parent blueprint to apply after
     # this one.  You can supply another blueprint, or a class in which to look
     # for a blueprint.  In the latter case, make will walk up the superclass
     # chain looking for blueprints to apply.

data/lib/machinist/lathe.rb

@@ -1,5 +1,3 @@
-require 'active_support/inflector'
-
 module Machinist
 
   # When you make an object, the blueprint for that object is instance-evaled
@@ -19,8 +17,9 @@ module Machinist
     end
 
     # Returns a unique serial number for the object under construction.
-    attr_reader :serial_number
-    alias_method :sn, :serial_number
+    def sn
+      @serial_number
+    end
 
     # Returns the object under construction.
     attr_reader :object

data/lib/machinist/machinable.rb

@@ -45,17 +45,11 @@ module Machinist
     # :call-seq:
     #   make!([count], [blueprint_name], [attributes = {}])
     #
-    # A cached object will be returned from the shop if possible. See
-    # Machinist::Shop.
-    #
     # Arguments are the same as for make.
     def make!(*args)
       decode_args_to_make(*args) do |blueprint, attributes|
-        if Machinist.configuration.cache_objects?
-          Shop.instance.buy(blueprint, attributes)
-        else
-          blueprint.make!(attributes)
-        end
+        raise BlueprintCantSaveError.new(blueprint) unless blueprint.respond_to?(:make!)
+        blueprint.make!(attributes)
       end
     end
 

data/lib/machinist/version.rb

@@ -0,0 +1,3 @@
+module Machinist
+  VERSION = "2.0"
+end

data/machinist.gemspec

@@ -1,78 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "machinist/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{machinist}
-  s.version = "2.0.0.beta2"
+  s.name     = "machinist"
+  s.version  = Machinist::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors  = ["Pete Yandell"]
+  s.email    = ["pete@notahat.com"]
+  s.homepage = "http://github.com/notahat/machinist"
+  s.summary  = "Fixtures aren't fun. Machinist is."
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pete Yandell"]
-  s.date = %q{2010-07-07}
-  s.email = %q{pete@notahat.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/generators/machinist/install/USAGE",
-     "lib/generators/machinist/install/install_generator.rb",
-     "lib/generators/machinist/install/templates/blueprints.rb",
-     "lib/generators/machinist/install/templates/machinist.rb.erb",
-     "lib/generators/machinist/model/model_generator.rb",
-     "lib/machinist.rb",
-     "lib/machinist/active_record.rb",
-     "lib/machinist/active_record/blueprint.rb",
-     "lib/machinist/active_record/lathe.rb",
-     "lib/machinist/blueprint.rb",
-     "lib/machinist/configuration.rb",
-     "lib/machinist/exceptions.rb",
-     "lib/machinist/lathe.rb",
-     "lib/machinist/machinable.rb",
-     "lib/machinist/shop.rb",
-     "lib/machinist/warehouse.rb",
-     "machinist.gemspec",
-     "spec/active_record_spec.rb",
-     "spec/blueprint_spec.rb",
-     "spec/exceptions_spec.rb",
-     "spec/inheritance_spec.rb",
-     "spec/machinable_spec.rb",
-     "spec/shop_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/active_record_environment.rb",
-     "spec/warehouse_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/notahat/machinist}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Fixtures aren't fun. Machinist is.}
-  s.test_files = [
-    "spec/active_record_spec.rb",
-     "spec/blueprint_spec.rb",
-     "spec/exceptions_spec.rb",
-     "spec/inheritance_spec.rb",
-     "spec/machinable_spec.rb",
-     "spec/shop_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/active_record_environment.rb",
-     "spec/warehouse_spec.rb"
-  ]
+  s.rubyforge_project = "machinist"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.add_development_dependency "activerecord"
+  s.add_development_dependency "mysql"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rcov"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rdoc"
 end
-

data/spec/active_record_spec.rb

@@ -5,20 +5,11 @@ describe Machinist::ActiveRecord do
   include ActiveRecordEnvironment
 
   before(:each) do
-    Machinist::Shop.instance.reset!
     empty_database!
   end
 
-  def fake_a_test
-    ActiveRecord::Base.transaction do
-      Machinist.reset_before_test
-      yield
-      raise ActiveRecord::Rollback
-    end
-  end
-
   context "make" do
-    it "should return an unsaved object" do
+    it "returns an unsaved object" do
       Post.blueprint { }
       post = Post.make
       post.should be_a(Post)
@@ -27,41 +18,23 @@ describe Machinist::ActiveRecord do
   end
 
   context "make!" do
-    it "should make and save objects" do
+    it "makes and saves objects" do
       Post.blueprint { }
       post = Post.make!
       post.should be_a(Post)
       post.should_not be_new_record
     end
 
-    it "should raise an exception for an invalid object" do
+    it "raises an exception for an invalid object" do
       User.blueprint { }
       lambda {
         User.make!(:username => "")
       }.should raise_error(ActiveRecord::RecordInvalid)
     end
-
-    it "should buy objects from the shop" do
-      Post.blueprint { }
-      post_a, post_b = nil, nil
-      fake_a_test { post_a = Post.make! }
-      fake_a_test { post_b = Post.make! }
-      post_a.should == post_b
-    end
-
-    it "should not buy objects from the shop if caching is disabled" do
-      Machinist.configuration.cache_objects = false
-      Post.blueprint { }
-      post_a, post_b = nil, nil
-      fake_a_test { post_a = Post.make! }
-      fake_a_test { post_b = Post.make! }
-      post_a.should_not == post_b
-      Machinist.configuration.cache_objects = true 
-    end
   end
 
   context "associations support" do
-    it "should handle belongs_to associations" do
+    it "handles belongs_to associations" do
       User.blueprint do
         username { "user_#{sn}" }
       end
@@ -75,7 +48,7 @@ describe Machinist::ActiveRecord do
       post.author.should_not be_new_record
     end
 
-    it "should handle has_many associations" do
+    it "handles has_many associations" do
       Post.blueprint do
         comments(3)
       end
@@ -90,7 +63,7 @@ describe Machinist::ActiveRecord do
       end
     end
 
-    it "should handle habtm associations" do
+    it "handles habtm associations" do
       Post.blueprint do
         tags(3)
       end
@@ -107,12 +80,12 @@ describe Machinist::ActiveRecord do
       end
     end
 
-    it "should handle overriding associations" do
+    it "handles overriding associations" do
       User.blueprint do
         username { "user_#{sn}" }
       end
       Post.blueprint do
-        author { User.make!(:username => "post_author_#{sn}") }
+        author { User.make(:username => "post_author_#{sn}") }
       end
       post = Post.make!
       post.should be_a(Post)
@@ -124,7 +97,7 @@ describe Machinist::ActiveRecord do
   end
 
   context "error handling" do
-    it "should raise an exception for an attribute with no value" do
+    it "raises an exception for an attribute with no value" do
       User.blueprint { username }
       lambda {
         User.make

data/spec/blueprint_spec.rb

@@ -3,19 +3,19 @@ require 'ostruct'
 
 describe Machinist::Blueprint do
 
-  it "should make an object of the given class" do
+  it "makes an object of the given class" do
     blueprint = Machinist::Blueprint.new(OpenStruct) { }
     blueprint.make.should be_an(OpenStruct)
   end
 
-  it "should construct an attribute in the blueprint" do
+  it "constructs an attribute from the blueprint" do
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       name { "Fred" }
     end
     blueprint.make.name.should == "Fred"
   end
 
-  it "should construct an array for an attribute in the blueprint" do
+  it "constructs an array for an attribute in the blueprint" do
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       things(3) { Object.new }
     end
@@ -26,7 +26,7 @@ describe Machinist::Blueprint do
     things.uniq.should == things
   end
 
-  it "should allow passing in attributes to override the blueprint" do
+  it "allows passing in attributes to override the blueprint" do
     block_called = false
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       name { block_called = true; "Fred" }
@@ -35,7 +35,7 @@ describe Machinist::Blueprint do
     block_called.should be_false
   end
 
-  it "should provide a serial number within the blueprint" do
+  it "provides a serial number within the blueprint" do
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       name { "Fred #{sn}" }
     end
@@ -43,7 +43,7 @@ describe Machinist::Blueprint do
     blueprint.make.name.should == "Fred 0002"
   end
 
-  it "should provide access to the object being constructed within the blueprint" do
+  it "provides access to the object being constructed within the blueprint" do
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       title { "Test" }
       body  { object.title }
@@ -51,14 +51,16 @@ describe Machinist::Blueprint do
     blueprint.make.body.should == "Test"
   end
 
-  it "should allow attribute names to be strings" do
+  it "allows attribute names to be strings" do
     blueprint = Machinist::Blueprint.new(OpenStruct) do
       name { "Fred" }
     end
     blueprint.make("name" => "Bill").name.should == "Bill"
   end
 
-  it "should work with type and id attributes" do
+  # These are normally a problem because of name clashes with the standard (but
+  # deprecated) Ruby methods. This test makes sure we work around this.
+  it "works with type and id attributes" do
     klass = Class.new do
       attr_accessor :id, :type
     end

data/spec/exceptions_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe Machinist, "exceptions" do
 
   describe Machinist::BlueprintCantSaveError do
-    it "should present the right message" do
+    it "presents the right message" do
       blueprint = Machinist::Blueprint.new(String) { }
       exception = Machinist::BlueprintCantSaveError.new(blueprint)
       exception.message.should == "make! is not supported by blueprints for class String"
@@ -11,7 +11,7 @@ describe Machinist, "exceptions" do
   end
 
   describe Machinist::NoBlueprintError do
-    it "should present the right message" do
+    it "presents the right message" do
       exception = Machinist::NoBlueprintError.new(String, :master)
       exception.message.should == "No master blueprint defined for class String"
     end

data/spec/inheritance_spec.rb

@@ -21,7 +21,7 @@ end
 describe Machinist::Blueprint do
 
   describe "explicit inheritance" do
-    it "should inherit attributes from the parent blueprint" do
+    it "inherits attributes from the parent blueprint" do
       parent_blueprint = Machinist::Blueprint.new(OpenStruct) do
         name { "Fred" }
         age  { 97 }
@@ -36,7 +36,7 @@ describe Machinist::Blueprint do
       child.age.should == 97
     end
 
-    it "should take the serial number from the parent" do
+    it "takes the serial number from the parent" do
       parent_blueprint = Machinist::Blueprint.new(OpenStruct) do
         parent_serial { sn }
       end
@@ -56,7 +56,7 @@ describe Machinist::Blueprint do
       [InheritanceSpecs::Grandpa, InheritanceSpecs::Dad, InheritanceSpecs::Son].each(&:clear_blueprints!)
     end
 
-    it "should inherit blueprinted attributes from the parent class" do
+    it "inherits blueprinted attributes from the parent class" do
       InheritanceSpecs::Dad.blueprint do
         name { "Fred" }
       end
@@ -64,7 +64,7 @@ describe Machinist::Blueprint do
       InheritanceSpecs::Son.make.name.should == "Fred"
     end
 
-    it "should override blueprinted attributes in the child class" do
+    it "overrides blueprinted attributes in the child class" do
       InheritanceSpecs::Dad.blueprint do
         name { "Fred" }
       end
@@ -75,7 +75,7 @@ describe Machinist::Blueprint do
       InheritanceSpecs::Son.make.name.should == "George"
     end
 
-    it "should inherit from blueprinted attributes in ancestor class" do
+    it "inherits from blueprinted attributes in ancestor class" do
       InheritanceSpecs::Grandpa.blueprint do
         name { "Fred" }
       end
@@ -85,7 +85,7 @@ describe Machinist::Blueprint do
       InheritanceSpecs::Son.make.name.should == "Fred"
     end
 
-    it "should follow inheritance for named blueprints correctly" do
+    it "follows inheritance for named blueprints correctly" do
       InheritanceSpecs::Dad.blueprint do
         name { "John" }
         age  { 56 }