mongo_db 0.1.9 → 0.1.10

data/spec/object/crud_spec.rb

@@ -5,23 +5,25 @@ describe "Object CRUD" do
   with_mongo
 
   describe 'simple' do
-    before do
-      class Person
+    before :all do
+      class Unit2
         def initialize name = nil, info = nil; @name, @info = name, info end
         attr_accessor :name, :info
         def == o; [self.class, name, info] == [o.class, o.respond_to(:name), o.respond_to(:info)] end
       end
+    end
+    after(:all){remove_constants :Unit2}
 
-      @zeratul = Person.new 'Zeratul', 'Dark Templar'
+    before do
+      @zeratul = Unit2.new 'Zeratul', 'Dark Templar'
     end
-    after{remove_constants :Person}
 
     it_should_behave_like "object CRUD"
   end
 
   describe 'embedded' do
-    before do
-      class Player
+    before :all do
+      class Player2
         attr_accessor :missions
         def == o; [self.class, self.missions] == [o.class, o.respond_to(:missions)] end
 
@@ -31,14 +33,17 @@ describe "Object CRUD" do
           def == o; [self.class, self.name, self.stats] == [o.class, o.respond_to(:name), o.respond_to(:stats)] end
         end
       end
+    end
+    after(:all){remove_constants :Player2}
 
-      @player = Player.new
+    before do
+      @mission_class = Player2::Mission
+      @player = Player2.new
       @player.missions = [
-        Player::Mission.new('Wasteland',         {buildings: 5, units: 10}),
-        Player::Mission.new('Backwater Station', {buildings: 8, units: 25}),
+        Player2::Mission.new('Wasteland',         {buildings: 5, units: 10}),
+        Player2::Mission.new('Backwater Station', {buildings: 8, units: 25}),
       ]
     end
-    after{remove_constants :Player}
 
     it_should_behave_like 'embedded object CRUD'
   end

data/spec/object/spec_helper.rb

@@ -7,7 +7,8 @@ Mongo::ObjectSerializer::SIMPLE_TYPES << RSpec::Mocks::Proxy
 
 # To simplify callback expectations
 module RSpec::CallbackHelper
-  def _run_callbacks name
-    send name if respond_to? name
+  def _run_callbacks type, method_name
+    callback_method_name = :"#{type}_#{method_name}"
+    send callback_method_name if respond_to? callback_method_name
   end
 end

data/spec/object/validation_spec.rb

@@ -3,19 +3,21 @@ require 'object/spec_helper'
 describe 'Object validation' do
   with_mongo
 
-  before do
+  before :all do
     class Player
       attr_accessor :missions
 
       class Mission
       end
     end
+  end
+  after(:all){remove_constants :Player}
 
+  before do
     @mission = Player::Mission.new
     @player = Player.new
     @player.missions = [@mission]
   end
-  after{remove_constants :Player}
 
   it 'should not save/update/destroy invalid objects' do
     # create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_db
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2844700 !ruby/object:Gem::Requirement
+  requirement: &753720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2844700
+  version_requirements: *753720
 description: 
 email: 
 executables: []
@@ -30,34 +30,55 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/mongo_db/driver/core/collection.rb
-- lib/mongo_db/driver/core/database.rb
-- lib/mongo_db/driver/core.rb
-- lib/mongo_db/driver/more/collection_finders.rb
-- lib/mongo_db/driver/more.rb
+- lib/mongo_db/driver/collection.rb
+- lib/mongo_db/driver/database.rb
+- lib/mongo_db/driver/dynamic_finders.rb
 - lib/mongo_db/driver/spec.rb
 - lib/mongo_db/driver.rb
 - lib/mongo_db/gems.rb
+- lib/mongo_db/migration/definition.rb
+- lib/mongo_db/migration/migration.rb
+- lib/mongo_db/migration/tasks.rb
+- lib/mongo_db/migration.rb
+- lib/mongo_db/model/assignment.rb
+- lib/mongo_db/model/callbacks.rb
+- lib/mongo_db/model/crud.rb
+- lib/mongo_db/model/db.rb
+- lib/mongo_db/model/misc.rb
+- lib/mongo_db/model/model.rb
+- lib/mongo_db/model/query.rb
+- lib/mongo_db/model/scope.rb
+- lib/mongo_db/model/spec.rb
+- lib/mongo_db/model/support/types.rb
+- lib/mongo_db/model/validation.rb
+- lib/mongo_db/model.rb
 - lib/mongo_db/object/object_helper.rb
 - lib/mongo_db/object/object_serializer.rb
 - lib/mongo_db/object.rb
-- spec/driver/core/collection_spec.rb
-- spec/driver/core/crud_spec.rb
-- spec/driver/core/database_spec.rb
-- spec/driver/core/hash_helper_spec.rb
+- spec/driver/collection_spec.rb
+- spec/driver/crud_spec.rb
+- spec/driver/database_spec.rb
+- spec/driver/dynamic_finders_spec.rb
 - spec/driver/fixes_spec.rb
-- spec/driver/more/querying_spec.rb
+- spec/driver/hash_helper_spec.rb
 - spec/driver/spec_helper.rb
+- spec/integration/am_conversion_spec.rb
+- spec/integration/am_validation_spec.rb
 - spec/migration/migration_spec.rb
-- spec/model/callbacks.rb
-- spec/model/example.rb
-- spec/model/model_crud.rb
+- spec/model/assignment_spec.rb
+- spec/model/callbacks_spec.rb
+- spec/model/crud_spec.rb
+- spec/model/db_spec.rb
+- spec/model/misc_spec.rb
+- spec/model/query_spec.rb
+- spec/model/scope_spec.rb
+- spec/model/spec_helper.rb
+- spec/model/validation_spec.rb
 - spec/object/callbacks_spec.rb
 - spec/object/crud_shared.rb
 - spec/object/crud_spec.rb
 - spec/object/spec_helper.rb
 - spec/object/validation_spec.rb
-- spec/test.rb
 homepage: http://github.com/alexeypetrushin/mongo_db
 licenses: []
 post_install_message: 

data/lib/mongo_db/driver/core.rb

@@ -1,29 +0,0 @@
-require 'mongo_db/gems'
-
-require 'mongo'
-
-%w(
-  database
-  collection
-).each{|f| require "mongo_db/driver/core/#{f}"}
-
-# defaults
-Mongo.class_eval do
-  class << self
-    def defaults; @defaults ||= {} end
-    attr_writer :defaults
-  end
-end
-
-# database
-Mongo::DB.send :include, Mongo::DBExt
-
-# collection
-Mongo::Collection.class_eval do
-  include Mongo::CollectionExt
-
-  %w(insert update remove save).each do |method|
-    alias_method "#{method}_without_ext", method
-    alias_method method, "#{method}_with_ext"
-  end
-end

data/lib/mongo_db/driver/more/collection_finders.rb

@@ -1,43 +0,0 @@
-module Mongo::CollectionFinders
-  #
-  # first_by_id, special case
-  #
-  def first_by_id id
-    first _id: id
-  end
-  alias_method :by_id, :first_by_id
-
-  def first_by_id! id
-    first_by_id(id) || raise(Mongo::NotFound, "document with id #{id} not found!")
-  end
-  alias_method :by_id!, :first_by_id!
-
-  protected
-    #
-    # first_by_field, all_by_field
-    #
-    def method_missing clause, *a, &b
-      if clause =~ /^([a-z]_by_[a-z_])|(by_[a-z_])/
-        clause = clause.to_s
-
-        bang = clause =~ /!$/
-        clause = clause[0..-2] if bang
-
-        finder, field = if clause =~ /^by_/
-          ['first', clause.sub(/by_/, '')]
-        else
-          clause.split(/_by_/, 2)
-        end
-        finder = 'first' if finder == 'find'
-
-        raise "You can't use bang version with :#{finder}!" if bang and finder != 'first'
-
-        raise "invalid arguments for finder (#{a})!" unless a.size == 1
-        field_value = a.first
-
-        send(finder, field => field_value) || (bang && raise(Mongo::NotFound, "document with #{field}: #{field_value} not found!"))
-      else
-        super
-      end
-    end
-end

data/lib/mongo_db/driver/more.rb

@@ -1,10 +0,0 @@
-require 'mongo_db/driver/core'
-
-class Mongo::NotFound < StandardError; end
-
-%w(
-  collection_finders
-).each{|f| require "mongo_db/driver/more/#{f}"}
-
-Mongo::Collection.send :include, Mongo::CollectionFinders
-

data/spec/driver/more/querying_spec.rb

@@ -1,59 +0,0 @@
-require 'driver/spec_helper'
-
-describe "Querying" do
-  with_mongo
-
-  before do
-    @jim =  {name: 'Jim', age: 34}
-    @units = db.units
-  end
-
-  describe "dynamic finders" do
-    it "find, first, by" do
-      @units.first_by_name('Jim').should be_nil
-      -> {@units.first_by_name!('Jim')}.should raise_error(Mongo::NotFound)
-      @units.by_name('Jim').should be_nil
-      -> {@units.by_name!('Jim')}.should raise_error(Mongo::NotFound)
-      @units.first_by_name('Jim').should be_nil
-      -> {@units.first_by_name!('Jim')}.should raise_error(Mongo::NotFound)
-
-      @units.save @jim
-
-      @units.first_by_name('Jim').should == @jim
-      @units.first_by_name!('Jim').should == @jim
-      @units.by_name('Jim').should == @jim
-      @units.by_name!('Jim').should == @jim
-      @units.first_by_name('Jim').should == @jim
-      @units.first_by_name!('Jim').should == @jim
-    end
-
-    it "all" do
-      @units.all_by_name('Jim').should == []
-      @units.save @jim
-      @units.all_by_name('Jim').should == [@jim]
-    end
-
-    it "should allow to use bang version only with :first" do
-      -> {@units.all_by_name!('Jim')}.should raise_error(/can't use bang/)
-    end
-
-    it "by_id (special case)" do
-      @units.method(:by_id).should == @units.method(:first_by_id)
-      @units.method(:by_id!).should == @units.method(:first_by_id!)
-
-      @units.by_id('4de81858cf26bde569000009').should be_nil
-      -> {@units.by_id!('4de81858cf26bde569000009')}.should raise_error(Mongo::NotFound)
-
-      @units.save @jim
-
-      @units.by_id(@jim[:_id]).should == @jim
-      @units.by_id!(@jim[:_id]).should == @jim
-    end
-  end
-
-  it "underscore to dollar" do
-    @units.save @jim
-    @units.save name: 'Zeratul', age: 600
-    @units.all(age: {_lt: 100}).should == [@jim]
-  end
-end

data/spec/model/callbacks.rb

@@ -1,100 +0,0 @@
-require 'spec_helper'
-
-describe 'Object callbacks' do
-  with_mongo
-
-  before do
-    class Player
-      attr_accessor :missions
-
-      class Mission
-      end
-    end
-
-    @mission = Player::Mission.new
-    @player = Player.new
-    @player.missions = [@mission]
-  end
-  after{remove_constants :Player}
-
-  it 'create' do
-    [
-      :before_validation,
-      :after_validation,
-      :before_save,
-      :before_create,
-      :after_create,
-      :after_save
-    ].each do |name|
-      @player.should_receive(name).ordered
-      @misson.should_receive(name).ordered
-    end
-
-    db.players.save @player
-  end
-
-  it 'update' do
-    db.players.save @player
-
-    [
-      :before_validation,
-      :validate,
-      :after_validation,
-      :before_save,
-      :before_update,
-      :after_update,
-      :after_save
-    ].each do |name|
-      @player.should_receive(name).ordered
-      @misson.should_receive(name).ordered
-    end
-    db.players.save @player
-  end
-
-  it 'destroy' do
-    db.players.save @player
-
-    [
-      :before_validation,
-      :validate,
-      :after_validation,
-      :before_destroy,
-      :after_destroy,
-    ].each do |name|
-      @player.should_receive(name).ordered
-      @misson.should_receive(name).ordered
-    end
-    db.players.destroy @player
-  end
-
-  it 'should be able interrupt CRUD' do
-    @misson.stub!(:before_save).and_return(false)
-    db.players.save(@player).should be_false
-    db.players.count.should == 0
-  end
-
-  it 'should be able skip callbacks' do
-    [
-      :before_validation,
-      :after_validation,
-      :before_save,
-      :before_create,
-      :after_create,
-      :after_save,
-      :before_update,
-      :after_update,
-      :before_destroy,
-      :after_destroy
-    ].each do |name|
-      @player.should_not_receive(name)
-      @misson.should_receive(name)
-    end
-
-    db.players.save @player, callbacks: false
-    db.players.count.should == 1
-    db.players.save @player, callbacks: false
-    db.players.count.should == 1
-    db.players.destroy @player, callbacks: false
-    db.players.count.should == 0
-  end
-end

data/spec/test.rb

@@ -1,10 +0,0 @@
-require 'driver/spec_helper'
-
-describe 'Test' do
-  with_mongo
-
-  it do
-    class A; end
-    db.units.save a: A.new
-  end
-end