mongodb_model 0.2.8 → 2.0.0

data/lib/mongo/model.rb

@@ -1,51 +1,6 @@
 require 'mongodb_model/gems'
 
-require 'validatable'
-require 'ruby_ext'
-require 'mongo/object'
-
-module Mongo::Model; end
-
-%w(
-  support/types
-
-  db
-  conversion
-  assignment
-  callbacks
-  validation
-  validation/uniqueness_validator
-  crud
-  query
-  query_mixin
-  scope
-  attribute_convertors
-  misc
-  model
-).each{|f| require "mongo/model/#{f}"}
-
 module Mongo
-  module Model
-    autoload :FileModel, 'mongo/model/file_model'
-
-    inherit \
-      Db,
-      Conversion,
-      Assignment,
-      Callbacks,
-      Validation,
-      Crud,
-      QueryMixin,
-      Scope,
-      AttributeConvertors,
-      Misc
-  end
+  autoload :Model, 'mongo/model/load'
 end
 
-Mongo.defaults.merge! \
-  convert_underscore_to_dollar: true,
-  batch_size:                   50,
-  multi:                        true,
-  safe:                         true
-
-require 'mongo/model/integration/rails' if defined? Rails

data/spec/assignment_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Model callbacks' do
+describe 'Attribute assignment' do
   with_mongo_model
 
   after{remove_constants :User, :Writer}
@@ -70,7 +70,7 @@ describe 'Model callbacks' do
     [u.age, u.posts].should == [20, 12]
   end
 
-  it 'casting smoke test' do
+  it 'should cast string values' do
     [
       Boolean, '1',          true,
       Date,    '2011-08-23', Date.parse('2011-08-23'),

data/spec/associations_spec.rb

@@ -5,7 +5,7 @@ describe 'Associations' do
 
   after{remove_constants :Post, :Comment}
 
-  it "basic" do
+  it "should allow to model associations" do
     class Post
       inherit Mongo::Model
       collection :posts
@@ -13,7 +13,7 @@ describe 'Associations' do
       attr_accessor :text
 
       def comments
-        Comment.query({post_id: _id}, {sort: [[:created_at, -1]]})
+        Comment.query({post_id: _id}, {sort: [[:text, -1]]})
       end
     end
 
@@ -26,8 +26,6 @@ describe 'Associations' do
       def == o
         self.class == o.class and [text, post_id] == [o.text, o.post_id]
       end
-
-      timestamps!
     end
 
     post1 = Post.create! text: 'Post 1'

data/spec/attribute_convertors_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe "Attribute Convertors" do
+describe "Attribute convertors" do
   with_mongo_model
 
   after(:all){remove_constants :TheSample}
 
   convertors = Mongo::Model::AttributeConvertors::CONVERTORS
 
-  it ":line convertor" do
+  it "should convert line of comma-separated tokens to array and backward" do
     v = ['a', 'b']
     str_v = 'a, b'
     convertors[:line][:from_string].call(str_v).should == v
     convertors[:line][:to_string].call(v).should == str_v
   end
 
-  it ":yaml convertor" do
+  it "should convert to YAML and backward" do
     v = {'a' => 'b'}
     str_v = v.to_yaml.strip
 
@@ -22,14 +22,14 @@ describe "Attribute Convertors" do
     convertors[:yaml][:to_string].call(v).should == str_v
   end
 
-  it ":json convertor" do
+  it "should convert to JSON and backward" do
     v = {'a' => 'b'}
     str_v = v.to_json.strip
     convertors[:json][:from_string].call(str_v).should == v
     convertors[:json][:to_string].call(v).should == str_v
   end
 
-  it ":field should generate helper methods if :as_string option provided" do
+  it "should generate helper methods if :as_string option provided" do
     class ::TheSample
       inherit Mongo::Model
 
@@ -48,24 +48,24 @@ describe "Attribute Convertors" do
 
     o = TheSample.new
 
-    # get
+    # Get.
     o.tags_as_string.should == ''
     o.tags = %w(Java Ruby)
     o._cache.clear
     o.tags_as_string.should == 'Java, Ruby'
 
-    # set
+    # Set.
     o.tags_as_string = ''
     o.tags.should == []
     o.tags_as_string = 'Java, Ruby'
     o.tags.should == %w(Java Ruby)
 
-    # mass assignment
+    # Mass assignment.
     o.tags = []
     o.set tags_as_string: 'Java, Ruby'
     o.tags.should == %w(Java Ruby)
 
-    # # protection
+    # Protection.
     o.protected_tags = []
     -> {o.set protected_tags_as_string: 'Java, Ruby'}.should raise_error(/not allowed/)
   end

data/spec/callbacks_spec.rb

@@ -1,60 +1,187 @@
 require 'spec_helper'
 
-describe 'Model callbacks' do
+describe 'Callbacks' do
   with_mongo_model
 
-  after{remove_constants :Post, :Player}
+  describe "basics" do
+    after{remove_constants :Post, :Unit}
 
-  it "integration smoke test" do
-    class Player
-      inherit Mongo::Model
+    it "should works in common use case" do
+      class Unit
+        inherit Mongo::Model
 
-      before_validate :before_validate_check
-      after_save :after_save_check
+        before_validate :validate_unit
+        after_save :unit_saved
 
-      attr_accessor :missions
+        attr_accessor :items
+        embedded :items
 
-      class Mission
-        inherit Mongo::Model
+        class Item
+          inherit Mongo::Model
 
-        before_validate :before_validate_check
-        after_save :after_save_check
+          before_validate :validate_item
+          after_save :item_saved
+        end
       end
-    end
 
-    mission = Player::Mission.new
-    player = Player.new
-    player.missions = [mission]
+      item = Unit::Item.new
+      unit = Unit.new
+      unit.items = [item]
 
-    player.should_receive(:before_validate_check).once.ordered.and_return(nil)
-    mission.should_receive(:before_validate_check).once.ordered.and_return(nil)
-    player.should_receive(:after_save_check).once.ordered.and_return(nil)
-    mission.should_receive(:after_save_check).once.ordered.and_return(nil)
+      unit.should_receive(:validate_unit).once.ordered.and_return(nil)
+      unit.should_receive(:unit_saved).once.ordered.and_return(nil)
+      item.should_receive(:validate_item).once.ordered.and_return(nil)
+      item.should_receive(:item_saved).once.ordered.and_return(nil)
 
-    db.units.save(player).should be_true
+      db.units.save(unit).should be_true
+    end
   end
 
-  it "should have :build callback" do
-    class Post
-      inherit Mongo::Model
-      collection :posts
+  describe 'CRUD' do
+    with_mongo_model
+
+    before do
+      class MainObject
+        inherit Mongo::Model, RSpec::CallbackHelper
 
-      class Tags < Array
+        attr_accessor :children
+        embedded :children
       end
 
-      def tags
-        @tags ||= Tags.new
+      class EmbeddedObject
+        inherit Mongo::Model, RSpec::CallbackHelper
       end
-      attr_writer :tags
+    end
+    after{remove_constants :MainObject, :Post}
 
-      after_build do |post|
-        post.tags = Tags.new.replace post.tags
+    before do
+      @child = EmbeddedObject.new
+      @object = MainObject.new
+      @object.children = [@child]
+    end
+
+    it 'should fire create callbacks' do
+      %w(before_validate after_validate before_save before_create after_create after_save).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
       end
+
+      db.objects.save(@object).should be_true
     end
 
-    post = Post.new
-    post.save!
+    it 'should fire update callbacks' do
+      @object.dont_watch_callbacks do
+        db.objects.save(@object).should be_true
+      end
 
-    Post.first.tags.class.should == Post::Tags
+      %w(before_validate after_validate before_save before_update after_update after_save).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
+      end
+      db.objects.save(@object).should be_true
+    end
+
+    it 'should fire delete callbacks' do
+      @object.dont_watch_callbacks do
+        db.objects.save(@object).should be_true
+      end
+
+      %w(before_validate after_validate before_delete after_delete).each do |name|
+        @object.should_receive(name).once.ordered.and_return(true)
+        @child.should_receive(name).once.ordered.and_return(true)
+      end
+      db.objects.delete(@object).should be_true
+    end
+
+    it 'should be able skip callbacks' do
+      %w(before_validate after_validate before_save before_update after_update after_save).each do |name|
+        @object.should_not_receive(name)
+        @child.should_not_receive(name)
+      end
+
+      db.objects.save(@object, callbacks: false).should be_true
+      db.objects.count.should == 1
+      db.objects.save(@object, callbacks: false).should be_true
+      db.objects.count.should == 1
+      db.objects.delete(@object, callbacks: false).should be_true
+      db.objects.count.should == 0
+    end
+
+    it 'should be able interrupt CRUD' do
+      %w(before_validate after_validate before_save).each do |name|
+        @object.should_receive(name).and_return true
+        @child.should_receive(name).and_return true
+      end
+
+      @object.should_receive(:before_create).and_return true
+      @child.should_receive(:before_create).and_return false
+
+      db.objects.save(@object).should be_false
+      db.objects.count.should == 0
+    end
+
+    # Rejected.
+    # describe "embedded" do
+    #   it 'should fire :delete on detached objects' do
+    #     db.objects.save(@object).should be_true
+    #     @object.children.clear
+    #     @child.should_receive(:before_delete).once.and_return(true)
+    #     db.objects.delete(@object).should be_true
+    #   end
+    #
+    #   it 'should fire :delete on deleted objects in update' do
+    #     db.objects.save(@object).should be_true
+    #     @object.children.clear
+    #     @child.should_receive(:before_delete).once.and_return(true)
+    #     db.objects.save(@object).should be_true
+    #   end
+    #
+    #   it 'should fire :create on new objects in update' do
+    #     db.objects.save(@object).should be_true
+    #     child2 = EmbeddedObject.new
+    #     @object.children << child2
+    #     child2.should_receive(:before_create).once.and_return(true)
+    #     child2.should_not_receive(:before_update)
+    #     db.objects.save(@object).should be_true
+    #   end
+    # end
+
+    it "should fire after build callback after building the model" do
+      @object.dont_watch_callbacks do
+        db.objects.save(@object).should be_true
+      end
+
+      MainObject.after_instantiate do |instance|
+        instance.should_receive(:after_build)
+      end
+      EmbeddedObject.after_instantiate do |instance|
+        instance.should_receive(:after_build)
+      end
+      db.objects.first
+    end
+
+    it "should allow to use after build callback to post-process and alter model" do
+      class Post
+        inherit Mongo::Model
+        collection :posts
+
+        class Tags < Array
+        end
+
+        def tags
+          @tags ||= Tags.new
+        end
+        attr_writer :tags
+
+        after_build do |post|
+          post.tags = Tags.new.replace post.tags
+        end
+      end
+
+      post = Post.new
+      post.save!
+
+      Post.first.tags.class.should == Post::Tags
+    end
   end
 end

data/spec/conversion_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Model callbacks' do
+describe 'Conversion' do
   with_mongo_model
 
   before :all do
@@ -40,7 +40,7 @@ describe 'Model callbacks' do
 
   it "should work without arguments" do
     post = build_post_with_comment
-    post.to_rson.should == {
+    post.to_hash.should == {
       'text' => 'StarCraft releasing soon!',
       'token' => 'secret',
       'comments' => [
@@ -49,32 +49,32 @@ describe 'Model callbacks' do
     }
   end
 
-  it "only, except, methods" do
+  it "should accept :only, :except and :methods options" do
     post = build_post_with_comment
-    post.to_rson(only: :text).should == {'text' => 'StarCraft releasing soon!'}
-    post.to_rson(except: :token).should == {
+    post.to_hash(only: :text).should == {'text' => 'StarCraft releasing soon!'}
+    post.to_hash(except: :token).should == {
       'text' => 'StarCraft releasing soon!',
       'comments' => [
         {'text' => 'Cool!'}
       ]
     }
-    post.to_rson(only: [], methods: :teaser).should == {'teaser' => 'StarCraft r'}
+    post.to_hash(only: [], methods: :teaser).should == {'teaser' => 'StarCraft r'}
   end
 
-  it "profiles" do
+  it "should use conversion profiles" do
     Post.class_eval do
       profile :public, only: [:text, :comments], methods: :teaser
     end
 
     post = build_post_with_comment
 
-    -> {post.to_rson(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
+    -> {post.to_hash(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
 
     Comment.class_eval do
       profile :public
     end
 
-    post.to_rson(profile: :public).should == {
+    post.to_hash(profile: :public).should == {
       'text' => 'StarCraft releasing soon!',
       'teaser' => 'StarCraft r',
       'comments' => [
@@ -82,7 +82,7 @@ describe 'Model callbacks' do
       ]
     }
   end
-  
+
   it "should include errors" do
     Post.class_eval do
       validates_presence_of :token
@@ -90,30 +90,30 @@ describe 'Model callbacks' do
 
     post = Post.new text: 'StarCraft releasing soon!'
     post.valid?.should be_false
-    
-    post.to_rson.should == {
+
+    post.to_hash.should == {
       'text' => 'StarCraft releasing soon!',
       'errors' => {"token" => ["can't be empty"]}
     }
-    
-    post.to_rson(errors: false).should == {
+
+    post.to_hash(errors: false).should == {
       'text' => 'StarCraft releasing soon!'
     }
   end
 
-  it "to_json" do
+  it "should convert to to_json" do
     post = build_post_with_comment
     rson = mock
     rson.should_receive(:to_json).and_return(:ok)
-    post.should_receive(:to_rson).with(only: :text).and_return(rson)
+    post.should_receive(:to_hash).with(only: :text).and_return(rson)
     post.to_json(only: :text).should == :ok
   end
 
-  it "to_xml" do
+  it "should convert to to_xml" do
     post = build_post_with_comment
     rson = mock
     rson.should_receive(:to_xml).and_return(:ok)
-    post.should_receive(:to_rson).with(only: :text).and_return(rson)
+    post.should_receive(:to_hash).with(only: :text).and_return(rson)
     post.to_xml(only: :text).should == :ok
   end
 end