perpetuity 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9580976e3da148321a6f89b5c8aef63f43d4eba2
-  data.tar.gz: 92849267be3d5db48a02ceaa6018dfbba882d79b
+  metadata.gz: 2244d23d7746c76519f66795e7799800d7ed84f5
+  data.tar.gz: f3aa364123d96e1477e64eeda2676e616a712515
 SHA512:
-  metadata.gz: 83e137d58c0e537264726628f761d5819c503a801de7e803602121fa3448ee1cba2cc1db1c5fbd20534e4133fb64ca62250818cbd0ea048cc8d2797dfd43d18c
-  data.tar.gz: a3f48dcfe2e00f862e4d2ef978c2cc11c5ded5e3b9bd955f623abe18f0b0b9ede6733794c05b6c9e40f121bb727e92cfe67f57eb5fb3f34b7cf8ea584950c0ae
+  metadata.gz: 4baa0facacc3099d0f8c8e36e0fb283ee1dd319067a6249ef2d6ffbdad6afddca95d70779bd8b140b713b6717778182afcfccb26661113e22401aa2cf18aed62
+  data.tar.gz: fea3b1c06ef2b0f90738d53d9f1783024527582f5c49bd4869233a71882e248623c7b5980b7679701d6e1c1f61f0bb78886807fd861570017e2710f21a4916df

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.7.3
+
+- Only save attributes which have changed
+
 ## Version 0.7.2
 
 - Add license to gemspec for the benefit of [Rubygems.org](http://rubygems.org/gems/perpetuity)

data/lib/perpetuity/attribute.rb

@@ -17,5 +17,9 @@ module Perpetuity
     def to_s
       name
     end
+
+    def =~ regexp
+      name.to_s =~ regexp
+    end
   end
 end

data/lib/perpetuity/identity_map.rb

@@ -13,7 +13,7 @@ module Perpetuity
     def << object
       klass = object.class
       id = object.instance_variable_get(:@id)
-      map[klass][id.to_s] = object
+      map[klass][id.to_s] = object.dup
     end
   end
 end

data/lib/perpetuity/mapper.rb

@@ -47,18 +47,25 @@ module Perpetuity
 
     def reindex!
       indexes.each { |index| data_source.activate_index! index }
-      (data_source.active_indexes(mapped_class) - indexes).reject do |index|
-        # TODO: Make this not MongoDB-specific
-        index.attribute.name.to_s == '_id'
-      end.each do |index|
+      unspecified_indexes.each do |index|
         data_source.remove_index index
       end
     end
 
+    def unspecified_indexes
+      active_indexes = data_source.active_indexes(mapped_class)
+      active_but_unspecified_indexes = (active_indexes - indexes)
+      active_but_unspecified_indexes.reject { |index| index.attribute =~ /id/ }
+    end
+
     def attributes
       self.class.attributes
     end
 
+    def attribute_set
+      self.class.attribute_set
+    end
+
     def delete_all
       data_source.delete_all mapped_class
     end
@@ -66,14 +73,7 @@ module Perpetuity
     def insert object
       raise "#{object} is invalid and cannot be persisted." unless self.class.validations.valid?(object)
       objects = Array(object)
-      serialized_objects = objects.map do |obj|
-        attributes = serialize(obj)
-        if o_id = obj.instance_exec(&self.class.id)
-          attributes[:id] = o_id
-        end
-
-        attributes
-      end
+      serialized_objects = objects.map { |obj| serialize(obj) }
 
       new_ids = data_source.insert(mapped_class, serialized_objects)
       objects.each_with_index do |obj, index|
@@ -87,6 +87,10 @@ module Perpetuity
       end
     end
 
+    def generate_id_for object
+      object.instance_exec(&self.class.id)
+    end
+
     def self.data_source(configuration=Perpetuity.configuration)
       configuration.data_source
     end
@@ -186,7 +190,12 @@ module Perpetuity
     end
 
     def save object
-      update object, serialize(object), false
+      changed_attributes = serialize_changed_attributes(object)
+      if changed_attributes && changed_attributes.any?
+        update object, changed_attributes
+      else
+        update object, serialize(object), false
+      end
     end
 
     def increment object, attribute, count=1
@@ -226,7 +235,19 @@ module Perpetuity
     end
 
     def serialize object
-      data_source.serialize(object, self)
+      attributes = data_source.serialize(object, self)
+      if o_id = generate_id_for(object)
+        attributes[:id] = o_id
+      end
+
+      attributes
+    end
+
+    def serialize_changed_attributes object
+      cached = identity_map[object.class, id_for(object)]
+      if cached
+        data_source.serialize_changed_attributes(object, cached, self)
+      end
     end
 
     def self.mapped_class

data/lib/perpetuity/mongodb/serializer.rb

@@ -1,4 +1,5 @@
 require 'perpetuity/data_injectable'
+require 'perpetuity/reference'
 
 module Perpetuity
   class MongoDB
@@ -22,7 +23,7 @@ module Perpetuity
       end
 
       def serialize object
-        attrs = mapper.class.attribute_set.map do |attrib|
+        attrs = mapper.attribute_set.map do |attrib|
           next unless has_attribute? object, attrib.name
 
           value = attribute_for object, attrib.name
@@ -45,6 +46,10 @@ module Perpetuity
         Hash[attrs.compact]
       end
 
+      def serialize_changes changed, original
+        Hash[Array(serialize(changed)) - Array(serialize(original))]
+      end
+
       def unserialize data
         if data.is_a? Array
           unserialize_object_array data

data/lib/perpetuity/mongodb.rb

@@ -146,7 +146,7 @@ module Perpetuity
     end
 
     def update klass, id, new_data
-      find(klass, id).update(new_data)
+      find(klass, id).update('$set' => new_data)
     end
 
     def can_serialize? value
@@ -214,6 +214,10 @@ module Perpetuity
       Serializer.new(mapper).serialize object
     end
 
+    def serialize_changed_attributes object, original, mapper
+      Serializer.new(mapper).serialize_changes object, original
+    end
+
     def unserialize data, mapper
       Serializer.new(mapper).unserialize data
     end

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/integration/mongodb_spec.rb

@@ -100,6 +100,38 @@ module Perpetuity
       retrieved_time.to_f.should be_within(0.001).of time.to_f
     end
 
+    describe 'serialization' do
+      let(:object) { Object.new }
+      let(:foo_attribute) { double('Attribute', name: :foo) }
+      let(:baz_attribute) { double('Attribute', name: :baz) }
+      let(:mapper) { double('Mapper',
+                            mapped_class: Object,
+                            mapper_registry: {},
+                            attribute_set: Set[foo_attribute, baz_attribute],
+                            data_source: mongo,
+                           ) }
+
+      before do
+        object.instance_variable_set :@foo, 'bar'
+        object.instance_variable_set :@baz, 'quux'
+      end
+
+      it 'serializes objects' do
+        mongo.serialize(object, mapper).should == {
+          'foo' => 'bar',
+          'baz' => 'quux'
+        }
+      end
+
+      it 'can serialize only modified attributes of objects' do
+        updated = object.dup
+        updated.instance_variable_set :@foo, 'foo'
+
+        serialized = mongo.serialize_changed_attributes(updated, object, mapper)
+        serialized.should == { 'foo' => 'foo' }
+      end
+    end
+
     describe 'serializable objects' do
       let(:serializable_values) { [nil, true, false, 1, 1.2, '', [], {}, Time.now] }
 

data/spec/integration/update_spec.rb

@@ -26,6 +26,24 @@ describe 'updating' do
     mapper.find(mapper.id_for article).title.should eq new_title
   end
 
+  it 'only updates attributes which have changed since last retrieval' do
+    first_mapper = Perpetuity[Article]
+    second_mapper = Perpetuity[Article]
+    article_id = first_mapper.id_for(article)
+    first_article = first_mapper.find(article_id)
+    second_article = second_mapper.find(article_id)
+
+    # Change different attributes on each
+    first_article.title = 'New title'
+    second_article.views = 7
+    first_mapper.save first_article
+    second_mapper.save second_article
+
+    canonical_article = mapper.find(article_id)
+    canonical_article.title.should == 'New title'
+    canonical_article.views.should == 7
+  end
+
   it 'updates an object with referenced attributes' do
     user = User.new
     article.author = user

data/spec/perpetuity/attribute_spec.rb

@@ -2,7 +2,9 @@ require 'perpetuity/attribute'
 
 module Perpetuity
   describe Attribute do
-    subject { Attribute.new :article, Object }
+    let(:attribute) { Attribute.new :article, Object }
+    subject { attribute }
+
     it 'has a name' do
       subject.name.should == :article
     end
@@ -15,5 +17,9 @@ module Perpetuity
       attribute = Attribute.new :article, Object, embedded: true
       attribute.should be_embedded
     end
+
+    it 'can match a regex' do
+      expect(attribute =~ /article/).to be_true
+    end
   end
 end

data/spec/perpetuity/dereferencer_spec.rb

@@ -18,7 +18,8 @@ module Perpetuity
         mapper.should_receive(:find).with(1) { first }
 
         derefer.load first_ref
-        derefer[first_ref].should == first
+        id = derefer[first_ref].instance_variable_get(:@id)
+        id.should == 1
       end
     end
 

data/spec/perpetuity/identity_map_spec.rb

@@ -2,23 +2,29 @@ require 'perpetuity/identity_map'
 
 module Perpetuity
   describe IdentityMap do
-    let(:object_mapper) { double('Mapper', id_for: 1) }
-    let(:object) { double('Object', class: Object) }
     let(:id_map) { IdentityMap.new }
 
     context 'when the object exists in the IdentityMap' do
-      let(:object) { double('Object', class: Object) }
+      let(:object) { Object.new }
 
-      before { object.instance_variable_set :@id, 1 }
+      before do
+        object.instance_variable_set :@id, 1
+        id_map << object
+      end
 
       it 'returns the object with the given class and id' do
-        id_map << object
-        id_map[Object, 1].should == object
+        retrieved = id_map[Object, 1]
+
+        retrieved.instance_variable_get(:@id).should == 1
+      end
+
+      specify 'the object returned is a duplicate, not the same object' do
+        id_map[Object, 1].should_not be object
       end
 
       it 'stringifies keys when checking' do
-        id_map << object
-        id_map[Object, '1'].should == object
+        retrieved = id_map[Object, '1']
+        retrieved.instance_variable_get(:@id).should == 1
       end
     end
 

data/spec/perpetuity/mapper_spec.rb

@@ -123,6 +123,22 @@ module Perpetuity
         mapper.save object
       end
 
+      it 'can serialize only changed attributes for updates' do
+        mapper_class.attribute :modified
+        mapper_class.attribute :unmodified
+        object = Object.new
+        object.instance_variable_set :@id, 1
+        object.instance_variable_set :@modified, false
+        object.instance_variable_set :@unmodified, false
+        mapper.identity_map << object
+
+        object.instance_variable_set :@modified, true
+
+        mapper.serialize_changed_attributes(object).should == {
+          'modified' => true
+        }
+      end
+
       it 'deletes an object from the data source' do
         object = Object.new
 

data/spec/perpetuity/mongodb/serializer_spec.rb

@@ -61,6 +61,18 @@ module Perpetuity
         }
       end
 
+      it 'can serialize only changed attributes' do
+        book = Book.new('Original Title')
+        updated_book = book.dup
+        updated_book.title = 'New Title'
+        book_mapper.stub(data_source: data_source)
+        data_source.stub(:can_serialize?).with('New Title') { true }
+        data_source.stub(:can_serialize?).with('Original Title') { true }
+        serializer.serialize_changes(updated_book, book).should == {
+          'title' => 'New Title'
+        }
+      end
+
       context 'with objects that have hashes as attributes' do
         let(:name_data) { {first_name: 'Jamie', last_name: 'Gaskins'} }
         let(:serialized_data) { { 'name' => name_data } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Persistence library allowing serialization of Ruby objects