mongoid 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/mongoid.rb

@@ -50,6 +50,7 @@ require "mongoid/errors"
 require "mongoid/field"
 require "mongoid/fields"
 require "mongoid/finders"
+require "mongoid/identity"
 require "mongoid/indexes"
 require "mongoid/memoization"
 require "mongoid/named_scope"

data/lib/mongoid/associations/has_many.rb

@@ -41,7 +41,7 @@ module Mongoid #:nodoc:
         object = type ? type.instantiate : @klass.instantiate
         object.parentize(@parent, @association_name)
         object.write_attributes(attrs)
-        object.generate_key
+        object.identify
         @documents << object
         object
       end

data/lib/mongoid/attributes.rb

@@ -38,7 +38,7 @@ module Mongoid #:nodoc:
           if Mongoid.allow_dynamic_fields && !respond_to?("#{key}=")
             @attributes[key] = value
           else
-            set_unless_blank(key, value)
+            send("#{key}=", value)
           end
         end
       end
@@ -136,10 +136,6 @@ module Mongoid #:nodoc:
         end
       end
 
-      # Sets the attirbute value unless it is a blank string.
-      def set_unless_blank(name, value)
-        send("#{name}=", value) unless (value.is_a?(String) && value.blank?)
-      end
     end
 
     module ClassMethods

data/lib/mongoid/document.rb

@@ -84,7 +84,7 @@ module Mongoid #:nodoc:
       #   end
       def key(*fields)
         self.primary_key = fields
-        before_save :generate_key
+        before_save :identify
       end
 
       # Macro for setting the collection name to store in.
@@ -138,12 +138,8 @@ module Mongoid #:nodoc:
       end
 
       # Generate an id for this +Document+.
-      def generate_key
-        if primary_key
-          @attributes[:_id] = extract_keys.join(" ").identify
-        else
-          @attributes[:_id] = Mongo::ObjectID.new.to_s unless id
-        end
+      def identify
+        Identity.create(self)
       end
 
       # Instantiate a new +Document+, setting the Document's attributes if
@@ -165,12 +161,12 @@ module Mongoid #:nodoc:
         process(defaults.merge(attrs))
         @new_record = true if id.nil?
         document = yield self if block_given?
-        generate_key; generate_type; document
+        identify
       end
 
       # Returns the class name plus its attributes.
       def inspect
-        attrs = fields.map { |name, field| "#{name}: #{@attributes[name] || 'nil'}" } * ", "
+        attrs = fields.map { |name, field| "#{name}: #{@attributes[name].inspect}" } * ", "
         "#<#{self.class.name} _id: #{id}, #{attrs}>"
       end
 
@@ -276,16 +272,6 @@ module Mongoid #:nodoc:
         clear ? @attributes.delete(name) : @attributes.insert(name, child.attributes)
         notify
       end
-
-      protected
-      def generate_type
-        @attributes[:_type] ||= self.class.name
-      end
-
-      def extract_keys
-        primary_key.collect { |key| @attributes[key] }.reject { |val| val.nil? }
-      end
-
     end
 
   end

data/lib/mongoid/extensions/hash/assimilation.rb

@@ -21,7 +21,7 @@ module Mongoid #:nodoc:
           klass = type ? type : options.klass
           child = klass.instantiate(:_parent => parent)
           child.write_attributes(self.merge(:_type => klass.name))
-          child.generate_key
+          child.identify
           child.assimilate(parent, options)
         end
       end

data/lib/mongoid/identity.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+module Mongoid #:nodoc:
+  class Identity #:nodoc:
+    class << self
+      # Create the identity for the +Document+.
+      #
+      # The id will be set in either in the form of a Mongo
+      # +ObjectID+ or a composite key set up by defining a key on the document.
+      #
+      # The _type will be set to the document's class name.
+      def create(doc)
+        identify(doc); type(doc); doc
+      end
+
+      protected
+      # Set the id for the document.
+      def identify(doc)
+        doc.id = compose(doc).join(" ").identify if doc.primary_key
+        doc.id = Mongo::ObjectID.new.to_s unless doc.id
+      end
+
+      # Set the _type field on the document.
+      def type(doc)
+        doc._type = doc.class.name
+      end
+
+      # Generates the composite key for a document.
+      def compose(doc)
+        doc.primary_key.collect { |key| doc.attributes[key] }.reject { |val| val.nil? }
+      end
+    end
+  end
+end

data/mongoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-14}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/field.rb",
      "lib/mongoid/fields.rb",
      "lib/mongoid/finders.rb",
+     "lib/mongoid/identity.rb",
      "lib/mongoid/indexes.rb",
      "lib/mongoid/memoization.rb",
      "lib/mongoid/named_scope.rb",
@@ -136,6 +137,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/fields_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
+     "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",
@@ -204,6 +206,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/field_spec.rb",
      "spec/unit/mongoid/fields_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
+     "spec/unit/mongoid/identity_spec.rb",
      "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/named_scope_spec.rb",

data/spec/spec_helper.rb

@@ -60,7 +60,7 @@ class Person
   has_many_related :posts
 
   def score_with_rescoring=(score)
-    @rescored = score + 20
+    @rescored = score.to_i + 20
     self.score_without_rescoring = score
   end
 

data/spec/unit/mongoid/attributes_spec.rb

@@ -223,7 +223,7 @@ describe Mongoid::Attributes do
         attrs[:age].should == 30
         attrs[:terms].should == true
         attrs[:_id].should == "1"
-        attrs[:score].should be_nil
+        attrs[:score].should == ""
       end
 
     end

data/spec/unit/mongoid/extensions/integer/conversions_spec.rb

@@ -4,18 +4,46 @@ describe Mongoid::Extensions::Integer::Conversions do
 
   describe "#set" do
 
-    context "when string is a number" do
+    context "when the value is a number" do
 
-      it "converts the string to an Integer" do
-        Integer.set("32").should == 32
+      it "converts the number to an integer" do
+        Integer.set(3).should == 3
       end
 
     end
 
-    context "when string is not a number" do
+    context "when the string is not a number" do
+
+      context "when the string is non numerical" do
+
+        it "returns the string" do
+          Integer.set("foo").should == "foo"
+        end
+
+      end
+
+      context "when the string is numerical" do
+
+        it "returns the integer value for the string" do
+          Integer.set("3").should == 3
+        end
+
+      end
+
+      context "when the string is empty" do
+
+        it "returns an empty string" do
+          Integer.set("").should be_blank
+        end
+
+      end
+
+      context "when the string is nil" do
+
+        it "returns nil" do
+          Integer.set(nil).should be_nil
+        end
 
-      it "returns the string" do
-        Integer.set("foo").should == "foo"
       end
 
     end
@@ -25,7 +53,7 @@ describe Mongoid::Extensions::Integer::Conversions do
   describe "#get" do
 
     it "returns the integer" do
-      Integer.get(44).should == 44
+      Integer.get(3).should == 3
     end
 
   end

data/spec/unit/mongoid/identity_spec.rb

@@ -0,0 +1,68 @@
+require "spec_helper"
+
+describe Mongoid::Identity do
+
+  describe ".create" do
+
+    let(:name) { Name.new }
+
+    it "sets the document _type to the class name" do
+      Mongoid::Identity.create(name)
+      name._type.should == "Name"
+    end
+
+    it "returns the document" do
+      Mongoid::Identity.create(name).should == name
+    end
+
+    context "when the document has a primary key" do
+
+      before do
+        @address = Address.allocate
+        @address.instance_variable_set(:@attributes, { :street => "Market St"})
+      end
+
+      it "sets the id to the composite key" do
+        Mongoid::Identity.create(@address)
+        @address.id.should == "market-st"
+      end
+
+    end
+
+    context "when the document has no primary key" do
+
+      context "when the document has no id" do
+
+        before do
+          @person = Person.allocate
+          @person.instance_variable_set(:@attributes, {})
+          @object_id = stub(:to_s => "1")
+          Mongo::ObjectID.expects(:new).returns(@object_id)
+        end
+
+        it "sets the id to a mongo object id" do
+          Mongoid::Identity.create(@person)
+          @person.id.should == "1"
+        end
+
+      end
+
+      context "when the document has an id" do
+
+        before do
+          @person = Person.allocate
+          @person.instance_variable_set(:@attributes, { :_id => "5" })
+        end
+
+        it "returns the existing id" do
+          Mongoid::Identity.create(@person)
+          @person.id.should == "5"
+        end
+
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Durran Jordan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -05:00
+date: 2010-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,6 +139,7 @@ files:
 - lib/mongoid/field.rb
 - lib/mongoid/fields.rb
 - lib/mongoid/finders.rb
+- lib/mongoid/identity.rb
 - lib/mongoid/indexes.rb
 - lib/mongoid/memoization.rb
 - lib/mongoid/named_scope.rb
@@ -202,6 +203,7 @@ files:
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/fields_spec.rb
 - spec/unit/mongoid/finders_spec.rb
+- spec/unit/mongoid/identity_spec.rb
 - spec/unit/mongoid/indexes_spec.rb
 - spec/unit/mongoid/memoization_spec.rb
 - spec/unit/mongoid/named_scope_spec.rb
@@ -292,6 +294,7 @@ test_files:
 - spec/unit/mongoid/field_spec.rb
 - spec/unit/mongoid/fields_spec.rb
 - spec/unit/mongoid/finders_spec.rb
+- spec/unit/mongoid/identity_spec.rb
 - spec/unit/mongoid/indexes_spec.rb
 - spec/unit/mongoid/memoization_spec.rb
 - spec/unit/mongoid/named_scope_spec.rb