simple_record 1.5.4 → 1.5.6

data/lib/simple_record.rb

@@ -41,24 +41,25 @@ require File.expand_path(File.dirname(__FILE__) + "/simple_record/rails2")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/results_array")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/stats")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/translations")
+require_relative 'simple_record/sharding'
 
 
 module SimpleRecord
 
-    @@options = {}
-    @@stats = SimpleRecord::Stats.new
-    @@logging = false
-    @@s3 = nil
+    @@options       = {}
+    @@stats         = SimpleRecord::Stats.new
+    @@logging       = false
+    @@s3            = nil
     @@auto_close_s3 = false
-    @@logger = Logger.new(STDOUT)
-    @@logger.level = Logger::INFO
+    @@logger        = Logger.new(STDOUT)
+    @@logger.level  = Logger::INFO
 
     class << self;
         attr_accessor :aws_access_key, :aws_secret_key
 
         # Deprecated
         def enable_logging
-            @@logging = true
+            @@logging      = true
             @@logger.level = Logger::DEBUG
         end
 
@@ -127,7 +128,7 @@ module SimpleRecord
             if options[:connection_mode] == :per_thread
                 @@auto_close_s3 = true
                 # todo: should we init this only when needed?
-                @@s3 = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, {:connection_mode=>:per_thread})
+                @@s3            = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, {:connection_mode=>:per_thread})
             end
         end
 
@@ -139,7 +140,7 @@ module SimpleRecord
             @@s3.close_connection if @@auto_close_s3
         end
 
-   # If you'd like to specify the s3 connection to use for LOBs, you can pass it in here.
+        # If you'd like to specify the s3 connection to use for LOBs, you can pass it in here.
         # We recommend that this connection matches the type of connection you're using for SimpleDB,
         # at least if you're using per_thread connection mode.
         def s3=(s3)
@@ -172,6 +173,8 @@ module SimpleRecord
         include SimpleRecord::Translations
 #        include SimpleRecord::Attributes
         extend SimpleRecord::Attributes
+        extend SimpleRecord::Sharding::ClassMethods
+        include SimpleRecord::Sharding
         include SimpleRecord::Callbacks
         include SimpleRecord::Json
         include SimpleRecord::Logging
@@ -197,13 +200,13 @@ module SimpleRecord
             #we have to handle the virtuals.
             Attributes.handle_virtuals(attrs)
 
-            @errors=SimpleRecord_errors.new  if not (defined?(ActiveModel))
-            @dirty = {}
+            @errors=SimpleRecord_errors.new if not (defined?(ActiveModel))
+            @dirty         = {}
 
-            @attributes = {} # sdb values
+            @attributes    = {} # sdb values
             @attributes_rb = {} # ruby values
-            @lobs = {}
-            @new_record = true
+            @lobs          = {}
+            @new_record    = true
 
         end
 
@@ -232,7 +235,6 @@ module SimpleRecord
         end
 
 
-
         def defined_attributes_local
             # todo: store this somewhere so it doesn't keep going through this
             ret = self.class.defined_attributes
@@ -240,8 +242,6 @@ module SimpleRecord
         end
 
 
-
-
         class << self;
             attr_accessor :domain_prefix
         end
@@ -297,7 +297,7 @@ module SimpleRecord
 
         def get_attribute_sdb(name)
             name = name.to_sym
-            ret = strip_array(@attributes[sdb_att_name(name)])
+            ret  = strip_array(@attributes[sdb_att_name(name)])
             return ret
         end
 
@@ -307,7 +307,7 @@ module SimpleRecord
         end
 
         def get_att_meta(name)
-            name_s = name.to_s
+            name_s   = name.to_s
             att_meta = defined_attributes_local[name.to_sym]
             if att_meta.nil? && has_id_on_end(name_s)
                 att_meta = defined_attributes_local[name_s[0..-4].to_sym]
@@ -339,7 +339,7 @@ module SimpleRecord
 
         def make_dirty(arg, value)
             sdb_att_name = sdb_att_name(arg)
-            arg = arg.to_s
+            arg          = arg.to_s
 
 #            puts "Marking #{arg} dirty with #{value}" if SimpleRecord.logging?
             if @dirty.include?(sdb_att_name)
@@ -422,7 +422,7 @@ module SimpleRecord
                 return true if @dirty.size == 0 # Nothing to save so skip it
             end
             is_create = self[:id].nil?
-            ok = pre_save(options)
+            ok        = pre_save(options) # Validates and sets ID
             if ok
                 begin
                     dirty = @dirty
@@ -432,13 +432,14 @@ module SimpleRecord
                         return true if @dirty.size == 0 # This should probably never happen because after pre_save, created/updated dates are changed
                         options[:dirty_atts] = @dirty
                     end
-                    to_delete = get_atts_to_delete
+                    to_delete                = get_atts_to_delete
                     SimpleRecord.stats.saves += 1
-#                    puts 'SELF BEFORE super=' + self.inspect
-#                    puts 'dirty before2=' + @dirty.inspect
+
+                    if self.class.is_sharded?
+                        options[:domain] = sharded_domain
+                    end
+
                     if super(options)
-#                        puts 'dirty super=' + @dirty.inspect
-#                        puts 'SELF AFTER super=' + self.inspect
                         self.class.cache_results(self)
                         delete_niled(to_delete)
                         save_lobs(dirty)
@@ -564,7 +565,7 @@ module SimpleRecord
         def pre_save(options)
 
             is_create = self[:id].nil?
-            ok = run_before_validation && (is_create ? run_before_validation_on_create : run_before_validation_on_update)
+            ok        = run_before_validation && (is_create ? run_before_validation_on_create : run_before_validation_on_update)
             return false unless ok
 
             validate()
@@ -594,6 +595,7 @@ module SimpleRecord
                 # Now translate all fields into SimpleDB friendly strings
 #                convert_all_atts_to_sdb()
             end
+            prepare_for_update
             ok
         end
 
@@ -652,7 +654,7 @@ module SimpleRecord
         def self.delete_all(*params)
             # could make this quicker by just getting item_names and deleting attributes rather than creating objects
             obs = self.find(params)
-            i = 0
+            i   = 0
             obs.each do |a|
                 a.delete
                 i+=1
@@ -662,7 +664,7 @@ module SimpleRecord
 
         def self.destroy_all(*params)
             obs = self.find(params)
-            i = 0
+            i   = 0
             obs.each do |a|
                 a.destroy
                 i+=1
@@ -672,7 +674,11 @@ module SimpleRecord
 
         def delete()
             # TODO: DELETE CLOBS, etc from s3
-            super
+            options = {}
+            if self.class.is_sharded?
+                options[:domain] = sharded_domain
+            end
+            super(options)
         end
 
         def destroy
@@ -685,8 +691,8 @@ module SimpleRecord
         def get_attribute(name)
 #            puts "GET #{arg}"
             # Check if this arg is already converted
-            name_s = name.to_s
-            name = name.to_sym
+            name_s   = name.to_s
+            name     = name.to_sym
             att_meta = get_att_meta(name)
 #            puts "att_meta for #{name}: " + att_meta.inspect
             if att_meta && att_meta.type == :clob
@@ -702,7 +708,7 @@ module SimpleRecord
                 # get it from s3
                 unless new_record?
                     begin
-                        ret = s3_bucket.get(s3_lob_id(name))
+                        ret                        = s3_bucket.get(s3_lob_id(name))
 #                        puts 'got from s3 ' + ret.inspect
                         SimpleRecord.stats.s3_gets += 1
                     rescue Aws::AwsError => ex
@@ -725,8 +731,8 @@ module SimpleRecord
                 ret = @attributes_rb[name_s] # instance_variable_get(instance_var)
                 return ret unless ret.nil?
                 return nil if ret.is_a? RemoteNil
-                ret = get_attribute_sdb(name)
-                ret = sdb_to_ruby(name, ret)
+                ret                    = get_attribute_sdb(name)
+                ret                    = sdb_to_ruby(name, ret)
                 @attributes_rb[name_s] = ret
                 return ret
             end
@@ -736,22 +742,22 @@ module SimpleRecord
         def set(name, value, dirtify=true)
 #            puts "SET #{name}=#{value.inspect}" if SimpleRecord.logging?
 #            puts "self=" + self.inspect
-            attname = name.to_s # default attname
-            name = name.to_sym
-            att_meta = get_att_meta(name)
+            attname      = name.to_s # default attname
+            name         = name.to_sym
+            att_meta     = get_att_meta(name)
             store_rb_val = false
             if att_meta.nil?
                 # check if it ends with id and see if att_meta is there
                 ends_with = name.to_s[-3, 3]
                 if ends_with == "_id"
 #                    puts 'ends with id'
-                    n2 = name.to_s[0, name.length-3]
+                    n2       = name.to_s[0, name.length-3]
 #                    puts 'n2=' + n2
                     att_meta = defined_attributes_local[n2.to_sym]
 #                    puts 'defined_attributes_local=' + defined_attributes_local.inspect
-                    attname = name.to_s
+                    attname  = name.to_s
                     attvalue = value
-                    name = n2.to_sym
+                    name     = n2.to_sym
                 end
                 return if att_meta.nil?
             else
@@ -761,8 +767,8 @@ module SimpleRecord
                         att_name = name.to_s
                         attvalue = value
                     else
-                        attname = name.to_s + '_id'
-                        attvalue = value.nil? ? nil : value.id
+                        attname      = name.to_s + '_id'
+                        attvalue     = value.nil? ? nil : value.id
                         store_rb_val = true
                     end
                 elsif att_meta.type == :clob
@@ -770,7 +776,7 @@ module SimpleRecord
                     @lobs[name] = value
                     return
                 else
-                    attname = name.to_s
+                    attname  = name.to_s
                     attvalue = att_meta.init_value(value)
 #                  attvalue = value
                     #puts 'converted ' + value.inspect + ' to ' + attvalue.inspect
@@ -779,7 +785,7 @@ module SimpleRecord
             attvalue = strip_array(attvalue)
             make_dirty(name, attvalue) if dirtify
 #            puts "ARG=#{attname.to_s} setting to #{attvalue}"
-            sdb_val = ruby_to_sdb(name, attvalue)
+            sdb_val              = ruby_to_sdb(name, attvalue)
 #            puts "sdb_val=" + sdb_val.to_s
             @attributes[attname] = sdb_val
 #            attvalue = wrap_if_required(name, attvalue, sdb_val)
@@ -834,7 +840,7 @@ module SimpleRecord
             if $&
                 before=$`
                 middle=$&
-                after=$'
+                after =$'
 
                 before =~ /'$/ #is there already a quote immediately before the match?
                 unless $&
@@ -868,34 +874,43 @@ module SimpleRecord
         #   :consistent_read => true/false  --  as per http://developer.amazonwebservices.com/connect/entry.jspa?externalID=3572
         def self.find(*params)
             #puts 'params=' + params.inspect
-            q_type = :all
-            select_attributes=[]
 
+            q_type           = :all
+            select_attributes=[]
             if params.size > 0
                 q_type = params[0]
             end
+            options = {}
+            if params.size > 1
+                options = params[1]
+            end
+
+            if !options[:shard_find] && is_sharded?
+                # then break off and get results across all shards
+                return find_sharded(*params)
+            end
 
             # Pad and Offset number attributes
-            options = {}
             params_dup = params.dup
             if params.size > 1
                 options = params[1]
                 #puts 'options=' + options.inspect
                 #puts 'after collect=' + options.inspect
                 convert_condition_params(options)
-                per_token = options[:per_token]
+                per_token       = options[:per_token]
                 consistent_read = options[:consistent_read]
                 if per_token || consistent_read then
-                    op_dup = options.dup
-                    op_dup[:limit] = per_token # simpledb uses Limit as a paging thing, not what is normal
+                    op_dup                   = options.dup
+                    op_dup[:limit]           = per_token # simpledb uses Limit as a paging thing, not what is normal
                     op_dup[:consistent_read] = consistent_read
-                    params_dup[1] = op_dup
+                    params_dup[1]            = op_dup
                 end
             end
 #            puts 'params2=' + params.inspect
 
-             ret = q_type == :all ? [] : nil
+            ret = q_type == :all ? [] : nil
             begin
+
                 results=find_with_metadata(*params_dup)
 #                puts "RESULT=" + results.inspect
                 write_usage(:select, domain, q_type, options, results)
@@ -951,14 +966,14 @@ module SimpleRecord
         def self.paginate(options={})
 #            options = args.pop
 #            puts 'paginate options=' + options.inspect if SimpleRecord.logging?
-            page     = options[:page] || 1
-            per_page = options[:per_page] || 50
+            page               = options[:page] || 1
+            per_page           = options[:per_page] || 50
 #            total    = options[:total_entries].to_i
-            options[:page] = page.to_i # makes sure it's to_i
+            options[:page]     = page.to_i # makes sure it's to_i
             options[:per_page] = per_page.to_i
-            options[:limit] = options[:page] * options[:per_page]
+            options[:limit]    = options[:page] * options[:per_page]
 #            puts 'paging options=' + options.inspect
-            fr = find(:all, options)
+            fr                 = find(:all, options)
             return fr
 
         end
@@ -982,15 +997,15 @@ module SimpleRecord
                     # todo: cache each result
                     results.each do |item|
                         class_name = item.class.name
-                        id = item.id
-                        cache_key = self.cache_key(class_name, id)
+                        id         = item.id
+                        cache_key  = self.cache_key(class_name, id)
                         #puts 'caching result at ' + cache_key + ': ' + results.inspect
                         cache_store.write(cache_key, item, :expires_in =>30)
                     end
                 else
                     class_name = results.class.name
-                    id = results.id
-                    cache_key = self.cache_key(class_name, id)
+                    id         = results.id
+                    cache_key  = self.cache_key(class_name, id)
                     #puts 'caching result at ' + cache_key + ': ' + results.inspect
                     cache_store.write(cache_key, results, :expires_in =>30)
                 end
@@ -1051,8 +1066,8 @@ module SimpleRecord
 
     class Activerecordtosdb_subrecord_array
         def initialize(subname, referencename, referencevalue)
-            @subname=subname.classify
-            @referencename=referencename.tableize.singularize + "_id"
+            @subname       =subname.classify
+            @referencename =referencename.tableize.singularize + "_id"
             @referencevalue=referencevalue
         end
 
@@ -1104,7 +1119,7 @@ module SimpleRecord
 
         def create(*params)
             params[0][@referencename]=@referencevalue
-            record = eval(@subname).new(*params)
+            record                   = eval(@subname).new(*params)
             record.save
         end
 

data/lib/simple_record/active_sdb.rb

@@ -966,9 +966,9 @@ module SimpleRecord
             #  sandy.reload
             #  puts sandy.inspect  #=> #<Client:0xb7761d28 @attributes={}, @new_record=false>
             #
-            def delete
+            def delete(options={})
                 raise_on_id_absence
-                connection.delete_attributes(domain, id)
+                connection.delete_attributes(options[:domain] || domain, id)
             end
 
             # Item ID

data/lib/simple_record/results_array.rb

@@ -5,7 +5,7 @@ module SimpleRecord
     class ResultsArray
         include Enumerable
 
-        attr_reader :next_token, :clz, :params, :items, :i, :box_usage, :request_id
+        attr_reader :next_token, :clz, :params, :items, :index, :box_usage, :request_id
 
 
         def initialize(clz=nil, params=[], results=nil, next_token=nil)
@@ -27,6 +27,7 @@ module SimpleRecord
                 load_to(@options[:per_page] * @options[:page])
                 @start_at = @options[:per_page] * (@options[:page] - 1)
             end
+            @index = 0
             # puts 'RESULTS_ARRAY=' + self.inspect
         end
 
@@ -96,6 +97,7 @@ module SimpleRecord
             params_for_count[1] = params_for_count[1].dup # for deep clone
             params_for_count[1].delete(:limit)
             params_for_count[1].delete(:per_token)
+            params_for_count[1][:called_by] = :results_array
 
             #       puts '@params2=' + @params.inspect
             # puts 'params_for_count=' + params_for_count.inspect
@@ -127,6 +129,7 @@ module SimpleRecord
 #                puts "i=" + i.to_s
                 yield v
                 i += 1
+                @index += 1
                 if !limit.nil? && i >= limit
                     return
                 end
@@ -194,6 +197,7 @@ module SimpleRecord
         def load_next_token_set
             options              = @params[1]
             options[:next_token] = @next_token
+            options[:called_by] = :results_array
             res                  = @clz.find(*@params)
             @currentset_items    = res.items # get the real items array from the ResultsArray
             @currentset_items.each do |item|

data/lib/simple_record/sharding.rb

@@ -0,0 +1,273 @@
+module SimpleRecord
+
+    module Sharding
+
+        def self.included(base)
+#            base.extend ClassMethods
+        end
+
+        module ClassMethods
+
+            def shard(options=nil)
+                @sharding_options = options
+            end
+
+            def sharding_options
+                @sharding_options
+            end
+
+            def is_sharded?
+                @sharding_options
+            end
+
+            def find_sharded(*params)
+                puts 'find_sharded ' + params.inspect
+
+                options = params.size > 1 ? params[1] : {}
+
+                domains = sharded_domains
+                puts "sharded_domains=" + domains.inspect
+
+                single = false
+                case params.first
+                    when nil then
+                        raise "Invalid parameters passed to find: nil."
+                    when :all, :first, :count
+                        # nada
+                    else # single id
+                        unless params.first.is_a?(Array)
+                            single = true
+                        end
+                end
+
+                results = ShardedResults.new(params)
+                domains.each do |d|
+                    p2               = params.dup
+                    op2              = options.dup
+                    op2[:from]       = d
+                    op2[:shard_find] = true
+                    p2[1]            = op2
+                    rs               = find(*p2)
+                    if params.first == :first || single
+                        return rs if rs
+                    else
+                        results.add_results rs
+                    end
+                end
+                puts 'results=' + results.inspect
+                if params.first == :first || single
+                    # Then we found nothing by this point so return nil
+                    return nil
+                elsif params.first == :count
+                    return results.sum_count
+                end
+                results
+
+            end
+
+            def shards
+                send(sharding_options[:shards])
+            end
+
+            def sharded_domains
+                sharded_domains = []
+                shard_names     = shards
+                shard_names.each do |s|
+                    sharded_domains << "#{domain}_#{s}"
+                end
+                sharded_domains
+            end
+        end
+
+
+        def sharded_domain
+#            puts 'getting sharded_domain'
+            options        = self.class.sharding_options
+#            val = self.send(options[:on])
+#            puts "val=" + val.inspect
+#            shards = options[:shards] # is user passed in static array of shards
+#            if options[:shards].is_a?(Symbol)
+#                shards = self.send(shards)
+#            end
+            sharded_domain = "#{domain}_#{self.send(options[:map])}"
+            puts "sharded_domain=" + sharded_domain.inspect
+            sharded_domain
+        end
+
+        class ShardedResults
+            include Enumerable
+
+            def initialize(params)
+                @params         = params
+                @options        = params.size > 1 ? params[1] : {}
+                @results_arrays = []
+            end
+
+            def add_results(rs)
+#        puts 'adding results=' + rs.inspect
+                @results_arrays << rs
+            end
+
+            # only used for count queries
+            def sum_count
+                x = 0
+                @results_arrays.each do |rs|
+                    x += rs if rs
+                end
+                x
+            end
+
+            def <<(val)
+                raise "Not supported."
+            end
+
+            def element_at(index)
+                @results_arrays.each do |rs|
+                    if rs.size > index
+                        return rs[index]
+                    end
+                    index -= rs.size
+                end
+            end
+
+            def [](*i)
+                if i.size == 1
+                    #            puts '[] i=' + i.to_s
+                    index = i[0]
+                    return element_at(index)
+                else
+                    offset = i[0]
+                    rows   = i[1]
+                    ret    = []
+                    x      = offset
+                    while x < (offset+rows)
+                        ret << element_at(x)
+                        x+=1
+                    end
+                    ret
+                end
+            end
+
+            def first
+                @results_arrays.first.first
+            end
+
+            def last
+                @results_arrays.last.last
+            end
+
+            def empty?
+                @results_arrays.each do |rs|
+                    return false if !rs.empty?
+                end
+                true
+            end
+
+            def include?(obj)
+                @results_arrays.each do |rs|
+                    x = rs.include?(obj)
+                    return true if x
+                end
+                false
+            end
+
+            def size
+                return @size if @size
+                s = 0
+                @results_arrays.each do |rs|
+                    #            puts 'rs=' + rs.inspect
+                    #            puts 'rs.size=' + rs.size.inspect
+                    s += rs.size
+                end
+                @size = s
+                s
+            end
+
+            def length
+                return size
+            end
+
+            def each(&blk)
+                i = 0
+                @results_arrays.each do |rs|
+                    rs.each(&blk)
+                    i+=1
+                end
+            end
+
+            # for will_paginate support
+            def total_pages
+                # puts 'total_pages'
+                # puts  @params[1][:per_page].to_s
+                return 1 if @params[1][:per_page].nil?
+                ret = (size / @params[1][:per_page].to_f).ceil
+                #puts 'ret=' + ret.to_s
+                ret
+            end
+
+            def current_page
+                return query_options[:page] || 1
+            end
+
+            def query_options
+                return @options
+            end
+
+            def total_entries
+                return size
+            end
+
+            # Helper method that is true when someone tries to fetch a page with a
+            # larger number than the last page. Can be used in combination with flashes
+            # and redirecting.
+            def out_of_bounds?
+                current_page > total_pages
+            end
+
+            # Current offset of the paginated collection. If we're on the first page,
+            # it is always 0. If we're on the 2nd page and there are 30 entries per page,
+            # the offset is 30. This property is useful if you want to render ordinals
+            # side by side with records in the view: simply start with offset + 1.
+            def offset
+                (current_page - 1) * per_page
+            end
+
+            # current_page - 1 or nil if there is no previous page
+            def previous_page
+                current_page > 1 ? (current_page - 1) : nil
+            end
+
+            # current_page + 1 or nil if there is no next page
+            def next_page
+                current_page < total_pages ? (current_page + 1) : nil
+            end
+
+
+            def delete(item)
+                raise "Not supported"
+            end
+
+            def delete_at(index)
+                raise "Not supported"
+            end
+
+        end
+
+        # Some hashing algorithms
+        module Hashing
+            def self.sdbm_hash(str, len=str.length)
+#                puts 'sdbm_hash ' + str.inspect
+                hash = 0
+                len.times { |i|
+                    c    = str[i]
+#                    puts "c=" + c.class.name + "--" + c.inspect + " -- " + c.ord.inspect
+                    c    = c.ord
+                    hash = c + (hash << 6) + (hash << 16) - hash
+                }
+#                puts "hash=" + hash.inspect
+                return hash
+            end
+        end
+    end
+
+end

data/test/my_sharded_model.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+class MyShardedModel < SimpleRecord::Base
+
+    shard :shards=>:my_shards, :map=>:my_mapping_function
+
+    has_strings :name
+
+    def self.my_shards
+        Array(0...4)
+    end
+
+    def my_mapping_function
+        shard_num = SimpleRecord::Sharding::Hashing.sdbm_hash(self.id) % 4
+        puts "shard_num=" + shard_num.inspect
+        shard_num
+    end
+
+
+
+end
+
+
+class MyShardedByFieldModel < SimpleRecord::Base
+
+    shard :shards=>:my_shards, :map=>:my_mapping_function
+
+    has_strings :name, :state
+
+    def self.my_shards
+        ['AL', 'CA', 'FL', 'NY']
+    end
+
+    def my_mapping_function
+        state
+    end
+
+
+end

data/test/test_base.rb

@@ -19,6 +19,16 @@ class TestBase < Test::Unit::TestCase
         SimpleRecord.close_connection
     end
 
+    def delete_all(clz)
+        puts 'delete_all ' + clz.name
+        obs = clz.find(:all)
+        obs.each do |o|
+            o.delete
+        end
+#        @@sdb.select("select * from #{domain}") do |o|
+#            o.delete
+#        end
+    end
 
     def reset_connection
         puts 'reset_connection'

data/test/test_shards.rb

@@ -0,0 +1,127 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require File.join(File.dirname(__FILE__), "./test_base")
+require "yaml"
+require 'aws'
+require_relative 'my_sharded_model'
+
+# Tests for SimpleRecord
+#
+class TestShards < TestBase
+
+    def setup
+        super
+        delete_all MyShardedModel
+    end
+
+    def teardown
+        super
+
+    end
+
+    # We'll want to shard based on ID's, user decides how many shards and some mapping function will
+    # be used to select the shard.
+    def test_id_sharding
+
+        mm = MyShardedModel.new(:name=>"single")
+        mm.save
+        sleep 1
+        puts 'finding by id'
+        mm2 = MyShardedModel.find(mm.id)
+        p mm2
+        assert_equal mm.id, mm2.id
+        puts 'deleting'
+        mm2.delete
+        sleep 1
+        mm3 = MyShardedModel.find(mm.id)
+        assert_nil mm3
+
+        puts "saving 20 now"
+        saved = []
+        20.times do |i|
+            mm = MyShardedModel.new(:name=>"name #{i}")
+            mm.save
+            saved << mm
+        end
+
+        # todo: assert that we're actually sharding
+
+        puts "finding them all"
+        found = []
+        rs    = MyShardedModel.find(:all)
+        rs.each do |m|
+            p m
+            found << m
+        end
+        saved.each do |so|
+            assert(found.find { |m1| m1.id == so.id })
+        end
+
+        puts "deleting all of them"
+        found.each do |fo|
+            fo.delete
+        end
+
+        puts "Now ensure that all are deleted"
+        rs = MyShardedModel.find(:all)
+        assert rs.size == 0
+
+    end
+
+    def test_field_sharding
+
+        states = MyShardedByFieldModel.shards
+        puts "states=" + states.inspect
+
+        mm = MyShardedByFieldModel.new(:name=>"single", :state=>"CA")
+        mm.save
+        sleep 1
+        puts 'finding by id'
+        mm2 = MyShardedByFieldModel.find(mm.id)
+        p mm2
+        assert_equal mm.id, mm2.id
+        puts 'deleting'
+        mm2.delete
+        sleep 1
+        mm3 = MyShardedByFieldModel.find(mm.id)
+        assert_nil mm3
+
+        puts "saving 20 now"
+        saved = []
+        20.times do |i|
+            mm = MyShardedByFieldModel.new(:name=>"name #{i}", :state=>states[i % states.size])
+            mm.save
+            p mm
+            saved << mm
+        end
+
+        # todo: assert that we're actually sharding
+
+        puts "finding them all"
+        found = []
+        rs    = MyShardedByFieldModel.find(:all)
+        rs.each do |m|
+            p m
+            found << m
+        end
+        saved.each do |so|
+            assert(found.find { |m1| m1.id == so.id })
+        end
+
+        puts "deleting all of them"
+        found.each do |fo|
+            fo.delete
+        end
+        sleep 1
+
+        puts "Now ensure that all are deleted"
+        rs = MyShardedByFieldModel.find(:all)
+        assert rs.size == 0
+    end
+
+    def test_time_sharding
+
+    end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/simple_record/password.rb
 - lib/simple_record/rails2.rb
 - lib/simple_record/results_array.rb
+- lib/simple_record/sharding.rb
 - lib/simple_record/stats.rb
 - lib/simple_record/translations.rb
 - README.markdown
@@ -61,6 +62,7 @@ files:
 - test/my_base_model.rb
 - test/my_child_model.rb
 - test/my_model.rb
+- test/my_sharded_model.rb
 - test/paging_array_test.rb
 - test/simple_record_test.rb
 - test/temp.rb
@@ -76,6 +78,7 @@ files:
 - test/test_pagination.rb
 - test/test_rails3.rb
 - test/test_results_array.rb
+- test/test_shards.rb
 - test/test_usage.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
@@ -115,6 +118,7 @@ test_files:
 - test/my_base_model.rb
 - test/my_child_model.rb
 - test/my_model.rb
+- test/my_sharded_model.rb
 - test/paging_array_test.rb
 - test/simple_record_test.rb
 - test/temp.rb
@@ -130,4 +134,5 @@ test_files:
 - test/test_pagination.rb
 - test/test_rails3.rb
 - test/test_results_array.rb
+- test/test_shards.rb
 - test/test_usage.rb