fcoury-mongomapper 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/mongomapper.rb

@@ -24,7 +24,8 @@ require dir + 'finder_options'
 require dir + 'key'
 require dir + 'observing'
 require dir + 'pagination'
-require dir + 'rails_compatibility'
+require dir + 'document_rails_compatibility'
+require dir + 'embedded_document_rails_compatibility'
 require dir + 'save_with_validation'
 require dir + 'serialization'
 require dir + 'validations'

data/lib/mongomapper/document.rb

@@ -9,7 +9,7 @@ module MongoMapper
         include Observing
         include Callbacks
         include SaveWithValidation
-        include RailsCompatibility
+        include DocumentRailsCompatibility
         extend ClassMethods
 
         key :_id, String

data/lib/mongomapper/document_rails_compatibility.rb

@@ -0,0 +1,13 @@
+module MongoMapper
+  module DocumentRailsCompatibility
+    def self.included(model)
+      model.class_eval do
+        alias_method :new_record?, :new?
+      end
+    end
+
+    def to_param
+      id
+    end
+  end
+end

data/lib/mongomapper/embedded_document.rb

@@ -8,10 +8,11 @@ module MongoMapper
       model.class_eval do
         extend ClassMethods
         include InstanceMethods
-
+      
         extend Associations::ClassMethods
         include Associations::InstanceMethods
 
+        include EmbeddedDocumentRailsCompatibility
         include Validatable
         include Serialization
       end

data/lib/mongomapper/{rails_compatibility.rb → embedded_document_rails_compatibility.rb}

@@ -1,8 +1,7 @@
 module MongoMapper
-  module RailsCompatibility
+  module EmbeddedDocumentRailsCompatibility
     def self.included(model)
       model.class_eval do
-        alias_method :new_record?, :new?
         extend ClassMethods
       end
       class << model
@@ -17,7 +16,7 @@ module MongoMapper
     end
 
     def to_param
-      id
+      raise "Missing to_param method in #{self.class.name}. You should implement it to return the unique identifier of this document within a collection."
     end
   end
 end

data/mongomapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
@@ -34,12 +34,13 @@ Gem::Specification.new do |s|
      "lib/mongomapper/associations/proxy.rb",
      "lib/mongomapper/callbacks.rb",
      "lib/mongomapper/document.rb",
+     "lib/mongomapper/document_rails_compatibility.rb",
      "lib/mongomapper/embedded_document.rb",
+     "lib/mongomapper/embedded_document_rails_compatibility.rb",
      "lib/mongomapper/finder_options.rb",
      "lib/mongomapper/key.rb",
      "lib/mongomapper/observing.rb",
      "lib/mongomapper/pagination.rb",
-     "lib/mongomapper/rails_compatibility.rb",
      "lib/mongomapper/save_with_validation.rb",
      "lib/mongomapper/serialization.rb",
      "lib/mongomapper/serializers/json_serializer.rb",

data/test/test_rails_compatibility.rb

@@ -1,29 +1,73 @@
 require 'test_helper'
 
+class Item
+  include MongoMapper::EmbeddedDocument
+  key :for_all, String
+end
+
+class FirstItem < Item  
+  key :first_only, String
+end
+
+class SecondItem < Item
+  key :second_only, String
+end
+
+class Order
+  include MongoMapper::Document
+  many :items, :polymorphic => true, :class_name => "Item"
+  key :order_only, String
+end
+
 class TestRailsCompatibility < Test::Unit::TestCase
   def setup
     @document = Class.new do
       include MongoMapper::Document
     end
   end
+  
+  context "EmbeddedDocument" do
+    should "have to_param that returns id" do
+      first_item = FirstItem.new
+      second_item = SecondItem.new
 
-  should "have to_param that returns id" do
-    instance = @document.create('_id' => '1234')
-    instance.to_param.should == '1234'
-  end
+      order = Order.create('_id' => '1234')
+      order.items = [
+        first_item,
+        second_item
+      ]
+      order.to_param.should == '1234'
 
-  should "alias new to new_record?" do
-    instance = @document.new
-    instance.new_record?.should == instance.new?
-  end
+      lambda { first_item.to_param }.should raise_error
+      lambda { second_item.to_param }.should raise_error
+    end
 
-  should "alias many to has_many" do
-    @document.should respond_to(:has_many)
-    @document.method(:has_many).should == @document.method(:many)
+    should "have column names" do
+      Order.column_names.sort.should == ['_id', 'created_at', 'order_only', 'updated_at']
+      FirstItem.column_names.sort.should == ['first_only', 'for_all']
+      SecondItem.column_names.sort.should == ['for_all', 'second_only']
+    end
   end
 
-  should "have column names" do
-    @document.key :fname, String
-    @document.column_names.sort.should == ['_id', 'created_at', 'fname', 'updated_at']
+  context "Document" do
+    should "have to_param that returns id" do
+      instance = @document.create('_id' => '1234')
+      instance.to_param.should == '1234'
+    end
+
+    should "alias new to new_record?" do
+      instance = @document.new
+      instance.new_record?.should == instance.new?
+    end
+
+    should "alias many to has_many" do
+      @document.should respond_to(:has_many)
+      @document.method(:has_many).should == @document.method(:many)
+    end
+
+    should "have column names" do
+      @document.key :fname, String
+      @document.column_names.sort.should == ['_id', 'created_at', 'fname', 'updated_at']
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fcoury-mongomapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -91,12 +91,13 @@ files:
 - lib/mongomapper/associations/proxy.rb
 - lib/mongomapper/callbacks.rb
 - lib/mongomapper/document.rb
+- lib/mongomapper/document_rails_compatibility.rb
 - lib/mongomapper/embedded_document.rb
+- lib/mongomapper/embedded_document_rails_compatibility.rb
 - lib/mongomapper/finder_options.rb
 - lib/mongomapper/key.rb
 - lib/mongomapper/observing.rb
 - lib/mongomapper/pagination.rb
-- lib/mongomapper/rails_compatibility.rb
 - lib/mongomapper/save_with_validation.rb
 - lib/mongomapper/serialization.rb
 - lib/mongomapper/serializers/json_serializer.rb