mongoo 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/mongoo.rb

@@ -63,6 +63,7 @@ require "mongoo/base"
 
 require "mongoo/embedded/base"
 require "mongoo/embedded/hash_proxy"
+require "mongoo/embedded/array_proxy"
 
 require "mongoo/mongohash"
 require "mongoo/identity_map"

data/lib/mongoo/attributes.rb

@@ -12,20 +12,22 @@ module Mongoo::Attributes
       end
     end
 
-    def attributes_tree
+    def attributes_tree(tree_opts={})
       tree = {}
       self.attributes.each do |name, opts|
-        parts = name.split(".")
-        curr_branch = tree
-        while part = parts.shift
-          if !parts.empty?
-            curr_branch[part.to_s] ||= {}
-            curr_branch = curr_branch[part.to_s]
-          else
-            curr_branch[part.to_s] = opts[:type]
+        unless tree_opts[:only_definable] == true && opts[:define_methods] == false
+          parts = name.split(".")
+          curr_branch = tree
+          while part = parts.shift
+            if !parts.empty?
+              curr_branch[part.to_s] ||= {}
+              curr_branch = curr_branch[part.to_s]
+            else
+              curr_branch[part.to_s] = opts[:type]
+            end
           end
-        end
-      end
+        end # unless
+      end # self.attributes
       tree
     end
 

data/lib/mongoo/attributes/describe_dsl.rb

@@ -8,7 +8,7 @@ module Mongoo
       end
 
       def define_attribute_methods
-        @klass.attributes_tree.each do |name, val|
+        @klass.attributes_tree(only_definable: true).each do |name, val|
           if val.is_a?(Hash)
             blk = Proc.new { Mongoo::AttributeProxy.new(val, [name], self) }
             @klass.send(:define_method, name, &blk)

data/lib/mongoo/embedded/array_proxy.rb

@@ -0,0 +1,71 @@
+module Mongoo
+  module Embedded
+    class ArrayProxy
+
+      def initialize(doc, array, klass)
+        @doc   = doc
+        @array = array
+        @klass = klass
+      end
+
+      def build(hash, i=nil)
+        @klass.new(@doc, hash, i)
+      end
+
+      def raw
+        @array
+      end
+
+      def [](i)
+        build raw[i], i
+      end
+
+      def delete_at(i)
+        raw.delete_at(i)
+      end
+
+      def []=(i,o)
+        raw[i] = o.to_hash
+      end
+
+      def each
+        raw.each_with_index { |v,i| yield(i, build(v, i)) }
+      end
+
+      def size
+        raw.size
+      end
+
+      def keys
+        (0..size-1).to_a
+      end
+
+      def first
+        raw.first
+      end
+
+      def last
+        raw.last
+      end
+
+      def all
+        raw
+      end
+
+      alias :to_a :all
+
+      def push(obj)
+        raw << obj.to_hash; raw.index(obj.to_hash)
+      end
+
+      def <<(obj)
+        push(obj.to_hash)
+      end
+
+      def empty?
+        raw.empty?
+      end
+
+    end # ArrayProxy
+  end # Embedded
+end # Mongoo

data/lib/mongoo/embedded/core_mixin.rb

@@ -11,6 +11,10 @@ module Mongoo
           Mongoo::Embedded::HashProxy.new(self, attrib, klass)
         end
 
+        def embedded_array_proxy(attrib, klass)
+          Mongoo::Embedded::ArrayProxy.new(self, attrib, klass)
+        end
+
         def embedded_doc(attrib, klass)
           klass.new(self, attrib)
         end

data/lib/mongoo/embedded/describe_dsl.rb

@@ -12,17 +12,26 @@ module Mongoo
       end
 
       def define_embeds_many_method(attrib_key, opts)
+        embed_type   = opts[:type]
+        embed_type ||= :hash
+
         as = attrib_key
-        attrib_key = "embedded_#{attrib_key}"
+        attrib_key = "#{attrib_key}"
 
-        attribute(attrib_key, :type => :hash)
+        attribute(attrib_key, :type => embed_type, :define_methods => false)
 
         blk = Proc.new {
           if val = instance_variable_get("@#{as}")
             val
           else
-            instance_variable_set("@#{as}",
-              embedded_hash_proxy(get_or_set(attrib_key,{}), eval(opts[:class])))
+            case embed_type
+            when :hash then
+              instance_variable_set("@#{as}",
+                embedded_hash_proxy(get_or_set(attrib_key,{}), eval(opts[:class])))
+            when :array then
+              instance_variable_set("@#{as}",
+                embedded_array_proxy(get_or_set(attrib_key,[]), eval(opts[:class])))
+            end
           end
         }
         @klass.send(:define_method, as, &blk)
@@ -45,9 +54,9 @@ module Mongoo
 
       def define_embeds_one_method(attrib_key, opts)
         as = attrib_key
-        attrib_key = "embedded_#{attrib_key}"
+        attrib_key = "#{attrib_key}"
 
-        attribute(attrib_key, :type => :hash)
+        attribute(attrib_key, :type => :hash, :define_methods => false)
 
         blk = Proc.new {
           if val = instance_variable_get("@#{as}")

data/lib/mongoo/grid_fs/describe_dsl.rb

@@ -10,15 +10,14 @@ module Mongoo
       end
 
       def define_grid_fs_file_method(name, opts)
-        attrib_name = "gridfs_#{name}"
-        attribute(attrib_name, :type => :hash)
+        attribute(name, :type => :hash, :define_methods => false)
 
         blk = Proc.new {
           if file = instance_variable_get("@#{name}")
             file
           else
             db_lambda = opts[:db] || lambda { self.db }
-            container = get_or_set(attrib_name, {})
+            container = get_or_set(name, {})
             file = Mongoo::GridFs::File.new(container, db_lambda)
             instance_variable_set("@#{name}", file)
           end
@@ -27,15 +26,14 @@ module Mongoo
       end # define_grid_fs_file_methods
 
       def define_grid_fs_files_method(name, opts)
-        attrib_name = "gridfs_#{name}"
-        attribute(attrib_name, :type => :hash)
+        attribute(name, :type => :hash, :define_methods => false)
 
         blk = Proc.new {
           if files = instance_variable_get("@#{name}")
             files
           else
             db_lambda = opts[:db] || lambda { self.db }
-            container = get_or_set(attrib_name, {})
+            container = get_or_set(name, {})
             files = Mongoo::GridFs::Files.new(container, db_lambda)
             instance_variable_set("@#{name}", files)
           end

data/lib/mongoo/modifiers.rb

@@ -24,16 +24,22 @@ module Mongoo
       end
     end
 
+    def cast_value(v)
+      if v.is_a?(Mongoo::Embedded::Base)
+        return v.to_hash
+      end; v
+    end
+
     def inc(k, v=1)
       v = sanitize_value(k,v)
       @queue["$inc"] ||= {}
-      @queue["$inc"]["#{@key_prefix}#{k}"] = v
+      @queue["$inc"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def set(k,v)
       v = sanitize_value(k,v)
       @queue["$set"] ||= {}
-      @queue["$set"]["#{@key_prefix}#{k}"] = v
+      @queue["$set"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def unset(k)
@@ -43,17 +49,17 @@ module Mongoo
 
     def push(k, v)
       @queue["$push"] ||= {}
-      @queue["$push"]["#{@key_prefix}#{k}"] = v
+      @queue["$push"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def push_all(k, v)
       @queue["$pushAll"] ||= {}
-      @queue["$pushAll"]["#{@key_prefix}#{k}"] = v
+      @queue["$pushAll"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def add_to_set(k,v)
       @queue["$addToSet"] ||= {}
-      @queue["$addToSet"]["#{@key_prefix}#{k}"] = v
+      @queue["$addToSet"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def pop(k)
@@ -63,12 +69,12 @@ module Mongoo
 
     def pull(k, v)
       @queue["$pull"] ||= {}
-      @queue["$pull"]["#{@key_prefix}#{k}"] = v
+      @queue["$pull"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def pull_all(k, v)
       @queue["$pullAll"] ||= {}
-      @queue["$pullAll"]["#{@key_prefix}#{k}"] = v
+      @queue["$pullAll"]["#{@key_prefix}#{k}"] = cast_value(v)
     end
 
     def run!
@@ -112,35 +118,71 @@ module Mongoo
                 @doc.mongohash.dot_delete( k )
                 @doc.persisted_mongohash.dot_delete( k )
               when "$push" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || []) + [v]
-                @doc.mongohash.dot_set( k, new_val )
-                @doc.persisted_mongohash.dot_set( k, new_val )
+                unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
+                @doc.persisted_mongohash.dot_get(k) << v
+                @doc.mongohash.dot_get(k) << v
               when "$pushAll" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || []) + v
-                @doc.mongohash.dot_set( k, new_val )
-                @doc.persisted_mongohash.dot_set( k, new_val )
+                unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
+                @doc.persisted_mongohash.dot_get(k).concat(v)
+                @doc.mongohash.dot_get(k).concat(v)
               when "$addToSet" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || [])
-                new_val << v unless new_val.include?(v)
-                @doc.mongohash.dot_set(k, new_val)
-                @doc.persisted_mongohash.dot_set(k, new_val)
+                unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
+                unless @doc.persisted_mongohash.dot_get(k).include?(v)
+                  @doc.persisted_mongohash.dot_get(k) << v
+                end
+                unless @doc.mongohash.dot_get(k).include?(v)
+                  @doc.mongohash.dot_get(k) << v
+                end
               when "$pop" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || [])
-                new_val.pop
-                @doc.mongohash.dot_set(k, new_val)
-                @doc.persisted_mongohash.dot_set(k, new_val)
+               unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
+                @doc.persisted_mongohash.dot_get(k).pop
+                @doc.mongohash.dot_get(k).pop
               when "$pull" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || [])
-                new_val.delete(v)
-                @doc.mongohash.dot_set(k, new_val)
-                @doc.persisted_mongohash.dot_set(k, new_val)
+                unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
+                @doc.persisted_mongohash.dot_get(k).delete(v)
+                @doc.mongohash.dot_get(k).delete(v)
               when "$pullAll" then
-                new_val = (@doc.persisted_mongohash.dot_get(k) || [])
+                unless @doc.persisted_mongohash.dot_get(k)
+                  @doc.persisted_mongohash.dot_set(k, [])
+                end
+                unless @doc.mongohash.dot_get(k)
+                  @doc.mongohash.dot_set(k, [])
+                end
+
                 v.each do |val|
-                  new_val.delete(val)
+                  @doc.persisted_mongohash.dot_get(k).delete(val)
+                  @doc.mongohash.dot_get(k).delete(val)
                 end
-                @doc.mongohash.dot_set(k, new_val)
-                @doc.persisted_mongohash.dot_set(k, new_val)
               end
             end
           end # @queue.each

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2011-06-16}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/mongoo/core.rb",
     "lib/mongoo/cursor.rb",
     "lib/mongoo/describe_dsl.rb",
+    "lib/mongoo/embedded/array_proxy.rb",
     "lib/mongoo/embedded/base.rb",
     "lib/mongoo/embedded/core_mixin.rb",
     "lib/mongoo/embedded/describe_dsl.rb",

data/test/test_embedded.rb

@@ -1,5 +1,19 @@
 require 'helper'
 
+class Customer < Mongoo::Base
+  describe do |d|
+    d.attribute "name", :type => :string
+    d.embeds_many "addresses", :class => "Customer::Address", :type => :array
+  end
+end
+
+class Customer::Address < Mongoo::Embedded::Base
+  describe do |d|
+    d.attribute "street", :type => :string
+    d.attribute "city", :type => :string
+  end
+end
+
 class Book < Mongoo::Base
   describe do |d|
     d.attribute "title", :type => :string
@@ -45,6 +59,7 @@ end
 class TestEmbedded < Test::Unit::TestCase
   def setup
     Book.collection.drop
+    Customer.collection.drop
   end
 
   should "be able to work with embedded doc hashes" do
@@ -71,11 +86,11 @@ class TestEmbedded < Test::Unit::TestCase
     b = Book.new(title: "BASE Jumping Basics")
     b.sample_chapter = Book::Chapter.new(b, {})
     b.sample_chapter.title = "Understanding the Risks"
-    assert_equal "Understanding the Risks", b.g('embedded_sample_chapter')['title']
+    assert_equal "Understanding the Risks", b.g('sample_chapter')['title']
     b.insert!
     b = Book.find_one(b.id)
     assert_equal "Understanding the Risks", b.sample_chapter.title
-    assert_equal "Understanding the Risks", b.g('embedded_sample_chapter')['title']
+    assert_equal "Understanding the Risks", b.g('sample_chapter')['title']
   end
 
   should "validate embedded docs and can have nested embeds" do
@@ -85,7 +100,7 @@ class TestEmbedded < Test::Unit::TestCase
     purchase_id = BSON::ObjectId.new.to_s
     b.purchases[purchase_id] = b.purchases.build({})
     assert !b.valid?
-    assert_equal({:"embedded_purchases.#{purchase_id}.payment_type"=>["can't be blank"]}, b.errors)
+    assert_equal({:"purchases.#{purchase_id}.payment_type"=>["can't be blank"]}, b.errors)
     b.purchases[purchase_id].payment_type = "Cash"
     assert b.valid?
     b.update!
@@ -96,14 +111,14 @@ class TestEmbedded < Test::Unit::TestCase
     b.purchases[purchase_id].customer = Book::Purchase::Customer.new(b.purchases[purchase_id], name: "Jiminy")
     assert_equal "Jiminy", b.purchases[purchase_id].customer.name
     assert !b.valid?
-    assert_equal({:"embedded_purchases.#{purchase_id}.embedded_customer.phone"=>["can't be blank"]}, b.errors)
+    assert_equal({:"purchases.#{purchase_id}.customer.phone"=>["can't be blank"]}, b.errors)
     b.purchases[purchase_id].customer.phone = "123"
     assert b.valid?
     b.update!
     b = Book.find_one(b.id)
     assert_equal "Jiminy", b.purchases[purchase_id].customer.name
     b.purchases[purchase_id].customer = nil
-    assert_equal [[:unset, "embedded_purchases.#{purchase_id}.embedded_customer", 1]], b.changelog
+    assert_equal [[:unset, "purchases.#{purchase_id}.customer", 1]], b.changelog
     b.update!
     b = Book.find_one(b.id)
     assert_nil b.purchases[purchase_id].customer
@@ -183,4 +198,46 @@ class TestEmbedded < Test::Unit::TestCase
     assert_nothing_raised { BSON::ObjectId(key) }
     assert_equal doc, b.purchases[key]
   end
+
+  should "be able to have an embedded array doc" do
+    c = Customer.new(name: "Ben")
+    assert c.addresses.empty?
+    c.insert!
+
+    address = c.addresses.build(street: "123 Street", city: "Metropolis")
+    c.addresses << address
+    assert_equal address, c.addresses.first
+    assert_equal address, c.addresses[0]
+    assert_equal 1, c.addresses.size
+
+    c.update!
+    assert_equal address, c.addresses.first
+    assert_equal address, c.addresses[0]
+    assert_equal 1, c.addresses.size
+    c = Customer.find_one(c.id)
+    assert_equal address, c.addresses.first
+    assert_equal address, c.addresses[0]
+    assert_equal 1, c.addresses.size
+
+    market_st = c.addresses.build(street: "Market Street", city: "San Francisco")
+    c.mod! do |m|
+      m.push "addresses", market_st.to_hash
+    end
+
+    assert_equal 2, c.addresses.size
+    assert_equal market_st, c.addresses.last
+    c = Customer.find_one(c.id)
+    assert_equal address, c.addresses.first
+    assert_equal address, c.addresses[0]
+    assert_equal 2, c.addresses.size
+    assert_equal market_st, c.addresses[1]
+    assert_equal market_st, c.addresses.last
+
+    c.mod! do |m|
+      m.pull 'addresses', market_st
+    end
+
+    assert_equal 1, c.addresses.size
+    assert_equal [address], c.addresses.to_a
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-15 00:00:00.000000000 -07:00
+date: 2011-06-16 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151903140 !ruby/object:Gem::Requirement
+  requirement: &2151897700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151903140
+  version_requirements: *2151897700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151900000 !ruby/object:Gem::Requirement
+  requirement: &2151896280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151900000
+  version_requirements: *2151896280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2151898100 !ruby/object:Gem::Requirement
+  requirement: &2151894080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151898100
+  version_requirements: *2151894080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2151896120 !ruby/object:Gem::Requirement
+  requirement: &2151892200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151896120
+  version_requirements: *2151892200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151894800 !ruby/object:Gem::Requirement
+  requirement: &2151889420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151894800
+  version_requirements: *2151889420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151893220 !ruby/object:Gem::Requirement
+  requirement: &2151888040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151893220
+  version_requirements: *2151888040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151890660 !ruby/object:Gem::Requirement
+  requirement: &2151885940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151890660
+  version_requirements: *2151885940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151888260 !ruby/object:Gem::Requirement
+  requirement: &2151883000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2151888260
+  version_requirements: *2151883000
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151886260 !ruby/object:Gem::Requirement
+  requirement: &2151879760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151886260
+  version_requirements: *2151879760
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2151884580 !ruby/object:Gem::Requirement
+  requirement: &2151877780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151884580
+  version_requirements: *2151877780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2151882580 !ruby/object:Gem::Requirement
+  requirement: &2151876520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151882580
+  version_requirements: *2151876520
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -159,6 +159,7 @@ files:
 - lib/mongoo/core.rb
 - lib/mongoo/cursor.rb
 - lib/mongoo/describe_dsl.rb
+- lib/mongoo/embedded/array_proxy.rb
 - lib/mongoo/embedded/base.rb
 - lib/mongoo/embedded/core_mixin.rb
 - lib/mongoo/embedded/describe_dsl.rb
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1842464465711727650
+      hash: 2808617450618615822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: