mongomodel 0.1.1 → 0.1.3

data/lib/mongomodel.rb

@@ -17,6 +17,7 @@ module MongoModel
   autoload :Attributes,       'mongomodel/concerns/attributes'
   autoload :AttributeMethods, 'mongomodel/concerns/attribute_methods'
   autoload :Associations,     'mongomodel/concerns/associations'
+  autoload :Translation,      'mongomodel/concerns/translation'
   autoload :Validations,      'mongomodel/concerns/validations'
   autoload :Callbacks,        'mongomodel/concerns/callbacks'
   autoload :Logging,          'mongomodel/concerns/logging'

data/lib/mongomodel/concerns/associations/base/association.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/module/introspection'
+
 module MongoModel
   module Associations
     module Base

data/lib/mongomodel/concerns/attributes.rb

@@ -69,12 +69,12 @@ module MongoModel
     
     private
       def class_for_type(type)
-        type = type.constantize
+        klass = type.constantize
         
-        if (subclasses + [name]).include?(type.to_s)
-          type
+        if (subclasses + [name]).include?(type)
+          klass
         else
-          raise DocumentNotFound, "Document not of the correct type (got #{type.to_s})"
+          raise DocumentNotFound, "Document not of the correct type (got #{type})"
         end
       rescue NameError
         self

data/lib/mongomodel/concerns/translation.rb

@@ -0,0 +1,10 @@
+module MongoModel
+  module Translation
+    extend ActiveModel::Translation
+    
+    # Set the i18n scope to overwrite ActiveModel.
+    def i18n_scope #:nodoc:
+      :mongomodel
+    end
+  end
+end

data/lib/mongomodel/concerns/validations.rb

@@ -14,11 +14,6 @@ module MongoModel
         
         property
       end
-      
-      # Set the i18n scope to overwrite ActiveModel.
-      def i18n_scope #:nodoc:
-        :mongomodel
-      end
     end
     
     def valid?

data/lib/mongomodel/embedded_document.rb

@@ -11,6 +11,8 @@ module MongoModel
     include Attributes
     include Properties
     
+    extend Translation
+    
     include Validations
     include Callbacks
     

data/lib/mongomodel/support/core_extensions.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 class Boolean < TrueClass; end
 
 class Symbol
@@ -9,52 +11,62 @@ class Symbol
   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:
+class Class
+  # Rubinius
+  if defined?(Class.__subclasses__)
+    def descendents
       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__.each {|k| subclasses << k; subclasses.concat k.descendents }
       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 = []
+  else
+    # MRI
+    begin
+      ObjectSpace.each_object(Class.new) {}
 
-      superclasses.each do |sup|
+      def descendents
+        subclasses = []
+        ObjectSpace.each_object(class << self; self; end) do |k|
+          subclasses << k unless k == self
+        end
+        subclasses
+      end
+    # JRuby
+    rescue StandardError
+      def descendents
+        subclasses = []
         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
+          subclasses << k if k < self
         end
         subclasses.uniq!
+        subclasses
       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 reachable?
+    eval("defined?(::#{self}) && ::#{self}.equal?(self)")
+  end
+  
   def subclasses
     Object.subclasses_of(self).map { |o| o.to_s }
   end
 end
+
+class Object
+    def remove_subclasses_of(*superclasses) #:nodoc:
+      Class.remove_class(*subclasses_of(*superclasses))
+    end
+  
+  # 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 |klass|
+      subclasses.concat klass.descendents.select {|k| k.name.blank? || k.reachable?}
+    end
+    subclasses
+  end
+end

data/lib/mongomodel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +10:30
+date: 2010-02-10 00:00:00 +10:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ files:
 - lib/mongomodel/concerns/properties.rb
 - lib/mongomodel/concerns/record_status.rb
 - lib/mongomodel/concerns/timestamps.rb
+- lib/mongomodel/concerns/translation.rb
 - lib/mongomodel/concerns/validations.rb
 - lib/mongomodel/concerns/validations/associated.rb
 - lib/mongomodel/document.rb