yeastymobs-machinist_mongomapper 0.9.2 → 0.9.3

data/README.md

@@ -2,4 +2,4 @@ Machinist adapter for [MongoMapper](http://github.com/jnunemaker/mongomapper).
 
 ## TODO
 
-* Add associations support.
+* Spec for EmbeddedDocument.

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/init.rb

@@ -1 +1,4 @@
-require 'machinist/mongomapper' if Rails.env =~ /^test|cucumber$/
+config.after_initialize do
+  require 'machinist/mongomapper' if Rails.env =~ /^test|cucumber$/
+end
+

data/lib/machinist/mongomapper.rb

@@ -18,7 +18,7 @@ module Machinist
       lathe.assigned_attributes.each_pair do |attribute, value|
         association = lathe.object.class.associations[attribute]
         if association && association.belongs_to?
-          attributes[association.belongs_to_key_name.to_sym] = value.id
+          attributes[association.foreign_key.to_sym] = value.id
         else
           attributes[attribute] = value
         end
@@ -28,21 +28,30 @@ module Machinist
   end
 
   module MongoMapperExtensions
-    def make(*args, &block)
-      lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
-      lathe.object.save! unless Machinist.nerfed?
-      lathe.object(&block)
-    end
+    module Document
+      def make(*args, &block)
+        lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
+        lathe.object.save! unless Machinist.nerfed?
+        lathe.object(&block)
+      end
 
-    def make_unsaved(*args)
-      returning(Machinist.with_save_nerfed { make(*args) }) do |object|
-        yield object if block_given?
+      def make_unsaved(*args)
+        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
+          yield object if block_given?
+        end
       end
-    end
 
-    def plan(*args)
-      lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
-      Machinist::MongoMapperAdapter.assigned_attributes_without_associations(lathe)
+      def plan(*args)
+        lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
+        Machinist::MongoMapperAdapter.assigned_attributes_without_associations(lathe)
+      end
+    end
+    
+    module EmbeddedDocument
+      def make(*args, &block)
+        lathe = Lathe.run(Machinist::MongoMapperAdapter, self.new, *args)
+        lathe.object(&block)
+      end
     end
   end
   
@@ -57,4 +66,6 @@ end
 
 MongoMapper::Associations::Proxy.send(:include, Machinist::MongoMapperAssociationsProxyExtensions)
 MongoMapper::Document::ClassMethods.send(:include, Machinist::Blueprints::ClassMethods)
-MongoMapper::Document::ClassMethods.send(:include, Machinist::MongoMapperExtensions)
+MongoMapper::Document::ClassMethods.send(:include, Machinist::MongoMapperExtensions::Document)
+MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Machinist::Blueprints::ClassMethods)
+MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Machinist::MongoMapperExtensions::EmbeddedDocument)

data/machinist_mongomapper.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{machinist_mongomapper}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas M\303\251rouze", "Vincent Hellot", "Mathieu Fosse"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-09-24}
   s.email = %q{dev@yeastymobs.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/mongomapper_spec.rb

@@ -1,6 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'machinist/mongomapper'
 
+class Address
+  include MongoMapper::EmbeddedDocument
+  
+  key :street, String
+  key :zip, String
+  key :country, String
+end
+
 class Person
   include MongoMapper::Document
   
@@ -8,6 +16,7 @@ class Person
   key :type, String
   key :password, String
   key :admin, Boolean, :default => false
+  key :address, Address
 end
 
 class Post
@@ -24,12 +33,14 @@ class Comment
   include MongoMapper::Document
   
   key :body, String
+  key :post_id, String
+  key :author_id, String
   
   belongs_to :post
   belongs_to :author, :class_name => "Person"
 end
 
-describe Machinist, "MongoMapper adapter" do 
+describe Machinist, "MongoMapper::Document adapter" do 
 
   before(:each) do
     Person.clear_blueprints!
@@ -107,4 +118,29 @@ describe Machinist, "MongoMapper adapter" do
     end
   end
 
+end
+
+describe Machinist, "MongoMapper::EmbeddedDocument adapter" do 
+
+  before(:each) do
+    Person.clear_blueprints!
+    Address.clear_blueprints!
+  end
+
+  describe "make method" do
+    it "should construct object" do
+      Address.blueprint { }
+      address = Address.make
+      address.should be_instance_of(Address)
+    end
+
+    it "should make an embed object" do
+      Address.blueprint { }
+      Person.blueprint do
+        address { Address.make }
+      end
+      Person.make.address.should be_instance_of(Address)
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -3,16 +3,17 @@ require "rubygems"
 require "spec"
 require "sham"
 
-gem "mongomapper", "~> 0.3.1"
+begin
+  $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../mongomapper/lib"
+rescue
+  gem "mongomapper"
+end
+
 require "mongomapper"
 
 MongoMapper.database = "machinist_mongomapper"
 
-def reset_test_db!
-  MongoMapper.connection.drop_database("machinist_mongomapper")
-end
-
 Spec::Runner.configure do |config|
   config.before(:each) { Sham.reset }
-  config.after(:all)   { reset_test_db! }
+  config.after(:all)   { MongoMapper.database.collections.each { |c| c.clear } }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yeastymobs-machinist_mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency