mordor 0.2.5 → 0.2.6

data/lib/mordor/resource.rb

@@ -82,7 +82,6 @@ module Mordor
       else
         insert_id = self.update
       end
-      self.class.send(:ensure_indices)
       saved?
     end
 
@@ -185,6 +184,7 @@ module Mordor
         if options[:index]
           @indices    << name unless @indices.include?(name)
           @index_types[name] = options[:index_type] ? options[:index_type] : Mongo::DESCENDING
+          ensure_index(name)
         end
 
         if options[:timestamp]
@@ -224,10 +224,14 @@ module Mordor
 
       def ensure_indices
         indices.each do |index|
-          collection.ensure_index( [ [index.to_s, index_types[index]] ] )
+          ensure_index(index)
         end
       end
 
+      def ensure_index(attribute)
+        collection.ensure_index( [ [attribute.to_s, index_types[attribute] ]] )
+      end
+
       def indices
         @indices ||= []
       end

data/mordor.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.5"
-  s.date    = "2012-01-03"
+  s.version = "0.2.6"
+  s.date    = "2012-01-04"
 
   s.summary     = "mordor"
   s.description = <<-eos

data/spec/mordor/resource_spec.rb

@@ -48,38 +48,6 @@ describe "with respect to resources" do
     TestResource.send(:index_types)[:second].should == Mongo::ASCENDING
   end
 
-  it "should call ensure_index on the collection for each index when a query is performed" do
-    TestResource.class_eval do
-      def self.reset_ensure_count
-        @count = 0
-      end
-
-      def self.ensure_count
-        @count ||= 0
-      end
-
-      def self.ensure_count=(val)
-        @count = val
-      end
-
-      private
-      def self.do_ensure_indices
-        indices.each do |index|
-          collection.ensure_index( [ [index.to_s, index_types[index]] ] )
-        end
-      end
-
-      def self.ensure_indices
-        self.ensure_count = self.ensure_count + 1
-        self.do_ensure_indices
-      end
-    end
-    TestResource.create({:first => 'first', :second => 'second', :third => 'third'})
-    TestResource.reset_ensure_count
-    TestResource.all()
-    TestResource.ensure_count.should == 1
-  end
-
   it "should be possible to designate an attribute as a timestamp" do
     TestResource.timestamped_attribute.should_not be_nil
     TestResource.timestamped_attribute.should == :at
@@ -157,6 +125,66 @@ describe "with respect to resources" do
 
   end
 
+  context "with respect to indices" do
+    before :each do
+      class TestResource2
+        include Mordor::Resource
+      end
+
+      [TestResource, TestResource2].each do |klass|
+        klass.class_eval do
+          def self.reset_ensure_count
+            @count = 0
+          end
+
+          def self.ensure_count
+            @count ||= 0
+          end
+
+          def self.ensure_count=(val)
+            @count = val
+          end
+
+          private
+          def self.do_ensure_indices
+            indices.each do |index|
+              do_ensure_index(index)
+            end
+          end
+
+          def self.do_ensure_index(attribute)
+            collection.ensure_index( [ [attribute.to_s, index_types[attribute]] ] )
+          end
+
+          def self.ensure_indices
+            self.ensure_count = self.ensure_count + 1
+            self.do_ensure_indices
+          end
+
+          def self.ensure_index(attribute)
+            self.ensure_count += 1
+            self.do_ensure_index(attribute)
+          end
+        end
+      end
+    end
+
+    it "should call ensure_index on the collection for each index when a query is performed" do
+      TestResource.create({:first => 'first', :second => 'second', :third => 'third'})
+      TestResource.reset_ensure_count
+      TestResource.all()
+      TestResource.ensure_count.should == 1
+    end
+
+    it "should call ensure index for each index attribute on creation" do
+      TestResource2.class_eval do
+        attribute :test_attribute, :index => true
+      end
+
+      TestResource2.ensure_count.should == 1
+    end
+  end
+
   context "with respect to creating" do
     before :each do
       clean_sheet

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 +01:00
+date: 2012-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency