simple_record 1.3.9 → 1.3.11

data/lib/simple_record.rb

@@ -84,7 +84,7 @@ module SimpleRecord
         @aws_access_key = aws_access_key
         @aws_secret_key = aws_secret_key
         @@options.merge!(params)
-        puts 'SimpleRecord.establish_connection with options: ' + @@options.inspect
+        #puts 'SimpleRecord.establish_connection with options: ' + @@options.inspect
         Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
     end
 
@@ -193,31 +193,32 @@ module SimpleRecord
 
         # Sets the domain name for this class
         def self.set_domain_name(table_name)
-            # puts 'setting domain name for class ' + self.inspect + '=' + table_name
-            #@domain_name_for_class = table_name
             super
         end
 
 
         def domain
-            self.class.domain # super # super.domain
+            self.class.domain
         end
 
         def self.domain
-            #return self.get_domain_name unless self.get_domain_name.nil?
-            d = super
-#            puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
-            domain_name_for_class = (SimpleRecord::Base.domain_prefix || "") + d.to_s
-            #self.set_domain_name(domain_name_for_class)
+            unless @domain
+                # This strips off the module if there is one.
+                n2 = name.split('::').last || name
+                puts 'n2=' + n2
+                if defined? ActiveSupport::CoreExtensions::String::Inflections
+                    @domain = n2.tableize
+                else
+                    @domain = n2.downcase
+                end
+                set_domain_name @domain
+            end
+            domain_name_for_class = (SimpleRecord::Base.domain_prefix || "") + @domain.to_s
             domain_name_for_class
         end
 
         def get_attribute_sdb(name)
             name = name.to_sym
-#            arg = arg.to_s
-#            puts "get_attribute_sdb(#{arg}) - #{arg.class.name}"
-#            puts 'self[]=' + self.inspect
-#            att_meta = get_att_meta(name)
             ret = strip_array(@attributes[sdb_att_name(name)])
             return ret
         end
@@ -230,10 +231,7 @@ module SimpleRecord
         def get_att_meta(name)
             name_s = name.to_s
             att_meta = defined_attributes_local[name.to_sym]
-#            puts 'name_s=' + name_s
-#            puts 'end of string=' + name_s[-3..-1] if name_s.length > 4
             if att_meta.nil? && has_id_on_end(name_s)
-#                puts 'strip _id=' + name_s[0..-4].to_s
                 att_meta = defined_attributes_local[name_s[0..-4].to_sym]
             end
             return att_meta
@@ -306,7 +304,7 @@ module SimpleRecord
 
         def domain_ok(ex)
             if (ex.message().index("NoSuchDomain") != nil)
-                puts "Creating new SimpleDB Domain: " + domain
+                #puts "Creating new SimpleDB Domain: " + domain
                 self.class.create_domain
                 return true
             end
@@ -792,6 +790,7 @@ module SimpleRecord
         #
         # Extra options:
         #   :per_token => the number of results to return per next_token, max is 2500.
+        #   :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
@@ -809,9 +808,11 @@ module SimpleRecord
                 #puts 'after collect=' + options.inspect
                 convert_condition_params(options)
                 per_token = options[:per_token]
-                if 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[:consistent_read] = consistent_read
                     params[1] = op_dup
                 end
 
@@ -820,13 +821,23 @@ module SimpleRecord
 
             results = q_type == :all ? [] : nil
             begin
-                results=super(*params)
-#                puts "RESULT=" + results.inspect
+                results=find_with_metadata(*params)
+                # puts "RESULT=" + results.inspect
                 #puts 'params3=' + params.inspect
                 SimpleRecord.stats.selects += 1
-                if q_type != :count
+                if q_type == :count
+                    results = results[:count]
+                elsif q_type == :first
+                    ret = results[:items].first
+                    # todo: we should store request_id and box_usage with the object maybe?
+                    cache_results(ret)
+                    results = ret
+                elsif results[:single]
+                    results = results[:single]
                     cache_results(results)
-                    if results.is_a?(Array)
+                else
+                    if results[:items] #.is_a?(Array)
+                        cache_results(results[:items])
                         results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
                     end
                 end
@@ -861,7 +872,7 @@ module SimpleRecord
 
         # This gets less and less efficient the higher the page since SimpleDB has no way
         # to start at a specific row. So it will iterate from the first record and pull out the specific pages.
-       def self.paginate(options={})
+        def self.paginate(options={})
 #            options = args.pop
 #            puts 'paginate options=' + options.inspect if SimpleRecord.logging?
             page     = options[:page] || 1
@@ -893,6 +904,13 @@ module SimpleRecord
             if !cache_store.nil? && !results.nil?
                 if results.is_a?(Array)
                     # todo: cache each result
+                    results.each do |item|
+                        class_name = item.class.name
+                        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

data/lib/simple_record/results_array.rb

@@ -5,10 +5,10 @@ module SimpleRecord
     class ResultsArray
         include Enumerable
 
-        attr_reader :next_token, :clz, :params, :items, :i
+        attr_reader :next_token, :clz, :params, :items, :i, :box_usage, :request_id
 
 
-        def initialize(clz=nil, params=[], items=[], next_token=nil)
+        def initialize(clz=nil, params=[], results=nil, next_token=nil)
             @clz = clz
             #puts 'class=' + clz.inspect
             @params = params
@@ -16,9 +16,12 @@ module SimpleRecord
                 options = {}
                 @params[1] = options
             end
-            @items = items
-            @currentset_items = items
+            @items = results[:items]
+            @currentset_items = results[:items]
             @next_token = next_token
+            puts 'bu=' + results[:box_usage]
+            @box_usage = results[:box_usage].to_f
+            @request_id = results[:request_id]
             @options = @params[1]
             if @options[:page]
                 load_to(@options[:per_page] * @options[:page])
@@ -80,6 +83,9 @@ module SimpleRecord
         end
 
         def size
+            if @options[:per_page]
+                return @items.size - @start_at
+            end
             if @next_token.nil?
                 return @items.size
             end
@@ -87,13 +93,13 @@ module SimpleRecord
 #            puts '@params=' + @params.inspect
             params_for_count = @params.dup
             params_for_count[0] = :count
-            params_for_count[1] =  params_for_count[1].dup # for deep clone
+            params_for_count[1] = params_for_count[1].dup # for deep clone
             params_for_count[1].delete(:limit)
 
      #       puts '@params2=' + @params.inspect
            # puts 'params_for_count=' + params_for_count.inspect
             @count = clz.find(*params_for_count)
-            # puts '@count=' + @count.to_s
+#            puts '@count=' + @count.to_s
             @count
         end
 

data/test/test_pagination.rb

@@ -19,7 +19,7 @@ class TestPagination < TestBase
         i = 20
         (1..3).each do |page|
             models = MyModel.paginate :page=>page, :per_page=>5, :order=>"created desc"
-            assert models.size == 5
+            assert models.size == 5, "models.size=#{models.size}"
             models.each do |m|
                 i -= 1
                 puts m.name

data/test/test_simple_record.rb

@@ -306,7 +306,9 @@ class TestSimpleRecord < TestBase
         assert count > 0
 
         mms = MyModel.find(:all) # select 2
+        puts 'mms=' + mms.inspect
         assert mms.size > 0 # select 3
+        puts 'mms=' + mms.inspect
         assert mms.size == count, "size != count! size=" + mms.size.to_s + " count=" + count.to_s
         assert SimpleRecord.stats.selects == 3, "should have been 3 select, but was actually #{SimpleRecord.stats.selects}" # count should not have been called twice
 
@@ -480,15 +482,15 @@ class TestSimpleRecord < TestBase
 
         mm = MyModel.find(:first, :conditions=>["date1 >= ?", 1.days.ago.to_date])
         puts 'mm=' + mm.inspect
-        assert mm
+        assert mm.is_a? MyModel
 
         mm = MyModel.find(:first, :conditions=>["date2 >= ?", 1.minutes.ago])
         puts 'mm=' + mm.inspect
-        assert mm
+        assert mm.is_a? MyModel
 
         mm = MyModel.find(:first, :conditions=>["date3 >= ?", 1.minutes.ago])
         puts 'mm=' + mm.inspect
-        assert mm
+        assert mm.is_a? MyModel
 
     end
 
@@ -662,5 +664,18 @@ class TestSimpleRecord < TestBase
 
     end
 
+    def test_box_usage
+        mm = MyModel.new
+        mm.name = "whatever"
+        mm.age = "1"
+        mm.save
+        sleep 1
+
+        mms = MyModel.all
+
+        assert mms.box_usage && mms.box_usage > 0
+        assert mms.request_id
+
+    end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 3
-  - 9
-  version: 1.3.9
+  - 11
+  version: 1.3.11
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency