perpetuity 0.4.7 → 0.4.8

data/spec/integration/retrieval_spec.rb

@@ -1,21 +1,24 @@
 require 'spec_helper'
 require 'support/test_classes'
+require 'securerandom'
 
 describe "retrieval" do
+  let(:mapper) { Perpetuity[Article] }
+
   it "gets all the objects of a class" do
-    expect { Perpetuity[Article].insert Article.new }.
-      to change { Perpetuity[Article].all.count }.by 1
+    expect { mapper.insert Article.new }.
+      to change { mapper.all.count }.by 1
   end
 
   it "has an ID when retrieved" do
-    Perpetuity[Article].insert Article.new
-    Perpetuity[Article].first.should respond_to :id
+    mapper.insert Article.new
+    mapper.first.should respond_to :id
   end
 
   it "gets an item with a specific ID" do
     article = Article.new
-    Perpetuity[Article].insert article
-    retrieved = Perpetuity[Article].find(article.id)
+    mapper.insert article
+    retrieved = mapper.find(article.id)
 
     retrieved.id.should eq article.id
     retrieved.title.should eq article.title
@@ -28,94 +31,109 @@ describe "retrieval" do
     let(:third) { Article.new('Third', '', nil, Time.now) }
 
     before do
-      Perpetuity[Article].delete_all
-      [second, third, first].each { |article| Perpetuity[Article].insert article }
+      mapper.delete_all
+      [second, third, first].each { |article| mapper.insert article }
     end
 
     it 'sorts results' do
-      titles = Perpetuity[Article].all.sort(:published_at).map(&:title)
+      titles = mapper.all.sort(:published_at).map(&:title)
       titles.should be == %w(First Second Third)
     end
 
     it 'reverse-sorts results' do
-      titles = Perpetuity[Article].all.sort(:published_at).reverse.map(&:title)
+      titles = mapper.all.sort(:published_at).reverse.map(&:title)
       titles.should be == %w(Third Second First)
     end
   end
 
   it 'limits result set' do
-    5.times { Perpetuity[Article].insert Article.new }
-    Perpetuity[Article].all.limit(4).should have(4).items
+    5.times { mapper.insert Article.new }
+    mapper.all.limit(4).to_a.should have(4).items
   end
 
   describe "Array-like syntax" do
     let(:draft) { Article.new 'Draft', 'draft content', nil, Time.now + 30 }
     let(:published) { Article.new 'Published', 'content', nil, Time.now - 30, 3 }
     before do
-      Perpetuity[Article].insert draft
-      Perpetuity[Article].insert published
+      mapper.insert draft
+      mapper.insert published
     end
 
     it 'selects objects using equality' do
-      selected = Perpetuity[Article].select { |article| article.title == 'Published' }
+      selected = mapper.select { |article| article.title == 'Published' }
       selected.map(&:id).should include published.id
       selected.map(&:id).should_not include draft.id
     end
 
     it 'selects objects using greater-than' do
-      selected = Perpetuity[Article].select { |article| article.published_at < Time.now }
+      selected = mapper.select { |article| article.published_at < Time.now }
       ids = selected.map(&:id)
       ids.should include published.id
       ids.should_not include draft.id
     end
 
     it 'selects objects using greater-than-or-equal' do
-      selected = Perpetuity[Article].select { |article| article.views >= 3 }
+      selected = mapper.select { |article| article.views >= 3 }
       ids = selected.map(&:id)
       ids.should include published.id
       ids.should_not include draft.id
     end
 
     it 'selects objects using less-than' do
-      selected = Perpetuity[Article].select { |article| article.views < 3 }
+      selected = mapper.select { |article| article.views < 3 }
       ids = selected.map(&:id)
       ids.should include draft.id
       ids.should_not include published.id
     end
 
     it 'selects objects using less-than-or-equal' do
-      selected = Perpetuity[Article].select { |article| article.views <= 0 }
+      selected = mapper.select { |article| article.views <= 0 }
       ids = selected.map(&:id)
       ids.should include draft.id
       ids.should_not include published.id
     end
 
     it 'selects objects using inequality' do
-      selected = Perpetuity[Article].select { |article| article.title != 'Draft' }
+      selected = mapper.select { |article| article.title != 'Draft' }
       ids = selected.map(&:id)
       ids.should_not include draft.id
       ids.should include published.id
     end
 
     it 'selects objects using regular expressions' do
-      selected = Perpetuity[Article].select { |article| article.title =~ /Pub/ }
+      selected = mapper.select { |article| article.title =~ /Pub/ }
       ids = selected.map(&:id)
       ids.should include published.id
       ids.should_not include draft.id
     end
 
     it 'selects objects using inclusion' do
-      selected = Perpetuity[Article].select { |article| article.title.in %w( Published ) }
+      selected = mapper.select { |article| article.title.in %w( Published ) }
       ids = selected.map(&:id)
       ids.should include published.id
       ids.should_not include draft.id
     end
   end
 
+  describe 'counting results' do
+    let(:title) { SecureRandom.hex }
+    let(:articles) do
+      5.times.map { Article.new(title) } + 5.times.map { Article.new }
+    end
+
+    before do
+      articles.each { |article| mapper.insert article }
+    end
+
+    it 'counts the results' do
+      query = mapper.select { |article| article.title == title }
+      query.count.should == 5
+    end
+  end
+
   context 'with namespaced classes' do
     let(:article) { Article.new }
     let(:person) { CRM::Person.new }
-    let(:mapper) { Perpetuity[Article] }
 
     before { article.author = person }
 

data/spec/integration/update_spec.rb

@@ -38,6 +38,24 @@ describe 'updating' do
     retrieved_article = mapper.find(retrieved_article.id)
     retrieved_article.author.should be_a Perpetuity::Reference
   end
+
+  it 'updates an object with an array of referenced attributes' do
+    dave = User.new('Dave')
+    andy = User.new('Andy')
+    authors = [dave]
+    book = Book.new("Title #{Time.now.to_f}", authors)
+    mapper = Perpetuity[Book]
+
+    mapper.insert book
+
+    retrieved_book = mapper.find(book.id)
+    retrieved_book.authors << andy
+    mapper.save retrieved_book
+
+    retrieved_authors = mapper.find(retrieved_book.id).authors
+    retrieved_authors.map(&:klass).should == [User, User]
+    retrieved_authors.map(&:id).should == [dave.id, andy.id]
+  end
 end
 
 

data/spec/perpetuity/dereferencer_spec.rb

@@ -0,0 +1,23 @@
+require 'perpetuity/dereferencer'
+require 'perpetuity/reference'
+
+module Perpetuity
+  describe Dereferencer do
+    let(:registry) { double('Mapper Registry') }
+    let(:mapper) { double('ObjectMapper') }
+    let(:object) { double('Object', id: 1, class: Object) }
+    let(:reference) { Reference.new(Object, 1) }
+    let(:objects) { [object] }
+
+    before do
+      registry.should_receive(:[]).with(Object) { mapper }
+      mapper.should_receive(:select) { objects }
+    end
+
+    it 'loads objects based on the specified objects and attribute' do
+      derefer = Dereferencer.new(registry)
+      derefer.load reference
+      derefer[reference].should == object
+    end
+  end
+end

data/spec/perpetuity/identity_map_spec.rb

@@ -0,0 +1,22 @@
+require 'perpetuity/identity_map'
+
+module Perpetuity
+  describe IdentityMap do
+    context 'when the object exists in the IdentityMap' do
+      let(:object) { double('Object', id: 1, class: Object) }
+
+      it 'returns the object with the given class and id' do
+        id_map = IdentityMap.new
+        id_map << object
+        id_map[Object, 1].should == object
+      end
+    end
+
+    context 'when the object does not exist in the IdentityMap' do
+      it 'returns nil' do
+        id_map = IdentityMap.new
+        id_map[Object, 1].should be_nil
+      end
+    end
+  end
+end

data/spec/perpetuity/mapper_spec.rb

@@ -30,25 +30,6 @@ module Perpetuity
       registry[Object].should be_instance_of mapper_class
     end
 
-    context 'with unserializable embedded attributes' do
-      let(:unserializable_object) { 1.to_c }
-      let(:serialized_attrs) do
-        [ Marshal.dump(unserializable_object) ]
-      end
-
-      it 'serializes attributes' do
-        object = Object.new
-        object.instance_variable_set '@sub_objects', [unserializable_object]
-        mapper_class.attribute :sub_objects, embedded: true
-        mapper_class.map Object, registry
-        data_source = double(:data_source)
-        mapper.stub(data_source: data_source)
-        data_source.should_receive(:can_serialize?).with(unserializable_object).and_return false
-
-        mapper.serialize(object)['sub_objects'].should eq serialized_attrs
-      end
-    end
-
     describe 'talking to the data source' do
       let(:data_source) { MongoDB.new(db: nil) }
       before do

data/spec/perpetuity/mongodb/serializer_spec.rb

@@ -0,0 +1,117 @@
+require 'perpetuity/mongodb/serializer'
+require 'perpetuity/mapper'
+require 'perpetuity/mapper_registry'
+require 'support/test_classes/book'
+require 'support/test_classes/user'
+
+module Perpetuity
+  class MongoDB
+    describe Serializer do
+      let(:dave) { User.new('Dave') }
+      let(:andy) { User.new('Andy') }
+      let(:authors) { [dave, andy] }
+      let(:book) { Book.new('The Pragmatic Programmer', authors) }
+      let(:mapper_registry) { MapperRegistry.new }
+      let!(:book_mapper_class) do
+        registry = mapper_registry
+        Class.new(Perpetuity::Mapper) do
+          map Book, registry
+          attribute :title
+          attribute :authors
+        end
+      end
+      let!(:user_mapper_class) do
+        registry = mapper_registry
+        Class.new(Perpetuity::Mapper) do
+          map User, registry
+          attribute :name
+        end
+      end
+      let(:data_source) { double('Data Source') }
+      let(:serializer) { Serializer.new(mapper_registry[Book]) }
+
+      before do
+        dave.extend PersistedObject
+        andy.extend PersistedObject
+        user_mapper_class.stub(data_source: data_source)
+        book_mapper_class.stub(data_source: data_source)
+      end
+
+      it 'serializes an array of non-embedded attributes as references' do
+        data_source.should_receive(:can_serialize?).with(book.title).and_return true
+        data_source.should_receive(:can_serialize?).with(dave).and_return false
+        data_source.should_receive(:can_serialize?).with(andy).and_return false
+        serializer.serialize(book).should be == {
+          'title' => book.title,
+          'authors' => [
+            {
+              '__metadata__' => {
+                'class' => 'User',
+                'id' => dave.id
+              }
+            },
+            {
+              '__metadata__' => {
+                'class' => 'User',
+                'id' => andy.id
+              }
+            }
+          ]
+        }
+      end
+
+      context 'with objects that have hashes as attributes' do
+        let(:name_data) { {first_name: 'Jamie', last_name: 'Gaskins'} }
+        let(:serialized_data) do
+          {
+            'name' => name_data
+          }
+        end
+        let(:user) { User.new(name_data) }
+        let(:user_mapper) { mapper_registry[User] }
+        let(:user_serializer) { Serializer.new(user_mapper) }
+
+        before do
+          data_source.stub(:can_serialize?).with(name_data) { true }
+        end
+
+        it 'serializes' do
+          user_serializer.serialize(user).should be == serialized_data
+        end
+
+        it 'unserializes' do
+          user_serializer.unserialize(serialized_data).name.should be == user.name
+        end
+      end
+
+      describe 'unserializes attributes' do
+        let(:unserializable_object) { 1.to_c }
+        let(:serialized_attrs) { [ Marshal.dump(unserializable_object) ] }
+        let(:objects) { serializer.unserialize(serialized_attrs)  }
+        subject { objects.first }
+
+        it { should be_a Complex }
+        it { should eq unserializable_object}
+      end
+
+      describe 'with an array of references' do
+        let(:author) { Reference.new(User, 1) }
+        let(:title) { 'title' }
+        let(:book) { Book.new(title, [author]) }
+
+        it 'passes the reference unserialized' do
+          data_source.should_receive(:can_serialize?).with('title') { true }
+          serializer.serialize(book).should == {
+            'title' => title,
+            'authors' => [{
+              '__metadata__' => {
+                'class' => author.klass.to_s,
+                'id' => author.id
+              }
+            }]
+          }
+        end
+      end
+    end
+  end
+end

data/spec/perpetuity/retrieval_spec.rb

@@ -49,22 +49,16 @@ module Perpetuity
 
     it 'retrieves data from the data source' do
       return_data = { id: 0, a: 1, b: 2 }
+      return_object = Object.new
+      return_object.stub(id: return_data[:id])
       options = { attribute: nil, direction: nil, limit: nil, page: nil }
+
       data_source.should_receive(:retrieve).with(Object, {}, options).
                   and_return([return_data])
+      data_source.should_receive(:unserialize).with([return_data], mapper) { [return_object] }
       results = retrieval.to_a
 
       results.map(&:id).should == [0]
     end
-
-    describe 'unserializes attributes' do
-      let(:unserializable_object) { 1.to_c }
-      let(:serialized_attrs) { [ Marshal.dump(unserializable_object) ] }
-      let(:comments) { retrieval.unserialize(serialized_attrs)  }
-      subject { comments.first }
-
-      it { should be_a Complex }
-      it { should eq unserializable_object}
-    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
 require 'perpetuity'
 
-Perpetuity.configure do
-  data_source Perpetuity::MongoDB.new db: 'perpetuity_gem_test'
-end
-
+Perpetuity.data_source :mongodb, 'perpetuity_gem_test'

data/spec/support/test_classes/generic_object.rb

@@ -0,0 +1,3 @@
+class GenericObject
+  attr_accessor :referenced_attribute, :embedded_attribute
+end

data/spec/support/test_classes/user.rb

@@ -3,4 +3,8 @@ class User
   def initialize name="Foo"
     @name = name
   end
+
+  def == other
+    name == other.name
+  end
 end

data/spec/support/test_classes.rb

@@ -1,4 +1,4 @@
-%w( user article comment book message topic car crm_person).each do |file|
+%w( user article comment book message topic car crm_person generic_object).each do |file|
   require "support/test_classes/#{file}"
 end
 
@@ -59,3 +59,8 @@ end
 Perpetuity.generate_mapper_for CRM::Person do
   attribute :name
 end
+
+Perpetuity.generate_mapper_for GenericObject do
+  attribute :referenced_attribute
+  attribute :embedded_attribute, embedded: true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Persistence layer for Ruby objects
@@ -79,6 +79,7 @@ files:
 - lib/perpetuity/attribute_set.rb
 - lib/perpetuity/config.rb
 - lib/perpetuity/data_injectable.rb
+- lib/perpetuity/dereferencer.rb
 - lib/perpetuity/exceptions/duplicate_key_error.rb
 - lib/perpetuity/identity_map.rb
 - lib/perpetuity/mapper.rb
@@ -90,10 +91,10 @@ files:
 - lib/perpetuity/mongodb/query_expression.rb
 - lib/perpetuity/mongodb/query_intersection.rb
 - lib/perpetuity/mongodb/query_union.rb
+- lib/perpetuity/mongodb/serializer.rb
 - lib/perpetuity/persisted_object.rb
 - lib/perpetuity/reference.rb
 - lib/perpetuity/retrieval.rb
-- lib/perpetuity/serializer.rb
 - lib/perpetuity/validations.rb
 - lib/perpetuity/validations/length.rb
 - lib/perpetuity/validations/presence.rb
@@ -114,6 +115,8 @@ files:
 - spec/perpetuity/attribute_spec.rb
 - spec/perpetuity/config_spec.rb
 - spec/perpetuity/data_injectable_spec.rb
+- spec/perpetuity/dereferencer_spec.rb
+- spec/perpetuity/identity_map_spec.rb
 - spec/perpetuity/mapper_registry_spec.rb
 - spec/perpetuity/mapper_spec.rb
 - spec/perpetuity/mongodb/index_spec.rb
@@ -122,10 +125,10 @@ files:
 - spec/perpetuity/mongodb/query_intersection_spec.rb
 - spec/perpetuity/mongodb/query_spec.rb
 - spec/perpetuity/mongodb/query_union_spec.rb
+- spec/perpetuity/mongodb/serializer_spec.rb
 - spec/perpetuity/persisted_object_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
-- spec/perpetuity/serializer_spec.rb
 - spec/perpetuity/validations/length_spec.rb
 - spec/perpetuity/validations/presence_spec.rb
 - spec/perpetuity/validations_spec.rb
@@ -137,6 +140,7 @@ files:
 - spec/support/test_classes/car.rb
 - spec/support/test_classes/comment.rb
 - spec/support/test_classes/crm_person.rb
+- spec/support/test_classes/generic_object.rb
 - spec/support/test_classes/message.rb
 - spec/support/test_classes/topic.rb
 - spec/support/test_classes/user.rb
@@ -149,21 +153,21 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3471626582421512512
+      hash: -66928365718597043
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3471626582421512512
+      hash: -66928365718597043
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -185,6 +189,8 @@ test_files:
 - spec/perpetuity/attribute_spec.rb
 - spec/perpetuity/config_spec.rb
 - spec/perpetuity/data_injectable_spec.rb
+- spec/perpetuity/dereferencer_spec.rb
+- spec/perpetuity/identity_map_spec.rb
 - spec/perpetuity/mapper_registry_spec.rb
 - spec/perpetuity/mapper_spec.rb
 - spec/perpetuity/mongodb/index_spec.rb
@@ -193,10 +199,10 @@ test_files:
 - spec/perpetuity/mongodb/query_intersection_spec.rb
 - spec/perpetuity/mongodb/query_spec.rb
 - spec/perpetuity/mongodb/query_union_spec.rb
+- spec/perpetuity/mongodb/serializer_spec.rb
 - spec/perpetuity/persisted_object_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
-- spec/perpetuity/serializer_spec.rb
 - spec/perpetuity/validations/length_spec.rb
 - spec/perpetuity/validations/presence_spec.rb
 - spec/perpetuity/validations_spec.rb
@@ -208,6 +214,7 @@ test_files:
 - spec/support/test_classes/car.rb
 - spec/support/test_classes/comment.rb
 - spec/support/test_classes/crm_person.rb
+- spec/support/test_classes/generic_object.rb
 - spec/support/test_classes/message.rb
 - spec/support/test_classes/topic.rb
 - spec/support/test_classes/user.rb