mongomodel 0.1 → 0.1.1

data/Rakefile

@@ -30,7 +30,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "mongomodel"
     gem.summary = "MongoDB ORM for Ruby/Rails"
-    gem.description = "MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord, DataMapper."
+    gem.description = "MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper."
     gem.email = "sam@sampohlenz.com"
     gem.homepage = "http://github.com/spohlenz/mongomodel"
     gem.authors = ["Sam Pohlenz"]

data/lib/mongomodel/concerns/attributes.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/module/aliasing'
-require 'active_support/core_ext/class/removal'
 
 module MongoModel
   module Attributes

data/lib/mongomodel/document/persistence.rb

@@ -5,7 +5,7 @@ module MongoModel
       
       included do
         undef_method :id if method_defined?(:id)
-        property :id, String, :as => '_id', :default => lambda { ::Mongo::ObjectID.new.to_s }
+        property :id, String, :as => '_id', :default => lambda { |doc| doc.generate_id }
         
         class_inheritable_writer :collection_name
       end
@@ -50,6 +50,10 @@ module MongoModel
         self.class.database
       end
       
+      def generate_id
+        ::Mongo::ObjectID.new.to_s
+      end
+      
       module ClassMethods
         def create(attributes={}, &block)
           if attributes.is_a?(Array)

data/lib/mongomodel/support/core_extensions.rb

@@ -8,3 +8,53 @@ class Symbol
   define_method(:asc) { MongoModel::MongoOrder::Clause.new(self, :ascending) }
   define_method(:desc) { MongoModel::MongoOrder::Clause.new(self, :descending) }
 end
+
+class Object
+  begin
+    ObjectSpace.each_object(Class.new) {}
+
+    # Exclude this class unless it's a subclass of our supers and is defined.
+    # We check defined? in case we find a removed class that has yet to be
+    # garbage collected. This also fails for anonymous classes -- please
+    # submit a patch if you have a workaround.
+    def subclasses_of(*superclasses) #:nodoc:
+      subclasses = []
+
+      superclasses.each do |sup|
+        ObjectSpace.each_object(class << sup; self; end) do |k|
+          if k != sup && (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+            subclasses << k
+          end
+        end
+      end
+
+      subclasses
+    end
+  rescue RuntimeError
+    # JRuby and any implementations which cannot handle the objectspace traversal
+    # above fall back to this implementation
+    def subclasses_of(*superclasses) #:nodoc:
+      subclasses = []
+
+      superclasses.each do |sup|
+        ObjectSpace.each_object(Class) do |k|
+          if superclasses.any? { |superclass| k < superclass } &&
+            (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+            subclasses << k
+          end
+        end
+        subclasses.uniq!
+      end
+      subclasses
+    end
+  end
+end
+
+class Class
+  # Returns an array with the names of the subclasses of +self+ as strings.
+  #
+  #   Integer.subclasses # => ["Bignum", "Fixnum"]
+  def subclasses
+    Object.subclasses_of(self).map { |o| o.to_s }
+  end
+end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/spec/mongomodel/document_spec.rb

@@ -10,7 +10,7 @@ module MongoModel
       property = Document.properties[:id]
       property.name.should == :id
       property.as.should == '_id'
-      property.default(mock('instance')).should_not be_nil
+      property.default(mock('instance', :generate_id => 'abc-123')).should == 'abc-123'
     end
     
     describe "single collection inheritance" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 +10:30
+date: 2010-01-28 00:00:00 +10:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.18.3
     version: 
-description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord, DataMapper.
+description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: sam@sampohlenz.com
 executables: 
 - console