perpetuity 0.7.3 → 1.0.0.beta

data/spec/perpetuity/mapper_spec.rb

@@ -47,8 +47,7 @@ module Perpetuity
         obj.instance_variable_set '@my_attribute', 'foo'
         data_source.should_receive(:can_serialize?).with('foo') { true }
         data_source.should_receive(:insert)
-                   .with(Object,
-                         [{ 'my_attribute' => 'foo' }])
+                   .with(Object, [{ 'my_attribute' => 'foo' }], mapper.attribute_set)
                    .and_return(['bar'])
 
         mapper.insert(obj).should be == 'bar'
@@ -93,6 +92,9 @@ module Perpetuity
         it 'caches results' do
           mapper.give_id_to returned_object, 1
           criteria = data_source.query { |o| o.id == 1 }
+          duplicate = returned_object.dup
+          duplicate.stub(class: returned_object.class)
+          returned_object.stub(dup: duplicate)
           data_source.should_receive(:retrieve)
                      .with(Object, criteria, options) { [returned_object] }
                      .once
@@ -177,5 +179,22 @@ module Perpetuity
         end
       end
     end
+
+    describe 'setting the id manually' do
+      context 'when setting the type' do
+        it 'adds the attribute to the attribute set' do
+          mapper_class.id(String) { 1.to_s }
+          id_attr = mapper_class.attribute_set[:id]
+          id_attr.type.should be String
+        end
+      end
+
+      context 'when not setting the type' do
+        it 'does not add the attribute' do
+          mapper_class.id { 1.to_s }
+          mapper_class.attribute_set[:id].should be_nil
+        end
+      end
+    end
   end
 end

data/spec/perpetuity_spec.rb

@@ -10,7 +10,7 @@ describe Perpetuity do
 
     it 'provides a DSL within the generated mapper' do
       Perpetuity.generate_mapper_for Object do
-        id { object_id + 1 }
+        id(Integer) { object_id + 1 }
         attribute :object_id
       end
 
@@ -18,7 +18,7 @@ describe Perpetuity do
       object = Object.new
       mapper.insert object
       mapper.id_for(object).should be == object.object_id + 1
-      mapper.attributes.should eq [:object_id]
+      mapper.attributes.should include :object_id
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,9 @@
-require 'perpetuity'
+require 'bundler/setup'
 
-Perpetuity.data_source :mongodb, 'perpetuity_gem_test'
+if ENV['PERPETUITY_ADAPTER'] == 'postgres'
+  require 'perpetuity/postgres'
+  Perpetuity.data_source :postgres, 'perpetuity_gem_test', user: ENV['USER'], password: nil
+else
+  require 'perpetuity/mongodb'
+  Perpetuity.data_source :mongodb, 'perpetuity_gem_test'
+end

data/spec/support/test_classes.rb

@@ -4,19 +4,19 @@ end
 
 class UserMapper < Perpetuity::Mapper
   map User
-  attribute :name
+  attribute :name, type: String
 end
 
 Perpetuity.generate_mapper_for Article do
-  attribute :title
-  attribute :body
-  attribute :author
-  attribute :comments, embedded: true
-  attribute :published_at
-  attribute :views
+  attribute :title, type: String
+  attribute :body, type: String
+  attribute :author, type: User
+  attribute :comments, type: Array, embedded: true
+  attribute :published_at, type: Time
+  attribute :views, type: Integer
 
   def published
-    select { |article| (article.published_at.not_equal? nil) &
+    select { |article| (article.published_at != nil) &
                        (article.published_at < Time.now) }
   end
 
@@ -27,40 +27,36 @@ Perpetuity.generate_mapper_for Article do
 end
 
 Perpetuity.generate_mapper_for(Comment) do
-  attribute :body
-  attribute :author
+  attribute :body, type: String
+  attribute :author, type: User
 end
 
 Perpetuity.generate_mapper_for Book do
-  id { title.gsub(/\W+/, '-').downcase }
-  attribute :title
-  attribute :authors
+  id(String) { title.gsub(/\W+/, '-').downcase }
+  attribute :title, type: String
+  attribute :authors, type: Array
 end
 
 Perpetuity.generate_mapper_for Message do
-  attribute :text
+  attribute :text, type: String
 end
 
 Perpetuity.generate_mapper_for(Topic) do
-  attribute :title
-  attribute :creator
+  attribute :title, type: String
+  attribute :creator, type: User
 end
 
 Perpetuity.generate_mapper_for(Car) do
-  attribute :make
-  attribute :model
-  attribute :seats
-
-  validate do
-    present :make
-  end
+  attribute :make, type: String
+  attribute :model, type: String
+  attribute :seats, type: Integer
 end
 
 Perpetuity.generate_mapper_for CRM::Person do
-  attribute :name
+  attribute :name, type: String
 end
 
 Perpetuity.generate_mapper_for GenericObject do
-  attribute :referenced_attribute
-  attribute :embedded_attribute, embedded: true
+  attribute :referenced_attribute, type: Object
+  attribute :embedded_attribute, type: Object, embedded: true
 end

data/spec/support/test_classes/topic.rb

@@ -1,3 +1,8 @@
 class Topic
   attr_accessor :title, :creator
+
+  def initialize title, creator
+    @title = title
+    @creator = creator
+  end
 end

data/spec/support/test_classes/user.rb

@@ -5,6 +5,6 @@ class User
   end
 
   def == other
-    name == other.name
+    other.is_a?(self.class) && name == other.name
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 1.0.0.beta
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: moped
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Persistence layer for Ruby objects
 email:
 - jgaskins@gmail.com
@@ -73,61 +59,38 @@ files:
 - lib/perpetuity/config.rb
 - lib/perpetuity/data_injectable.rb
 - lib/perpetuity/dereferencer.rb
+- lib/perpetuity/duplicator.rb
 - lib/perpetuity/exceptions/duplicate_key_error.rb
 - lib/perpetuity/identity_map.rb
 - lib/perpetuity/mapper.rb
 - lib/perpetuity/mapper_registry.rb
-- lib/perpetuity/mongodb.rb
-- lib/perpetuity/mongodb/index.rb
-- lib/perpetuity/mongodb/nil_query.rb
-- lib/perpetuity/mongodb/query.rb
-- lib/perpetuity/mongodb/query_attribute.rb
-- 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/rails.rb
 - lib/perpetuity/rails_model.rb
 - lib/perpetuity/reference.rb
 - lib/perpetuity/retrieval.rb
-- lib/perpetuity/validations.rb
-- lib/perpetuity/validations/length.rb
-- lib/perpetuity/validations/presence.rb
-- lib/perpetuity/validations/validation_set.rb
 - lib/perpetuity/version.rb
 - perpetuity.gemspec
 - spec/integration/associations_spec.rb
 - spec/integration/deletion_spec.rb
 - spec/integration/enumerable_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
 - spec/integration/serialization_spec.rb
 - spec/integration/update_spec.rb
-- spec/integration/validations_spec.rb
 - spec/perpetuity/attribute_set_spec.rb
 - spec/perpetuity/attribute_spec.rb
 - spec/perpetuity/config_spec.rb
 - spec/perpetuity/data_injectable_spec.rb
 - spec/perpetuity/dereferencer_spec.rb
+- spec/perpetuity/duplicator_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
-- spec/perpetuity/mongodb/query_attribute_spec.rb
-- spec/perpetuity/mongodb/query_expression_spec.rb
-- 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/rails_model_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
-- spec/perpetuity/validations/length_spec.rb
-- spec/perpetuity/validations/presence_spec.rb
-- spec/perpetuity/validations_spec.rb
 - spec/perpetuity_spec.rb
 - spec/spec_helper.rb
 - spec/support/stubbed_rails.rb
@@ -156,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6
@@ -170,34 +133,23 @@ test_files:
 - spec/integration/deletion_spec.rb
 - spec/integration/enumerable_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
 - spec/integration/serialization_spec.rb
 - spec/integration/update_spec.rb
-- spec/integration/validations_spec.rb
 - spec/perpetuity/attribute_set_spec.rb
 - spec/perpetuity/attribute_spec.rb
 - spec/perpetuity/config_spec.rb
 - spec/perpetuity/data_injectable_spec.rb
 - spec/perpetuity/dereferencer_spec.rb
+- spec/perpetuity/duplicator_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
-- spec/perpetuity/mongodb/query_attribute_spec.rb
-- spec/perpetuity/mongodb/query_expression_spec.rb
-- 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/rails_model_spec.rb
 - spec/perpetuity/reference_spec.rb
 - spec/perpetuity/retrieval_spec.rb
-- spec/perpetuity/validations/length_spec.rb
-- spec/perpetuity/validations/presence_spec.rb
-- spec/perpetuity/validations_spec.rb
 - spec/perpetuity_spec.rb
 - spec/spec_helper.rb
 - spec/support/stubbed_rails.rb

data/lib/perpetuity/mongodb.rb

@@ -1,230 +0,0 @@
-require 'moped'
-require 'perpetuity/mongodb/query'
-require 'perpetuity/mongodb/nil_query'
-require 'perpetuity/mongodb/index'
-require 'perpetuity/mongodb/serializer'
-require 'set'
-require 'perpetuity/exceptions/duplicate_key_error'
-require 'perpetuity/attribute'
-
-module Perpetuity
-  class MongoDB
-    attr_accessor :host, :port, :db, :pool_size, :username, :password
-
-    def initialize options
-      @host       = options.fetch(:host, 'localhost')
-      @port       = options.fetch(:port, 27017)
-      @db         = options.fetch(:db)
-      @pool_size  = options.fetch(:pool_size, 5)
-      @username   = options[:username]
-      @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}"]).with(safe: true)
-    end
-
-    def connect
-      session.login(@username, @password) if @username and @password
-      @connected = true
-      session
-    end
-
-    def connected?
-      !!@connected
-    end
-
-    def database
-      session.use db
-      connect unless connected?
-      session
-    end
-
-    def collection klass
-      database[klass.to_s]
-    end
-
-    def insert klass, objects
-      if objects.is_a? Array
-        objects.each do |object|
-          object[:_id] = object.delete(:id) || Moped::BSON::ObjectId.new
-        end
-
-        collection(klass).insert objects
-        objects.map { |object| object[:_id] }
-      else
-        insert(klass, [objects]).first
-      end
-
-    rescue Moped::Errors::OperationFailure => e
-      if e.message =~ /duplicate key/
-        e.message =~ /\$(\w+)_\d.*dup key: { : (.*) }/
-        key = $1
-        value = $2.gsub("\\\"", "\"")
-        raise DuplicateKeyError, "Tried to insert #{klass} with duplicate unique index: #{key} => #{value}"
-      end
-    end
-
-    def count klass, criteria=nil_query, &block
-      q = block_given? ? query(&block).to_db : criteria.to_db
-      collection(klass).find(q).count
-    end
-
-    def delete_all klass
-      collection(klass.to_s).find.remove_all
-    end
-
-    def first klass
-      document = collection(klass.to_s).find.limit(1).first
-      document[:id] = document.delete("_id")
-
-      document
-    end
-
-    def retrieve klass, criteria, options = {}
-      # MongoDB uses '_id' as its ID field.
-      criteria = to_bson_id(criteria.to_db)
-
-      skipped = options.fetch(:skip) { 0 }
-
-      query = collection(klass.to_s)
-                .find(criteria)
-                .skip(skipped)
-                .limit(options[:limit])
-
-      sort(query, options).map do |document|
-        document[:id] = document.delete("_id")
-        document
-      end
-    end
-
-    def increment klass, id, attribute, count=1
-      find(klass, id).update '$inc' => { attribute => count }
-    end
-
-    def find klass, id
-      collection(klass).find(to_bson_id(_id: id))
-    end
-
-    def to_bson_id criteria
-      criteria = criteria.dup
-
-      # Check for both string and symbol ID in criteria
-      if criteria.has_key?('id')
-        criteria['_id'] = Moped::BSON::ObjectId(criteria['id']) rescue criteria['id']
-        criteria.delete 'id'
-      end
-
-      if criteria.has_key?(:id)
-        criteria[:_id] = Moped::BSON::ObjectId(criteria[:id]) rescue criteria[:id]
-        criteria.delete :id
-      end
-
-      criteria
-    end
-
-    def sort query, options
-      return query unless options[:attribute] &&
-                          options[:direction]
-
-      sort_orders = { ascending: 1, descending: -1 }
-      sort_field = options[:attribute]
-      sort_direction = options[:direction]
-      sort_criteria = { sort_field => sort_orders[sort_direction] }
-      query.sort(sort_criteria)
-    end
-
-    def all klass
-      retrieve klass, nil_query, {}
-    end
-    
-    def delete id, klass
-      collection(klass.to_s).find("_id" => id).remove
-    end
-
-    def update klass, id, new_data
-      find(klass, id).update('$set' => new_data)
-    end
-
-    def can_serialize? value
-      serializable_types.include? value.class
-    end
-
-    def drop_collection to_be_dropped
-      collection(to_be_dropped.to_s).drop
-    end
-
-    def query &block
-      Query.new(&block)
-    end
-
-    def nil_query
-      NilQuery.new
-    end
-
-    def negate_query &block
-      Query.new(&block).negate
-    end
-
-    def index klass, attribute, options={}
-      @indexes[klass] ||= Set.new
-
-      index = Index.new(klass, attribute, options)
-      @indexes[klass] << index 
-      index
-    end
-
-    def indexes klass
-      @indexes[klass]
-    end
-
-    def active_indexes klass
-      collection(klass).indexes.map do |index|
-        key = index['key'].keys.first
-        direction = index['key'][key]
-        unique = index['unique']
-        Index.new(klass, Attribute.new(key), order: Index::KEY_ORDERS[direction], unique: unique)
-      end.to_set
-    end
-
-    def activate_index! index
-      attribute = index.attribute.to_s
-      order = index.order == :ascending ? 1 : -1
-      unique = index.unique?
-
-      collection(index.collection).indexes.create({attribute => order}, unique: unique)
-      index.activate!
-    end
-
-    def remove_index index
-      coll = collection(index.collection)
-      db_indexes = coll.indexes.select do |db_index|
-        db_index['name'] =~ /\A#{index.attribute}/
-      end.map { |idx| idx['key'] }
-
-      if db_indexes.any?
-        collection(index.collection).indexes.drop db_indexes.first
-      end
-    end
-
-    def serialize object, mapper
-      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
-
-    private
-    def serializable_types
-      @serializable_types ||= [NilClass, TrueClass, FalseClass, Fixnum, Float, String, Array, Hash, Time]
-    end
-  end
-end