active_mongo 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/active_mongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_mongo}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mantas Masalskis"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-02-05}
   s.description = %q{Schemaless Mongo ORM for Rails 3.0}
   s.email = %q{mantas@idev.lt}
   s.extra_rdoc_files = [

data/lib/active_mongo.rb

@@ -4,9 +4,17 @@ include Mongo
 
 config = YAML::load(File.open("#{RAILS_ROOT}/config/mongo.yml"))[Rails.env]
 
-$mongo_conn = Connection.new(config["host"], config["port"], :pool_size => 5, :timeout => 5)
+$mongo_conn = Connection.new(config["host"], config["port"], :pool_size => 10, :timeout => 2)
 $mongo_db = $mongo_conn.db(config["database"])
 
+if defined?(PhusionPassenger)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if forked
+      $mongo_db.connect_to_master # Call db.connect_to_master to reconnect here
+    end
+  end
+end
+
 if config["user"]
   if !$mongo_db.authenticate(config["user"], config["password"])
     puts "Wrong MongoDB user and/or password!!!"

data/lib/active_mongo_collection.rb

@@ -28,11 +28,12 @@ ActiveMongo::Base.class_eval do
         end
       end
 
-      def self.find(attrs = {})
-        if attrs.class == String || attrs.class == Mongo::ObjectID
-          id = Mongo::ObjectID.from_string(attrs) if attrs.class == String
+      # def self.find(attrs = {})
+      def self.find(selector = nil, *attrs)
+        if selector.class == String || selector.class == Mongo::ObjectID
+          id = Mongo::ObjectID.from_string(selector) if selector.class == String
           
-          id ||= attrs
+          id ||= selector
           
           obj = self.collection.find_one(id)
           
@@ -42,11 +43,19 @@ ActiveMongo::Base.class_eval do
           
           return model
         else
-          attrs = self.scope.merge(attrs) if self.scope
+          selector = self.scope.merge(selector || {}) if self.scope
           
           ret = []
           
-          self.collection.find(attrs).to_a.map do |obj|
+          selector ||= {}
+          
+          selector.each do |key, value|
+            if key.to_s.match(/\_id$/) && value.class == String
+              selector[key] = Mongo::ObjectID.from_string(value)
+            end
+          end
+          
+          self.collection.find(selector, attrs[0] || {}).to_a.map do |obj|
             model = eval(self.name || @name).new
 
             obj.each {|key, value| model.set_var(key, value)  }

data/lib/active_mongo_has_many.rb

@@ -8,12 +8,16 @@ module ActiveMongo
       def internal_has_manies_set(name, attrs)
         @@internal_has_manies ||= {}
         
-        @@internal_has_manies[name.to_sym] = attrs if @@internal_has_manies[name].nil?
+        name = self.name.to_s+'___'+name.to_s
+        
+        @@internal_has_manies[name.to_sym] = attrs if @@internal_has_manies[name.to_sym].nil?
       end
     
       def internal_has_manies_get(name)
         @@internal_has_manies ||= {}
         
+        name = self.name.to_s+'___'+name.to_s
+        
         @@internal_has_manies[name.to_sym]
       end
       
@@ -24,7 +28,7 @@ module ActiveMongo
         return false if self.new_record?
         
         attrs[:class_name] ||= name.to_s.classify
-        attrs[:foreign_key] ||= name.to_s.singularize.underscore+"_id"
+        attrs[:foreign_key] ||= self.class.name.to_s.singularize.underscore+"_id"
         
         return eval(attrs[:class_name]).with_scope(attrs[:foreign_key] => self._id )
       end

data/lib/active_mongo_instance.rb

@@ -2,7 +2,7 @@ ActiveMongo::Base.class_eval do
   def initialize(*attr)
     @vars = []
     
-    attrs = attr[0] || {}
+    attrs = (attr[0] || {})
     
     if self.class.attr_accessible_get.any?
       attrs.delete_if {|key, value| !self.class.attr_accessible_get.include?(key.to_sym) }
@@ -28,6 +28,13 @@ ActiveMongo::Base.class_eval do
       h[var] = instance_variable_get("@#{var}")
     end
     
+    h.each do |key, value|
+      if key.to_s.match(/\_id$/) && value.class == String
+        h[key] = Mongo::ObjectID.from_string(value)
+      end
+    end
+    
+    
     return h
   end
   
@@ -117,12 +124,12 @@ ActiveMongo::Base.class_eval do
     return self
   end
   
-  def unset(var)
+  def unset(var, do_not_save = false)
     self.set_var(var, nil)
     
     @vars.delete var.to_sym
     
-    return false if self.new_record?
+    return false if self.new_record? || do_not_save
     
     hash = self.class.collection.find_one self._id
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_mongo
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mantas Masalskis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +00:00
+date: 2010-02-05 00:00:00 +00:00
 default_executable: 
 dependencies: []