mordor 0.2.2 → 0.2.3

data/lib/mordor/resource.rb

@@ -14,7 +14,7 @@ module Mordor
 
     def replace_params(params = {})
       result = {}
-      return result unless params
+      return result if params.nil? or params.empty?
       params.each do |key, value|
         value = replace_type(value)
         key = key.to_s.gsub(/\W|\./, "_")
@@ -37,6 +37,8 @@ module Mordor
         value = value.map do |val|
           replace_type(val)
         end
+      when BSON::Timestamp
+        value = replace_params({:seconds => value ? value.seconds : 0, :increment => value ? value.increment : 0})
       when Integer
       else
         value = value.to_s
@@ -65,8 +67,11 @@ module Mordor
         self_hash = self.to_hash
         if timestamp_attribute = self.class.timestamped_attribute
           timestamp_value = self_hash.delete(timestamp_attribute)
+          if timestamp_value.is_a?(Hash)
+            timestamp_value = BSON::Timestamp.new(timestamp_value["seconds"], timestamp_value["increment"])
+          end
           ordered_self_hash = BSON::OrderedHash.new
-          ordered_self_hash[timestamp_attribute] = (timestamp_value.nil? || timestamp_value.empty?) ? BSON::Timestamp.new(0, 0) : timestamp_value
+          ordered_self_hash[timestamp_attribute] = (timestamp_value.nil?) ? BSON::Timestamp.new(0, 0) : timestamp_value
           self_hash.each do |key, value|
             ordered_self_hash[key] = value
           end
@@ -74,7 +79,6 @@ module Mordor
         end
         insert_id = self.class.collection.insert(self_hash)
         self._id = insert_id
-        self.reload
       else
         insert_id = self.update
       end

data/mordor.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.2"
-  s.date    = "2011-12-28"
+  s.version = "0.2.3"
+  s.date    = "2012-01-02"
 
   s.summary     = "mordor"
   s.description = <<-eos

data/spec/mordor/resource_spec.rb

@@ -96,6 +96,7 @@ describe "with respect to resources" do
 
   it "should provide timestamped attribute as first attribute when creating a Resource" do
     tr = TestResource.create({:first => 'first'})
+    tr.reload
     tr.at.should_not be_nil
     TestResource.get(tr._id).at.should_not == BSON::Timestamp.new(0,0)
   end
@@ -134,6 +135,17 @@ describe "with respect to resources" do
       end
     end
 
+    it "should correctly replace BSON::Timestampls" do
+      options = {
+        "option" => BSON::Timestamp.new(324244, 12)
+      }
+      result = TestResource.new.replace_params(options)
+      result.each do |k, v|
+        v["seconds"].should == 324244
+        v["increment"].should == 12
+      end
+    end
+
     it "should correctly respond to to_hash" do
       resource = TestResource.new({:first => "first", :second => "second", :third => "third"})
       hash = resource.to_hash
@@ -142,6 +154,7 @@ describe "with respect to resources" do
       hash[:second].should == "second"
       hash[:third].should  == "third"
     end
+
   end
 
   context "with respect to creating" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 +01:00
+date: 2012-01-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency