mongodb_model 0.0.11 → 0.0.12

data/lib/mongo/model/db.rb

@@ -1,56 +1,39 @@
 module Mongo::Model::Db
   module ClassMethods
-    inheritable_accessor :_db, nil
-    def db= v
-      self._db = if v.is_a? ::Proc
-        v
-      elsif v.is_a? ::Symbol
-        -> do
-          db_name = ::Mongo::Model.resolve_db_alias v
-          ::Mongo::Model.connection.db db_name
-        end
+    inheritable_accessor :db_name, nil
+    def db name = nil
+      if name
+        self.db_name = name
       else
-        -> {v}
+        Mongo.db db_name || Mongo::Model.default_database_name
       end
     end
 
-    def db *args, &block
-      if block
-        self.db = block
-      elsif !args.empty?
-        args.size.must == 1
-        self.db = args.first
+    inheritable_accessor :collection_name, nil
+    def collection name = nil, &block
+      if name
+        self.collection_name = name
       else
-        (_db && _db.call) || ::Mongo::Model.db
+        db.collection(collection_name || default_collection_name)
       end
     end
 
-    inheritable_accessor :_collection, nil
-    def collection= v
-      self._collection = if v.is_a? ::Proc
-        v
-      elsif v.is_a? ::Symbol
-        -> {db.collection v}
-      else
-        -> {v}
+    protected
+      def default_collection_name
+        first_ancestor_class = ancestors.find{|a| a.is_a? Class} ||
+          raise("can't evaluate default collection name for #{self}!")
+        first_ancestor_class.alias.pluralize.underscore.to_sym
       end
-    end
+  end
+end
 
-    def collection *args, &block
-      if block
-        self.collection = block
-      elsif !args.empty?
-        args.size.must == 1
-        self.collection = args.first
-      else
-        (_collection && _collection.call) || db.collection(default_collection_name)
-      end
-    end
+Mongo::Model.class_eval do
+  class << self
+    attr_accessor :default_database_name
 
-    def default_collection_name
-      first_ancestor_class = ancestors.find{|a| a.is_a? Class} ||
-        raise("can't evaluate default collection name for #{self}!")
-      first_ancestor_class.alias.pluralize.underscore.to_sym
+    def default_database
+      Mongo.db default_database_name
     end
   end
+  self.default_database_name = :default
 end

data/lib/mongo/model/file_model.rb

@@ -19,9 +19,9 @@ module Mongo::Model::FileModel
         model.errors[attr_name] = file_model.errors unless file_model.errors.empty?
       end
 
-      after_save{|model| model.send(attr_name).save}
+      after_save{|model| model.send(attr_name).save!}
 
-      after_destroy{|model| model.send(attr_name).destroy}
+      after_destroy{|model| model.send(attr_name).destroy!}
     end
   end
 end

data/lib/mongo/model/model.rb

@@ -25,14 +25,15 @@ module Mongo::Model
     variables == o_variables
   end
 
-  class << self
-    attr_accessor :db, :connection
-    attr_required :db, :connection
-
-    # Override this method to provide custom alias to db name translation,
-    # for example db_name = my_config[alias_name]
-    def resolve_db_alias alias_name
-      alias_name.to_s
-    end
-  end
+  # class << self
+  #   attr_accessor :db, :connection
+  #   attr_required :db, :connection
+  #
+  #   # Override this method to provide custom alias to db name translation,
+  #   # for example db_name = my_config[alias_name]
+  #   def resolve_db_alias alias_name
+  #     db_name = alias_name.to_s
+  #     connection.db db_name
+  #   end
+  # end
 end

data/lib/mongo/model/query.rb

@@ -1,7 +1,7 @@
 class Mongo::Model::Query < Object
   attr_reader :model_class, :selector, :options
 
-  def initialize model_class, selector = {}, options = {} *args
+  def initialize model_class, selector = {}, options = {}
     @model_class, @selector, @options = model_class, selector, options
   end
 

data/lib/mongo/model/query_mixin.rb

@@ -11,6 +11,10 @@ module Mongo::Model::QueryMixin
       collection.count selector, options
     end
 
+    def size *args
+      count *args
+    end
+
     def first selector = {}, options = {}
       collection.first selector, options
     end

data/lib/mongo/model/scope.rb

@@ -87,7 +87,10 @@ module Mongo::Model::Scope
     #
     def limit n; query({}, limit: n) end
     def skip n; query({}, skip: n) end
-    def sort *list; query({}, sort: list) end
+    def sort *list
+      list = list.collect{|item| item.is_a?(Array) ? item : [item, 1]}
+      query({}, sort: list)
+    end
     def snapshot; query({}, snapshot: true) end
 
     def paginate page, per_page

data/lib/mongo/model/spec.rb

@@ -5,9 +5,9 @@ rspec do
   class << self
     def with_mongo_model
       with_mongo
-
-      before{Mongo::Model.db = mongo.db}
-      after{Mongo::Model.db = nil}
+      #
+      # before{Mongo::Model.db = mongo.db}
+      # after{Mongo::Model.db = nil}
     end
   end
 end

data/readme.md

@@ -4,14 +4,14 @@ Object Model for MongoDB (callbacks, validations, mass-assignment, finders, ...)
 - Minimum extra abstractions, trying to keep things as close to the MongoDB semantic as possible.
 - Schema-less, dynamic (with ability to specify types for mass-assignment).
 - Models can be saved to any collection, dynamically.
-- Full support for embedded objects (validations, callbacks, ...).
+- Full support for composite / embedded objects (validations, callbacks, ...).
 - Scope, default_scope
-- Doesn't try to mimic ActiveRecord, MongoDB is differrent and this tool designed to get most of it.
+- Doesn't try to mimic ActiveRecord, MongoDB is differrent and the Object Model designed to get most of it.
 - Works with multiple connections and databases.
 - Associations.
 - Very small, see [code stats][code_stats].
 
-Other ODM usually try to cover simple but non-standard API of MongoDB behind complex ORM-like abstractions. This tool **exposes simplicity and power of MongoDB and leverages it's differences**.
+Other ODM usually try to cover simple but non-standard API of MongoDB behind complex ORM-like abstractions. This tool **exposes simplicity and power of MongoDB and leverages its differences**.
 
 ``` ruby
 # Connecting to MongoDB.

data/spec/db_spec.rb

@@ -3,61 +3,46 @@ require 'spec_helper'
 describe 'Collection & Database' do
   with_mongo_model
 
-  before :all do
+  before do
     class TheModel
       inherit Mongo::Model
     end
   end
-  after(:all){remove_constants :TheModel}
+  after{remove_constants :TheModel}
 
-  after do
-    TheModel.db = nil
-    TheModel.collection = nil
-    Mongo::Model.connection, Mongo::Model.db = nil, nil
-  end
-
-  it "global setting" do
-    Mongo::Model.connection = db.connection
-    Mongo::Model.db = db
-
-    Mongo::Model.connection.should == db.connection
-    Mongo::Model.db.should == db
-  end
+  # Discarded
+  # it "global setting" do
+  #   Mongo::Model.connection = db.connection
+  #   Mongo::Model.db = db
+  #
+  #   Mongo::Model.connection.should == db.connection
+  #   Mongo::Model.db.should == db
+  # end
 
   it "should allow set database per model" do
-    Mongo::Model.connection = db.connection
-    Mongo::Model.db = db
-
-    TheModel.db.should == db
-
-    TheModel.db :test
-    TheModel.db.name.should == 'test'
+    TheModel.db :special_db_name
 
-    TheModel.db = nil
-    TheModel.db db
-    TheModel.db.should == db
-
-    TheModel.db = nil
-    TheModel.db{db}
-    TheModel.db.should == db
+    Mongo.should_receive(:db).with(:special_db_name).and_return(:special_db)
+    TheModel.db.should == :special_db
   end
 
-  it "should allow set collection per model" do
-    Mongo::Model.db = db
-
-    # TheModel.default_collection_name.should == :the_model
-    # TheModel.collection.name.should == 'the_model'
-
-    TheModel.collection :units
-    TheModel.collection.name.should == 'units'
-
-    TheModel.collection = nil
-    units = db.units
-    TheModel.collection units
-    TheModel.collection.should == units
-
-    TheModel.collection = nil
-    TheModel.collection{units}
-    TheModel.collection.should == units
-  end
+  # Discarded
+  # it "should allow set collection per model" do
+  #   Mongo::Model.db = db
+  #
+  #   # TheModel.default_collection_name.should == :the_model
+  #   # TheModel.collection.name.should == 'the_model'
+  #
+  #   TheModel.collection :units
+  #   TheModel.collection.name.should == 'units'
+  #
+  #   TheModel.collection = nil
+  #   units = db.units
+  #   TheModel.collection units
+  #   TheModel.collection.should == units
+  #
+  #   TheModel.collection = nil
+  #   TheModel.collection{units}
+  #   TheModel.collection.should == units
+  # end
 end

data/spec/query_spec.rb

@@ -87,4 +87,12 @@ describe "Model Query" do
     u = SpecialUnit.query(name: 'Zeratul', status: 'active').build age: 500
     u.status.should == 'active'
   end
+
+  it "where" do
+    # Unit.where(name: 'Zeratul').should == Mongo::Model::Query.new(Unit, {name: 'Zeratul'}, {})
+
+    query = Unit.where(name: 'Zeratul')
+    query = query.where(race: 'Protoss')
+    query.should == Mongo::Model::Query.new(Unit, {name: 'Zeratul', race: 'Protoss'}, {})
+  end
 end

data/spec/scope_spec.rb

@@ -150,9 +150,17 @@ describe "Scope" do
 
   describe 'handy scopes' do
     it "limit, skip, sort" do
-      query = Unit.skip(30).limit(10).sort([name: 1]).snapshot
+      query = Unit.skip(30).limit(10).sort([:name, 1]).snapshot
       query.selector.should == {}
-      query.options.should == {skip: 30, limit: 10, sort: [[name: 1]], snapshot: true}
+      query.options.should == {skip: 30, limit: 10, sort: [[:name, 1]], snapshot: true}
+    end
+
+    it "sort should understand simplified form" do
+      query = Unit.sort(:name)
+      query.options.should == {sort: [[:name, 1]]}
+
+      query = Unit.sort(:race, :name)
+      query.options.should == {sort: [[:race, 1], [:name, 1]]}
     end
 
     it 'paginate' do

data/spec/validation_spec.rb

@@ -34,10 +34,10 @@ describe "Validations" do
       unit.errors.clear
       unit.save.should be_true
 
-      unit.errors[:name] = 'hairy error'
+      unit.errors.stub(:empty?).and_return(false)
       unit.save.should be_false
 
-      unit.errors.clear
+      unit.errors.stub(:empty?).and_return(true)
       unit.save.should be_true
     end
 
@@ -93,6 +93,17 @@ describe "Validations" do
     end
   end
 
+  it "should clear errors before validation" do
+    class Unit < BaseUnit
+      validates_presence_of :name
+    end
+
+    unit = Unit.new
+    unit.should_not be_valid
+    unit.name = 'Zeratul'
+    unit.should be_valid
+  end
+
   describe "special" do
     it 'validates_uniqueness_of' do
       class Unit < BaseUnit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2839010 !ruby/object:Gem::Requirement
+  requirement: &2843630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2839010
+  version_requirements: *2843630
 - !ruby/object:Gem::Dependency
   name: file_model
-  requirement: &2845520 !ruby/object:Gem::Requirement
+  requirement: &2843390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2845520
+  version_requirements: *2843390
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2846710 !ruby/object:Gem::Requirement
+  requirement: &2843150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2846710
+  version_requirements: *2843150
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2847870 !ruby/object:Gem::Requirement
+  requirement: &2842910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2847870
+  version_requirements: *2842910
 description: 
 email: 
 executables: []