machinist_mongo 1.1.1 → 1.2.0

data/README.textile

@@ -2,32 +2,23 @@ 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. Usage
+h2. For Rails 2
 
-Using Machinist MongoMapper is simple. Put this in your @Gemfile@:
+Current Machinist Mongo versions are only compatible with Rails 3. Use 1.x versions to use Machinist Mongo with Rails 2.
 
-bc. gem 'machinist_mongo'
+h2. For Machinist 2
 
-And run:
+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.
 
-bc. bundle install
+h2. Usage
 
-Or — if you’re using Rails 2.x — put this in @config/environment.rb@:
+Using Machinist MongoMapper is simple. Put this in your @Gemfile@:
 
-bc. config.gem 'machinist_mongo'
+bc. gem 'machinist_mongo', :require => 'machinist/mongoid' # or mongo_mapper
 
 And run:
 
-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")
+bc. bundle install
 
 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.
 
@@ -37,3 +28,5 @@ h2. Contributors
 * "Cyril Mougel":http://github.com/shingara
 * "Aubrey Holland":http://github.com/aub
 * "Jeff Kreeftmeijer":http://github.com/jeffkreeftmeijer
+* "Joshua Szmajda":http://github.com/joshsz
+* "Rodrigo Alvarez":http://github.com/Papipo

data/lib/machinist/mongo_mapper.rb

@@ -1,8 +1,8 @@
 require "machinist"
 require "machinist/blueprints"
-
 begin
   require "mongo_mapper"
+  require "mongo_mapper/embedded_document"
 rescue LoadError
   puts "MongoMapper is not installed (gem install mongo_mapper)"
   exit
@@ -20,17 +20,17 @@ module Machinist
       end
     end
   end
-  
+
   class MongoMapperAdapter
     def self.has_association?(object, attribute)
       object.class.associations[attribute]
     end
-    
+
     def self.class_for_association(object, attribute)
       association = object.class.associations[attribute]
       association && association.klass
     end
-    
+
     def self.assigned_attributes_without_associations(lathe)
       attributes = {}
       lathe.assigned_attributes.each_pair do |attribute, value|
@@ -57,7 +57,7 @@ module Machinist
       end
 
       def make_unsaved(*args)
-        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
+        Machinist.with_save_nerfed{ make(*args) }.tap do |object|
           yield object if block_given?
         end
       end
@@ -67,8 +67,9 @@ module Machinist
         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)

data/lib/machinist/mongoid.rb

@@ -12,16 +12,20 @@ module Machinist
   class Lathe
     def assign_attribute(key, value)
       assigned_attributes[key.to_sym] = value
-      @object.process(key => value)
+      if @object.respond_to?("#{key}=")
+        @object.send("#{key}=", value)
+      else
+        @object.process(key => value)
+      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
@@ -31,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 == :belongs_to_related) && !value.nil?
+          if association && (association.macro == :referenced_in) && !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)
@@ -52,13 +56,13 @@ module Machinist
         end
         lathe.object(&block)
       end
-      
+
       def make_unsaved(*args)
-        returning(Machinist.with_save_nerfed { make(*args) }) do |object|
+        Machinist.with_save_nerfed { make(*args) }.tap 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)
@@ -68,4 +72,4 @@ module Machinist
 end
 
 Mongoid::Document::ClassMethods.send(:include, Machinist::Blueprints::ClassMethods)
-Mongoid::Document::ClassMethods.send(:include, Machinist::MongoidExtensions::Document)
+Mongoid::Document::ClassMethods.send(:include, Machinist::MongoidExtensions::Document)

data/spec/mongo_mapper_spec.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require "spec_helper"
 require "machinist/mongo_mapper"
 
 Spec::MongoMapper.configure!
 
 class Address
   include MongoMapper::EmbeddedDocument
-  
+
   key :street, String
   key :zip, String
   key :country, String
@@ -13,9 +13,8 @@ end
 
 class Person
   include MongoMapper::Document
-  
+
   key :name, String
-  key :type, String
   key :password, String
   key :admin, Boolean, :default => false
   key :address, Address
@@ -23,26 +22,26 @@ end
 
 class Post
   include MongoMapper::Document
-  
+
   key :title, String
   key :body, String
   key :published, Boolean, :default => true
-  
+
   many :comments
 end
 
 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::Document adapter" do 
+describe Machinist, "MongoMapper::Document adapter" do
 
   before(:each) do
     Person.clear_blueprints!
@@ -62,13 +61,13 @@ describe Machinist, "MongoMapper::Document adapter" do
       Comment.blueprint { post }
       Comment.make.post.class.should == Post
     end
-      
+
     it "should create an object through belongs_to association with a class_name attribute" do
       Person.blueprint { }
       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
@@ -86,13 +85,13 @@ describe Machinist, "MongoMapper::Document adapter" do
       person = Person.plan
       Person.count.should == person_count
     end
-    
+
     it "should return a regular attribute in the hash" do
       Post.blueprint { title "Test" }
       post = Post.plan
       post[:title].should == "Test"
     end
-    
+
     it "should create an object through a belongs_to association, and return its id" do
       Post.blueprint { }
       Comment.blueprint { post }
@@ -103,7 +102,7 @@ describe Machinist, "MongoMapper::Document adapter" do
       comment[:post_id].should_not be_nil
     end
 
-    context "attribute assignment" do 
+    context "attribute assignment" do
       it "should allow assigning a value to an attribute" do
         Post.blueprint { title "1234" }
         post = Post.make

data/spec/mongoid_spec.rb

@@ -9,18 +9,17 @@ class Address
   field :street
   field :zip
   field :country
-  belongs_to :person, :inverse_of => :address
+  embedded_in :person, :inverse_of => :address
 end
 
 class Person
   include Mongoid::Document
   
-  field :name
-  field :type
+  field :name, :accessible => false
   field :password
   field :admin, :type => Boolean, :default => false
 
-  has_one :address
+  embeds_one :address
 end
 
 class Post
@@ -59,19 +58,19 @@ describe Machinist, "Mongoid::Document adapter" do
       person.should_not be_new_record
     end
     
-    it "should create an object through belongs_to association" do
+    it "should create an object through embedded_in association" do
       Post.blueprint { }
       Comment.blueprint { post }
       Comment.make.post.class.should == Post
     end
       
-    it "should create an object through belongs_to association with a class_name attribute" do
+    it "should create an object through embedded_in association with a class_name attribute" do
       Person.blueprint { }
       Comment.blueprint { author }
       Comment.make.author.class.should == Person
     end
     
-    it "should create an object through belongs_to association using a named blueprint" do
+    it "should create an object through embedded_in association using a named blueprint" do
       Post.blueprint { }
       Post.blueprint(:dummy) do
         title { 'Dummy Post' }
@@ -79,6 +78,13 @@ describe Machinist, "Mongoid::Document adapter" do
       Comment.blueprint { post(:dummy) }
       Comment.make.post.title.should == 'Dummy Post'
     end
+
+    it "should be able to set attributes which are marked as inaccessible" do
+      Person.blueprint do
+        name { 'Foobar User' }
+      end
+      Person.make.name.should == 'Foobar User'
+    end
   end
   
   describe "plan method" do
@@ -95,7 +101,7 @@ describe Machinist, "Mongoid::Document adapter" do
       post[:title].should == "Test"
     end
     
-    it "should create an object through a belongs_to association, and return its id" do
+    it "should create an object through a embedded_in association, and return its id" do
       Post.blueprint { }
       Comment.blueprint { post }
       post_count = Post.count
@@ -167,4 +173,4 @@ describe Machinist, "Mongoid::Document adapter" do
     end
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 require "rubygems"
-require "spec"
+require "rspec"
 require "sham"
 
 module Spec
@@ -8,24 +8,24 @@ module Spec
     def self.configure!
       ::MongoMapper.database = "machinist_mongomapper"
 
-      Spec::Runner.configure do |config|
+      ::Rspec.configure do |config|
         config.before(:each) { Sham.reset }
         config.after(:all)   { ::MongoMapper.database.collections.each { |c| c.remove } }
       end
     end
   end
-  
+
   module Mongoid
     def self.configure!
       ::Mongoid.configure do |config|
         config.master = Mongo::Connection.new.db("machinist_mongoid")
         config.allow_dynamic_fields = true
       end
-      
-      Spec::Runner.configure do |config|
+
+      ::Rspec.configure do |config|
         config.before(:each) { Sham.reset }
         config.after(:all)   { ::Mongoid.master.collections.each { |c| c.remove } }
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: machinist_mongo
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +02:00
+date: 2011-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
-        - 4
-        version: 1.0.4
+        - 6
+        version: 1.0.6
   type: :runtime
   version_requirements: *id001
 description: 
@@ -45,14 +43,10 @@ extra_rdoc_files:
 - LICENSE
 - README.textile
 files: 
-- .gitignore
 - LICENSE
-- README.textile
-- Rakefile
-- VERSION
 - lib/machinist/mongo_mapper.rb
 - lib/machinist/mongoid.rb
-- machinist_mongo.gemspec
+- README.textile
 - spec/mongo_mapper_spec.rb
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb
@@ -70,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -79,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/.gitignore

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

data/Rakefile

@@ -1,28 +0,0 @@
-# encoding: utf-8
-require 'rubygems'
-require 'rake'
-require 'spec/rake/spectask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "machinist_mongo"
-    gem.summary = %Q{Machinist adapters for MongoDB ORMs}
-    gem.email = "nicolas.merouze@gmail.com"
-    gem.homepage = "http://github.com/nmerouze/machinist_mongo"
-    gem.authors = ["Nicolas Mérouze", "Cyril Mougel"]
-
-    gem.add_dependency('machinist',  '~> 1.0.4')
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-desc 'Default: run specs.'
-task :default => :spec
-
-desc 'Run all the specs for the machinist plugin.'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = false
-end

data/VERSION

@@ -1 +0,0 @@
-1.1.1

data/machinist_mongo.gemspec

@@ -1,55 +0,0 @@
-# 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_mongo}
-  s.version = "1.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nicolas M\303\251rouze", "Cyril Mougel"]
-  s.date = %q{2010-07-09}
-  s.email = %q{nicolas.merouze@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.textile"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "lib/machinist/mongo_mapper.rb",
-     "lib/machinist/mongoid.rb",
-     "machinist_mongo.gemspec",
-     "spec/mongo_mapper_spec.rb",
-     "spec/mongoid_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/nmerouze/machinist_mongo}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Machinist adapters for MongoDB ORMs}
-  s.test_files = [
-    "spec/mongo_mapper_spec.rb",
-     "spec/mongoid_spec.rb",
-     "spec/spec_helper.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
-      s.add_runtime_dependency(%q<machinist>, ["~> 1.0.4"])
-    else
-      s.add_dependency(%q<machinist>, ["~> 1.0.4"])
-    end
-  else
-    s.add_dependency(%q<machinist>, ["~> 1.0.4"])
-  end
-end
-