mm-files 0.0.1 → 0.0.2

data/lib/mm-files.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module MmFiles
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end
 
 require 'mongomapper'

data/lib/mm-files/file.rb

@@ -23,7 +23,7 @@ module MongoMapper
 
     def self.fetch(owner, filename)
       db = owner.class.database
-      criteria, options = FinderOptions.new(:filename => filename, :metadata => owner.id, :limit => 1).to_a
+      criteria, options = FinderOptions.new(:filename => filename, :metadata => {:_id => owner.id}, :limit => 1).to_a
 
       obj = db.collection("#{owner.collection.name}.files").find(criteria, options).next_object
       if obj

data/lib/mm-files/files.rb

@@ -1,16 +1,16 @@
 module MongoMapper
   module Files
-    def self.included?(model)
+    def self.included(model)
       model.class_eval do
         after_create :_sync_pending_files
       end
     end
 
-    def put_file(filename, data)
+    def put_file(filename, data, metadata = {})
       if !new?
         XGen::Mongo::GridFS::GridStore.open(self.class.database, filename, "w",
                                             :root => self.collection.name,
-                                            :metadata => self.id) do |f|
+                                            :metadata => metadata.deep_merge({:_id => self.id})) do |f|
           f << data
         end
       else
@@ -23,7 +23,7 @@ module MongoMapper
     end
 
     def files
-      criteria, options = FinderOptions.new(:metadata => self.id).to_a
+      criteria, options = FinderOptions.new(:metadata => {:_id => self.id}).to_a
       coll = self.class.database.collection("#{self.collection.name}.files")
       @files = coll.find(criteria, options).map do |a|
         MongoMapper::File.new(self, a)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mm-files
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Cuadrado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -05:00
+date: 2009-08-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency