perpetuity 0.4.3 → 0.4.4

data/.travis.yml

@@ -3,5 +3,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx-19mode
+  - jruby-19mode
+  - ruby-head
+  - 2.0.0
 services:
   - mongodb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.4.4
+
+- Automatically persist all referenced objects if they are not already persisted. Previously, referenced objects were required to be persisted before persisting the referencing object.
+
 ## Version 0.4.3
 
 - Made `Mapper#load_association!` more friendly. It now loads the associated objects for all objects passed in and works with arrays of referenced objects.

data/lib/perpetuity/mapper.rb

@@ -69,30 +69,14 @@ module Perpetuity
       new_id
     end
 
-    def serialize object
-      Serializer.new(self, mapper_registry).serialize(object)
-    end
-
     def self.data_source(configuration=Perpetuity.configuration)
       configuration.data_source
     end
 
-    def data_source
-      self.class.data_source
-    end
-
     def count
       data_source.count mapped_class
     end
 
-    def self.mapped_class
-      @mapped_class
-    end
-
-    def mapped_class
-      self.class.mapped_class
-    end
-
     def first
       retrieve.limit(1).first
     end
@@ -101,10 +85,6 @@ module Perpetuity
       retrieve
     end
 
-    def retrieve criteria={}
-      Perpetuity::Retrieval.new mapped_class, criteria, data_source
-    end
-
     def select &block
       query = data_source.class::Query.new(&block).to_db
       retrieve query
@@ -162,6 +142,28 @@ module Perpetuity
     def self.validations
       @validations ||= ValidationSet.new
     end
+
+    def data_source
+      self.class.data_source
+    end
+
+    def serialize object
+      Serializer.new(self, mapper_registry).serialize(object)
+    end
+
+    private
+
+    def retrieve criteria={}
+      Perpetuity::Retrieval.new mapped_class, criteria, data_source
+    end
+
+    def self.mapped_class
+      @mapped_class
+    end
+
+    def mapped_class
+      self.class.mapped_class
+    end
   end
 end
 

data/lib/perpetuity/serializer.rb

@@ -40,12 +40,7 @@ module Perpetuity
         attr = value_serializer.serialize(value)
         attr.merge '__metadata__' =>  { 'class' => value.class }
       else
-        {
-          '__metadata__' =>  {
-            'class' => value.class.to_s,
-            'id' => value.id
-          }
-        }
+        serialize_reference(value)
       end
     end
 
@@ -63,17 +58,24 @@ module Perpetuity
               }
             }.merge mapper_registry[value.class].serialize(value)
           else
-            {
-              '__metadata__' => {
-                'class' => value.class.to_s,
-                'id' => value.id
-              }
-            }
+            serialize_reference value
           end
         else
           Marshal.dump(value)
         end
       end
     end
+
+    def serialize_reference value
+      unless value.respond_to? :id
+        mapper_registry[value.class].insert value
+      end
+      {
+        '__metadata__' =>  {
+          'class' => value.class.to_s,
+          'id' => value.id
+        }
+      }
+    end
   end
 end

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/perpetuity.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_runtime_dependency "mongo", ">= 1.8.0"
-  s.add_runtime_dependency "bson_ext"
+  s.add_runtime_dependency "bson_ext" unless RUBY_PLATFORM == 'java'
 end

data/spec/perpetuity_spec.rb

@@ -46,6 +46,23 @@ describe Perpetuity do
       article.id.should eq 1
     end
 
+    it 'persists referenced objects if they are not persisted' do
+      article = Article.new
+      article.author = User.new
+      Perpetuity[Article].insert article
+
+      Perpetuity[Article].find(article.id).author.id.should be == article.author.id
+    end
+
+    it 'persists arrays of referenced objects if they are not persisted' do
+      authors = [User.new('Dave'), User.new('Andy')]
+      book = Book.new
+      book.authors = authors
+      Perpetuity[Book].insert book
+
+      Perpetuity[Book].find(book.id).authors.first.id.should be == authors.first.id
+    end
+
     describe 'id injection' do
       let(:article) { Article.new }
 
@@ -58,10 +75,6 @@ describe Perpetuity do
         Perpetuity[Article].first.should respond_to :id
       end
 
-      it 'assigns an id using Mapper.retrieve.first' do
-        Perpetuity[Article].retrieve.first.should respond_to :id
-      end
-
       it 'assigns an id using Mapper.all.first' do
         Perpetuity[Article].all.first.should respond_to :id
       end
@@ -128,10 +141,6 @@ describe Perpetuity do
       Perpetuity[Article].insert Article.new
       Perpetuity[Article].first.should respond_to :id
     end
-    
-    it "returns a Perpetuity::Retrieval object" do
-      Perpetuity[Article].retrieve(id: 1).should be_an_instance_of Perpetuity::Retrieval
-    end
 
     it "gets an item with a specific ID" do
       article = Article.new
@@ -143,15 +152,6 @@ describe Perpetuity do
       retrieved.body.should eq article.body
     end
 
-    it "gets an item by its attributes" do
-      article = Article.new
-      Perpetuity[Article].insert article
-      retrieved = Perpetuity[Article].retrieve(title: article.title)
-
-      retrieved.to_a.should_not be_empty
-      retrieved.first.title.should eq article.title
-    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 }
@@ -219,24 +219,24 @@ describe Perpetuity do
 
   describe 'pagination' do
     it 'specifies the page we want' do
-      Perpetuity[Article].retrieve.should respond_to :page
+      Perpetuity[Article].all.should respond_to :page
     end
 
     it 'specify the quantity per page' do
-      Perpetuity[Article].retrieve.should respond_to :per_page
+      Perpetuity[Article].all.should respond_to :per_page
     end
 
     it 'returns an empty set when there is no data for that page' do
       mapper = Perpetuity[Article]
       mapper.delete_all
-      data = mapper.retrieve.page(2)
+      data = mapper.all.page(2)
       data.should be_empty
     end
 
     it 'specifies per-page quantity' do
       Perpetuity[Article].delete_all
       5.times { |i| Perpetuity[Article].insert Article.new i }
-      data = Perpetuity[Article].retrieve.page(3).per_page(2)
+      data = Perpetuity[Article].all.page(3).per_page(2)
       data.should have(1).item
     end
   end

data/spec/support/test_classes/book.rb

@@ -1,6 +1,6 @@
 class Book
   attr_accessor :title, :authors
-  def initialize title="Foo Bar", authors=[]
+  def initialize title="Foo Bar #{Time.now.to_f.to_s}", authors=[]
     @title = title
     @authors = authors
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4673501112155482
+      hash: -2281292064449361967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4673501112155482
+      hash: -2281292064449361967
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24