ampere 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-01-18"
+  s.date = "2012-01-19"
   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

@@ -80,6 +80,15 @@ module Ampere
     
     # Saves this record to the database.
     def save
+      self.class.unique_indices.each do |idx|
+        # For each uniquely-indexed field, look up the index for that field,
+        # and throw an exception if this record's value for that field is in
+        # the index already.
+        if Ampere.connection.hexists("ampere.index.#{self.class.to_s.downcase}.#{idx}", instance_variable_get("@#{idx}")) then
+          raise "Cannot save non-unique value for #{idx}"
+        end
+      end
+      
       # Grab a fresh GUID from Redis by incrementing the "__guid" key
       if @id.nil? then
         @id = "#{self.class.to_s.downcase}.#{Ampere.connection.incr('__guid')}"
@@ -164,6 +173,7 @@ module Ampere
       @fields         ||= []
       @field_defaults ||= {}
       @indices        ||= []
+      @unique_indices ||= []
       @field_types    ||= {}
       
       @fields << name
@@ -260,13 +270,18 @@ module Ampere
     
     # Defines an index. See the README for more details.
     def self.index(field_name, options = {})
+      # TODO There has just got to be a better way to handle this.
       @fields         ||= []
       @field_defaults ||= {}
       @indices        ||= []
+      @unique_indices ||= []
       @field_types    ||= {}
+      
       if field_name.class == String or field_name.class == Symbol then
+        # Singular index
         raise "Can't index a nonexistent field!" unless @fields.include?(field_name)
       elsif field_name.class == Array then
+        # Compound index
         field_name.each{|f| raise "Can't index a nonexistent field!" unless @fields.include?(f)}
         field_name.sort!
       else
@@ -274,12 +289,17 @@ module Ampere
       end
       
       @indices << field_name
+      @unique_indices << field_name if options[:unique]
     end
     
     def self.indices
       @indices
     end
     
+    def self.unique_indices
+      @unique_indices
+    end
+    
     # Finds an array of records which match the given conditions. This method is
     # much faster when all the fields given are indexed.
     def self.where(options = {})

data/spec/models/indices_spec.rb

@@ -68,8 +68,7 @@ describe "Model indices", :indices => true do
     }).should raise_error
   end
   
-  it 'should enforce the uniqueness of unique single-field indices' do
-    pending
+  it 'should enforce the uniqueness of unique single-field indices', wip:true 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 
     # save successfully, throwing an exception instead.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70220576682780 !ruby/object:Gem::Requirement
+  requirement: &70296343880340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220576682780
+  version_requirements: *70296343880340
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70220576678180 !ruby/object:Gem::Requirement
+  requirement: &70296343658140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220576678180
+  version_requirements: *70296343658140
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70220576676920 !ruby/object:Gem::Requirement
+  requirement: &70296343657240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220576676920
+  version_requirements: *70296343657240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70220576675420 !ruby/object:Gem::Requirement
+  requirement: &70296343656200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70220576675420
+  version_requirements: *70296343656200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70220576674400 !ruby/object:Gem::Requirement
+  requirement: &70296343655220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70220576674400
+  version_requirements: *70296343655220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70220576672900 !ruby/object:Gem::Requirement
+  requirement: &70296343654580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220576672900
+  version_requirements: *70296343654580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220576671880 !ruby/object:Gem::Requirement
+  requirement: &70296343653980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220576671880
+  version_requirements: *70296343653980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70220576670820 !ruby/object:Gem::Requirement
+  requirement: &70296343653400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220576670820
+  version_requirements: *70296343653400
 description: An ActiveRecord/Mongoid-esque object model for the Redis key/value data
   store.
 email: max@villainousindustri.es
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4395967643533566831
+      hash: -723934337440945373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: