active_mongo 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/active_mongo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_mongo}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mantas Masalskis"]

data/lib/active_mongo.rb

@@ -1,5 +1,5 @@
 require 'mongo'
-require 'lib/active_mongo_uniquenesss'
+require 'active_mongo_uniquenesss'
 include Mongo
 
 config = YAML::load(File.open("#{RAILS_ROOT}/config/mongo.yml"))[Rails.env]
@@ -7,7 +7,7 @@ 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_db = $mongo_conn.db(config["database"])
 
-require 'lib/active_mongo_has_many'
+require 'active_mongo_has_many'
 
 module ActiveMongo
   
@@ -18,10 +18,22 @@ module ActiveMongo
     include ActiveMongo::HasMany::InstanceMethods
     
     class << self; attr_accessor :scope; end
+    
+    def self.extended(klass)
+      class << klass
+        alias __old_name name
+        def name(*args, &blk)
+          return @name || self.__old_name
+        end
+      end
+    end    
+    
+    self.extended(self)  
+    
   end
 end
 
 
-require 'lib/active_mongo_collection'
-require 'lib/active_mongo_instance'
-require 'lib/active_mongo_scope'
+require 'active_mongo_collection'
+require 'active_mongo_instance'
+require 'active_mongo_scope'

data/lib/active_mongo_collection.rb

@@ -53,9 +53,6 @@ ActiveMongo::Base.class_eval do
       def self.extended(klass)
         class << klass
           alias __old_new new
-          def new(*args, &blk)
-            __old_new(*args, &blk).freeze
-          end
         end
       end    
       
@@ -64,11 +61,11 @@ ActiveMongo::Base.class_eval do
       def self.new(*attrs)
         attrs = attrs[0]
         
-        if self.scope
-          attrs ||= {}
-          attrs.merge!(self.scope)   
-        end
+        # if self.scope
+        #   attrs ||= {}
+        #   attrs.merge!(self.scope)   
+        # end
         
-        eval(self.name || @name).__old_new(attrs)
+        eval(self.name || @name).__old_new(attrs, :scope => self.scope)
       end
 end

data/lib/active_mongo_instance.rb

@@ -4,15 +4,11 @@ ActiveMongo::Base.class_eval do
     
     attrs = attr[0] || {}
     
-    self.class.attr_accessible_get.each do |field|
-    end
-    
-    
     if self.class.attr_accessible_get.any?
-      attrs.delete_if {|field| !self.class.attr_accessible_get.include?(field.to_sym) }
+      attrs.delete_if {|key, value| !self.class.attr_accessible_get.include?(key.to_sym) }
     end
     
-    attrs.merge!(self.class.scope) if self.class.scope
+    attrs.merge!(attr[1][:scope]) if attr[1] && attr[1][:scope]
     
     attrs.each do |key, value|
       self.set_var(key, value)
@@ -69,7 +65,7 @@ ActiveMongo::Base.class_eval do
   def update_attributes(*attrs)
     attrs = attrs[0]
     if self.class.attr_accessible_get.any?
-      attrs.delete_if {|field| !self.class.attr_accessible_get.include?(field.to_sym) }
+      attrs.delete_if {|key, value| !self.class.attr_accessible_get.include?(key.to_sym) }
     end
     
     attrs.each do |key, value|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_mongo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mantas Masalskis