perpetuity 0.4 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 0.4.1
+
+- Add `Mapper#remove_index!` to remove DB indexes
+- Fix index declarations in mappers to take unique/order options
+  - These were intended to be there from the beginning, but the API wasn't made available in the mapper
+
 ## Version 0.4
 
 - Mapper select DSL now more closely resembles `Enumerable` syntax

data/lib/perpetuity/mapper.rb

@@ -10,8 +10,9 @@ module Perpetuity
     include DataInjectable
 
     def self.generate_for(klass, &block)
-      mapper = Class.new(base_class, &block)
+      mapper = Class.new(base_class)
       mapper.map klass
+      mapper.instance_exec &block if block_given?
     end
 
     def self.map klass
@@ -32,8 +33,12 @@ module Perpetuity
       attribute_set.map(&:name)
     end
 
-    def self.index attribute
-      data_source.index mapped_class, attribute_set[attribute]
+    def self.index attribute, options={}
+      data_source.index mapped_class, attribute_set[attribute], options
+    end
+
+    def remove_index! index
+      data_source.remove_index index
     end
 
     def indexes

data/lib/perpetuity/mongodb.rb

@@ -140,6 +140,16 @@ module Perpetuity
       index.activate!
     end
 
+    def remove_index index
+      coll = collection(index.collection)
+      db_indexes = coll.index_information.select do |name, info|
+        name =~ /#{index.attribute}/
+      end
+      if db_indexes.any?
+        collection(index.collection).drop_index db_indexes.first.first
+      end
+    end
+
     private
     def serializable_types
       @serializable_types ||= [NilClass, TrueClass, FalseClass, Fixnum, Float, String, Array, Hash, Time]

data/lib/perpetuity/version.rb

@@ -1,3 +1,3 @@
 module Perpetuity
-  VERSION = "0.4"
+  VERSION = "0.4.1"
 end

data/spec/perpetuity/mongodb_spec.rb

@@ -119,12 +119,18 @@ module Perpetuity
       end
 
       it 'creates indexes on the database collection' do
-        mongo.delete_all collection
         index = mongo.index collection, 'real_index', order: :descending, unique: true
         mongo.activate_index! index
 
         mongo.active_indexes(collection).should include index
       end
+
+      it 'removes indexes' do
+        index = mongo.index collection, 'real_index', order: :descending, unique: true
+        mongo.activate_index! index
+        mongo.remove_index index
+        mongo.active_indexes(collection).should_not include index
+      end
     end
   end
 end

data/spec/perpetuity_spec.rb

@@ -1,13 +1,11 @@
 require 'perpetuity'
+
+mongodb = Perpetuity::MongoDB.new db: 'perpetuity_gem_test'
+Perpetuity.configure { data_source mongodb }
+
 require 'test_classes'
 
 describe Perpetuity do
-  before(:all) do
-    # Use MongoDB for now as its the only one supported.
-    mongodb = Perpetuity::MongoDB.new db: 'perpetuity_gem_test'
-    Perpetuity.configure { data_source mongodb }
-  end
-
   describe 'mapper generation' do
     it 'generates mappers' do
       Perpetuity.generate_mapper_for Object
@@ -409,7 +407,7 @@ describe Perpetuity do
       Class.new(Perpetuity::Mapper) do
         map Object
         attribute :name
-        index :name
+        index :name, unique: true
       end
     end
     let(:mapper) { mapper_class.new }
@@ -419,6 +417,8 @@ describe Perpetuity do
       end
     end
 
+    after { mapper.data_source.database.drop_collection 'Object' }
+
     it 'adds indexes to database collections/tables' do
       name_index.attribute.name.should be == :name
     end
@@ -430,6 +430,11 @@ describe Perpetuity do
     it 'creates indexes' do
       mapper.reindex!
       name_index.should be_active
+      mapper.remove_index! name_index
+    end
+
+    it 'specifies uniqueness of the index' do
+      name_index.should be_unique
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake