mongoo 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/mongoo.rb

@@ -9,6 +9,7 @@ end
 module Mongoo
   INDEX_META = {}
   ATTRIBUTE_META = {}
+  EMBEDS_META = {}
 
   class << self
     attr_accessor :verbose_debug
@@ -55,7 +56,6 @@ require "mongoo/modifiers"
 require "mongoo/core"
 require "mongoo/base"
 require "mongoo/embedded/base"
-require "mongoo/embedded/array_proxy"
 require "mongoo/embedded/hash_proxy"
 require "mongoo/mongohash"
 require "mongoo/identity_map"

data/lib/mongoo/base.rb

@@ -9,17 +9,5 @@ module Mongoo
 
     define_model_callbacks :insert, :update, :remove
 
-    def embedded_array_proxy(attrib, klass)
-      Mongoo::Embedded::ArrayProxy.new(self, attrib, klass)
-    end
-
-    def embedded_hash_proxy(attrib, klass)
-      Mongoo::Embedded::HashProxy.new(self, attrib, klass)
-    end
-
-    def embedded_doc(attrib, klass)
-      klass.new(self, attrib)
-    end
-
   end
 end

data/lib/mongoo/core.rb

@@ -5,6 +5,96 @@ module Mongoo
     include ActiveModel::Validations
     extend  ActiveModel::Naming
 
+    def self.embeds_meta
+      Mongoo::EMBEDS_META[self.to_s] ||= {}
+    end
+
+    def self.embeds_many(attrib_key, opts)
+      raise(ArgumentError, "missing opt :as")    unless opts[:as]
+      raise(ArgumentError, "missing opt :class") unless opts[:class]
+
+      self.embeds_meta["embeds_many"] ||= {}
+      self.embeds_meta["embeds_many"][attrib_key] = opts
+
+      define_embeds_many_methods
+    end
+
+    def self.define_embeds_many_methods
+      (self.embeds_meta["embeds_many"] || {}).each do |attrib_key, opts|
+        define_method(opts[:as]) do
+          if val = instance_variable_get("@#{opts[:as]}")
+            val
+          else
+            instance_variable_set("@#{opts[:as]}",
+              embedded_hash_proxy(get_or_set(attrib_key,{}), eval(opts[:class])))
+          end
+        end # define_method
+        unless opts[:validate] == false
+          define_method("validate_#{opts[:as]}") do
+            send(opts[:as]).each do |k,v|
+              unless v.valid?
+                v.errors.each do |field, messages|
+                  errors.add "#{attrib_key}.#{k}.#{field}", messages
+                end
+              end
+            end
+          end # define_method
+          validate "validate_#{opts[:as]}"
+        end
+      end
+    end
+
+    def self.embeds_one(attrib_key, opts)
+      raise(ArgumentError, "missing opt :as")    unless opts[:as]
+      raise(ArgumentError, "missing opt :class") unless opts[:class]
+
+      self.embeds_meta["embeds_one"] ||= {}
+      self.embeds_meta["embeds_one"][attrib_key] = opts
+
+      define_embeds_one_methods
+    end
+
+    def self.define_embeds_one_methods
+      (self.embeds_meta["embeds_one"] || {}).each do |attrib_key, opts|
+        define_method(opts[:as]) do
+          if val = instance_variable_get("@#{opts[:as]}")
+            val
+          else
+            if hash = get(attrib_key)
+              instance_variable_set("@#{opts[:as]}",
+                embedded_doc(hash, eval(opts[:class])))
+            end
+          end
+        end
+
+        define_method("#{opts[:as]}=") do |obj|
+          set(attrib_key, (obj.nil? ? nil : obj.to_hash))
+          send("#{opts[:as]}")
+        end
+
+        unless opts[:validate] == false
+          define_method("validate_#{opts[:as]}") do
+            if v = send(opts[:as])
+              unless v.valid?
+                v.errors.each do |field, messages|
+                  errors.add "#{attrib_key}.#{field}", messages
+                end
+              end
+            end
+          end # define_method
+          validate "validate_#{opts[:as]}"
+        end
+      end
+    end
+
+    def embedded_hash_proxy(attrib, klass)
+      Mongoo::Embedded::HashProxy.new(self, attrib, klass)
+    end
+
+    def embedded_doc(attrib, klass)
+      klass.new(self, attrib)
+    end
+
     def self.attribute(name, opts={})
       raise ArgumentError.new("missing :type") unless opts[:type]
       self.attributes[name.to_s] = opts

data/lib/mongoo/embedded/hash_proxy.rb

@@ -20,6 +20,10 @@ module Mongoo
         build raw[k]
       end
 
+      def delete(k)
+        raw.delete(k)
+      end
+
       def []=(k,o)
         raw[k] = o.to_hash
       end

data/mongoo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/mongoo/changelog.rb",
     "lib/mongoo/core.rb",
     "lib/mongoo/cursor.rb",
-    "lib/mongoo/embedded/array_proxy.rb",
     "lib/mongoo/embedded/base.rb",
     "lib/mongoo/embedded/hash_proxy.rb",
     "lib/mongoo/hash_ext.rb",
@@ -52,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/benmyles/mongoo}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Object mapper for MongoDB}
   s.test_files = [
     "test/helper.rb",

data/test/test_embedded.rb

@@ -1,22 +1,17 @@
 require 'helper'
 
 class Book < Mongoo::Base
-  attribute "title",    :type => :string
-  attribute "chapters", :type => :array
-  attribute "authors",  :type => :hash
-  attribute "sample_chapter", :type => :hash
-
-  def chapters
-    @chapters ||= embedded_array_proxy(get_or_set('chapters',[]), Book::Chapter)
-  end
+  attribute "title",          :type => :string
 
-  def authors
-    @authors ||= embedded_hash_proxy(get_or_set('authors', {}), Book::Author)
-  end
+  attribute "chapters",       :type => :hash
+  attribute "authors",        :type => :hash
+  attribute "sample_chapter", :type => :hash
+  attribute "purchases",      :type => :hash
 
-  def sample_chapter
-    @sample_chapter ||= embedded_doc(get_or_set('sample_chapter', {}), Book::Chapter)
-  end
+  embeds_one  "sample_chapter", :as => "sample_chapter",  :class => "Book::Chapter"
+  embeds_many "chapters",       :as => "chapters",        :class => 'Book::Chapter'
+  embeds_many "authors",        :as => "authors",         :class => 'Book::Author'
+  embeds_many "purchases",      :as => "purchases",       :class => 'Book::Purchase'
 end
 
 class Book::Chapter < Mongoo::Embedded::Base
@@ -28,32 +23,25 @@ class Book::Author < Mongoo::Embedded::Base
   attribute "last_name",  :type => :string
 end
 
-class TestEmbedded < Test::Unit::TestCase
-  def setup
-    Book.collection.drop
-  end
+class Book::Purchase < Mongoo::Embedded::Base
+  attribute "payment_type",  :type => :string
 
-  should "be able to work with embedded doc arrays" do
-    b = Book.new
-    b.title = "Skydiving Instruction Manual"
+  attribute   "customer", :type => :hash
+  embeds_one  "customer", :as => "customer", :class => 'Book::Purchase::Customer'
 
-    b.chapters.push(b.chapters.build(title: "How to Land"))
-
-    b2 = Book.new(title: "Something Else")
-    b2.chapters.push b2.chapters.build(title: "How to Transcend Fear")
-
-    assert_equal [], b.chapters.raw & b2.chapters.raw
-
-    b2.chapters.push b2.chapters.build({title: "How to Land"})
-
-    assert_equal([{"title"=>"How to Land"}], b.chapters.raw & b2.chapters.raw)
-
-    assert_equal b.chapters.range(0,0), b2.chapters.range(1,1)
-    assert_not_equal b.chapters.range(0,0), b2.chapters.range(0,0)
+  validates_presence_of :payment_type
+end
 
-    assert_equal 2, b2.chapters.size
+class Book::Purchase::Customer < Mongoo::Embedded::Base
+  attribute "name", :type => :string
+  attribute "phone", :type => :string
+  validates_presence_of :name
+  validates_presence_of :phone
+end
 
-    assert_equal "How to Transcend Fear", b2.chapters[0].title
+class TestEmbedded < Test::Unit::TestCase
+  def setup
+    Book.collection.drop
   end
 
   should "be able to work with embedded doc hashes" do
@@ -78,6 +66,7 @@ class TestEmbedded < Test::Unit::TestCase
 
   should "be able to work with a single embedded doc" do
     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('sample_chapter')['title']
     b.insert!
@@ -85,4 +74,65 @@ class TestEmbedded < Test::Unit::TestCase
     assert_equal "Understanding the Risks", b.sample_chapter.title
     assert_equal "Understanding the Risks", b.g('sample_chapter')['title']
   end
+
+  should "validate embedded docs and can have nested embeds" do
+    b = Book.new(title: "BASE Jumping Basics")
+    b.insert!
+
+    purchase_id = BSON::ObjectId.new.to_s
+    b.purchases[purchase_id] = b.purchases.build({})
+    assert !b.valid?
+    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!
+
+    b = Book.find_one(b.id)
+    assert_equal "Cash", b.purchases[purchase_id].payment_type
+    assert_nil b.purchases[purchase_id].customer
+    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({:"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, "purchases.#{purchase_id}.customer", 1]], b.changelog
+    b.update!
+    b = Book.find_one(b.id)
+    assert_nil b.purchases[purchase_id].customer
+    assert_equal [], b.changelog
+  end
+
+  should "be able to delete a doc in an embeds_many" do
+    b = Book.new(title: "BASE Jumping Basics")
+
+    purchase_id = BSON::ObjectId.new.to_s
+    b.purchases[purchase_id] = b.purchases.build({payment_type: "Cash"})
+
+    purchase_id2 = BSON::ObjectId.new.to_s
+    b.purchases[purchase_id2] = b.purchases.build({payment_type: "Card"})
+
+    assert_equal 3, b.changelog.size
+    b.purchases.delete(purchase_id2)
+    assert_equal 2, b.changelog.size
+    b.purchases[purchase_id2] = b.purchases.build({payment_type: "Card"})
+    assert_equal 3, b.changelog.size
+
+    b.insert!
+
+    assert_equal 2, b.purchases.size
+
+    b.purchases.delete(purchase_id2)
+    assert_equal 1, b.purchases.size
+    assert_equal 1, b.changelog.size
+    b.update!
+    assert_equal 1, b.purchases.size
+
+    b = Book.find_one(b.id)
+    assert_equal 1, b.purchases.size
+  end
 end

metadata

@@ -1,149 +1,146 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoo
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.9
   prerelease: 
-  version: 0.4.8
 platform: ruby
-authors: 
+authors:
 - Ben Myles
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-07 00:00:00 -07:00
+date: 2011-06-07 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157581440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157581440
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2157579300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157579300
+- !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2157573100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157573100
+- !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2157571300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157571300
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2157569760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157569760
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2157568060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157568060
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2157566000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157566000
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2157554600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157554600
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2157550280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157550280
+- !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2157548520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2157548520
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2157541520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *2157541520
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rvmrc
 - CHANGELOG
@@ -159,7 +156,6 @@ files:
 - lib/mongoo/changelog.rb
 - lib/mongoo/core.rb
 - lib/mongoo/cursor.rb
-- lib/mongoo/embedded/array_proxy.rb
 - lib/mongoo/embedded/base.rb
 - lib/mongoo/embedded/hash_proxy.rb
 - lib/mongoo/hash_ext.rb
@@ -177,36 +173,34 @@ files:
 - test/test_performance.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongoo
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3583778272833589372
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2847002487203023580
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object mapper for MongoDB
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_activemodel.rb
 - test/test_embedded.rb

data/lib/mongoo/embedded/array_proxy.rb

@@ -1,53 +0,0 @@
-module Mongoo
-  module Embedded
-    class ArrayProxy
-
-      def initialize(doc, array, klass)
-        @doc   = doc
-        @array = array
-        @klass = klass
-      end
-
-      def build(hash)
-        @klass.new(@doc,hash)
-      end
-
-      def raw
-        @array
-      end
-
-      def [](index)
-        if res = raw[index]
-          build(res)
-        end
-      end
-
-      def range(min=0, max=-1)
-        if res = raw[min..max]
-          res.collect { |h| build(h) }
-        end
-      end
-
-      def all
-        range
-      end
-
-      def each
-        raw.each { |h| yield(build(h)) }
-      end
-
-      def push(o)
-        raw << o.to_hash
-      end
-
-      def pop(o)
-        raw.pop o.to_hash
-      end
-
-      def size
-        raw.size
-      end
-
-    end # ArrayProxy
-  end # Embedded
-end # Mongoo