mongodb_model 2.1.1 → 2.1.2

data/lib/mongo/model/conversion.rb

@@ -21,13 +21,14 @@ module Mongo::Model::Conversion
     alias_method :as_xml, :model_to_xml
   end
 
-  def to_rson options = {}
+  def to_rson options = {}, &block
     options = {profile: options} if options.is_a? Symbol
 
     if profile = options[:profile]
       raise "no other optins are allowed when using :profile option!" if options.size > 1
-      profile_options = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
-      to_rson profile_options.merge(_profile: profile)
+      meta = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
+      profile_options, profile_block = meta
+      to_rson profile_options.merge(_profile: profile), &profile_block
     else
       options.validate_options! :only, :except, :methods, :errors, :id, :_profile
       child_options = options[:_profile] ? {profile: options[:_profile]} : {}
@@ -61,7 +62,9 @@ module Mongo::Model::Conversion
         result[:errors] = errors
       end
 
-      result[:id] = _id if _id and (options[:id] != false)
+      result[:id] = id if id and (options[:id] != false)
+
+      instance_exec result, &block if block
 
       result
     end
@@ -69,8 +72,8 @@ module Mongo::Model::Conversion
 
   module ClassMethods
     inheritable_accessor :profiles, {}
-    def profile name, options = {}
-      profiles[name] = options
+    def profile name, options = {}, &block
+      profiles[name] = [options, block]
     end
   end
 end

data/lib/mongo/model/crud.rb

@@ -46,7 +46,7 @@ module Mongo::Model::Crud
 
   def update doc, options = {}
     with_collection options do |collection, options|
-      collection.update({_id: _id}, doc, options)
+      collection.update({id: id}, doc, options)
     end
   end
 
@@ -104,7 +104,10 @@ module Mongo::Model::Crud
   protected
     def with_collection options, &block
       options = options.clone
-      collection = options.delete(:collection) || self.class.collection
+      if collection = options.delete(:collection)
+        collection = self.class.db.collection collection if collection.is_a?(Symbol)
+      end
+      collection ||= self.class.collection
       block.call collection, options
     end
 end

data/lib/mongo/model/identity_map.rb

@@ -6,7 +6,7 @@ module Mongo::Model::IdentityMap
   def original
     unless _cache[:original_cached]
       _cache[:original_cached] = true
-      _cache[:original] = _id && self.class.get_from_identity_map(_id)
+      _cache[:original] = id && self.class.get_from_identity_map(id)
     end
     _cache[:original]
   end
@@ -23,7 +23,7 @@ module Mongo::Model::IdentityMap
 
     def from_mongo doc
       model = super doc
-      model.class.identity_map[model._id] = doc if model._id
+      model.class.identity_map[model.id] = doc if model.id
       model
     end
   end

data/lib/mongo/model/integration/rad.rb

@@ -12,7 +12,33 @@ rad.register :models do
   Mongo::Model::Component.new
 end
 
-# Using DB connection setting defined in component's config file.
+# Connection settings defined in the `models.yml` config file for the :models component.
+#
+# Sample of `models.yml` config file, it cotains database names and connection settings.
+#
+#   db:
+#     default:
+#       host: localhost
+#       port: 4029
+#       name: my_web_app
+#     tmp:
+#       name: all_sorts_of_tmp_data
+#
+# Note that we use logical name of the database, the real name can be different. It gives You flexibility and
+# allows You to use the same logical name, but it can mean different databases with different real names in
+# let's say :development and :production evnironments:
+#
+# Usage - if not specified the :default alias will be used:
+#
+#   class Blog
+#   end
+#
+# You can also explicitly specify what alias should be used:
+#
+#   class Token
+#     db :tmp
+#   end
+#
 Mongo.metaclass_eval do
   def db name
     config = rad.models.db[name.to_s] || raise("no database config for #{name} alias!")

data/lib/mongo/model/integration/rails.rb

@@ -14,10 +14,10 @@ end
 module Mongo::Model::Rails
   def to_model; self end
 
-  def persisted?; !!_id end
+  def persisted?; _saved end
 
   def to_key
-    persisted? ? [_id] : nil
+    persisted? ? [id] : nil
   end
 
   def new_record?; new? end

data/lib/mongo/model/integration/validatable/uniqueness_validator.rb

@@ -19,7 +19,7 @@ class Validatable::UniquenessValidator < Validatable::ValidationBase
     end
 
     # Make sure we're not including the current document in the query.
-    conditions[:_id] = {_ne: instance._id} if instance._id
+    conditions[:_id] = {_ne: instance.id} if instance.id
 
     !klass.exists?(conditions)
   end

data/lib/mongo/model/misc.rb

@@ -18,11 +18,11 @@ module Mongo::Model::Misc
   end
 
   def to_param
-    _id.try :to_s
+    id.try :to_s
   end
 
   def reload
-    obj = self.class.by_id!(_id || raise("can't reload new document (#{self})!"))
+    obj = self.class.by_id!(id || raise("can't reload new document (#{self})!"))
     instance_variables.each{|n| remove_instance_variable n}
     obj.instance_variables.each do |n|
       instance_variable_set n, obj.instance_variable_get(n)
@@ -33,7 +33,7 @@ module Mongo::Model::Misc
   def original
     unless _cache[:original_cached]
       _cache[:original_cached] = true
-      _cache[:original] = _id && self.class.by_id(_id)
+      _cache[:original] = id && self.class.by_id(id)
     end
     _cache[:original]
   end

data/lib/mongo/model/query_mixin.rb

@@ -1,6 +1,6 @@
 module Mongo::Model::QueryMixin
   def exists? options = {}
-    self.class.count({_id: _id}, options) > 0
+    self.class.count({id: id}, options) > 0
   end
   alias_method :exist?, :exists?
 

data/lib/mongo/model/scope.rb

@@ -1,113 +1,116 @@
-module Mongo::Model::Scope
-  module ClassMethods
-    def current_scope
-      scope, exclusive = Thread.current[scope_identifier]
-      current = if exclusive
-        scope
-      elsif scope
-        default_scope ? default_scope.merge(scope) : scope
-      else
-        default_scope
-      end
-    end
+module Mongo::Model
+  PER_PAGE, MAX_PER_PAGE = 25, 100
 
-    def with_exclusive_scope *args, &block
-      with_scope *(args << true), &block
-    end
+  module Scope
+    module ClassMethods
+      def current_scope
+        scope, exclusive = Thread.current[scope_identifier]
+        current = if exclusive
+          scope
+        elsif scope
+          default_scope ? default_scope.merge(scope) : scope
+        else
+          default_scope
+        end
+      end
 
-    def with_scope *args, &block
-      if args.last.is_a?(TrueClass) or args.last.is_a?(FalseClass)
-        exclusive = args.pop
-      else
-        exclusive = false
+      def with_exclusive_scope *args, &block
+        with_scope *(args << true), &block
       end
 
-      scope = query *args
-      previous_scope, previous_exclusive = Thread.current[scope_identifier]
-      raise "exclusive scope already applied!" if previous_exclusive
+      def with_scope *args, &block
+        if args.last.is_a?(TrueClass) or args.last.is_a?(FalseClass)
+          exclusive = args.pop
+        else
+          exclusive = false
+        end
 
-      begin
-        scope = previous_scope.merge scope if !exclusive and previous_scope
-        Thread.current[scope_identifier] = [scope, exclusive]
-        return block.call
-      ensure
-        Thread.current[scope_identifier] = [previous_scope, false]
+        scope = query *args
+        previous_scope, previous_exclusive = Thread.current[scope_identifier]
+        raise "exclusive scope already applied!" if previous_exclusive
+
+        begin
+          scope = previous_scope.merge scope if !exclusive and previous_scope
+          Thread.current[scope_identifier] = [scope, exclusive]
+          return block.call
+        ensure
+          Thread.current[scope_identifier] = [previous_scope, false]
+        end
       end
-    end
 
-    inheritable_accessor :_default_scope, nil
-    def default_scope *args, &block
-      if block
-        self._default_scope = -> {query block.call}
-      elsif !args.empty?
-        self._default_scope = -> {query *args}
-      else
-        _default_scope && _default_scope.call
+      inheritable_accessor :_default_scope, nil
+      def default_scope *args, &block
+        if block
+          self._default_scope = -> {query block.call}
+        elsif !args.empty?
+          self._default_scope = -> {query *args}
+        else
+          _default_scope && _default_scope.call
+        end
       end
-    end
 
-    def scope name, *args, &block
-      model = self
-      metaclass.define_method name do
-        query (block && instance_eval(&block)) || args
+      def scope name, *args, &block
+        model = self
+        metaclass.define_method name do
+          query (block && instance_eval(&block)) || args
+        end
       end
-    end
 
-    # Finders.
+      # Finders.
 
-    def count selector = {}, options = {}
-      if current = current_scope
-        super current.selector.merge(selector), current.options.merge(options)
-      else
-        super selector, options
+      def count selector = {}, options = {}
+        if current = current_scope
+          super current.selector.merge(selector), current.options.merge(options)
+        else
+          super selector, options
+        end
       end
-    end
 
-    def first  selector = {}, options = {}
-      if current = current_scope
-        super current.selector.merge(selector), current.options.merge(options)
-      else
-        super selector, options
+      def first  selector = {}, options = {}
+        if current = current_scope
+          super current.selector.merge(selector), current.options.merge(options)
+        else
+          super selector, options
+        end
       end
-    end
 
-    def each  selector = {}, options = {}, &block
-      if current = current_scope
-        super current.selector.merge(selector), current.options.merge(options), &block
-      else
-        super selector, options, &block
+      def each  selector = {}, options = {}, &block
+        if current = current_scope
+          super current.selector.merge(selector), current.options.merge(options), &block
+        else
+          super selector, options, &block
+        end
       end
-    end
-
-    # Shortcuts for frequently used scopes.
 
-    def limit n; query({}, limit: n) end
-    def skip n; query({}, skip: n) end
-    def sort *list
-      list = list.collect{|item| item.is_a?(Array) ? item : [item, 1]}
-      query({}, sort: list)
-    end
-    alias_method :sort_by, :sort
-    def snapshot; query({}, snapshot: true) end
+      # Shortcuts for frequently used scopes.
 
-    PER_PAGE, MAX_PER_PAGE = 25, 100
-    def paginate *args
-      args.size.must.be_in 1..2
-      if args.size == 2
-        page, per_page = *args
-      else
-        options = args.first
-        page, per_page = options[:page], options[:per_page]
+      def limit n; query({}, limit: n) end
+      def skip n; query({}, skip: n) end
+      def sort *list
+        list = list.collect{|item| item.is_a?(Array) ? item : [item, 1]}
+        query({}, sort: list)
       end
-      page ||= 1
-      per_page ||= PER_PAGE
-      per_page = MAX_PER_PAGE if per_page > MAX_PER_PAGE
-      skip((page - 1) * per_page).limit(per_page)
-    end
+      alias_method :sort_by, :sort
+      def snapshot; query({}, snapshot: true) end
 
-    protected
-      def scope_identifier
-        @scope_identifier ||= :"mms_#{self.name}"
+      def paginate *args
+        args.size.must.be_in 1..2
+        if args.size == 2
+          page, per_page = *args
+        else
+          options = args.first
+          page, per_page = options[:page].try(:to_i), options[:per_page].try(:to_i)
+        end
+        page ||= 1
+        per_page ||= PER_PAGE
+        per_page = MAX_PER_PAGE if per_page > MAX_PER_PAGE
+        skip((page - 1) * per_page).limit(per_page)
       end
+
+      protected
+        def scope_identifier
+          @scope_identifier ||= :"mms_#{self.name}"
+        end
+    end
   end
 end

data/spec/associations_spec.rb

@@ -13,7 +13,7 @@ describe 'Associations' do
       attr_accessor :text
 
       def comments
-        Comment.query({post_id: _id}, {sort: [[:text, -1]]})
+        Comment.query({post_id: id}, {sort: [[:text, -1]]})
       end
     end
 

data/spec/conversion_spec.rb

@@ -49,11 +49,12 @@ describe 'Conversion' do
     }
   end
 
-  it "should accept :only, :except and :methods options" do
+  it "should accept :only, :except, :methods options and block" do
     post = build_post_with_comment
     post.to_rson(only: :text).should == {text: 'StarCraft releasing soon!'}
-    post.to_rson(except: :token).should == {
+    post.to_rson(except: :token){|data| data[:type] = 'Post'}.should == {
       text:     'StarCraft releasing soon!',
+      type:     'Post',
       comments: [
         {text: 'Cool!'}
       ]
@@ -71,14 +72,16 @@ describe 'Conversion' do
     -> {post.to_rson(profile: :public)}.should raise_error(/profile :public not defined for Comment/)
 
     Comment.class_eval do
-      profile :public
+      profile :public do |data|
+        data[:type] = 'Comment'
+      end
     end
 
     post.to_rson(profile: :public).should == {
       text:     'StarCraft releasing soon!',
       teaser:   'StarCraft r',
       comments: [
-        {text: 'Cool!'}
+        {text: 'Cool!', type: 'Comment'}
       ]
     }
 
@@ -86,7 +89,7 @@ describe 'Conversion' do
       text:     'StarCraft releasing soon!',
       teaser:   'StarCraft r',
       comments: [
-        {text: 'Cool!'}
+        {text: 'Cool!', type: 'Comment'}
       ]
     }
   end

data/spec/crud_spec.rb

@@ -47,7 +47,7 @@ describe "Model CRUD" do
 
       # Create.
       @unit.save.should be_true
-      @unit._id.should_not be_nil
+      @unit.id.should_not be_nil
 
       # Read.
       Unit.count.should == 1
@@ -69,7 +69,7 @@ describe "Model CRUD" do
     it 'should be able to save model to another collection' do
       # Create.
       @unit.save(collection: db.heroes).should be_true
-      @unit._id.should_not be_nil
+      @unit.id.should_not be_nil
 
       # Read.
       Unit.count.should == 0
@@ -89,6 +89,11 @@ describe "Model CRUD" do
       db.heroes.count.should == 0
     end
 
+    it 'should be able to save model to another collection (defined as symbol)' do
+      @unit.save(collection: :heroes).should be_true
+      db.heroes.first.should == @unit
+    end
+
     it 'should build model' do
       u = Unit.build name: 'Zeratul'
       u.name.should == 'Zeratul'
@@ -111,7 +116,7 @@ describe "Model CRUD" do
     it 'should accept modifiers' do
       unit = Unit.create! name: 'Zeratul'
 
-      Unit.update({_id: unit._id}, _set: {name: 'Tassadar'})
+      Unit.update({id: unit.id}, _set: {name: 'Tassadar'})
       unit.reload
       unit.name.should == 'Tassadar'
 
@@ -152,7 +157,7 @@ describe "Model CRUD" do
     it 'should perform CRUD' do
       # Create.
       @unit.save.should be_true
-      @unit._id.should_not be_nil
+      @unit.id.should_not be_nil
 
       # Read.
       Unit.count.should == 1

data/spec/misc_spec.rb

@@ -85,7 +85,7 @@ describe 'Miscellaneous' do
       unit = Unit.first
       unit.name = "Tassadar"
 
-      Unit.should_receive(:first).with(_id: unit._id).and_return{db.units.first(_id: unit._id)}
+      Unit.should_receive(:first).with(_id: unit.id).and_return{db.units.first(id: unit.id)}
       unit.original.name.should == "Zeratul"
     end
 

data/spec/query_spec.rb

@@ -43,7 +43,7 @@ describe "Query" do
     u = Unit.build(name: 'Zeratul')
     u.save!
     Unit.first_by_name('Zeratul').name.should == 'Zeratul'
-    Unit.by_id!(u._id).name.should == 'Zeratul'
+    Unit.by_id!(u.id).name.should == 'Zeratul'
   end
 
   it 'should be integrated with build, create and create!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &70215691223380 !ruby/object:Gem::Requirement
+  requirement: &70263477501940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215691223380
+  version_requirements: *70263477501940
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &70215691222580 !ruby/object:Gem::Requirement
+  requirement: &70263477501460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215691222580
+  version_requirements: *70263477501460
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &70215691222100 !ruby/object:Gem::Requirement
+  requirement: &70263477500960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215691222100
+  version_requirements: *70263477500960
 description: 
 email: 
 executables: []