machinist_mongo 1.0.1 → 1.0.2

data/.gitignore

@@ -1 +1,2 @@
 .DS_Store
+pkg

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gem.authors = ["Nicolas Mérouze", "Cyril Mougel"]
 
     gem.add_dependency('machinist',  '~> 1.0.4')
-    gem.add_dependency('mongo_mapper', '~> 0.6.1')
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/machinist/mongo_mapper.rb

@@ -1,5 +1,12 @@
-require 'machinist'
-require 'machinist/blueprints'
+require "machinist"
+require "machinist/blueprints"
+
+begin
+  require "mongo_mapper"
+rescue LoadError
+  puts "MongoMapper is not installed (gem install mongo_mapper)"
+  exit
+end
 
 module Machinist
   
@@ -17,7 +24,7 @@ module Machinist
       attributes = {}
       lathe.assigned_attributes.each_pair do |attribute, value|
         association = lathe.object.class.associations[attribute]
-        if association && association.belongs_to?
+        if association && association.belongs_to? && !value.nil?
           attributes[association.foreign_key.to_sym] = value.id
         else
           attributes[attribute] = value
@@ -31,7 +38,10 @@ module Machinist
     module Document
       def make(*args, &block)
         lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
-        lathe.object.save! unless Machinist.nerfed?
+        unless Machinist.nerfed?
+          lathe.object.save!
+          lathe.object.reload
+        end
         lathe.object(&block)
       end
 
@@ -59,4 +69,4 @@ end
 MongoMapper::Document.append_extensions(Machinist::Blueprints::ClassMethods)
 MongoMapper::Document.append_extensions(Machinist::MongoMapperExtensions::Document)
 MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Machinist::Blueprints::ClassMethods)
-MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Machinist::MongoMapperExtensions::EmbeddedDocument)
+MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Machinist::MongoMapperExtensions::EmbeddedDocument)

data/machinist_mongo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{machinist_mongo}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas M\303\251rouze", "Cyril Mougel"]
@@ -42,14 +42,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<machinist>, ["~> 1.0.4"])
-      s.add_runtime_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
     else
       s.add_dependency(%q<machinist>, ["~> 1.0.4"])
-      s.add_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
     end
   else
     s.add_dependency(%q<machinist>, ["~> 1.0.4"])
-    s.add_dependency(%q<mongo_mapper>, ["~> 0.6.1"])
   end
 end
 

data/spec/mongo_mapper_spec.rb

@@ -1,5 +1,7 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require 'machinist/mongo_mapper'
+require File.dirname(__FILE__) + "/spec_helper"
+require "machinist/mongo_mapper"
+
+Spec::MongoMapper.configure!
 
 class Address
   include MongoMapper::EmbeddedDocument
@@ -52,7 +54,7 @@ describe Machinist, "MongoMapper::Document adapter" do
     it "should save the constructed object" do
       Person.blueprint { }
       person = Person.make
-      person.should_not be_new_record
+      person.should_not be_new
     end
 
     it "should create an object through belongs_to association" do
@@ -66,6 +68,15 @@ describe Machinist, "MongoMapper::Document adapter" do
       Comment.blueprint { author }
       Comment.make.author.class.should == Person
     end
+    
+    it "should create an object through belongs_to association using a named blueprint" do
+      Post.blueprint { }
+      Post.blueprint(:dummy) do
+        title { 'Dummy Post' }
+      end
+      Comment.blueprint { post(:dummy) }
+      Comment.make.post.title.should == 'Dummy Post'
+    end
   end
 
   describe "plan method" do
@@ -97,7 +108,7 @@ describe Machinist, "MongoMapper::Document adapter" do
     it "should not save the constructed object" do
       Person.blueprint { }
       person = Person.make_unsaved
-      person.should be_new_record
+      person.should be_new
     end
     
     it "should not save associated objects" do
@@ -105,7 +116,7 @@ describe Machinist, "MongoMapper::Document adapter" do
       # Post.blueprint { }
       # Comment.blueprint { post }
       # comment = Comment.make_unsaved
-      # comment.post.should be_new_record
+      # comment.post.should be_new
     end
     
     it "should save objects made within a passed-in block" do
@@ -113,8 +124,8 @@ describe Machinist, "MongoMapper::Document adapter" do
       Comment.blueprint { }
       comment = nil
       post = Post.make_unsaved { comment = Comment.make }
-      post.should be_new_record
-      comment.should_not be_new_record
+      post.should be_new
+      comment.should_not be_new
     end
   end
 

data/spec/spec_helper.rb

@@ -3,17 +3,15 @@ require "rubygems"
 require "spec"
 require "sham"
 
-begin
-  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../mongomapper/lib"
-rescue
-  gem "mongo_mapper"
-end
+module Spec
+  module MongoMapper
+    def self.configure!
+      ::MongoMapper.database = "machinist_mongomapper"
 
-require "mongo_mapper"
-
-MongoMapper.database = "machinist_mongomapper"
-
-Spec::Runner.configure do |config|
-  config.before(:each) { Sham.reset }
-  config.after(:all)   { MongoMapper.database.collections.each { |c| c.remove } }
-end
+      Spec::Runner.configure do |config|
+        config.before(:each) { Sham.reset }
+        config.after(:all)   { ::MongoMapper.database.collections.each { |c| c.remove } }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: machinist_mongo
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -23,16 +23,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
-    version: 
 description: 
 email: nicolas.merouze@gmail.com
 executables: []