machinist 2.0.0.beta1 → 2.0.0.beta2

data/.gitignore

@@ -2,4 +2,5 @@
 .DS_Store
 coverage
 doc
+pkg
 tags

data/VERSION

@@ -0,0 +1 @@
+2.0.0.beta2

data/lib/machinist.rb

@@ -1,4 +1,5 @@
 require 'machinist/blueprint'
+require 'machinist/configuration'
 require 'machinist/exceptions'
 require 'machinist/lathe'
 require 'machinist/machinable'

data/lib/machinist/configuration.rb

@@ -0,0 +1,32 @@
+module Machinist
+
+  # Configure Machinist.
+  #
+  # To change Machinist configuration, do something like this in your
+  # config/environments/test.rb or somewhere similar:
+  #
+  #     Machinist.configure do |config|
+  #       config.cache_objects = false
+  #     end
+  class Configuration
+    # Set this to false to disable object caching. Defaults to true.
+    attr_accessor :cache_objects
+
+    def cache_objects? #:nodoc:
+      @cache_objects
+    end
+
+    def initialize #:nodoc:
+      self.cache_objects = true
+    end
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+end

data/lib/machinist/machinable.rb

@@ -51,7 +51,11 @@ module Machinist
     # Arguments are the same as for make.
     def make!(*args)
       decode_args_to_make(*args) do |blueprint, attributes|
-        Shop.instance.buy(blueprint, attributes)
+        if Machinist.configuration.cache_objects?
+          Shop.instance.buy(blueprint, attributes)
+        else
+          blueprint.make!(attributes)
+        end
       end
     end
 

data/machinist.gemspec

@@ -0,0 +1,78 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{machinist}
+  s.version = "2.0.0.beta2"
+
+  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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/spec/active_record_spec.rb

@@ -48,6 +48,16 @@ describe Machinist::ActiveRecord do
       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

data/spec/spec_helper.rb

@@ -5,3 +5,7 @@ require 'rubygems'
 require 'test/unit'
 require 'rspec'
 require 'machinist'
+
+Machinist.configure do |config|
+  config.cache_objects = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: machinist
 version: !ruby/object:Gem::Version 
-  hash: -1848230035
+  hash: -1848230038
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - beta1
-  version: 2.0.0.beta1
+  - beta2
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
 - Pete Yandell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +10:00
+date: 2010-07-07 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - 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
@@ -44,11 +45,13 @@ files:
 - 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