machinist_mongo 1.2.0 → 2.0.0.pre

data/README.textile

@@ -2,23 +2,32 @@ h1. Machinist Mongo
 
 It aims to replace "machinist_mongomapper":http://github.com/yeastymobs/machinist_mongomapper to provide "Machinist":http://github.com/notahat/machinist adapters not just for "MongoMapper":http://mongomapper.com but for all the others MongoDB ORMs too. Right now it supports "Mongoid":http://mongoid.com and "MongoMapper":http://mongomapper.com, but we aim to support _all_ "mongoDB":http://www.mongodb.org/ ORMs, so If you're using something other than MongoMapper or Mongoid, please be sure to write a adapter for it.
 
-h2. For Rails 2
+h2. Usage
 
-Current Machinist Mongo versions are only compatible with Rails 3. Use 1.x versions to use Machinist Mongo with Rails 2.
+Using Machinist MongoMapper is simple. Put this in your @Gemfile@:
 
-h2. For Machinist 2
+bc. gem 'machinist_mongo'
 
-There's a machinist2 branch if you want to use Machinist Mongo with Machinist 2. It will be merge in the master branch before the Machinist Mongo 2.0.0 final version.
+And run:
 
-h2. Usage
+bc. bundle install
 
-Using Machinist MongoMapper is simple. Put this in your @Gemfile@:
+Or — if you’re using Rails 2.x — put this in @config/environment.rb@:
 
-bc. gem 'machinist_mongo', :require => 'machinist/mongoid' # or mongo_mapper
+bc. config.gem 'machinist_mongo'
 
 And run:
 
-bc. bundle install
+bc. rake gems:install
+
+Now create your @spec/blueprints.rb@ or @test/blueprints.rb@ file as you normally would, only using "Mongoid":http://mongoid.com or "MongoMapper":http://mongomapper.com instead of ActiveRecord:
+
+bc. require 'machinist/mongo_mapper' # or mongoid
+require 'sham'
+
+Don't forget to require the new @blueprints.rb@ file in your @spec_helper@ (or @test_helper@):
+
+bc. require File.expand_path(File.dirname(__FILE__) + "/blueprints")
 
 And you're all set. Be sure read "Machinist's README":http://github.com/notahat/machinist to find out how to create your objects and get this thing running.
 

data/lib/machinist/mongo_mapper.rb

@@ -57,7 +57,7 @@ module Machinist
       end
 
       def make_unsaved(*args)
-        Machinist.with_save_nerfed{ make(*args) }.tap do |object|
+        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
           yield object if block_given?
         end
       end

data/lib/machinist/mongoid.rb

@@ -19,13 +19,13 @@ module Machinist
       end
     end
   end
-
+  
   class MongoidAdapter
     class << self
       def has_association?(object, attribute)
         object.class.associations[attribute.to_s]
       end
-
+      
       def class_for_association(object, attribute)
         association = object.class.associations[attribute.to_s]
         association && association.klass
@@ -35,17 +35,17 @@ module Machinist
         attributes = {}
         lathe.assigned_attributes.each_pair do |attribute, value|
           association = lathe.object.class.associations[attribute.to_s]
-          if association && (association.macro == :referenced_in) && !value.nil?
+          if association && (association.macro == :belongs_to_related) && !value.nil?
             attributes[association.foreign_key.to_sym] = value.id
           else
             attributes[attribute] = value
           end
         end
-        attributes
-      end
+        attributes        
+      end      
     end
   end
-
+  
   module MongoidExtensions
     module Document
       def make(*args, &block)
@@ -56,13 +56,13 @@ module Machinist
         end
         lathe.object(&block)
       end
-
+      
       def make_unsaved(*args)
-        Machinist.with_save_nerfed { make(*args) }.tap do |object|
+        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
           yield object if block_given?
         end
       end
-
+      
       def plan(*args)
         lathe = Lathe.run(Machinist::MongoidAdapter, self.new, *args)
         Machinist::MongoidAdapter.assigned_attributes_without_associations(lathe)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: machinist_mongo
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
-  - 1
   - 2
   - 0
-  version: 1.2.0
+  - 0
+  - pre
+  version: 2.0.0.pre
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -15,14 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: machinist
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -47,9 +47,6 @@ files:
 - lib/machinist/mongo_mapper.rb
 - lib/machinist/mongoid.rb
 - README.textile
-- spec/mongo_mapper_spec.rb
-- spec/mongoid_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nmerouze/machinist_mongo
 licenses: []
@@ -60,7 +57,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -68,17 +64,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Machinist adapters for MongoDB ORMs