machinist 2.0.0.beta2 → 2.0

data/spec/machinable_spec.rb

@@ -18,7 +18,7 @@ describe Machinist::Machinable do
     MachinableSpecs::Post.clear_blueprints!
   end
 
-  it "should make an object" do
+  it "makes an object" do
     MachinableSpecs::Post.blueprint do
       title { "First Post" }
     end
@@ -28,7 +28,7 @@ describe Machinist::Machinable do
     post.title.should == "First Post"
   end
 
-  it "should make an object from a named blueprint" do
+  it "makes an object from a named blueprint" do
     MachinableSpecs::Post.blueprint do
       title { "First Post" }
       body  { "Woot!" }
@@ -44,7 +44,7 @@ describe Machinist::Machinable do
     post.body.should == "Woot!"
   end
 
-  it "should make an array of objects" do
+  it "makes an array of objects" do
     MachinableSpecs::Post.blueprint do
       title { "First Post" }
     end
@@ -58,7 +58,7 @@ describe Machinist::Machinable do
     end
   end
 
-  it "should make array attributes from the blueprint" do
+  it "makes array attributes from the blueprint" do
     MachinableSpecs::Comment.blueprint { }
     MachinableSpecs::Post.blueprint do 
       comments(3) { MachinableSpecs::Comment.make }
@@ -72,7 +72,7 @@ describe Machinist::Machinable do
     end
   end
 
-  it "should fail without a blueprint" do
+  it "fails without a blueprint" do
     expect do
       MachinableSpecs::Post.make
     end.should raise_error(Machinist::NoBlueprintError) do |exception|
@@ -88,7 +88,7 @@ describe Machinist::Machinable do
     end
   end
 
-  it "should fail when calling make! on an unsavable object" do
+  it "fails when calling make! on an unsavable object" do
     MachinableSpecs::Post.blueprint { }
 
     expect do

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: machinist
 version: !ruby/object:Gem::Version 
-  hash: -1848230038
-  prerelease: true
+  hash: 3
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  - beta2
-  version: 2.0.0.beta2
+  version: "2.0"
 platform: ruby
 authors: 
 - Pete Yandell
@@ -16,21 +14,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +10:00
-default_executable: 
-dependencies: []
-
+date: 2012-01-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mysql
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  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: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: 
-email: pete@notahat.com
+email: 
+- pete@notahat.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -45,29 +127,24 @@ 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
+- lib/machinist/version.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
-has_rdoc: true
 homepage: http://github.com/notahat/machinist
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -82,18 +159,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: machinist
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fixtures aren't fun. Machinist is.
@@ -103,7 +178,5 @@ test_files:
 - 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

data/lib/machinist/configuration.rb

@@ -1,32 +0,0 @@
-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/shop.rb

@@ -1,52 +0,0 @@
-module Machinist
-
-  # The shop takes care of caching database objects.
-  #
-  # Calling make! on a class requests objects from the shop; you don't
-  # normally access the shop directly.
-  #
-  # Read more about object caching on the
-  # wiki[http://wiki.github.com/notahat/machinist/object-caching].
-  class Shop
-
-    # Return the singleton Shop instance.
-    def self.instance
-      @instance ||= Shop.new
-    end
-
-    def initialize #:nodoc:
-      reset!
-    end
-   
-    # Throw out the entire collection of cached objects.
-    def reset!
-      @warehouse = Warehouse.new
-      restock
-    end
-
-    # Restock the shop with all the cached objects we've got.
-    #
-    # This should be called before each test.
-    def restock
-      @back_room = @warehouse.clone
-    end
-
-    # Buy a (possibly cached) object from the shop.
-    #
-    # This is just like constructing an object by calling Blueprint#make!,
-    # but it will return a previously cached object if one is available.
-    def buy(blueprint, attributes = {})
-      raise BlueprintCantSaveError.new(blueprint) unless blueprint.respond_to?(:make!)
-
-      shelf = @back_room[blueprint, attributes]
-      if shelf.empty?
-        object = blueprint.outside_transaction { blueprint.make!(attributes) }
-        @warehouse[blueprint, attributes] << blueprint.box(object)
-        object
-      else
-        blueprint.unbox(shelf.shift)
-      end
-    end
-
-  end
-end

data/lib/machinist/warehouse.rb

@@ -1,36 +0,0 @@
-module Machinist
-
-  # A Warehouse is a hash supports lists as keys.
-  #
-  # It's used for storing cached objects created by Machinist::Shop.
-  #
-  #     warehouse[1, 2] = "Hello, world!"
-  #     warehouse[1, 2] # => "Hello, world!"
-  class Warehouse < Hash
-
-    # Assign a value for the given list of keys.
-    def []=(*keys)
-      value = keys.pop
-      super(keys, value)
-    end
-
-    # Return the value for the given list of keys.
-    #
-    # If the list of keys doesn't exist in the hash, this assigns a new empty
-    # array to that list of keys.
-    def [](*keys)
-      self[*keys] = [] if !has_key?(keys)
-      super(keys)
-    end
-
-    # Return a new warehouse with the same keys, and dups of all the values.
-    def clone
-      clone = Warehouse.new
-      each_pair do |key, value|
-        clone[*key] = value.dup
-      end
-      clone
-    end
-
-  end
-end

data/spec/shop_spec.rb

@@ -1,94 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require 'support/active_record_environment'
-
-describe Machinist::Shop do
-
-  before(:each) do
-    @shop = Machinist::Shop.new
-  end
-
-  def fake_a_test
-    ActiveRecord::Base.transaction do
-      @shop.restock
-      yield
-      raise ActiveRecord::Rollback
-    end
-  end
-  
-  it "should cache an object" do
-    blueprint = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test { post_a = @shop.buy(blueprint) }
-    fake_a_test { post_b = @shop.buy(blueprint) }
-
-    post_b.should == post_a
-    post_b.should_not equal(post_a)
-  end
-  
-  it "should cache an object with attributes" do
-    blueprint = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test { post_a = @shop.buy(blueprint, :title => "Test Title") }
-    fake_a_test { post_b = @shop.buy(blueprint, :title => "Test Title") }
-
-    post_b.should == post_a
-    post_b.should_not equal(post_a)
-  end
-
-  it "should not confuse objects with different blueprints" do
-    blueprint_a = Machinist::ActiveRecord::Blueprint.new(Post) { }
-    blueprint_b = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test { post_a = @shop.buy(blueprint_a) }
-    fake_a_test { post_b = @shop.buy(blueprint_b) }
-
-    post_b.should_not == post_a
-  end
-
-  it "should not confuse objects with the same blueprint but different attributes" do
-    blueprint = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test { post_a = @shop.buy(blueprint, :title => "A Title") }
-    fake_a_test { post_b = @shop.buy(blueprint, :title => "Not A Title") }
-
-    post_b.should_not == post_a
-  end
-
-  it "should cache multiple similar objects" do
-    blueprint = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test do
-      post_a = @shop.buy(blueprint, :title => "Test Title")
-      post_b = @shop.buy(blueprint, :title => "Test Title")
-      post_b.should_not == post_a
-    end
-
-    fake_a_test do
-      @shop.buy(blueprint, :title => "Test Title").should == post_a
-      @shop.buy(blueprint, :title => "Test Title").should == post_b
-      post_c = @shop.buy(blueprint, :title => "Test Title")
-      post_c.should_not == post_a
-      post_c.should_not == post_b
-    end
-  end
-  
-  it "should ensure future copies of a cached object do not reflect changes to the original" do
-    blueprint = Machinist::ActiveRecord::Blueprint.new(Post) { }
-
-    post_a, post_b = nil, nil
-    fake_a_test do
-      post_a = @shop.buy(blueprint, :title => "Test Title")
-      post_a.title = "Changed Title"
-      post_a.save!
-    end
-    fake_a_test { post_b = @shop.buy(blueprint, :title => "Test Title") }
-
-    post_b.title.should == "Test Title"
-  end
-
-end