mm_uses_uuid 0.0.16 → 0.0.18

data/lib/mm_uses_uuid.rb

@@ -24,7 +24,7 @@ class MongoMapper::Plugins::Associations::InArrayProxy
   def find_target
     return [] if ids.blank?
     if klass == UuidModel
-      UuidModel.find(*criteria[:_id])
+      out = *UuidModel.find(*criteria[:_id])
     else
       all
     end
@@ -32,93 +32,82 @@ class MongoMapper::Plugins::Associations::InArrayProxy
   
 end
 
-class UuidModel
-  
-  include MongoMapper::Document
-  
-  @@lsn_class_lookup ||= {}
-  
-  def self.add_lsn_mapping(ind, klass)
-    @@lsn_class_lookup[ind] = klass
-    @@class_lsn_lookup = @@lsn_class_lookup.invert
-  end
-  
-  def self.lsn_class_lookup
-    @@lsn_class_lookup
-  end
-  
-  def self.class_lsn_lookup
-    @@class_lsn_lookup
-  end
-  
-  def self.find(*ids)
-    ids = ids.flatten.uniq
-    ids_by_class = ids.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |id, hsh|
-      lsn = id.to_s[-1].hex
-      klass = @@lsn_class_lookup[lsn]
-      if klass.nil?
-        raise "expected to find a class in @@lsn_class_lookup[#{lsn}] of the MongoMapper module but there was no entry. You need to set uuid_lsn in your class."
-      end
-      hsh[klass] << id
-    end
-    result = ids_by_class.map {|klass, ids| klass.find(ids)} .flatten
-    ids.length == 1 ? result.first : result
-  end
-  
-  def self.find!(*ids)
-    ids = ids.flatten.uniq
-    raise MongoMapper::DocumentNotFound, "Couldn't find without an ID" if ids.size == 0
-    find(*ids).tap do |result|
-      if result.nil? || ids.size != Array(result).size
-        raise MongoMapper::DocumentNotFound, "Couldn't find all of the ids (#{ids.join(',')}). Found #{Array(result).size}, but was expecting #{ids.size}"
-      end
-    end
-  end
-
-end
-
 module MmUsesUuid
   extend ActiveSupport::Concern
 
   included do
-    key :_id, BsonUuid
+    key :_id, BsonUuid, :default => lambda { make_uuid }
   end
 
   module ClassMethods
     
-    def find(*args)
-      args = convert_ids_to_BSON(args)
-      super(args)
+    def serialize_id(object)
+      case object
+      when MongoMapper::Document, MongoMapper::EmbeddedDocument
+        object.id.to_s
+      else
+        object.to_s
+      end       
     end
     
-    def find!(*args)
-      args = convert_ids_to_BSON(args)
-      super(args)
+    def deserialize_id(id)
+      BSON::Binary.new(id, BSON::Binary::SUBTYPE_UUID)
     end
     
-    def convert_ids_to_BSON(args)
-      args.flatten!
-      if args.size > 1
-        args.map! {|id| BsonUuid.to_mongo(id)}
+    def make_uuid
+      uuid = SecureRandom.uuid.gsub!('-', '')
+      if single_collection_inherited? and not embeddable?
+        lookup_class_name = collection_name.singularize.camelize
       else
-        args = BsonUuid.to_mongo(args.first)
+        lookup_class_name = name
       end
-      args
+      replacement_lsn = UuidModel.class_lsn_lookup[lookup_class_name] || 0x00
+      uuid[-2..-1] = replacement_lsn.to_s(16).rjust(2,'0')
+      BSON::Binary.new(uuid, BSON::Binary::SUBTYPE_UUID)
+      
+    rescue => e
+      binding.pry
+      raise e
     end
     
-    def new(params = {})
-      passed_id = params.delete(:id) || params.delete(:_id) || params.delete('id') || params.delete('_id')
-      new_object = super(params)
-      if passed_id.is_a?(BSON::Binary) and passed_id.subtype == BSON::Binary::SUBTYPE_UUID
-        new_object.id = passed_id
-      else
-        new_object.find_new_uuid
-      end
-      new_object
+    def find(*ids)
+      batch_mode = ids.first.is_a?(Array) || ids.length > 1
+      ids.flatten!
+      ids = convert_ids_to_BSON(ids)
+      results = super(ids)
+      batch_mode ? results : results.first
+    end
+    
+    def find!(*ids)
+      batch_mode = ids.first.is_a?(Array) || ids.length > 1
+      ids.flatten!
+      ids = convert_ids_to_BSON(ids)
+      results = super(ids)
+      batch_mode ? results : results.first
     end
+    
+    def convert_ids_to_BSON(ids)
+      ids.map {|id| BsonUuid.to_mongo(id)}
+    end
+    
+    # def new(params = {})
+      # passed_id = params.delete(:id) || params.delete(:_id) || params.delete('id') || params.delete('_id')
+      # new_object = super(params)
+      # if passed_id
+        # if passed_id.is_a?(BSON::Binary) and passed_id.subtype == BSON::Binary::SUBTYPE_UUID
+          # new_object.id = passed_id
+        # else
+          # raise ArgumentError, "if you pass an explicit :id parameter it must be a valid BSON::Binary::SUBTYPE_UUID"
+        # end
+      # else
+        # new_object.find_new_uuid
+      # end
+      # new_object
+    # end
 
     def uuid_lsn(lsn_integer)
-      UuidModel.add_lsn_mapping(lsn_integer, self)
+      raise "lsn_integer must be from 0-255" unless (0..255).cover?(lsn_integer)
+      UuidModel.add_lsn_mapping(lsn_integer, self.name)
     end
     
   end
@@ -129,8 +118,8 @@ module MmUsesUuid
     options = {force_safe: false}.merge(options)
       
     if not options[:ensure_unique_in]
-      @_id, variant = make_uuid
-      #puts "assuming #{variant} UUID #{@_id} is available"
+      @_id = make_uuid
+      #puts "assuming UUID #{@_id} is available"
       return
     else
       find_new_uuid_safely(options[:ensure_unique_in])
@@ -142,8 +131,8 @@ module MmUsesUuid
 
     @_id = nil
     begin
-      trial_id, variant = make_uuid
-      #puts "CHECKING #{coll} collection for availability of #{variant} UUID: #{trial_id}"
+      trial_id = make_uuid
+      #puts "CHECKING #{coll} collection for availability of UUID: #{trial_id}"
       if coll.where(:_id => trial_id).fields(:_id).first.nil?
         @_id = trial_id
       end
@@ -152,17 +141,7 @@ module MmUsesUuid
   end
   
   def make_uuid
-    uuid = SecureRandom.uuid.gsub!('-', '')
-    if self.class.single_collection_inherited?
-      lookup_class = self.class.collection_name.singularize.camelize.constantize
-    else
-      lookup_class = self.class
-    end
-    if replacement_lsn = UuidModel.class_lsn_lookup[lookup_class]
-      uuid[-1] = replacement_lsn.to_s(16)
-    end
-    bson_encoded_uuid = BSON::Binary.new(uuid, BSON::Binary::SUBTYPE_UUID)
-    return bson_encoded_uuid, 'random'
+    self.class.make_uuid
   end
   
   def id_to_s!
@@ -177,3 +156,132 @@ module MmUsesUuid
   end
   
 end
+
+class UuidModel
+  
+  include MongoMapper::Document
+  plugin  MmUsesUuid
+  
+  @@lsn_class_lookup ||= {}
+  
+  class << self
+  
+    def add_lsn_mapping(ind, class_name)
+      class_name = class_name.to_s
+      if current_class_name = @@lsn_class_lookup[ind]
+        raise "cannont assign #{class_name} to #{ind} as #{current_class_name} is already assigned to that LSN"
+      end
+      @@lsn_class_lookup[ind] = class_name
+      @@class_lsn_lookup = @@lsn_class_lookup.invert
+    end
+    
+    def lsn_class_lookup
+      @@lsn_class_lookup
+    end
+    
+    def class_lsn_lookup
+      @@class_lsn_lookup
+    end
+    
+    def class_name_from_id(id, options = {})
+      lsn = id.to_s[-2..-1].hex
+      class_name = @@lsn_class_lookup[lsn]
+      if class_name.nil? and options[:error_if_no_lsn_match]
+        raise "expected to find a class name in @@lsn_class_lookup[#{lsn}] of the MongoMapper module but there was no entry. You need to set uuid_lsn in your class."
+      end
+      class_name
+    end
+    
+    def find_by_id(id)
+      find id
+    end
+    
+    def find(*args)
+      
+      # raise "foo"
+      
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      fields  = *options[:fields]
+      fields  = nil if fields.empty?
+      batch_mode = args.first.is_a?(Array) || args.length > 1
+      ids = args.flatten.uniq
+      ids.map! {|id| BsonUuid.to_mongo(id)}
+      
+      ids_by_model = ids.each_with_object(Hash.new { |hash, key| hash[key] = [] }) do |id, hsh|
+        model_name = class_name_from_id(id, options)
+        hsh[model_name.constantize] << id if model_name
+      end
+      
+      if defined? Celluloid
+        
+        #NOTE: because IdentityMap is in the current thread only...
+        #we have to manage it ourselves if using Celluloid
+        
+        im_results = []
+        
+        unless fields
+          ids_by_model.clone.each do |model, model_ids|
+            model_ids.each do |model_id|
+              doc = model.get_from_identity_map(model_id)
+              if doc
+                im_results << doc
+                ids_by_model[model].delete model_id
+              end
+            end
+            ids_by_model.delete(model) if ids_by_model[model].empty?
+          end
+        end
+      
+        future_db_results = ids_by_model.map do |model, model_ids|
+          query = model.where(:id => model_ids)
+          query = query.fields(fields) if fields
+          Celluloid::Future.new { query.all }
+        end
+        
+        db_results = future_db_results.map(&:value).flatten
+        
+        if fields
+          db_results.each(&:remove_from_identity_map)
+        else
+          db_results.each(&:add_to_identity_map)
+        end
+        
+        results = im_results + db_results
+        
+      else
+        
+        #NOTE: as this is in the current thread, IdentityMap management is normal
+        
+        results = ids_by_model.map do |model, model_ids|
+          if fields
+            model.where(:id => model_ids).fields(fields).all #models will be removed from the map
+          else
+            model.find model_ids #we use this so that we read and write to the identity map
+          end
+        end.flatten
+
+      end
+      
+      batch_mode ? results : results.first
+      
+    # rescue => e
+      # binding.pry
+    end
+    alias_method :find_with_fields, :find
+    
+    def find!(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      options.merge(:error_if_no_lsn_match => true)
+      ids = args.flatten.uniq
+      raise MongoMapper::DocumentNotFound, "Couldn't find without an ID" if ids.size == 0
+      find(*ids, options).tap do |result|
+        if result.nil? || ids.size != Array(result).size
+          raise MongoMapper::DocumentNotFound, "Couldn't find all of the ids (#{ids.join(',')}). Found #{Array(result).size}, but was expecting #{ids.size}"
+        end
+      end
+    end
+    alias_method :find_with_fields!, :find!
+
+  end
+
+end

data/lib/mm_uses_uuid/bson_binary_mixin.rb

@@ -18,8 +18,12 @@ module BSON
       end
     end
     
+    def hash
+      [@str, @subtype].hash
+    end
+    
     def eql?(value)
-      self.to_s == value.to_s
+      @str.eql?(value.to_s) && @subtype.eql?(value.subtype)
     end
 
   end

data/lib/mm_uses_uuid/version.rb

@@ -1,3 +1,3 @@
 module MmUsesUuid
-  VERSION = "0.0.16"
+  VERSION = "0.0.18"
 end

data/spec/mm_uses_uuid_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../../lib/mm_uses_uuid', __FILE__)
 require 'ruby-debug'
+require 'pry'
 
 describe MmUsesUuid do
   
@@ -10,7 +11,7 @@ describe MmUsesUuid do
       
       key  :name, String
       belongs_to :owner, :class_name => 'UuidModel', :required => true
-      many :people, :class_name => 'Person'
+      has_many :people, :class_name => 'Person'
       
       uuid_lsn 0
       
@@ -23,8 +24,8 @@ describe MmUsesUuid do
       key :name
       key :age
       
-      key  :interest_ids, Array
-      many :interests, :in => :interest_ids, :class_name => 'UuidModel' # this allows many-to-many polymorphic interests without the need for groups and people to be stored in a single collection
+      key  :interest_ids, Set
+      has_many :interests, :in => :interest_ids, :class_name => 'UuidModel' # this allows many-to-many polymorphic interests without the need for groups and people to be stored in a single collection
       
       belongs_to :group
       
@@ -79,6 +80,12 @@ describe MmUsesUuid do
     person = Person.find_by_name 'Jon'
     person.interests.map(&:name).should include(@person.name, @group.name)
   end
+  
+  it "should return an array for many to many associations when there is only one associated item" do
+    person = Person.new
+    person.interests << @group
+    person.interests.should be_an_instance_of(Array)
+  end
 
   it "should not set a new uuid if one as passed as a param" do
     group_with_passed_id = Group.new(:id => BSON::Binary.new("3333333333334333y333333333333330", BSON::Binary::SUBTYPE_UUID))

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mm_uses_uuid
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.16
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Jonathan Chambers
@@ -10,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 Z
+date: 2012-12-21 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -20,6 +25,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 7
         version: "2.7"
   type: :development
   version_requirements: *id001
@@ -31,6 +39,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :development
   version_requirements: *id002
@@ -42,6 +54,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 1
         version: 0.10.1
   type: :runtime
   version_requirements: *id003
@@ -65,6 +81,7 @@ files:
 - lib/mm_uses_uuid/version.rb
 - mm_uses_uuid.gemspec
 - spec/mm_uses_uuid_spec.rb
+has_rdoc: true
 homepage: https://github.com/jmchambers/mm_uses_uuid
 licenses: 
 - MIT
@@ -78,20 +95,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: UUIDs for MM
 test_files: []
 
-has_rdoc: