perpetuity 0.4.6 → 0.4.7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version 0.4.7
+
+- Use instance variables rather than attr_readers in IdentityMap (avoids calling methods during `load_association!`).
+- Fixed a bug with MongoDB authentication.
+- Use attribute names rather than a stringified attribute for MongoDB indexes.
+- Fixed a bug with deserializing attributes of namespaced classes. — [Jaap Groeneveld](https://github.com/jgroeneveld)
+- Fixed serialization of `Perpetuity::Reference` attributes caused by resaving an object that did not have all of its referenced associations loaded.
+
 ## Version 0.4.6
 
 - Fix an inconsistency between `mongo` and `moped` gems. Previously, the MongoDB adapter relied on the fail-fast behavior of the `mongo` gem so we had no need to check for errors. Moped does not do that by default, which resulted in incorrect behavior of the gem when an object was not persisted.

data/README.md

@@ -1,4 +1,4 @@
-# Perpetuity [![Build Status](https://secure.travis-ci.org/jgaskins/perpetuity.png)](http://travis-ci.org/jgaskins/perpetuity)
+# Perpetuity [![Build Status](https://secure.travis-ci.org/jgaskins/perpetuity.png)](http://travis-ci.org/jgaskins/perpetuity) [![Code Climate](https://codeclimate.com/github/jgaskins/perpetuity.png)](https://codeclimate.com/github/jgaskins/perpetuity)
 
 Perpetuity is a simple Ruby object persistence layer that attempts to follow Martin Fowler's Data Mapper pattern, allowing you to use plain-old Ruby objects in your Ruby apps in order to decouple your domain logic from the database as well as speed up your tests. There is no need for your model classes to inherit from another class or even include a mix-in.
 

data/lib/perpetuity/identity_map.rb

@@ -2,16 +2,17 @@ module Perpetuity
   class IdentityMap
     def initialize objects, attribute, mapper_registry
       @map = Hash[
-        objects.map(&attribute)
+        objects.map { |object| object.instance_variable_get("@#{attribute}") }
           .flatten
           .group_by(&:klass)
           .map { |klass, ref|
-            [klass,
-             Hash[
-              mapper_registry[klass].select { |object|
-                object.id.in ref.map(&:id).uniq
-              }.map { |obj| [obj.id, obj] }
-             ]
+            [
+              klass,
+              Hash[
+                mapper_registry[klass].select { |object|
+                  object.id.in ref.map(&:id).uniq
+                }.map { |obj| [obj.id, obj] }
+              ]
             ]
           }
       ]

data/lib/perpetuity/mapper.rb

@@ -103,7 +103,7 @@ module Perpetuity
       identity_map = IdentityMap.new(objects, attribute, mapper_registry)
 
       objects.each do |object|
-        reference = object.send(attribute)
+        reference = object.instance_variable_get("@#{attribute}")
         if reference.is_a? Array
           refs = reference
           real_objects = refs.map { |ref| identity_map[ref.klass][ref.id] }

data/lib/perpetuity/mongodb/index.rb

@@ -40,8 +40,12 @@ module Perpetuity
         self == other
       end
 
+      def attribute_name
+        attribute.respond_to?(:name) ? attribute.name : attribute
+      end
+
       def hash
-        "#{collection}/#{attribute}:#{unique?}:#{order}".hash
+        "#{collection}/#{attribute_name}:#{unique?}:#{order}".hash
       end
     end
   end

data/lib/perpetuity/mongodb.rb

@@ -17,25 +17,27 @@ module Perpetuity
       @password   = options[:password]
       @session    = nil
       @indexes    = Hash.new { |hash, key| hash[key] = active_indexes(key) }
+      @connected  = false
     end
 
     def session
-      @session ||= Moped::Session.new(["#{host}:#{port}"])
-      @session.with(safe: true)
+      @session ||= Moped::Session.new(["#{host}:#{port}"]).with(safe: true)
     end
 
     def connect
       session.login(@username, @password) if @username and @password
+      @connected = true
       session
     end
 
     def connected?
-      !!@session
+      !!@connected
     end
 
     def database
-      connect unless connected?
       session.use db
+      connect unless connected?
+      session
     end
 
     def collection klass

data/lib/perpetuity/serializer.rb

@@ -20,7 +20,9 @@ module Perpetuity
       attrs = mapper.class.attribute_set.map do |attrib|
         value = attribute_for object, attrib.name
 
-        serialized_value = if value.is_a? Array
+        serialized_value = if value.is_a? Reference
+          serialize_reference value
+        elsif value.is_a? Array
           serialize_array(value, attrib.embedded?)
         elsif mapper.data_source.can_serialize? value
           value
@@ -74,8 +76,11 @@ module Perpetuity
       elsif data.is_a? Hash
         metadata = data.delete('__metadata__')
         if metadata
-          klass = Object.const_get metadata['class']
+          klass = metadata['class'].split('::').inject(Kernel) do |scope, const_name|
+            scope.const_get(const_name)
+          end
           id = metadata['id']
+
           if id
             object = Reference.new(klass, id)
           else
@@ -123,13 +128,18 @@ module Perpetuity
     end
 
     def serialize_reference value
-      unless value.is_a? PersistedObject
-        mapper_registry[value.class].insert value
+      if value.is_a? Reference
+        reference = value
+      else
+        unless value.is_a? PersistedObject
+          mapper_registry[value.class].insert value
+        end
+        reference = Reference.new(value.class.to_s, value.id)
       end
       {
-        '__metadata__' =>  {
-          'class' => value.class.to_s,
-          'id' => value.id
+        '__metadata__' => {
+          'class' => reference.klass.to_s,
+          'id'    => reference.id
         }
       }
     end

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/{perpetuity → integration}/mongodb_spec.rb

@@ -48,10 +48,6 @@ module Perpetuity
       its(:password)  { should == password }
     end
 
-    it 'uses the selected database' do
-      mongo.database.name.should == 'perpetuity_gem_test'
-    end
-
     it 'removes all documents from a collection' do
       mongo.insert klass, {}
       mongo.delete_all klass

data/spec/integration/persistence_spec.rb

@@ -93,5 +93,17 @@ describe 'Persistence' do
     Perpetuity[Book].insert book
     book.id.should eq "my-title-#{noise}"
   end
+
+  context 'with namespaced classes' do
+    let(:person) { CRM::Person.new }
+    let(:mapper) { Perpetuity[CRM::Person] }
+
+    before { person.name = 'Foo Bar' }
+
+    it 'persists even with colons in the names' do
+      mapper.insert person
+      person.should be_a Perpetuity::PersistedObject
+    end
+  end
 end
 

data/spec/integration/retrieval_spec.rb

@@ -111,4 +111,19 @@ describe "retrieval" do
       ids.should_not include draft.id
     end
   end
+
+  context 'with namespaced classes' do
+    let(:article) { Article.new }
+    let(:person) { CRM::Person.new }
+    let(:mapper) { Perpetuity[Article] }
+
+    before { article.author = person }
+
+    it 'gets a CRM::Person object back' do
+      mapper.insert article
+      retrieved_article = mapper.find(article.id)
+      mapper.load_association! retrieved_article, :author
+      retrieved_article.author.should be_a CRM::Person
+    end
+  end
 end

data/spec/integration/update_spec.rb

@@ -25,6 +25,19 @@ describe 'updating' do
     mapper.save article
     mapper.find(article.id).title.should eq new_title
   end
+
+  it 'updates an object with referenced attributes' do
+    user = User.new
+    article.author = user
+    mapper.save article
+
+    retrieved_article = mapper.find(article.id)
+    retrieved_article.title = new_title
+    mapper.save retrieved_article
+
+    retrieved_article = mapper.find(retrieved_article.id)
+    retrieved_article.author.should be_a Perpetuity::Reference
+  end
 end
 
 

data/spec/support/test_classes/crm_person.rb

@@ -0,0 +1,5 @@
+module CRM
+  class Person
+    attr_accessor :name
+  end
+end

data/spec/support/test_classes.rb

@@ -1,4 +1,4 @@
-%w( user article comment book message topic car ).each do |file|
+%w( user article comment book message topic car crm_person).each do |file|
   require "support/test_classes/#{file}"
 end
 
@@ -55,3 +55,7 @@ Perpetuity.generate_mapper_for(Car) do
     present :make
   end
 end
+
+Perpetuity.generate_mapper_for CRM::Person do
+  attribute :name
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,7 @@ files:
 - spec/integration/associations_spec.rb
 - spec/integration/deletion_spec.rb
 - spec/integration/indexing_spec.rb
+- spec/integration/mongodb_spec.rb
 - spec/integration/pagination_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/retrieval_spec.rb
@@ -121,7 +122,6 @@ files:
 - spec/perpetuity/mongodb/query_intersection_spec.rb
 - spec/perpetuity/mongodb/query_spec.rb
 - spec/perpetuity/mongodb/query_union_spec.rb
-- spec/perpetuity/mongodb_spec.rb
 - spec/perpetuity/persisted_object_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
@@ -136,6 +136,7 @@ files:
 - spec/support/test_classes/book.rb
 - spec/support/test_classes/car.rb
 - spec/support/test_classes/comment.rb
+- spec/support/test_classes/crm_person.rb
 - spec/support/test_classes/message.rb
 - spec/support/test_classes/topic.rb
 - spec/support/test_classes/user.rb
@@ -151,15 +152,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3471626582421512512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3471626582421512512
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Persistence library allowing serialization of Ruby objects
@@ -167,6 +174,7 @@ test_files:
 - spec/integration/associations_spec.rb
 - spec/integration/deletion_spec.rb
 - spec/integration/indexing_spec.rb
+- spec/integration/mongodb_spec.rb
 - spec/integration/pagination_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/retrieval_spec.rb
@@ -185,7 +193,6 @@ 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_spec.rb
 - spec/perpetuity/persisted_object_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
@@ -200,6 +207,7 @@ test_files:
 - spec/support/test_classes/book.rb
 - spec/support/test_classes/car.rb
 - spec/support/test_classes/comment.rb
+- spec/support/test_classes/crm_person.rb
 - spec/support/test_classes/message.rb
 - spec/support/test_classes/topic.rb
 - spec/support/test_classes/user.rb