Merge branch 'master' into new-views

* master: Meta#+ support modulized metas now
yrashk · Apr 29, 2008 · ffd6043 · ffd6043
2 parents 04b4120 + 7ba89cc
commit ffd6043
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/strokedb/document/meta.rb b/lib/strokedb/document/meta.rb
@@ -86,9 +86,10 @@ def +(meta)
         new_meta.module_eval do
           extend Meta
         end
-        new_meta_name = new_meta.instance_variable_get(:@metas).map{|m| m.name}.join('__')
-        Object.send(:remove_const, new_meta_name) rescue nil
-        Object.const_set(new_meta_name, new_meta)
+        new_meta_name = new_meta.instance_variable_get(:@metas).map{|m| m.name.demodulize}.join('__')
+        mod = self.name.modulize.constantize rescue Object
+        mod.send(:remove_const, new_meta_name) rescue nil
+        mod.const_set(new_meta_name, new_meta)
         new_meta
       elsif is_a?(Document) && meta.is_a?(Document)
         (Document.new(store, self.to_raw.except('uuid','version','previous_version'), true) +