mongo_doc 0.6.3 → 0.6.4

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.2) 2010/06/25
+Version: Hurricane (0.6.4) 2010/07/07
 
 h2. Notes
 

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/features/step_definitions/document_steps.rb

@@ -123,6 +123,12 @@ Then /^the document '(.+)' does not roundtrip$/ do |name|
   from_db.should_not == object
 end
 
+Then /^the document '(\w+)' is reloaded$/ do |name|
+  object = instance_variable_get("@#{name}")
+  from_db = object.class.find_one(object._id)
+  instance_variable_set("@#{name}", from_db)
+end
+
 Then /^the last return value is (.+)$/ do |bool_val|
   @last_return.should send("be_#{bool_val}")
 end

data/features/step_definitions/documents.rb

@@ -38,3 +38,11 @@ class Event
 
   embed_hash :addresses
 end
+
+class Person
+  include MongoDoc::Document
+
+  attr_accessor :name
+
+  timestamps!
+end

data/features/step_definitions/field_steps.rb

@@ -0,0 +1,4 @@
+Then /^the field (\w+) of the document '(\w+)' is not nil$/ do |field, name|
+  doc = instance_variable_get("@#{name}")
+  doc.send(field).should_not be_nil
+end

data/features/timestamps.feature

@@ -0,0 +1,14 @@
+Feature: Timestamps
+
+  Background:
+    Given an empty Person document collection
+    And a Person document named 'Fry' :
+      | Name          |
+      | Philip J. Fry |
+
+  Scenario: Creation time
+    When I save the document 'Fry'
+    And the document 'Fry' is reloaded
+    Then the field created_at of the document 'Fry' is not nil
+    And the field updated_at of the document 'Fry' is not nil
+

data/lib/mongo_doc/document.rb

@@ -6,6 +6,7 @@ require 'mongo_doc/criteria'
 require 'mongo_doc/finders'
 require 'mongo_doc/index'
 require 'mongo_doc/scope'
+require 'mongo_doc/timestamps'
 require 'active_model/naming'
 require 'active_model/translation'
 require 'active_model/deprecated_error_methods'
@@ -31,6 +32,7 @@ module MongoDoc
         extend Finders
         extend Index
         extend Scope
+        extend Timestamps
         include ::ActiveModel::Validations
         extend ::ActiveModel::Naming
         extend Validations
@@ -103,7 +105,6 @@ module MongoDoc
     end
 
     def update_attributes!(attrs)
-      strict = attrs.delete(:__strict__)
       self.attributes = attrs
       return save! if new_record?
       raise DocumentInvalidError unless valid?

data/lib/mongo_doc/ext/numeric.rb

@@ -4,9 +4,9 @@ class Numeric
   end
 end
 
-class BigDecimal
+class Float
   def self.cast_from_string(string)
-    BigDecimal.new(string) unless string.blank?
+    string.to_f unless string.blank?
   end
 end
 

data/lib/mongo_doc/timestamps.rb

@@ -0,0 +1,54 @@
+module MongoDoc
+  module Timestamps
+
+    # Create automatic timestamps on a +root+ Document. Timestamps are not
+    # implemented for embedded documents.
+    #
+    # Two timestamps fields are created: +created_at+, +updated_at+
+    #
+    # +created_at+:: set on initial save only
+    # +updated_at+:: set on every save
+    def timestamps!
+      [:created_at, :updated_at].each do |name|
+        _keys << name unless _keys.include?(name)
+        attr_reader name
+        module_eval(<<-RUBY, __FILE__, __LINE__)
+          def #{name}=(value)                       # def created_at=(value)
+            if value.kind_of?(String)               #   if value.kind_of?(String)
+              value = Time.cast_from_string(value)  #     value = Time.cast_from_string(value)
+            end                                     #   end
+            @#{name} = value.nil? ? nil : value.utc #   @created_at = value.nil? ? nil : value.utc
+          end                                       # end
+        RUBY
+      end
+
+      module_eval do
+        def _save(safe)
+          if new_record?
+            self.created_at = self.updated_at = Time.now
+          else
+            original_updated_at = updated_at
+            self.updated_at = Time.now
+          end
+          super
+        rescue Mongo::MongoDBError => e
+          if new_record?
+            self.created_at = self.updated_at = nil
+          else
+            self.updated_at = original_updated_at
+          end
+          raise e
+        end
+
+        def _update(selector, data, safe)
+          original_updated_at = updated_at
+          self.updated_at = Time.now
+          super
+        rescue Mongo::MongoDBError => e
+          self.updated_at = original_updated_at
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/mongo_doc.rb

@@ -3,7 +3,7 @@ require 'active_support'
 require 'active_support/core_ext'
 
 module MongoDoc
-  VERSION = '0.6.2'
+  VERSION = '0.6.4'
 end
 
 require 'mongo_doc/connection'

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-06-27}
+  s.date = %q{2010-07-07}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
      "features/step_definitions/document_steps.rb",
      "features/step_definitions/documents.rb",
      "features/step_definitions/embed_hash_steps.rb",
+     "features/step_definitions/field_steps.rb",
      "features/step_definitions/finder_steps.rb",
      "features/step_definitions/index_steps.rb",
      "features/step_definitions/json_steps.rb",
@@ -60,6 +61,7 @@ Gem::Specification.new do |s|
      "features/step_definitions/util_steps.rb",
      "features/string_casting.feature",
      "features/support/support.rb",
+     "features/timestamps.feature",
      "features/using_criteria.feature",
      "lib/mongo_doc.rb",
      "lib/mongo_doc/associations.rb",
@@ -102,6 +104,7 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/railties/config.rb",
      "lib/mongo_doc/root.rb",
      "lib/mongo_doc/scope.rb",
+     "lib/mongo_doc/timestamps.rb",
      "lib/mongo_doc/validations.rb",
      "lib/mongo_doc/validations/validates_embedded.rb",
      "lib/mongoid/contexts/enumerable.rb",
@@ -162,6 +165,7 @@ Gem::Specification.new do |s|
      "spec/root_spec.rb",
      "spec/scope_spec.rb",
      "spec/spec_helper.rb",
+     "spec/timestamps_spec.rb",
      "spec/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/leshill/mongodoc}
@@ -200,6 +204,7 @@ Gem::Specification.new do |s|
      "spec/root_spec.rb",
      "spec/scope_spec.rb",
      "spec/spec_helper.rb",
+     "spec/timestamps_spec.rb",
      "spec/validations_spec.rb",
      "examples/simple_document.rb",
      "examples/simple_object.rb"

data/spec/ext_spec.rb

@@ -46,15 +46,15 @@ describe "Ruby Object Extensions" do
       end
     end
 
-    context "Numeric" do
-      context "BigDecimal" do
+    context "Numbers" do
+      context "Float" do
         it "returns nil for a blank string" do
-          BigDecimal.cast_from_string('').should be_nil
+          Float.cast_from_string('').should be_nil
         end
 
         it "converts from a string to a BigDecimal" do
-          big_decimal = BigDecimal.new("123")
-          BigDecimal.cast_from_string(big_decimal.to_s).should == big_decimal
+          float = "12345.6789".to_f
+          Float.cast_from_string(float.to_s).should == float
         end
       end
 

data/spec/timestamps_spec.rb

@@ -0,0 +1,154 @@
+require 'spec_helper'
+
+describe MongoDoc::Timestamps do
+  class TimestampsTest
+    include MongoDoc::Document
+
+    attr_accessor :name
+
+    timestamps!
+  end
+
+  let(:collection) { stub(:save => ::BSON::ObjectID.new, :update => true) }
+  let(:document) { TimestampsTest.new }
+
+  before do
+    TimestampsTest.stub(:collection).and_return(collection)
+  end
+
+  it "has a created_at attribute" do
+    document.should respond_to(:created_at)
+    document.should respond_to(:created_at=)
+  end
+
+  it "has an updated_at attribute" do
+    document.should respond_to(:updated_at)
+    document.should respond_to(:updated_at=)
+  end
+
+  context "on initial save" do
+    context "that suceeeds" do
+      it "sets the created_at timestamp" do
+        document.save
+        document.created_at.should_not be_nil
+      end
+
+      it "sets the updated_at timestamp" do
+        document.save
+        document.updated_at.should_not be_nil
+      end
+
+      it "the created_at and updated_at timestamps are the same" do
+        document.save
+        document.created_at.should == document.updated_at
+      end
+
+      it "sets the timezone to UTC" do
+        document.save
+        document.created_at.zone.should == "UTC"
+      end
+    end
+
+    context "that fails" do
+      before do
+        collection.stub(:save).and_raise(Mongo::MongoDBError.new)
+      end
+
+      it "does not set the created_at timestamp" do
+        document.save rescue nil
+        document.created_at.should be_nil
+      end
+
+      it "does not set the updated_at timestamp" do
+        document.save rescue nil
+        document.updated_at.should be_nil
+      end
+    end
+  end
+
+  context "on subsequent save" do
+    before do
+      document.save
+    end
+
+    context "that suceeeds" do
+      let!(:original_created_at) { document.created_at }
+
+      it "leaves the created_at timestamp unchanged" do
+        document.save
+        document.created_at.should == original_created_at
+      end
+
+      it "sets the updated_at timestamp" do
+        document.save
+        document.updated_at.should_not == original_created_at
+      end
+
+      it "the created_at and updated_at timestamps are not the same" do
+        document.save
+        document.created_at.should_not == document.updated_at
+      end
+    end
+
+    context "that fails" do
+      let!(:original_created_at) { document.created_at }
+
+      before do
+        collection.stub(:save).and_raise(Mongo::MongoDBError.new)
+      end
+
+      it "leaves the created_at timestamp unchanged" do
+        document.save rescue nil
+        document.created_at.should == original_created_at
+      end
+
+      it "leaves the updated_at timestamp unchanged" do
+        document.save rescue nil
+        document.updated_at.should == original_created_at
+      end
+    end
+  end
+
+  context "on update attributes" do
+    before do
+      document.save
+    end
+
+    context "that suceeeds" do
+      let!(:original_created_at) { document.created_at }
+
+      it "leaves the created_at timestamp unchanged" do
+        document.update_attributes(:name => 'name')
+        document.created_at.should == original_created_at
+      end
+
+      it "sets the updated_at timestamp" do
+        document.update_attributes(:name => 'name')
+        document.updated_at.should_not == original_created_at
+      end
+
+      it "the created_at and updated_at timestamps are not the same" do
+        document.update_attributes(:name => 'name')
+        document.created_at.should_not == document.updated_at
+      end
+    end
+
+    context "that fails" do
+      let!(:original_created_at) { document.created_at }
+
+      before do
+        collection.stub(:update).and_raise(Mongo::MongoDBError.new)
+      end
+
+      it "leaves the created_at timestamp unchanged" do
+        document.update_attributes(:name => 'name') rescue nil
+        document.created_at.should == original_created_at
+      end
+
+      it "leaves the updated_at timestamp unchanged" do
+        document.update_attributes(:name => 'name') rescue nil
+        document.updated_at.should == original_created_at
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_doc
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Les Hill
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,6 +176,7 @@ files:
 - features/step_definitions/document_steps.rb
 - features/step_definitions/documents.rb
 - features/step_definitions/embed_hash_steps.rb
+- features/step_definitions/field_steps.rb
 - features/step_definitions/finder_steps.rb
 - features/step_definitions/index_steps.rb
 - features/step_definitions/json_steps.rb
@@ -189,6 +190,7 @@ files:
 - features/step_definitions/util_steps.rb
 - features/string_casting.feature
 - features/support/support.rb
+- features/timestamps.feature
 - features/using_criteria.feature
 - lib/mongo_doc.rb
 - lib/mongo_doc/associations.rb
@@ -231,6 +233,7 @@ files:
 - lib/mongo_doc/railties/config.rb
 - lib/mongo_doc/root.rb
 - lib/mongo_doc/scope.rb
+- lib/mongo_doc/timestamps.rb
 - lib/mongo_doc/validations.rb
 - lib/mongo_doc/validations/validates_embedded.rb
 - lib/mongoid/contexts/enumerable.rb
@@ -291,6 +294,7 @@ files:
 - spec/root_spec.rb
 - spec/scope_spec.rb
 - spec/spec_helper.rb
+- spec/timestamps_spec.rb
 - spec/validations_spec.rb
 has_rdoc: true
 homepage: http://github.com/leshill/mongodoc
@@ -357,6 +361,7 @@ test_files:
 - spec/root_spec.rb
 - spec/scope_spec.rb
 - spec/spec_helper.rb
+- spec/timestamps_spec.rb
 - spec/validations_spec.rb
 - examples/simple_document.rb
 - examples/simple_object.rb