mongoo 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/mongoo.rb

@@ -52,6 +52,10 @@ require "mongoo/attribute_proxy"
 require "mongoo/changelog"
 require "mongoo/persistence"
 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

@@ -1,194 +1,25 @@
 module Mongoo
-  class UnknownAttributeError < Exception; end
-
-  class Base
+  class Base < Mongoo::Core
 
     include Mongoo::Changelog
     include Mongoo::Persistence
     include Mongoo::Modifiers
 
-    include ActiveModel::Validations
-
     extend ActiveModel::Callbacks
-    extend ActiveModel::Naming
 
     define_model_callbacks :insert, :update, :remove
 
-    def self.attribute(name, opts={})
-      raise ArgumentError.new("missing :type") unless opts[:type]
-      self.attributes[name.to_s] = opts
-      define_attribute_methods
-      true
-    end
-
-    def self.attributes
-      Mongoo::ATTRIBUTE_META[self.to_s] ||= {}
-    end
-
-    def self.attributes_tree
-      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]
-          end
-        end
-      end
-      tree
-    end
-
-    def self.define_attribute_methods
-      define_method("id") do
-        get("_id")
-      end
-      define_method("id=") do |val|
-        set("_id", val)
-      end
-
-      self.attributes_tree.each do |name, val|
-        if val.is_a?(Hash)
-          define_method(name) do
-            AttributeProxy.new(val, [name], self)
-          end
-        else
-          define_method(name) do
-            get(name)
-          end
-          define_method("#{name}=") do |val|
-            set(name, val)
-          end
-        end
-      end
-    end
-
-    def self.known_attribute?(k)
-      k == "_id" || self.attributes[k.to_s]
-    end
-
-    def initialize(hash={}, persisted=false)
-      @persisted = persisted
-      init_from_hash(hash)
-      set_persisted_mongohash((persisted? ? mongohash : nil))
-    end
-
-    def ==(val)
-      if val.class.to_s == self.class.to_s
-        if val.persisted?
-          val.id == self.id
-        else
-          self.mongohash.raw_hash == val.mongohash.raw_hash
-        end
-      end
-    end
-
-    def known_attribute?(k)
-      self.class.known_attribute?(k)
-    end
-
-    def read_attribute_for_validation(key)
-      get_attribute(key)
-    end
-
-    def get_attribute(k)
-      unless known_attribute?(k)
-        raise UnknownAttributeError, k
-      end
-      mongohash.dot_get(k.to_s)
-    end
-    alias :get :get_attribute
-    alias :g   :get_attribute
-
-    def set_attribute(k,v)
-      unless known_attribute?(k)
-        if self.respond_to?("#{k}=")
-          return self.send("#{k}=", v)
-        else
-          raise UnknownAttributeError, k
-        end
-      end
-      unless k.to_s == "_id" || v.nil?
-        field_type = self.class.attributes[k.to_s][:type]
-        v = Mongoo::AttributeSanitizer.sanitize(field_type, v)
-      end
-      mongohash.dot_set(k.to_s,v)
-    end
-    alias :set :set_attribute
-    alias :s   :set_attribute
-
-    def unset_attribute(k)
-      mongohash.dot_delete(k); true
-    end
-    alias :unset :unset_attribute
-    alias :u :unset_attribute
-
-    def set_attributes(k_v_pairs)
-      k_v_pairs.each do |k,v|
-        set_attribute(k,v)
-      end
-    end
-    alias :sets :set_attributes
-
-    def get_attributes(keys)
-      found = {}
-      keys.each { |k| found[k.to_s] = get_attribute(k) }
-      found
-    end
-    alias :gets :get_attributes
-
-    def unset_attributes(keys)
-      keys.each { |k| unset_attribute(k) }; true
-    end
-    alias :unsets :unset_attributes
-
-    def attributes
-      mongohash.to_key_value
-    end
-
-    def merge!(hash)
-      if hash.is_a?(Mongoo::Mongohash)
-        hash = hash.raw_hash
-      end
-      hash.deep_stringify_keys!
-      hash = mongohash.raw_hash.deep_merge(hash)
-      set_mongohash( Mongoo::Mongohash.new(hash) )
-      mongohash
+    def embedded_array_proxy(attrib, klass)
+      Mongoo::Embedded::ArrayProxy.new(self, attrib, klass)
     end
 
-    def init_from_hash(hash)
-      unless hash.is_a?(Mongoo::Mongohash)
-        hash = Mongoo::Mongohash.new(hash)
-      end
-      set_mongohash hash
+    def embedded_hash_proxy(attrib, klass)
+      Mongoo::Embedded::HashProxy.new(self, attrib, klass)
     end
-    protected :init_from_hash
 
-    def set_mongohash(mongohash)
-      @mongohash = mongohash
+    def embedded_doc(attrib, klass)
+      klass.new(self, attrib)
     end
-    protected :set_mongohash
 
-    def mongohash
-      @mongohash
-    end
-
-    def set_persisted_mongohash(hash)
-      @serialized_persisted_mongohash = Marshal.dump(hash)
-      @persisted_mongohash = nil
-      true
-    end
-    protected :set_persisted_mongohash
-
-    def persisted_mongohash
-      @persisted_mongohash ||= begin
-        if @serialized_persisted_mongohash
-          Marshal.load(@serialized_persisted_mongohash)
-        end
-      end
-    end
   end
 end

data/lib/mongoo/core.rb

@@ -0,0 +1,190 @@
+module Mongoo
+  class UnknownAttributeError < Exception; end
+
+  class Core
+    include ActiveModel::Validations
+    extend  ActiveModel::Naming
+
+    def self.attribute(name, opts={})
+      raise ArgumentError.new("missing :type") unless opts[:type]
+      self.attributes[name.to_s] = opts
+      define_attribute_methods
+      true
+    end
+
+    def self.attributes
+      Mongoo::ATTRIBUTE_META[self.to_s] ||= {}
+    end
+
+    def self.attributes_tree
+      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]
+          end
+        end
+      end
+      tree
+    end
+
+    def self.define_attribute_methods
+      define_method("id") do
+        get("_id")
+      end
+      define_method("id=") do |val|
+        set("_id", val)
+      end
+
+      self.attributes_tree.each do |name, val|
+        if val.is_a?(Hash)
+          define_method(name) do
+            AttributeProxy.new(val, [name], self)
+          end
+        else
+          define_method(name) do
+            get(name)
+          end
+          define_method("#{name}=") do |val|
+            set(name, val)
+          end
+        end
+      end
+    end
+
+    def self.known_attribute?(k)
+      k == "_id" || self.attributes[k.to_s]
+    end
+
+    def initialize(hash={}, persisted=false)
+      @persisted = persisted
+      init_from_hash(hash)
+      set_persisted_mongohash((persisted? ? mongohash : nil))
+    end
+
+    def ==(val)
+      if val.class.to_s == self.class.to_s
+        if val.persisted?
+          val.id == self.id
+        else
+          self.mongohash.raw_hash == val.mongohash.raw_hash
+        end
+      end
+    end
+
+    def known_attribute?(k)
+      self.class.known_attribute?(k)
+    end
+
+    def read_attribute_for_validation(key)
+      get_attribute(key)
+    end
+
+    def get_attribute(k)
+      unless known_attribute?(k)
+        raise UnknownAttributeError, k
+      end
+      mongohash.dot_get(k.to_s)
+    end
+    alias :get :get_attribute
+    alias :g   :get_attribute
+
+    def set_attribute(k,v)
+      unless known_attribute?(k)
+        if self.respond_to?("#{k}=")
+          self.send("#{k}=", v)
+          return v
+        else
+          raise UnknownAttributeError, k
+        end
+      end
+      unless k.to_s == "_id" || v.nil?
+        field_type = self.class.attributes[k.to_s][:type]
+        v = Mongoo::AttributeSanitizer.sanitize(field_type, v)
+      end
+      mongohash.dot_set(k.to_s,v); v
+    end
+    alias :set :set_attribute
+    alias :s   :set_attribute
+
+    def unset_attribute(k)
+      mongohash.dot_delete(k); true
+    end
+    alias :unset :unset_attribute
+    alias :u :unset_attribute
+
+    def set_attributes(k_v_pairs)
+      k_v_pairs.each do |k,v|
+        set_attribute(k,v)
+      end
+    end
+    alias :sets :set_attributes
+
+    def get_attributes(keys)
+      found = {}
+      keys.each { |k| found[k.to_s] = get_attribute(k) }
+      found
+    end
+    alias :gets :get_attributes
+
+    def unset_attributes(keys)
+      keys.each { |k| unset_attribute(k) }; true
+    end
+    alias :unsets :unset_attributes
+
+    def attributes
+      mongohash.to_key_value
+    end
+
+    def merge!(hash)
+      if hash.is_a?(Mongoo::Mongohash)
+        hash = hash.raw_hash
+      end
+      hash.deep_stringify_keys!
+      hash = mongohash.raw_hash.deep_merge(hash)
+      set_mongohash( Mongoo::Mongohash.new(hash) )
+      mongohash
+    end
+
+    def init_from_hash(hash)
+      unless hash.is_a?(Mongoo::Mongohash)
+        hash = Mongoo::Mongohash.new(hash)
+      end
+      set_mongohash hash
+    end
+    protected :init_from_hash
+
+    def set_mongohash(mongohash)
+      @mongohash = mongohash
+    end
+    protected :set_mongohash
+
+    def mongohash
+      @mongohash
+    end
+
+    def set_persisted_mongohash(hash)
+      @serialized_persisted_mongohash = Marshal.dump(hash)
+      @persisted_mongohash = nil
+      true
+    end
+    protected :set_persisted_mongohash
+
+    def persisted_mongohash
+      @persisted_mongohash ||= begin
+        if @serialized_persisted_mongohash
+          Marshal.load(@serialized_persisted_mongohash)
+        end
+      end
+    end
+
+    def to_hash
+      mongohash.to_hash
+    end
+  end # Core
+end # Mongoo

data/lib/mongoo/embedded/array_proxy.rb

@@ -0,0 +1,45 @@
+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 range(min=0, max=-1)
+        raw[min..max].collect { |h| build(h) }
+      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

data/lib/mongoo/embedded/base.rb

@@ -0,0 +1,21 @@
+module Mongoo
+  module Embedded
+    class Base < Mongoo::Core
+
+      def initialize(parent, hash={})
+        @parent    = parent
+        @persisted = persisted?
+        init_from_hash(hash)
+      end
+
+      def persisted?
+        @parent.persisted?
+      end
+
+      def ==(other)
+        to_hash == other.to_hash
+      end
+
+    end
+  end
+end

data/lib/mongoo/embedded/hash_proxy.rb

@@ -0,0 +1,41 @@
+module Mongoo
+  module Embedded
+    class HashProxy
+
+      def initialize(doc, hash, klass)
+        @doc   = doc
+        @hash  = hash
+        @klass = klass
+      end
+
+      def build(hash)
+        @klass.new(@doc,hash)
+      end
+
+      def raw
+        @hash
+      end
+
+      def [](k)
+        build raw[k]
+      end
+
+      def []=(k,o)
+        raw[k] = o.to_hash
+      end
+
+      def each
+        raw.each { |k,v| yield(k, build(v)) }
+      end
+
+      def size
+        raw.size
+      end
+
+      def keys
+        raw.keys
+      end
+
+    end # HashProxy
+  end # Embedded
+end # Mongoo

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-06-06}
+  s.date = %q{2011-06-07}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,11 @@ Gem::Specification.new do |s|
     "lib/mongoo/attribute_sanitizer.rb",
     "lib/mongoo/base.rb",
     "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",
     "lib/mongoo/identity_map.rb",
     "lib/mongoo/modifiers.rb",
@@ -39,6 +43,7 @@ Gem::Specification.new do |s|
     "mongoo.gemspec",
     "test/helper.rb",
     "test/test_activemodel.rb",
+    "test/test_embedded.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb",
@@ -52,6 +57,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/test_activemodel.rb",
+    "test/test_embedded.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb",

data/test/test_embedded.rb

@@ -0,0 +1,86 @@
+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((g('chapters') || s('chapters',[])), Book::Chapter)
+  end
+
+  def authors
+    @authors ||= embedded_hash_proxy((g('authors') || s('authors', {})), Book::Author)
+  end
+
+  def sample_chapter
+    @sample_chapter ||= embedded_doc((g('sample_chapter') || s('sample_chapter', {})), Book::Chapter)
+  end
+end
+
+class Book::Chapter < Mongoo::Embedded::Base
+  attribute "title", :type => :string
+end
+
+class Book::Author < Mongoo::Embedded::Base
+  attribute "first_name", :type => :string
+  attribute "last_name",  :type => :string
+end
+
+class TestEmbedded < Test::Unit::TestCase
+  def setup
+    Book.collection.drop
+  end
+
+  should "be able to work with embedded doc arrays" do
+    b = Book.new
+    b.title = "Skydiving Instruction Manual"
+
+    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)
+
+    assert_equal 2, b2.chapters.size
+  end
+
+  should "be able to work with embedded doc hashes" do
+    b = Book.new
+    b.authors["primary"]   = b.authors.build(first_name: "Ben", last_name: "Myles")
+    b.authors["secondary"] = b.authors.build(first_name: "John", last_name: "Smith")
+
+    assert_equal "Ben", b.authors["primary"].first_name
+    assert_equal "Smith", b.authors["secondary"].last_name
+
+    assert_equal 2, b.authors.size
+    assert_equal ["primary", "secondary"], b.authors.keys
+
+    b.insert!
+
+    b = Book.find_one(b.id)
+
+    assert_equal "Ben", b.authors["primary"].first_name
+    assert_equal 2, b.authors.size
+    assert_equal ["primary", "secondary"], b.authors.keys
+  end
+
+  should "be able to work with a single embedded doc" do
+    b = Book.new(title: "BASE Jumping Basics")
+    b.sample_chapter.title = "Understanding the Risks"
+    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('sample_chapter')['title']
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: mongoo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Ben Myles
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 -07:00
+date: 2011-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,7 +157,11 @@ files:
 - lib/mongoo/attribute_sanitizer.rb
 - lib/mongoo/base.rb
 - 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
 - lib/mongoo/identity_map.rb
 - lib/mongoo/modifiers.rb
@@ -166,6 +170,7 @@ files:
 - mongoo.gemspec
 - test/helper.rb
 - test/test_activemodel.rb
+- test/test_embedded.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
@@ -184,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 728381716729290434
+      hash: -2643579001889888610
       segments: 
       - 0
       version: "0"
@@ -204,6 +209,7 @@ summary: Object mapper for MongoDB
 test_files: 
 - test/helper.rb
 - test/test_activemodel.rb
+- test/test_embedded.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb