mm_uses_uuid 0.0.13 → 0.0.14

data/lib/mm_uses_uuid.rb

@@ -36,21 +36,42 @@ class UuidModel
   
   include MongoMapper::Document
   
-  @@lsn_class ||= []
+  @@lsn_class_lookup ||= {}
   
-  def self.find(*args)
-    args.flatten!
-    single_id = args.length == 1 ? true : false
-    ids_by_class = {}
-    args.each do |id|
+  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.flatten!
+    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[lsn]
-      raise "expected to find a class in @@lsn_class[#{lsn}] of the MongoMapper module but there was no entry. You need to set uuid_lsn in you class." if klass.nil?
-      ids_by_class[klass] ||= []
-      ids_by_class[klass] << id
+      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
-    single_id ? result.first : result
+    ids.length == 1 ? result.first : result
+  end
+  
+  def self.find!(*ids)
+    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
@@ -96,13 +117,9 @@ module MmUsesUuid
     end
 
     def uuid_lsn(lsn_integer)
-      add_class_lsn(self, lsn_integer)
+      UuidModel.add_lsn_mapping(lsn_integer, self)
     end
     
-    def add_class_lsn(klass, lsn_integer)
-      UuidModel.class_eval "@@lsn_class[#{lsn_integer}] = #{klass}"
-    end
-
   end
 
    
@@ -135,8 +152,12 @@ module MmUsesUuid
   
   def make_uuid
     uuid = SecureRandom.uuid.gsub!('-', '')
-    lsn_class = UuidModel.class_variable_get('@@lsn_class')
-    if replacement_lsn = lsn_class.index(self.class)
+    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)

data/lib/mm_uses_uuid/version.rb

@@ -1,3 +1,3 @@
 module MmUsesUuid
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/mm_uses_uuid_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../lib/mm_uses_uuid', __FILE__)
+require 'ruby-debug'
 
 describe MmUsesUuid do
   
@@ -8,6 +9,7 @@ describe MmUsesUuid do
       plugin  MmUsesUuid
       
       key  :name, String
+      belongs_to :owner, :class_name => 'UuidModel', :required => true
       many :people, :class_name => 'Person'
       
       uuid_lsn 0
@@ -38,19 +40,25 @@ describe MmUsesUuid do
   before(:each) do
     #we have to use a before(:each) to get the stubbing to work :(
     SecureRandom.stub!(:uuid).and_return(
-      "11111111-1111-4111-y111-111111111111",
       "22222222-2222-4222-y222-222222222222",
+      "11111111-1111-4111-y111-111111111111",
       "11111111-1111-4111-y111-111111111111", #we repeat these so that our safe uuid creation tests will detect a collision and be forced to search
       "11111111-1111-4111-y111-111111111111",
       "11111111-1111-4111-y111-111111111111",
       "33333333-3333-4333-y333-333333333333"
     )
-    @group  = Group.create(name: 'mongo_mapper fanclub')
     
     @person = Person.new(name: 'Jon', age: 33)
+    @person.save
+    
+    @group = Group.new(name: 'mongo_mapper fanclub')
+    @group.owner = @person
+    @group.save
+    
     @person.interests << @group
     @person.interests << @person #I'm very self-centred
     @person.save
+    
   end
   
   it "should cause newly initialized objects to have a BSON::Binary uuid" do
@@ -103,16 +111,32 @@ describe MmUsesUuid do
   
   context 'finding by uuid' do
     
-    it "with a BSON::Binary uuid" do
-      found_group = Group.find(@group._id)
+    it "should find with a BSON::Binary uuid" do
+      found_group = UuidModel.find(@group._id)
       found_group._id.should == @group._id
     end
     
-    it "with a String uuid" do
-      found_group = Group.find(@group._id.to_s)
+    it "should find with a String uuid" do
+      found_group = UuidModel.find(@group._id.to_s)
       found_group._id.should == @group._id
     end
     
+    it "find! should raise an error if an id is not found" do
+      lambda { UuidModel.find! "ffffffffffff4fffyffffffffffffff0" }.should raise_error(MongoMapper::DocumentNotFound)
+    end
+    
+    it "find! should raise an error if one of many ids is not found" do
+      lambda { UuidModel.find! "ffffffffffff4fffyffffffffffffff0", @group._id }.should raise_error(MongoMapper::DocumentNotFound)
+    end
+    
+  end
+  
+  context "finding indirectly via belongs_to assoc" do
+    
+    it "should find associated objects" do
+      @group.owner.should == @person
+    end
+    
   end
   
   after(:each) do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mm_uses_uuid
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 13
-  version: 0.0.13
+  prerelease: 
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jonathan Chambers
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 +01:00
-default_executable: 
+date: 2012-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
         version: "2.7"
   type: :development
   version_requirements: *id001
@@ -39,10 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :development
   version_requirements: *id002
@@ -54,10 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 1
         version: 0.10.1
   type: :runtime
   version_requirements: *id003
@@ -81,7 +65,6 @@ 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
@@ -95,23 +78,20 @@ 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.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: UUIDs for MM
 test_files: []
 
+has_rdoc: