mongoo 0.4.10 → 0.5.0

data/CHANGELOG

@@ -1,5 +1,23 @@
 == Changelog
 
+=== 0.5.0
+
+* Introduced an API/DSL for defining attributes and other features.
+  The old API will no longer work.
+
+  class Book < Mongoo::Base
+    describe do |d|
+      d.attribute "title", :type => :string
+      d.embeds_one  "sample_chapter",  :class => "Book::Chapter"
+      d.embeds_many "chapters",        :class => 'Book::Chapter'
+      d.index "title"
+    end
+  end
+
+* Notice too, there is now better support for embedded docs. See test_embedded.rb.
+
+* General, misc cleanup and restructuring of code.
+
 === 0.4.2
 
 * Added find_and_modify

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.5.0

data/lib/mongoo.rb

@@ -7,10 +7,6 @@ end
 # Mongoo.conn => #<Mongo::Connection:0x00000100db8ac0>
 
 module Mongoo
-  INDEX_META = {}
-  ATTRIBUTE_META = {}
-  EMBEDS_META = {}
-
   class << self
     attr_accessor :verbose_debug
 
@@ -46,6 +42,8 @@ require "forwardable"
 require "active_support/core_ext"
 require "active_model"
 
+require "mongoo/describe_dsl"
+
 require "mongoo/hash_ext"
 require "mongoo/cursor"
 require "mongoo/attribute_sanitizer"
@@ -53,9 +51,22 @@ require "mongoo/attribute_proxy"
 require "mongoo/changelog"
 require "mongoo/persistence"
 require "mongoo/modifiers"
+
+require "mongoo/embedded/describe_dsl"
+require "mongoo/embedded/core_mixin"
+
+require "mongoo/attributes/describe_dsl"
+require "mongoo/attributes"
+
 require "mongoo/core"
 require "mongoo/base"
+
 require "mongoo/embedded/base"
 require "mongoo/embedded/hash_proxy"
+
 require "mongoo/mongohash"
 require "mongoo/identity_map"
+
+require "mongoo/grid_fs/describe_dsl"
+require "mongoo/grid_fs/file"
+require "mongoo/grid_fs/files"

data/lib/mongoo/attributes.rb

@@ -0,0 +1,116 @@
+class Mongoo::UnknownAttributeError < Exception; end
+
+module Mongoo::Attributes
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def attributes
+      if @attributes
+        @attributes
+      else
+        @attributes = {}
+      end
+    end
+
+    def 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 known_attribute?(k)
+      k == "_id" || self.attributes[k.to_s]
+    end
+  end # ClassMethods
+
+  module InstanceMethods
+    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 Mongoo::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 Mongoo::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 get_or_set_attribute(k, v)
+      get_attribute(k) || set_attribute(k, v)
+    end
+    alias :get_or_set :get_or_set_attribute
+    alias :gs :get_or_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 id
+      get "_id"
+    end
+
+    def id=(val)
+      set "_id", val
+    end
+  end # InstanceMethods
+end

data/lib/mongoo/attributes/describe_dsl.rb

@@ -0,0 +1,32 @@
+module Mongoo
+  module Attributes
+    module DescribeDsl
+      def attribute(name, opts={})
+        raise ArgumentError.new("missing :type") unless opts[:type]
+        @klass.attributes[name.to_s] = opts
+        true
+      end
+
+      def define_attribute_methods
+        @klass.attributes_tree.each do |name, val|
+          if val.is_a?(Hash)
+            blk = Proc.new { Mongoo::AttributeProxy.new(val, [name], self) }
+            @klass.send(:define_method, name, &blk)
+          else
+            blk = Proc.new { get(name) }
+            @klass.send(:define_method, name, &blk)
+            blk = Proc.new { |val| set(name, val) }
+            @klass.send(:define_method, "#{name}=", &blk)
+          end
+        end
+      end # define_attribute_methods
+      protected :define_attribute_methods
+    end # DescribeDsl
+  end # Attributes
+end # Mongoo
+
+class Mongoo::DescribeDsl
+  include Mongoo::Attributes::DescribeDsl
+end
+
+Mongoo::DescribeDsl.after_describe << :define_attribute_methods

data/lib/mongoo/core.rb

@@ -1,154 +1,13 @@
 module Mongoo
-  class UnknownAttributeError < Exception; end
-
   class Core
     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
+    include Mongoo::Embedded::CoreMixin
+    include Mongoo::Attributes
 
-      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
-      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]
+    def self.describe(&block)
+      Mongoo::DescribeDsl.new(self).describe(&block)
     end
 
     def initialize(hash={}, persisted=false)
@@ -167,76 +26,6 @@ module Mongoo
       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 get_or_set_attribute(k, v)
-      get_attribute(k) || set_attribute(k, v)
-    end
-    alias :get_or_set :get_or_set_attribute
-    alias :gs :get_or_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

data/lib/mongoo/describe_dsl.rb

@@ -0,0 +1,36 @@
+module Mongoo
+  class DescribeDsl
+    def self.after_describe
+      @after_describe ||= []
+    end
+
+    def self.before_describe
+      @before_describe ||= []
+    end
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def describe(&block)
+      Mutex.new.synchronize do
+        self.class.before_describe.uniq!
+        self.class.after_describe.uniq!
+
+        self.class.before_describe.each do |m|
+          send(m)
+        end
+
+        block.call(self)
+
+        self.class.after_describe.each do |m|
+          send(m)
+        end
+      end
+    end
+
+    def index(*args)
+      @klass.send(:index, *args)
+    end
+  end # DescribeDsl
+end # Mongoo

data/lib/mongoo/embedded/base.rb

@@ -12,6 +12,18 @@ module Mongoo
         @parent.persisted?
       end
 
+      def db
+        @parent.db
+      end
+
+      def conn
+        @parent.conn
+      end
+
+      def collection_name
+        @parent.collection_name
+      end
+
       def ==(other)
         to_hash == other.to_hash
       end

data/lib/mongoo/embedded/core_mixin.rb

@@ -0,0 +1,20 @@
+module Mongoo
+  module Embedded
+    module CoreMixin
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+      end # ClassMethods
+
+      module InstanceMethods
+        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 # InstanceMethods
+    end # CoreMixin
+  end # Embedded
+end # Mongoo

data/lib/mongoo/embedded/describe_dsl.rb

@@ -0,0 +1,91 @@
+module Mongoo
+  module Embedded
+    module DescribeDsl
+      def embeds_one(attrib_key, opts)
+        raise(ArgumentError, "missing opt :class") unless opts[:class]
+        define_embeds_one_method(attrib_key, opts)
+      end
+
+      def embeds_many(attrib_key, opts)
+        raise(ArgumentError, "missing opt :class") unless opts[:class]
+        define_embeds_many_method(attrib_key, opts)
+      end
+
+      def define_embeds_many_method(attrib_key, opts)
+        as = attrib_key
+        attrib_key = "embedded_#{attrib_key}"
+
+        attribute(attrib_key, :type => :hash)
+
+        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])))
+          end
+        }
+        @klass.send(:define_method, as, &blk)
+
+        unless opts[:validate] == false
+          blk = Proc.new {
+            send(as).each do |k,v|
+              unless v.valid?
+                v.errors.each do |field, messages|
+                  errors.add "#{attrib_key}.#{k}.#{field}", messages
+                end
+              end
+            end
+          }
+          @klass.send(:define_method, "validate_#{as}", &blk)
+          @klass.validate "validate_#{as}"
+        end
+      end # define_embeds_many_method
+      protected :define_embeds_many_method
+
+      def define_embeds_one_method(attrib_key, opts)
+        as = attrib_key
+        attrib_key = "embedded_#{attrib_key}"
+
+        attribute(attrib_key, :type => :hash)
+
+        blk = Proc.new {
+          if val = instance_variable_get("@#{as}")
+            val
+          else
+            if hash = get(attrib_key)
+              instance_variable_set("@#{as}",
+                embedded_doc(hash, eval(opts[:class])))
+            end
+          end
+        }
+        @klass.send(:define_method, as, &blk)
+
+        blk = Proc.new { |obj|
+          set(attrib_key, (obj.nil? ? nil : obj.to_hash))
+          send("#{as}")
+        }
+        @klass.send(:define_method, "#{as}=", &blk)
+
+        unless opts[:validate] == false
+          blk = Proc.new {
+            if v = send(as)
+              unless v.valid?
+                v.errors.each do |field, messages|
+                  errors.add "#{attrib_key}.#{field}", messages
+                end
+              end
+            end
+          }
+          @klass.send(:define_method, "validate_#{as}", &blk)
+          @klass.validate "validate_#{as}"
+        end
+      end # define_embeds_one_method
+      protected :define_embeds_one_method
+    end # DescribeDsl
+  end # Embedded
+end
+
+class Mongoo::DescribeDsl
+  include Mongoo::Embedded::DescribeDsl
+end

data/lib/mongoo/grid_fs/describe_dsl.rb

@@ -0,0 +1,51 @@
+module Mongoo
+  module GridFs
+    module DescribeDsl
+      def grid_fs_file(name, opts={})
+        define_grid_fs_file_method(name, opts)
+      end
+
+      def grid_fs_files(name, opts={})
+        define_grid_fs_files_method(name, opts)
+      end
+
+      def define_grid_fs_file_method(name, opts)
+        attrib_name = "gridfs_#{name}"
+        attribute(attrib_name, :type => :hash)
+
+        blk = Proc.new {
+          if file = instance_variable_get("@#{name}")
+            file
+          else
+            db_lambda = opts[:db] || lambda { self.db }
+            container = get_or_set(attrib_name, {})
+            file = Mongoo::GridFs::File.new(container, db_lambda)
+            instance_variable_set("@#{name}", file)
+          end
+        }
+        @klass.send(:define_method, name, &blk)
+      end # define_grid_fs_file_methods
+
+      def define_grid_fs_files_method(name, opts)
+        attrib_name = "gridfs_#{name}"
+        attribute(attrib_name, :type => :hash)
+
+        blk = Proc.new {
+          if files = instance_variable_get("@#{name}")
+            files
+          else
+            db_lambda = opts[:db] || lambda { self.db }
+            container = get_or_set(attrib_name, {})
+            files = Mongoo::GridFs::Files.new(container, db_lambda)
+            instance_variable_set("@#{name}", files)
+          end
+        }
+        @klass.send(:define_method, name, &blk)
+      end
+    end # DescribeDsl
+  end # GridFs
+end # Mongoo
+
+class Mongoo::DescribeDsl
+  include Mongoo::GridFs::DescribeDsl
+end

data/lib/mongoo/grid_fs/file.rb

@@ -0,0 +1,40 @@
+module Mongoo
+  module GridFs
+
+    class File
+      def initialize(container_hash, db_lambda)
+        @db_lambda = db_lambda
+        @container_hash = container_hash
+      end
+
+      def grid
+        @grid ||= Mongo::Grid.new(@db_lambda.call)
+      end
+
+      def put(*args)
+        @container_hash["_id"] = grid.put(*args)
+      end
+
+      def delete(*args)
+        if file_id = @container_hash["_id"]
+          args ||= []
+          args.unshift file_id
+          res = grid.delete(*args)
+          @container_hash.clear
+          res
+        end
+      end
+
+      def get(*args)
+        if file_id = @container_hash["_id"]
+          args ||= []
+          args.unshift file_id
+          if io = grid.get(*args)
+            io.read
+          end
+        end
+      end
+    end # File
+
+  end
+end

data/lib/mongoo/grid_fs/files.rb

@@ -0,0 +1,34 @@
+module Mongoo
+  module GridFs
+
+    class Files
+      def initialize(container_hash, db_lambda)
+        @db_lambda = db_lambda
+        @container_hash = container_hash
+      end
+
+      def get(*args)
+        key = args.shift
+        if @container_hash[key]
+          Mongoo::GridFs::File.new(@container_hash[key], @db_lambda).get(*args)
+        end
+      end
+
+      def put(*args)
+        key = args.shift
+        unless @container_hash[key]
+          @container_hash[key] = {}
+        end
+        Mongoo::GridFs::File.new(@container_hash[key], @db_lambda).put(*args)
+      end
+
+      def delete(*args)
+        key = args.shift
+        if @container_hash[key]
+          Mongoo::GridFs::File.new(@container_hash[key], @db_lambda).delete(*args)
+        end
+      end
+    end # Files
+
+  end
+end

data/lib/mongoo/persistence.rb

@@ -123,7 +123,8 @@ module Mongoo
       end
 
       def index_meta
-        Mongoo::INDEX_META[self.collection_name] ||= {}
+        return @index_meta if @index_meta
+        @index_meta = {}
       end
 
       def index(spec, opts={})
@@ -138,6 +139,18 @@ module Mongoo
       end
     end # ClassMethods
 
+    def db
+      self.class.db
+    end
+
+    def conn
+      self.class.conn
+    end
+
+    def collection_name
+      self.class.collection_name
+    end
+
     def to_param
       persisted? ? get("_id").to_s : nil
     end

data/mongoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoo}
-  s.version = "0.4.10"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Myles"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-06-10}
   s.description = %q{Simple object mapper for MongoDB}
   s.email = %q{ben.myles@gmail.com}
   s.extra_rdoc_files = [
@@ -28,12 +28,20 @@ Gem::Specification.new do |s|
     "lib/mongoo.rb",
     "lib/mongoo/attribute_proxy.rb",
     "lib/mongoo/attribute_sanitizer.rb",
+    "lib/mongoo/attributes.rb",
+    "lib/mongoo/attributes/describe_dsl.rb",
     "lib/mongoo/base.rb",
     "lib/mongoo/changelog.rb",
     "lib/mongoo/core.rb",
     "lib/mongoo/cursor.rb",
+    "lib/mongoo/describe_dsl.rb",
     "lib/mongoo/embedded/base.rb",
+    "lib/mongoo/embedded/core_mixin.rb",
+    "lib/mongoo/embedded/describe_dsl.rb",
     "lib/mongoo/embedded/hash_proxy.rb",
+    "lib/mongoo/grid_fs/describe_dsl.rb",
+    "lib/mongoo/grid_fs/file.rb",
+    "lib/mongoo/grid_fs/files.rb",
     "lib/mongoo/hash_ext.rb",
     "lib/mongoo/identity_map.rb",
     "lib/mongoo/modifiers.rb",
@@ -43,6 +51,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_activemodel.rb",
     "test/test_embedded.rb",
+    "test/test_grid_fs.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb",
@@ -57,6 +66,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_activemodel.rb",
     "test/test_embedded.rb",
+    "test/test_grid_fs.rb",
     "test/test_identity_map.rb",
     "test/test_mongohash.rb",
     "test/test_mongoo.rb",

data/test/helper.rb

@@ -20,25 +20,28 @@ Mongoo.conn = lambda { Mongo::Connection.new("localhost", 27017, :pool_size => 5
 Mongoo.db   = "mongoo-test"
 
 class SearchIndex < Mongoo::Base
-  attribute "terms", :type => :array
-  index "terms"
+  describe do |d|
+    d.attribute "terms", :type => :array
+    d.index "terms"
+  end
 end
 
 class Person < Mongoo::Base
-  attribute "name", :type => :string
-  attribute "visits", :type => :integer
-  attribute "interests", :type => :array
-  attribute "jobs.total", :type => :integer
-  attribute "jobs.professional", :type => :array
-  attribute "jobs.volunteer", :type => :array
-  attribute "jobs.internships.high_school", :type => :array
-  attribute "location.city", :type => :string
-  attribute "location.demographics.crime_rate", :type => :symbol
-  attribute "location.demographics.education_quality", :type => :symbol
-  attribute "misc", :type => :hash
-
-  index "name"
-  index "location.city"
+  describe do |d|
+    d.attribute "name", :type => :string
+    d.attribute "visits", :type => :integer
+    d.attribute "interests", :type => :array
+    d.attribute "jobs.total", :type => :integer
+    d.attribute "jobs.professional", :type => :array
+    d.attribute "jobs.volunteer", :type => :array
+    d.attribute "jobs.internships.high_school", :type => :array
+    d.attribute "location.city", :type => :string
+    d.attribute "location.demographics.crime_rate", :type => :symbol
+    d.attribute "location.demographics.education_quality", :type => :symbol
+    d.attribute "misc", :type => :hash
+    d.index "name"
+    d.index "location.city"
+  end
 end
 
 class SpacePerson < Mongoo::Base
@@ -46,13 +49,15 @@ class SpacePerson < Mongoo::Base
 end
 
 class TvShow < Mongoo::Base
-  attribute "name", :type => :string
-  attribute "cast.director", :type => :string
-  attribute "cast.lead", :type => :string
-  attribute "rating", :type => :float
-  attribute "comments", :type => :array
-
-  index "name"
+  describe do |d|
+    d.attribute "name", :type => :string
+    d.attribute "cast.director", :type => :string
+    d.attribute "cast.lead", :type => :string
+    d.attribute "rating", :type => :float
+    d.attribute "comments", :type => :array
+    d.index "name"
+    d.index "cast.director"
+  end
 
   validates_presence_of "name"
   validates_presence_of "cast.director"

data/test/test_embedded.rb

@@ -1,40 +1,43 @@
 require 'helper'
 
 class Book < Mongoo::Base
-  attribute "title",          :type => :string
-
-  attribute "chapters",       :type => :hash
-  attribute "authors",        :type => :hash
-  attribute "sample_chapter", :type => :hash
-  attribute "purchases",      :type => :hash
-
-  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'
+  describe do |d|
+    d.attribute "title", :type => :string
+    d.embeds_one  "sample_chapter",  :class => "Book::Chapter"
+    d.embeds_many "chapters",        :class => 'Book::Chapter'
+    d.embeds_many "authors",         :class => 'Book::Author'
+    d.embeds_many "purchases",       :class => 'Book::Purchase'
+  end
 end
 
 class Book::Chapter < Mongoo::Embedded::Base
-  attribute "title", :type => :string
+  describe do |d|
+    d.attribute "title", :type => :string
+  end
 end
 
 class Book::Author < Mongoo::Embedded::Base
-  attribute "first_name", :type => :string
-  attribute "last_name",  :type => :string
+  describe do |d|
+    d.attribute "first_name", :type => :string
+    d.attribute "last_name",  :type => :string
+  end
 end
 
 class Book::Purchase < Mongoo::Embedded::Base
-  attribute "payment_type",  :type => :string
-
-  attribute   "customer", :type => :hash
-  embeds_one  "customer", :as => "customer", :class => 'Book::Purchase::Customer'
+  describe do |d|
+    d.attribute "payment_type",  :type => :string
+    d.embeds_one "customer", :class => 'Book::Purchase::Customer'
+  end
 
   validates_presence_of :payment_type
 end
 
 class Book::Purchase::Customer < Mongoo::Embedded::Base
-  attribute "name", :type => :string
-  attribute "phone", :type => :string
+  describe do |d|
+    d.attribute "name", :type => :string
+    d.attribute "phone", :type => :string
+  end
+
   validates_presence_of :name
   validates_presence_of :phone
 end
@@ -68,11 +71,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('sample_chapter')['title']
+    assert_equal "Understanding the Risks", b.g('embedded_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']
+    assert_equal "Understanding the Risks", b.g('embedded_sample_chapter')['title']
   end
 
   should "validate embedded docs and can have nested embeds" do
@@ -82,7 +85,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({:"purchases.#{purchase_id}.payment_type"=>["can't be blank"]}, b.errors)
+    assert_equal({:"embedded_purchases.#{purchase_id}.payment_type"=>["can't be blank"]}, b.errors)
     b.purchases[purchase_id].payment_type = "Cash"
     assert b.valid?
     b.update!
@@ -93,14 +96,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({:"purchases.#{purchase_id}.customer.phone"=>["can't be blank"]}, b.errors)
+    assert_equal({:"embedded_purchases.#{purchase_id}.embedded_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
+    assert_equal [[:unset, "embedded_purchases.#{purchase_id}.embedded_customer", 1]], b.changelog
     b.update!
     b = Book.find_one(b.id)
     assert_nil b.purchases[purchase_id].customer

data/test/test_grid_fs.rb

@@ -0,0 +1,91 @@
+require 'helper'
+
+class Email < Mongoo::Base
+  include Mongoo::GridFs
+
+  describe do |d|
+    d.attribute "subject", :type => :string
+    d.embeds_one "attachment", :class => "Email::Attachment"
+    d.grid_fs_file  "raw_message"
+    d.grid_fs_files "notes"
+  end
+end
+
+class Email::Attachment < Mongoo::Embedded::Base
+  include Mongoo::GridFs
+
+  describe do |d|
+    d.attribute "filename", :type => :string
+    d.grid_fs_file "data"
+  end
+end
+
+class Image < Mongoo::Base
+  include Mongoo::GridFs
+end
+
+class TestGridFs < Test::Unit::TestCase
+
+  def setup
+    [Email].each do |obj|
+      obj.drop
+      obj.create_indexes
+    end
+  end
+
+  should "be able to use a file in a normal doc" do
+    e = Email.new(subject: "Hello, World!")
+    assert_equal Mongoo::GridFs::File, e.raw_message.class
+    assert_nil e.raw_message.get
+    assert_nil e.raw_message.delete
+    file_id = e.raw_message.put "Welcome to GridFS!"
+    assert file_id.is_a?(BSON::ObjectId)
+    assert_equal "Welcome to GridFS!", e.raw_message.get
+    e.insert!
+    assert_equal "Welcome to GridFS!", e.raw_message.get
+
+    e = Email.find_one(e.id)
+    assert_equal "Welcome to GridFS!", e.raw_message.get
+    e.raw_message.delete
+    assert_nil e.raw_message.get
+    e.update!
+
+    e = Email.find_one(e.id)
+    assert_nil e.raw_message.get
+  end
+
+  should "be able to use a file in an embedded doc" do
+    e = Email.new(subject: "Hello, World!")
+    e.attachment = Email::Attachment.new(e, {filename: "secret.txt"})
+    assert_nil e.attachment.data.get
+    e.attachment.data.put "super secret message"
+    assert_equal "super secret message", e.attachment.data.get
+    e.attachment.save!
+
+    e = Email.find_one(e.id)
+    assert_equal "super secret message", e.attachment.data.get
+    e.attachment.data.delete
+    assert_nil e.attachment.data.get
+    e.save!
+
+    e = Email.find_one(e.id)
+    assert_nil e.attachment.data.get
+  end
+
+  should "be able to have multiple files keyed under a hash" do
+    e = Email.new(subject: "Hello, World!")
+    assert_equal Mongoo::GridFs::Files, e.notes.class
+    assert_nil e.notes.get("monday")
+    e.notes.put("tuesday", "Tuesday is a good day.")
+    assert_equal "Tuesday is a good day.", e.notes.get("tuesday")
+    e.insert!
+    e = Email.find_one(e.id)
+    assert_equal "Tuesday is a good day.", e.notes.get("tuesday")
+    e.notes.delete("tuesday")
+    assert_nil e.notes.get("tuesday")
+    e.update!
+    e = Email.find_one(e.id)
+    assert_nil e.notes.get("tuesday")
+  end
+
+end

data/test/test_mongoo.rb

@@ -9,6 +9,22 @@ class TestMongoo < Test::Unit::TestCase
     end
   end
 
+  should "respond to the correct attributes" do
+    assert Person.new.respond_to?("jobs")
+    assert !Person.new.respond_to?("cast")
+
+    assert !TvShow.new.respond_to?("jobs")
+    assert TvShow.new.respond_to?("cast")
+  end
+
+  should "have the right index meta" do
+    assert Person.index_meta["location.city"]
+    assert !Person.index_meta["cast.director"]
+
+    assert !TvShow.index_meta["location.city"]
+    assert TvShow.index_meta["cast.director"]
+  end
+
   should "be able to use a different db for each model" do
     assert_equal "mongoo-test", Mongoo.db.name
     assert_equal "mongoo-test", Person.db.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoo
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000 -07:00
+date: 2011-06-10 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2161066080 !ruby/object:Gem::Requirement
+  requirement: &2151904720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161066080
+  version_requirements: *2151904720
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161063520 !ruby/object:Gem::Requirement
+  requirement: &2151902760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161063520
+  version_requirements: *2151902760
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2161062040 !ruby/object:Gem::Requirement
+  requirement: &2151899180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161062040
+  version_requirements: *2151899180
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2161060660 !ruby/object:Gem::Requirement
+  requirement: &2151897040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161060660
+  version_requirements: *2151897040
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2161059080 !ruby/object:Gem::Requirement
+  requirement: &2151896120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161059080
+  version_requirements: *2151896120
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2161047120 !ruby/object:Gem::Requirement
+  requirement: &2151893780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161047120
+  version_requirements: *2151893780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161045260 !ruby/object:Gem::Requirement
+  requirement: &2151891820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161045260
+  version_requirements: *2151891820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161041560 !ruby/object:Gem::Requirement
+  requirement: &2151888440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2161041560
+  version_requirements: *2151888440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2161034660 !ruby/object:Gem::Requirement
+  requirement: &2151886720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161034660
+  version_requirements: *2151886720
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2161031960 !ruby/object:Gem::Requirement
+  requirement: &2151884780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161031960
+  version_requirements: *2151884780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2161029140 !ruby/object:Gem::Requirement
+  requirement: &2151882520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +132,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2161029140
+  version_requirements: *2151882520
 description: Simple object mapper for MongoDB
 email: ben.myles@gmail.com
 executables: []
@@ -152,12 +152,20 @@ files:
 - lib/mongoo.rb
 - lib/mongoo/attribute_proxy.rb
 - lib/mongoo/attribute_sanitizer.rb
+- lib/mongoo/attributes.rb
+- lib/mongoo/attributes/describe_dsl.rb
 - lib/mongoo/base.rb
 - lib/mongoo/changelog.rb
 - lib/mongoo/core.rb
 - lib/mongoo/cursor.rb
+- lib/mongoo/describe_dsl.rb
 - lib/mongoo/embedded/base.rb
+- lib/mongoo/embedded/core_mixin.rb
+- lib/mongoo/embedded/describe_dsl.rb
 - lib/mongoo/embedded/hash_proxy.rb
+- lib/mongoo/grid_fs/describe_dsl.rb
+- lib/mongoo/grid_fs/file.rb
+- lib/mongoo/grid_fs/files.rb
 - lib/mongoo/hash_ext.rb
 - lib/mongoo/identity_map.rb
 - lib/mongoo/modifiers.rb
@@ -167,6 +175,7 @@ files:
 - test/helper.rb
 - test/test_activemodel.rb
 - test/test_embedded.rb
+- test/test_grid_fs.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb
@@ -187,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2477631038074627607
+      hash: -2521719238518645958
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,6 +213,7 @@ test_files:
 - test/helper.rb
 - test/test_activemodel.rb
 - test/test_embedded.rb
+- test/test_grid_fs.rb
 - test/test_identity_map.rb
 - test/test_mongohash.rb
 - test/test_mongoo.rb