machinist_mongo 1.0.2 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/machinist/mongo_mapper.rb

@@ -9,6 +9,17 @@ rescue LoadError
 end
 
 module Machinist
+
+  class Lathe
+    def assign_attribute(key, value)
+      assigned_attributes[key.to_sym] = value
+      if @object.respond_to? "#{key}="
+        @object.send("#{key}=", value)
+      else
+        @object[key] = value
+      end
+    end
+  end
   
   class MongoMapperAdapter
     def self.has_association?(object, attribute)
@@ -69,4 +80,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/lib/machinist/mongoid.rb

@@ -0,0 +1,71 @@
+require "machinist"
+require "machinist/blueprints"
+
+begin
+  require "mongoid"
+rescue LoadError
+  puts "Mongoid is not installed (gem install mongoid)"
+  exit
+end
+
+module Machinist
+  class Lathe
+    def assign_attribute(key, value)
+      assigned_attributes[key.to_sym] = value
+      @object.process(key => value)
+    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
+      end
+
+      def assigned_attributes_without_associations(lathe)
+        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?
+            attributes[association.foreign_key.to_sym] = value.id
+          else
+            attributes[attribute] = value
+          end
+        end
+        attributes        
+      end      
+    end
+  end
+  
+  module MongoidExtensions
+    module Document
+      def make(*args, &block)
+        lathe = Lathe.run(Machinist::MongoidAdapter, self.new, *args)
+        unless Machinist.nerfed? || embedded
+          lathe.object.save!
+          lathe.object.reload
+        end
+        lathe.object(&block)
+      end
+      
+      def make_unsaved(*args)
+        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)
+      end
+    end
+  end
+end
+
+Mongoid::Document::ClassMethods.send(:include, Machinist::Blueprints::ClassMethods)
+Mongoid::Document::ClassMethods.send(:include, Machinist::MongoidExtensions::Document)

data/machinist_mongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{machinist_mongo}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   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-01-11}
+  s.date = %q{2010-03-31}
   s.email = %q{nicolas.merouze@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,17 +22,20 @@ Gem::Specification.new do |s|
      "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.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Machinist adapters for MongoDB ORMs}
   s.test_files = [
     "spec/mongo_mapper_spec.rb",
+     "spec/mongoid_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/mongo_mapper_spec.rb

@@ -102,6 +102,20 @@ describe Machinist, "MongoMapper::Document adapter" do
       comment[:post].should be_nil
       comment[:post_id].should_not be_nil
     end
+
+    context "attribute assignment" do 
+      it "should allow assigning a value to an attribute" do
+        Post.blueprint { title "1234" }
+        post = Post.make
+        post.title.should == "1234"
+      end
+
+      it "should allow arbitrary attributes on the base model in its blueprint" do
+        Post.blueprint { foo "bar" }
+        post = Post.make
+        post.foo.should == "bar"
+      end
+    end
   end
 
   describe "make_unsaved method" do
@@ -152,6 +166,12 @@ describe Machinist, "MongoMapper::EmbeddedDocument adapter" do
       end
       Person.make.address.should be_instance_of(Address)
     end
+
+    it "should allow arbitrary attributes on the base model in its blueprint" do
+      Address.blueprint { foo "bar" }
+      addr = Address.make
+      addr.foo.should == "bar"
+    end
   end
 
-end
+end

data/spec/mongoid_spec.rb

@@ -0,0 +1,170 @@
+require File.dirname(__FILE__) + "/spec_helper"
+require "machinist/mongoid"
+
+Spec::Mongoid.configure!
+
+class Address
+  include Mongoid::Document
+  
+  field :street
+  field :zip
+  field :country
+  belongs_to :person, :inverse_of => :address
+end
+
+class Person
+  include Mongoid::Document
+  
+  field :name
+  field :type
+  field :password
+  field :admin, :type => Boolean, :default => false
+
+  has_one :address
+end
+
+class Post
+  include Mongoid::Document
+  
+  field :title
+  field :body
+  field :published, :type => Boolean, :default => true
+  
+  has_many_related :comments
+end
+
+class Comment
+  include Mongoid::Document
+  
+  field :body
+  field :post_id
+  field :author_id
+  
+  belongs_to_related :post
+  belongs_to_related :author, :class_name => "Person"
+end
+
+describe Machinist, "Mongoid::Document adapter" do 
+
+  before(:each) do
+    Person.clear_blueprints!
+    Post.clear_blueprints!
+    Comment.clear_blueprints!
+  end
+
+  describe "make method" do
+    it "should save the constructed object" do
+      Person.blueprint { }
+      person = Person.make
+      person.should_not be_new_record
+    end
+    
+    it "should create an object through belongs_to 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
+      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
+        title { 'Dummy Post' }
+      end
+      Comment.blueprint { post(:dummy) }
+      Comment.make.post.title.should == 'Dummy Post'
+    end
+  end
+  
+  describe "plan method" do
+    it "should not save the constructed object" do
+      person_count = Person.count
+      Person.blueprint { }
+      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 }
+      post_count = Post.count
+      comment = Comment.plan
+      Post.count.should == post_count + 1
+      comment[:post].should be_nil
+      comment[:post_id].should_not be_nil
+    end
+
+    context "attribute assignment" do 
+      it "should allow assigning a value to an attribute" do
+        Post.blueprint { title "1234" }
+        post = Post.make
+        post.title.should == "1234"
+      end
+
+      it "should allow arbitrary attributes on the base model in its blueprint" do
+        Post.blueprint { foo "bar" }
+        post = Post.make
+        post.foo.should == "bar"
+      end
+    end
+  end
+  
+  describe "make_unsaved method" do
+    it "should not save the constructed object" do
+      Person.blueprint { }
+      person = Person.make_unsaved
+      person.should be_new_record
+    end
+    
+    it "should not save associated objects" do
+      pending
+      # Post.blueprint { }
+      # Comment.blueprint { post }
+      # comment = Comment.make_unsaved
+      # comment.post.should be_new_record
+    end
+    
+    it "should save objects made within a passed-in block" do
+      Post.blueprint { }
+      Comment.blueprint { }
+      comment = nil
+      post = Post.make_unsaved { comment = Comment.make }
+      post.should be_new_record
+      comment.should_not be_new_record
+    end
+  end
+  
+  describe "make method with embedded documents" 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
+
+    it "should allow arbitrary attributes on the base model in its blueprint" do
+      Address.blueprint { foo "bar" }
+      addr = Address.make
+      addr.foo.should == "bar"
+    end
+  end
+  
+end

data/spec/spec_helper.rb

@@ -14,4 +14,18 @@ module Spec
       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|
+        config.before(:each) { Sham.reset }
+        config.after(:all)   { ::Mongoid.master.collections.each { |c| c.remove } }
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: machinist_mongo
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Nicolas M\xC3\xA9rouze"
@@ -10,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: machinist
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: nicolas.merouze@gmail.com
 executables: []
@@ -39,8 +48,10 @@ files:
 - 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
 has_rdoc: true
 homepage: http://github.com/nmerouze/machinist_mongo
@@ -55,21 +66,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Machinist adapters for MongoDB ORMs
 test_files: 
 - spec/mongo_mapper_spec.rb
+- spec/mongoid_spec.rb
 - spec/spec_helper.rb