mingo 0.1.3 → 0.1.5

data/lib/mingo.rb

@@ -2,6 +2,10 @@ require 'active_support/core_ext/hash/conversions'
 require 'mongo'
 require 'active_model'
 require 'hashie/dash'
+# for ObjectId:
+require 'thread'
+require 'socket'
+require 'digest/md5'
 
 BSON::ObjectId.class_eval do
   def self.[](id)
@@ -11,6 +15,25 @@ BSON::ObjectId.class_eval do
   def id
     self
   end
+  
+  def initialize(time_or_data = nil)
+    if Time === time_or_data or Date === time_or_data
+      @data = generate_from_time(time_or_data)
+    else
+      @data = time_or_data || generate
+    end
+  end
+  
+  private
+  
+  def generate_from_time(time)
+    oid = ''
+    oid += [time.to_i].pack("N")
+    oid += Digest::MD5.digest(Socket.gethostname)[0, 3]
+    oid += [Process.pid % 0xFFFF].pack("n")
+    oid += [get_inc].pack("N")[1, 3]
+    oid.unpack("C12")
+  end
 end
 
 class Mingo < Hashie::Dash
@@ -85,13 +108,13 @@ class Mingo < Hashie::Dash
       end
     end
     
-    def many(property, model, &block)
+    def many(property, *args, &block)
       proxy_class = block_given?? Class.new(ManyProxy, &block) : ManyProxy
       ivar = "@#{property}"
       
       define_method(property) {
         (instance_variable_defined?(ivar) && instance_variable_get(ivar)) ||
-          instance_variable_set(ivar, proxy_class.new(self, property, model))
+          instance_variable_set(ivar, proxy_class.new(self, property, *args))
       }
     end
   end

data/lib/mingo/many_proxy.rb

@@ -16,65 +16,63 @@ class Mingo
       end
     end
     
-    def initialize(parent, property, model)
+    def initialize(parent, property, mapping)
       @parent = parent
       @property = property
-      @model = model
-      @collection = nil
-      @embedded = (@parent[@property] ||= [])
-      @parent.changes.delete(@property)
-    end
-    
-    def find_options
-      @find_options ||= begin
-        decorator = self.class.decorate_with
-        decorate_block = self.class.decorate_each
-        
-        if decorator or decorate_block
-          {:convert => lambda { |doc|
-            @model.new(doc).tap do |obj|
-              obj.extend decorator if decorator
-              decorate_block.call(obj, @embedded) if decorate_block
-            end
-          }}
-        else
-          {}
-        end
-      end
+      # TODO: ugh, improve naming
+      @model, @self_referencing_key, @forward_referencing_key = analyze_mapping mapping
+      @counter_cache_field = "#{@property}_count"
+      @join_loaded = nil
+      @loaded = nil
     end
   
     undef :inspect
     undef :to_a if instance_methods.include? 'to_a'
   
     def object_ids
-      @embedded
+      join_docs = load_join
+      join_docs = join_docs.select(&Proc.new) if block_given?
+      join_docs.map { |doc| doc[@forward_referencing_key] }
+    end
+    
+    def size
+      (counter_cache? && counter_cache) || (@join_loaded && @join_loaded.size) || join_cursor.count
     end
     
     def include?(doc)
-      object_ids.include? convert(doc)
+      !!find_join_doc(doc.id)
     end
   
     def convert(doc)
-      doc.id
+      {@self_referencing_key => @parent.id, @forward_referencing_key => doc.id}
     end
   
     def <<(doc)
       doc = convert(doc)
-      @parent.update '$addToSet' => { @property => doc }
+      doc['_id'] = join_collection.save doc
+      change_counter_cache(1)
+      load_join << doc if @join_loaded
       unload_collection
-      @embedded << doc
       self
     end
   
     def delete(doc)
       doc = convert(doc)
-      @parent.update '$pull' => { @property => doc }
-      unload_collection
-      @embedded.delete doc
+      if join_doc = find_join_doc(doc[@forward_referencing_key])
+        join_collection.remove :_id => join_doc['_id']
+        change_counter_cache(-1)
+        unload_collection
+        @join_loaded.delete join_doc
+      end
+      doc
     end
     
     def loaded?
-      !!@collection
+      !!@loaded
+    end
+    
+    def find_by_ids(ids)
+      @model.find_by_ids(ids, {}, find_options)
     end
     
     def respond_to?(method, priv = false)
@@ -85,21 +83,81 @@ class Mingo
   
     def method_missing(method, *args, &block)
       load_collection
-      @collection.send(method, *args, &block)
+      @loaded.send(method, *args, &block)
     end
-  
-    def unload_collection
-      @collection = nil
+    
+    def join_collection
+      @join_collection ||= @parent.class.collection[@property.to_s]
+    end
+    
+    def counter_cache
+      @counter_cache ||= @parent[@counter_cache_field].to_i
+    end
+    
+    def counter_cache?
+      !!@parent[@counter_cache_field]
+    end
+    
+    def change_counter_cache(by)
+      @counter_cache = counter_cache + by
+      @parent.update '$inc' => { @counter_cache_field => by }
+    end
+    
+    # Example: {self => 'user_id', 'movie_id' => Movie}
+    def analyze_mapping(mapping)
+      model = self_referencing_key = forward_referencing_key = nil
+      mapping.each do |key, value|
+        if key == @parent.class then self_referencing_key = value.to_s
+        elsif value < Mingo
+          forward_referencing_key = key.to_s
+          model = value
+        end
+      end
+      [model, self_referencing_key, forward_referencing_key]
+    end
+    
+    def find_options
+      @find_options ||= begin
+        decorator = self.class.decorate_with
+        decorate_block = self.class.decorate_each
+        
+        if decorator or decorate_block
+          {:convert => lambda { |doc|
+            @model.new(doc).tap do |obj|
+              obj.extend decorator if decorator
+              if decorate_block
+                join_doc = find_join_doc(doc['_id'])
+                decorate_block.call(obj, join_doc)
+              end
+            end
+          }}
+        else
+          {}
+        end
+      end
+    end
+    
+    def load_join
+      @join_loaded ||= join_cursor.to_a
+    end
+    
+    def find_join_doc(forward_id)
+      load_join.find { |d| d[@forward_referencing_key] == forward_id }
+    end
+    
+    def join_cursor
+      # TODO: make options configurable
+      join_collection.find({@self_referencing_key => @parent.id}, :sort => '_id')
     end
   
     def load_collection
-      @collection ||= if @embedded.empty? then []
+      @loaded ||= if self.object_ids.empty? then []
       else find_by_ids(self.object_ids)
       end
     end
-    
-    def find_by_ids(ids)
-      @model.find_by_ids(ids, {}, find_options)
+  
+    def unload_collection
+      @loaded = nil
     end
   end
 end

metadata

@@ -1,81 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mingo
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
-- "Mislav Marohni\xC4\x87"
+authors:
+- Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-23 00:00:00 +02:00
+date: 2011-03-07 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157373800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157373800
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &2157373320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 62196427
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  type: :development
-  version_requirements: *id003
+  version_requirements: *2157373320
 description: Mingo is a minimal document-object mapper for MongoDB.
 email: mislav.marohnic@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/mingo/cursor.rb
 - lib/mingo/many_proxy.rb
@@ -83,36 +47,26 @@ files:
 has_rdoc: false
 homepage: http://github.com/mislav/mingo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Minimal Mongo
 test_files: []
-