ampere 1.2.2 → 1.2.3

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-07-24"
+  s.date = "2012-10-02"
   s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
   s.email = "max@villainousindustri.es"
   s.extra_rdoc_files = [

data/lib/ampere/model.rb

@@ -315,7 +315,7 @@ module Ampere
           # Set attr with key where referred model is stored
           self.send("#{field_name}_id=", val.id)
           # Also update that model's hash with a pointer back to here
-          val.send("#{my_klass_name}_id=", self.send("id"))
+          val.send("#{my_klass_name}_id=", self.send("id")) if val.respond_to?("#{my_klass_name}_id=")
         end
       end
     
@@ -325,7 +325,7 @@ module Ampere
         my_klass_name = to_s.downcase
       
         define_method(:"#{field_name}") do
-          (Ampere.connection.smembers(key_for_has_many(to_s.downcase, self.id, field_name))).map do |id|
+          (Ampere.connection.smembers(key_for_has_many(my_klass_name, self.id, field_name))).map do |id|
             eval(klass_name.to_s.capitalize).find(id)
           end
         end
@@ -333,7 +333,7 @@ module Ampere
         define_method(:"#{field_name}=") do |val|
           val.each do |v|
             Ampere.connection.multi do
-              Ampere.connection.sadd(key_for_has_many(to_s.downcase, self.id, field_name), v.id)
+              Ampere.connection.sadd(key_for_has_many(my_klass_name, self.id, field_name), v.id)
               # Set pointer for belongs_to
               Ampere.connection.hset(key_for_find(v.class, v.id), "#{my_klass_name}_id", self.send("id"))
             end

data/spec/models/indices_spec.rb

@@ -1,21 +1,22 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
 
 describe "Model indices", :indices => true do
+  
+  class Student
+    include Ampere::Model
+
+    field :first_name
+    field :last_name
+    field :student_id_num
+
+    index :last_name
+    index :student_id_num, :unique => true
+  end
+  
   before :each do
     Redis.new.flushall
     Ampere.connect
-
-    class Student
-      include Ampere::Model
-      
-      field :first_name
-      field :last_name
-      field :student_id_num
-      
-      index :last_name
-      index :student_id_num, :unique => true
-    end
-    
+  
     @a = Student.create :first_name     => "Hannibal",
                         :last_name      => "Smith",
                         :student_id_num => "1001"
@@ -26,56 +27,56 @@ describe "Model indices", :indices => true do
                         :last_name      => "Goldstein",
                         :student_id_num => "1003"
   end
-  
+
   ###
-  
+
   it 'should know about its own indices' do
     Student.indices.should include(:last_name)
     Student.indices.should_not include(:first_name)
     Student.indices.should include(:student_id_num)
   end
-  
+
   it 'should find an array of values for a non-unique index' do
     smiths = Student.where(:last_name => "Smith")
     smiths.should_not be_empty
     smiths.to_a.map(&:first_name).should include("Hannibal")
     smiths.to_a.map(&:first_name).should include("Cindy")
   end
-  
+
   it 'should find a single value for a unique index' do
     emmanuel = Student.where(:student_id_num => "1003")
     emmanuel.should_not be_empty
     emmanuel.first.first_name.should == "Emmanuel"
   end
-  
+
   it 'should refuse to create an index on a field that does not exist' do
     (->{
-      class Student
+      class Student1
         include Ampere::Model
-        
+      
         field :this_field_exists
 
         index :this_field_exists
       end
     }).should_not raise_error
     (->{
-      class Student
+      class Student2
         include Ampere::Model
-        
+      
         index :this_field_does_not_exist
       end
     }).should raise_error
     (->{
-      class Student
+      class Student3
         include Ampere::Model
-        
+      
         field :this_field_exists
-        
+      
         index [:this_field_exists, :but_this_one_does_not]
       end
     }).should raise_error
   end
-  
+
   it 'should enforce the uniqueness of unique single-field indices' do
     # The student_id_num field of Student is unique. If two Students
     # with the same student_id_num are stored, the second should not 
@@ -92,23 +93,23 @@ describe "Model indices", :indices => true do
     }).should raise_error
     Student.where(:student_id_num => "2000").first.first_name.should == "Bobby"
   end
-  
+
   context 'compound indices' do
     before :all do
       class Professor
         include Ampere::Model
-        
+      
         field :first_name
         field :last_name
         field :employee_id_number
-        
+      
         index :employee_id_number
         index [:last_name, :first_name]
       end
     end
-    
+  
     ###
-    
+  
     it 'should define compound indices' do
       Professor.indices.should include([:first_name, :last_name])
 
@@ -119,7 +120,7 @@ describe "Model indices", :indices => true do
       Professor.count.should == 1
       Ampere.connection.exists("ampere.index.professor.first_name:last_name").should be_true
     end
-    
+  
     it 'should be able to search on both fields of a compound index' do
       Professor.create :first_name         => "Ava",
                        :last_name          => "Jenkins",
@@ -135,16 +136,16 @@ describe "Model indices", :indices => true do
       brandi.count.should == 1
       brandi.first.employee_id_number.should == "31415929"
     end
-    
+  
     # it 'should still be able to search on just one field of a compound index' do
     #   pending
     # end
   end
-  
+
   ###
-  
+
   after :all do
     Redis.new.flushall
     Ampere.disconnect
   end
-end
+end

data/spec/models/model_spec.rb

@@ -4,22 +4,22 @@ describe "Base models", :model => true do
   context "by themselves" do
     class Post
       include Ampere::Model
-      
+  
       field :title
       field :byline
       field :content
     end
-    
+
     before :all do
       Ampere.connect
-      
+  
       # Clear out Redis
       Redis.new.flushall
-      
+  
       # Define a model class here.
-      
+  
     end
-    
+
     # # #
 
     context 'fields' do
@@ -32,46 +32,46 @@ describe "Base models", :model => true do
         post.should respond_to(:content)
         post.should respond_to(:"content=")
       end
-    
+
       it "should know about its own fields" do
         Post.fields.should include(:title)
         Post.fields.should include(:byline)
         Post.fields.should include(:content)
       end
-    
+
       it "should have default values definable" do
         class Comment
           include Ampere::Model
-          
+      
           field :subject, :default => "No subject"
           field :content
         end
-      
+  
         comment = Comment.new
         comment.subject.should == "No subject"
         comment.content.should be_nil
       end
-    
+
       it "should raise an exception when you try to set a field that doesn't exist" do
         (->{Post.new :shazbot => "This isn't the right key"}).should raise_error
       end
-      
+  
       context 'types', :types => true do
         before :all do
           # Just adding a field with a type to Post
           class Post
             include Ampere::Model
-            
+        
             field :pageviews, :type => Integer, :default => 0
           end
         end
-        
+    
         it "should set field types for fields that have a type" do
           Post.field_types.should_not be_nil
           Post.field_types[:pageviews].should_not be_nil
           Post.field_types[:pageviews].should == 'Integer'
         end
-        
+    
         it "shouldn't care what the value types are assigned to a field with no type defined" do
           # Assign an int to the :title of a Post.
           (->{
@@ -79,10 +79,10 @@ describe "Base models", :model => true do
                         :byline    => "",
                         :content   => "",
                         :pageviews => 1234
-            
-            
+        
+        
           }).should_not raise_error
-          
+      
           # Assign a string to the :title of a Post.
           (->{
             Post.create :title     => "1234",
@@ -91,20 +91,20 @@ describe "Base models", :model => true do
                         :pageviews => 1234
           }).should_not raise_error
         end
-        
+    
         it "should, given a field's type, only accept values for that field of that type" do
           post = Post.create :title     => "",
                              :byline    => "",
                              :content   => "",
                              :pageviews => 1234
-          
+      
           # Try to assign a string to :year, raising an error.
           (->{post.pageviews = "this is not an integer"}).should raise_error
           (->{post.pageviews = 4321}).should_not raise_error
         end
       end
     end
-    
+
     it "should have a 'new' method that works like we'd expect" do
       post = Post.new :title   => "Amish Give Up - 'This is bullshit!', Elders Say",
                       :byline  => "The Onion",
@@ -117,7 +117,7 @@ describe "Base models", :model => true do
       post.byline.should  == "The Onion"
       post.content.should =~ /Lorem ipsum dolor/
     end
-    
+
     it "should be able to convert itself to a hash" do
       post = Post.new :title   => "A title",
                       :byline  => "Max",
@@ -127,7 +127,7 @@ describe "Base models", :model => true do
       hash[:byline].should  == "Max"
       hash[:content].should == "Some content"
     end
-    
+
     it "should have a 'save' and 'reload' method that work like we'd expect" do
       post = Post.new :title   => "A title",
                       :byline  => "Max",
@@ -140,25 +140,25 @@ describe "Base models", :model => true do
       post.byline.should  == "Max"
       post.content.should == "Some content"
     end
-    
+
     it "should refuse to reload a new record, that hasn't yet been saved" do
       post = Post.new :title   => "A title",
                       :byline  => "Max",
                       :content => "Some content"
       (->{post.reload}).should raise_error
     end
-    
+
     it "should be able to tell when two records are equivalent" do
       foo = Post.create :title => "Kitties!", :byline => "Max", :content => "Kitties are awesome."
       bar = Post.create :title => "Doggies!", :byline => "Max", :content => "Doggies are cool."
-      
+  
       foo.should == foo
       foo.should_not == bar
-      
+  
       foo.should eql(foo)
       foo.should_not eql(bar)
     end
-    
+
     it "should also be able to determine the hash of a record, for equivalence testing" do
       Post.new(title: "Guinea Pigs", byline: "Max", content: "Guinea pigs are super cute.").hash.is_a?(Fixnum).should be_true
     end
@@ -171,7 +171,7 @@ describe "Base models", :model => true do
       post.save
       post.new?.should be_false
     end
-    
+
     # context 'deletion' do
       it "should be deleteable from the model class", wip:true do
         post = Post.create :title   => "This post should be deleted",
@@ -185,7 +185,7 @@ describe "Base models", :model => true do
         deleted_post.should be_destroyed
         Post.find(id).should be_nil
       end
-    
+
       it "should be destroyable by itself" do
         another_post = Post.create :title   => "This one too, probably.",
                                    :byline  => "Just seems like one big",
@@ -196,7 +196,7 @@ describe "Base models", :model => true do
         Post.find(id).should be_nil
       end
     # end
-    
+
     it "should be findable by ID" do
       post = Post.create :title   => "foo",
                          :byline  => "bar",
@@ -204,7 +204,7 @@ describe "Base models", :model => true do
       Post.find(post.id).should == post
       # Since we're using GUIDs, this should also be true:
       post2 = Post.find(post.id)
-      
+  
       post.title.should   == post2.title
       post.byline.should  == post2.byline
       post.content.should == post2.content
@@ -217,22 +217,22 @@ describe "Base models", :model => true do
       post.should be_persisted
       Post.find(post.id).should == post
     end
-    
+
     it "should return an integer for its ID" do
       post = Post.create :title   => "On Motorcycles and Robots",
                          :byline  => "Max",
                          :content => "Motorcycles and robots are awesome"
       post.id.should be_a(Fixnum)
     end
-    
+
     # # #
-    
+
     after :all do
       # Clear out Redis
       Redis.new.flushall
       Ampere.disconnect
     end
-    
+
   end
-  
-end
+
+end

data/spec/models/queries_spec.rb

@@ -4,19 +4,19 @@ describe 'queries', :queries => true do
   before :each do
     Redis.new.flushall
     Ampere.connect
-    
+  
     class Kitty
       include Ampere::Model
-      
+    
       field :name
       field :breed
       field :age
       field :color
-      
+    
       index :name     # => Unique
       index :color    # => Non-unique
     end
-    
+  
     @kitty_paws = Kitty.create name:  'Kitty Paws',
                                breed: 'Domestic shorthair',
                                age:   19,
@@ -39,13 +39,13 @@ describe 'queries', :queries => true do
                                color: 'grey'
     [@kitty_paws, @nate, @jinxii, @italics, @serif]. each {|k| k.reload}
   end
-  
+
   ### 
-  
+
   it 'should pass a basic sanity check' do
     Kitty.count.should == 5
   end
-  
+
   it 'should be able to select all kitties' do
     Kitty.all.map(&:name).should include('Kitty Paws')
     Kitty.all.map(&:name).should include('Nate')
@@ -53,35 +53,35 @@ describe 'queries', :queries => true do
     Kitty.all.map(&:name).should include('Italics')
     Kitty.all.map(&:name).should include('Serif')
   end
-  
+
   context 'with no fields' do
     it 'should return the empty set with no conditions given' do
       Kitty.where().should be_empty
     end
   end
-  
+
   context 'with one field' do
     it 'should be able to find by an indexed field using where()' do
       Kitty.where(:name => 'Nate').to_a.map(&:name).should include('Nate')
     end
-  
+
     it 'should be able to find by a non-indexed field using where()' do
       Kitty.where(:breed => 'Siberian').to_a.map(&:name).should include('Italics')
       Kitty.where(:breed => 'Siberian').to_a.map(&:name).should include('Serif')
     end
   end
-  
+
   it 'should be able to find by two indexed fields at once' do
     kitty = Kitty.where(:name => "Kitty Paws", :color => "orange")
     kitty.count.should == 1
     kitty.first.name.should == "Kitty Paws"
   end
-  
+
   it 'should be able to find by two non-indexed fields at once' do
     # :breed and :age are not indexed
     Kitty.where(:breed => "Domestic shorthair", :age => 17).count.should == 1
   end
-  
+
   it 'should be able to find by a mix of indexed and non-indexed fields' do
     # :color is indexed, :breed is not
     Kitty.where(:color => "orange").count.should == 2
@@ -89,9 +89,9 @@ describe 'queries', :queries => true do
     Kitty.where(:color => "orange", :breed => "Siberian").count.should == 1
     Kitty.where(:color => "orange", :breed => "Siberian").first.name.should == "Italics"
   end
-  
+
   ###
-  
+
   after :all do
     Redis.new.flushall
     Ampere.connect

data/spec/models/relationships/belongs_to_spec.rb

@@ -1,41 +1,41 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe 'belongs_to relationships', :belongs_to => true do
+  
+  class Car
+    include Ampere::Model
+
+    field :make
+    field :model
+    field :year
+
+    has_one :engine
+    has_many :passengers
+  end
+
+  class Engine
+    include Ampere::Model
+
+    field :displacement
+    field :cylinders
+    field :configuration
+
+    belongs_to :car
+  end
+
+  class Passenger
+    include Ampere::Model
+
+    field :name
+    field :seat
+
+    belongs_to :car
+  end
+  
   before :all do
     Redis.new.flushall
     Ampere.connect
     
-    # These are used by the has_one/belongs_to example below
-    class Car
-      include Ampere::Model
-      
-      field :make
-      field :model
-      field :year
-
-      has_one :engine
-      has_many :passengers
-    end
-
-    class Engine
-      include Ampere::Model
-      
-      field :displacement
-      field :cylinders
-      field :configuration
-      
-      belongs_to :car
-    end
-    
-    class Passenger
-      include Ampere::Model
-      
-      field :name
-      field :seat
-      
-      belongs_to :car
-    end
-    
     @car    = Car.create :make  => "Lamborghini",
                          :model => "Countach",
                          :year  => "1974"
@@ -47,66 +47,66 @@ describe 'belongs_to relationships', :belongs_to => true do
     @passenger = Passenger.create :name => "Leila",
                                   :seat => "passenger"
   end
-  
+
   ###
-  
+
   it 'sets accessor methods for a belongs_to relationship' do
     # Other side of a has_many
     @driver.should respond_to(:car)
     # Other side of a has_one
     @engine.should respond_to(:car)
   end
-  
+
   it 'sets belongs_to pointer for has_one relationship that is set from the parent' do
     @car.engine = @engine
     @car.save
     @engine.save
-    
+  
     car    = Car.find(@car.id)
     engine = Engine.find(@engine.id)
-    
+  
     car.engine.should == @engine
     engine.car.should == @car
-    
+  
     # Cleanup
     @car.engine = nil
     @engine.car = nil
     @car.save
     @engine.save
   end
-  
+
   it 'sets belongs_to pointer for has_one relationship that is set from the child' do
     @engine.car = @car
     @car.save
     @engine.save
-    
+  
     car    = Car.find(@car.id)
     engine = Engine.find(@engine.id)
-    
+  
     car.engine.should == @engine
     engine.car.should == @car
-    
+  
     # Cleanup
     @car.engine = nil
     @engine.car = nil
     @car.save
     @engine.save
   end
-  
+
   it 'sets belongs_to pointer for has_many relationship' do
     @car.passengers = @car.passengers + [@driver]
     @car.passengers = @car.passengers + [@passenger]
     @car.save
-    
+  
     @driver.reload
     @passenger.reload
-    
+  
     @driver.car.should == @car
     @passenger.car.should == @car
   end
-  
+
   ###
-  
+
   after :all do
     Redis.new.flushall
     Ampere.connect

data/spec/models/relationships/has_many_spec.rb

@@ -1,30 +1,30 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe 'has_many relationships', :has_many => true do
+
+  class Car
+    include Ampere::Model
+  
+    field :make
+    field :model
+    field :year
+
+    has_many :passengers
+  end
+
+  class Passenger
+    include Ampere::Model
+  
+    field :name
+    field :seat
+  
+    belongs_to :car
+  end
+
   before :each do
     Redis.new.flushall
     Ampere.connect
-    
-    # These are used by the has_one/belongs_to example below
-    class Car
-      include Ampere::Model
-      
-      field :make
-      field :model
-      field :year
-
-      has_many :passengers
-    end
-    
-    class Passenger
-      include Ampere::Model
-      
-      field :name
-      field :seat
-      
-      belongs_to :car
-    end
-    
+  
     @car    = Car.create :make  => "Lamborghini",
                          :model => "Countach",
                          :year  => "1974"
@@ -34,22 +34,22 @@ describe 'has_many relationships', :has_many => true do
                                   :seat => "passenger"
 
   end
-  
+
   ###
-  
+
   it 'should define the necessary methods for has_many relationships' do
     # Attr accessors
     @car.should respond_to(:passengers)
     @car.should respond_to(:"passengers=")
   end
-  
+
   it 'should be able to add items to has_many relationships' do
     @car.passengers = @car.passengers + [@driver]
     @car.passengers = @car.passengers + [@passenger]
 
     @car.save
     @car.reload
-    
+  
     @driver.reload
     @passenger.reload
 
@@ -57,19 +57,24 @@ describe 'has_many relationships', :has_many => true do
     @car.passengers.should include(@passenger)
   end
   
+  it 'should add a set of IDs to Redis', wip:true do
+    @car.passengers = @car.passengers + [@driver]
+    Ampere.connection.keys.should include("car.#{@car.id}.has_many.passengers")
+  end
+
   # it 'should be able to remove items from has_many relationships' do
   #   pending
   # end
-  
+
   # it 'should be able to query has_many relationships' do
   #   pending
   # end
-  
+
   ###
-  
+
   after :all do
     Ampere.disconnect
     Redis.new.flushall
   end
-  
+
 end

data/spec/models/relationships/has_one_spec.rb

@@ -1,31 +1,32 @@
 require File.join(File.dirname(__FILE__), "..", "..", "spec_helper.rb")
 
 describe 'has_one relationships', has_one:true do
+  
+  class Car
+    include Ampere::Model
+  
+    field :make
+    field :model
+    field :year
+
+    has_one :engine
+  end
+
+  class Engine
+    include Ampere::Model
+  
+    field :displacement
+    field :cylinders
+    field :configuration
+  
+    belongs_to :car
+  end
+  
+
   before :all do
     Redis.new.flushall
     Ampere.connect
     
-    # These are used by the has_one/belongs_to example below
-    class Car
-      include Ampere::Model
-      
-      field :make
-      field :model
-      field :year
-
-      has_one :engine
-    end
-
-    class Engine
-      include Ampere::Model
-      
-      field :displacement
-      field :cylinders
-      field :configuration
-      
-      belongs_to :car
-    end
-    
     @car    = Car.create :make  => "Lamborghini",
                          :model => "Countach",
                          :year  => "1974"
@@ -33,9 +34,9 @@ describe 'has_one relationships', has_one:true do
                             :cylinders     => "12",
                             :configuration => "V"
   end
-  
+
   ###
-  
+
   it 'can store a relationship to one model instance from another using an attr_accessor' do
     @car.engine_id = @engine.id
     @car.save
@@ -43,12 +44,12 @@ describe 'has_one relationships', has_one:true do
     @engine.reload
     @car.engine_id.should == @engine.id
     @car.engine.should == @engine
-    
+  
     @car.engine_id = nil
     @car.save
     @car.engine.should be_nil
   end
-  
+
   it 'can store a relationship to one model instance from another using custom accessor methods' do
     @car.engine = @engine
     @car.save
@@ -56,12 +57,12 @@ describe 'has_one relationships', has_one:true do
     @engine.reload
     @car.engine_id.should == @engine.id
     @car.engine.should == @engine
-    
+  
     @car.engine_id = nil
     @car.save
     @car.engine.should be_nil
   end
-  
+
   it 'can delete the object related to it in a has_one relationship' do
     @car.engine = @engine
     @car.engine.destroy
@@ -69,11 +70,11 @@ describe 'has_one relationships', has_one:true do
     @car.engine.should be_nil
     Engine.find(@engine.id).should be_nil
   end
-  
+
   ###
-  
+
   after :all do
     Ampere.disconnect
     Redis.new.flushall
   end
-end
+end

data/spec/models/timestamps_spec.rb

@@ -1,45 +1,45 @@
 describe Ampere::Timestamps do
   before :all do
     Ampere.connect
-    
+  
     Ampere.connection.flushall
-    
+  
     class Comment
       include Ampere::Model
       include Ampere::Timestamps
-      
+    
       field :body
     end
   end
-  
+
   context 'when included in models' do
     it 'sets created_at for newly-created record' do
       Timecop.freeze(Time.now) do
         time = Time.now
-        
+      
         c = Comment.create body: "I am intrigued by your ideas, and would like to subscribe to your newsletter."
         c.created_at.should eq(time)
         c.updated_at.should eq(time)
       end
     end
-    
+  
     it 'sets updated_at when changing records' do
       c = Comment.create body: "I am intrigued by your ideas, and would like to subscribe to your newsletter."
       created_at = c.created_at
-      
+    
       time = 0
-      
+    
       Timecop.freeze(Time.now + 30) do
         time = Time.now
-        
+      
         c.body = "Theodore Roosevelt riding a moose, therefore your argument is invalid."
         c.save
       end
-      
+    
       c.updated_at.should eq(time)
       c.created_at.should eq(created_at)
     end
-    
-  end
   
+  end
+
 end

data/spec/models/updates_spec.rb

@@ -4,33 +4,33 @@ describe 'queries', :queries => true do
   before :each do
     Redis.new.flushall
     Ampere.connect
-    
+  
     class Motorcycle
       include Ampere::Model
-      
+    
       field :make
       field :model
       field :year
     end
-    
+  
     @bike = Motorcycle.create make: "Honda", model: "CB400", year: "1990"
   end
-  
+
   ###
-  
+
   it 'should be able to update one field atomically' do
     @bike.model.should == "CB400"
     @bike.update_attribute :model, "CB450SC"
     @bike.model.should == "CB450SC"
     @bike.reload.model.should == "CB450SC"
-    
+  
     @bike.year.should == "1990"
     @bike.update_attribute :year, "1986"
     @bike.year.should == "1986"
     @bike.reload
     @bike.year.should == "1986"
   end
-  
+
   it 'should be able to update multiple fields atomically' do
     @bike.update_attributes model: "CB750",
                              year:  "1996"
@@ -54,9 +54,9 @@ describe 'queries', :queries => true do
                               neither_does_this_one:     "Duis aute irure dolor in."
     }).should raise_error
   end
-  
+
   ###
-  
+
   after :all do
     Redis.new.flushall
     Ampere.connect

data/spec/models/validations_spec.rb

@@ -4,17 +4,17 @@ describe 'Validations', :validations => true do
   before :all do
     class Person
       include Ampere::Model
-      
+    
       field :first_name
       field :last_name
       field :email
-      
+    
       validates_presence_of :last_name
       validates_format_of :email, :with => /\A\w+@\w+\.com\Z/i
     end
-    
-  end
   
+  end
+
   it 'should validate presence of items' do
     alice = Person.new :first_name => 'Alice',
                        :last_name  => 'Steel',
@@ -26,16 +26,15 @@ describe 'Validations', :validations => true do
     bob.should be_invalid
     bob.errors.should_not be_empty
   end
-  
+
   it 'should validate format of items' do
     charlie = Person.new :first_name => 'Charlie',
                          :last_name  => 'Steel',
                          :email      => 'c h a r l i e @ charlie .com'
     charlie.should_not be_valid
   end
-  
+
   # Since this is accomplished by including a module, what is being tested here
   # is that the module got included correctly and works. For testing of all the
   # other kinds of validations, run the tests for ActiveModel::Validations.
 end
-

data/spec/module/collections_ennumerable_spec.rb

@@ -4,13 +4,13 @@ describe 'Collections are Ennumerable', :collections => true, :ennumerable => tr
   before :all do
     Redis.new.flushall
     Ampere.connect
-    
+  
     class President
       include Ampere::Model
-      
+    
       field :name
       field :party
-      
+    
       index :party
     end
 
@@ -21,32 +21,32 @@ describe 'Collections are Ennumerable', :collections => true, :ennumerable => tr
     President.create :name  => "John F. Kennedy"       , :party => "Democratic"
     President.create :name  => "Jimmy Carter"          , :party => "Democratic"
   end
-  
+
   it 'should implement the #each method correctly' do
     presidents = []
     President.all.each {|p| presidents << p.name}
-    presidents.should == [
-      "Millard Fillmore"     ,
-      "Ulysses S. Grant"     ,
+    presidents.sort.should == [
       "Abraham Lincoln"      ,
       "Franklin D. Roosevelt",
+      "Jimmy Carter"         ,
       "John F. Kennedy"      ,
-      "Jimmy Carter"         
+      "Millard Fillmore"     ,
+      "Ulysses S. Grant"     
     ]
   end
-  
+
   it 'should lazily evaluate the #[] method' do
     presidents = President.all
-    
+  
     presidents[2].name.should eq('Abraham Lincoln')
     presidents[2].name.should eq('Abraham Lincoln')
   end
-  
+
   it 'should be comparable to an array' do
     President.all.should == President.all.to_a
     President.all.should_not be(President.all.to_a)
   end
-  
+
   # These are just a handful of methods to ensure that the Enumerable module is
   # being included correctly. They can safely be factored out since the #each 
   # one above should cover Enumerable if it's being included correctly.
@@ -59,9 +59,9 @@ describe 'Collections are Ennumerable', :collections => true, :ennumerable => tr
     President.all.any? {|p| p.party == 'Whig'}.should be_true
     President.all.any? {|p| p.party == 'Green'}.should be_false
   end
-  
+
   it 'should implement the #map method correctly' do
-    President.all.map(&:party).should == %w{Whig Republican Republican Democratic Democratic Democratic}
+    President.all.map(&:party).sort.should == %w{Whig Republican Republican Democratic Democratic Democratic}.sort
   end
 
   it 'should implement the #inject method correctly' do
@@ -77,6 +77,6 @@ describe 'Collections are Ennumerable', :collections => true, :ennumerable => tr
     }
   end
 
-  
+
 end
 

data/spec/module/collections_spec.rb

@@ -3,13 +3,13 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
 describe 'Collections', :collections => true do
   class President
     include Ampere::Model
-    
+  
     field :name
     field :party
-    
+  
     index :party
   end
-  
+
   before :all do
     Redis.new.flushall
     Ampere.connect
@@ -21,7 +21,7 @@ describe 'Collections', :collections => true do
     President.create :name  => "John F. Kennedy"       , :party => "Democratic"
     President.create :name  => "Jimmy Carter"          , :party => "Democratic"
   end
-  
+
   ###
 
   it 'should be returned by President.all' do
@@ -31,7 +31,7 @@ describe 'Collections', :collections => true do
     democrats.raw_array.length.should == 6
     democrats.count.should == 6
   end
-  
+
   it 'should be returned by where() queries' do
     democrats = President.where(:party => "Democratic")
     democrats.class.should == Ampere::Collection
@@ -39,46 +39,46 @@ describe 'Collections', :collections => true do
     democrats.raw_array.length.should == 3
     democrats.count.should == 3
   end
-  
+
   it 'should be accessible via [] like an Array' do
     whigs = President.where(:party => "Whig")
     whigs[0].name.should == "Millard Fillmore"
   end
-  
+
   it 'should lazily load model instances searched for with indexed fields' do
     whigs = President.where(:party => "Whig")
     whigs.raw_array.first.class.should == String
     whigs[0].name.should == "Millard Fillmore"
     whigs.raw_array.first.class.should == President
   end
-  
+
   it 'should return its first() item' do
     republicans = President.where(:party => "Republican")
     republicans.first.name.should == "Ulysses S. Grant"
   end
-  
+
   it 'should return its first(n) items' do
     republicans = President.where(:party => "Republican")
     republicans.first(2).map(&:name).should == ["Ulysses S. Grant", "Abraham Lincoln"]
   end
-  
+
   it 'should return its last() item' do
     democrats = President.where(:party => "Democratic")
     democrats.last.name.should == "Jimmy Carter"
   end
-  
+
   it 'should be convertible to an array' do
     republicans = President.where(:party => "Republican")
     republicans.to_a.map(&:name).should == ["Ulysses S. Grant", "Abraham Lincoln"]
   end
-  
+
   it 'should give its first and last elements non-lazily' do
     President.first.name.should eq("Millard Fillmore")
     President.last.name.should eq("Jimmy Carter")
   end
-  
+
   ###
-  
+
   after :all do
     Ampere.disconnect
     Redis.new.flushall

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -315,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2731344431471118659
+      hash: 2670808373290565057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: