appoxy-simple_record 1.1.2 → 1.1.3

data/lib/results_array.rb

@@ -22,10 +22,12 @@ module SimpleRecord
         end
 
         def size
+            # puts 'SIZE count=' + @count.inspect
             return @count if @count
             params_for_count = params.dup
             params_for_count[0] = :count
-            @count = clz.find(*params)
+            @count = clz.find(*params_for_count)
+            # puts '@count=' + @count.to_s
             @count
         end
 

data/lib/simple_record.rb

@@ -25,11 +25,17 @@
 
 require 'right_aws'
 require 'sdb/active_sdb'
-#require 'results_array'
+#require 'results_array' # why the heck isn't this picking up???
 require File.expand_path(File.dirname(__FILE__) + "/results_array")
+require File.expand_path(File.dirname(__FILE__) + "/stats")
 
 module SimpleRecord
 
+    @@stats = SimpleRecord::Stats.new
+
+    def self.stats
+        @@stats
+    end
 
     # Create a new handle to an Sdb account. All handles share the same per process or per thread
     # HTTP connection to Amazon Sdb. Each handle is for a specific account.
@@ -75,6 +81,8 @@ module SimpleRecord
         include SimpleRecord::Callbacks
 
 
+
+
         # todo: move into Callbacks module
         #this bit of code creates a "run_blank" function for everything value in the @@callbacks array.
         #this function can then be inserted in the appropriate place in the save, new, destroy, etc overrides
@@ -864,6 +872,7 @@ This is done on getters now
             results = q_type == :all ? [] : nil
             begin
                 results=super(*params)
+                SimpleRecord.stats.selects += 1
                 if q_type != :count
                     cache_results(results)
                     if results.is_a?(Array)

data/lib/stats.rb

@@ -0,0 +1,10 @@
+module SimpleRecord
+    class Stats
+        attr_accessor :selects, :puts
+
+        def clear
+            self.selects = 0
+            self.puts = 0
+        end
+    end
+end

data/test/test_simple_record.rb

@@ -12,6 +12,7 @@ class TestSimpleRecord < Test::Unit::TestCase
         #puts @config.inspect
         SimpleRecord.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
         SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+        SimpleRecord.stats.clear
     end
 
     def teardown
@@ -19,159 +20,22 @@ class TestSimpleRecord < Test::Unit::TestCase
     end
 
 
-    def test_save_get
-        mm = MyModel.new
-        mm.name = "Travis"
-        mm.age = 32
-        mm.cool = true
-        mm.save
-
-        assert !mm.created.nil?
-        assert !mm.updated.nil?
-        assert !mm.id.nil?
-        assert mm.age == 32
-        assert mm.cool = true
-        assert mm.name = "Travis"
-
-        id = mm.id
-        puts 'id=' + id.to_s
-        # Get the object back
-        mm2 = MyModel.find(id)
-        #puts 'got=' + mm2.name + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
-        #puts mm2.cool.class.name
-        assert mm2.id == mm.id
-        assert mm2.age == mm.age
-        assert mm2.cool == mm.cool
-        assert mm2.age == 32
-        assert mm2.cool = true
-        assert mm2.name = "Travis"
-        assert mm2.created.is_a? DateTime
-    end
-
-    def test_bad_query
-        assert_raise RightAws::AwsError do
-            mm2 = MyModel.find(:all, :conditions=>["name =4?", "1"])
-        end
-    end
-
-    def test_batch_save
-        items = []
-        mm = MyModel.new
-        mm.name = "Travis"
-        mm.age = 32
-        mm.cool = true
-        items << mm
-        mm = MyModel.new
-        mm.name = "Tritt"
-        mm.age = 44
-        mm.cool = false
-        items << mm
-        MyModel.batch_save(items)
-        items.each do |item|
-            puts 'id=' + item.id
-            new_item = MyModel.find(item.id)
-            puts 'new=' + new_item.inspect
-            assert item.id == new_item.id
-            assert item.name == new_item.name
-            assert item.cool == new_item.cool
-        end
-    end
-
-    # Testing getting the association ID without materializing the obejct
-    def test_get_belongs_to_id
-        mm = MyModel.new
-        mm.name = "Parent"
-        mm.age = 55
-        mm.cool = true
-        mm.save
-
-        child = MyChildModel.new
-        child.name = "Child"
-        child.my_model = mm
-        child.save
-
-        child = MyChildModel.find(child.id)
-        puts child.my_model_id
-        assert child.my_model_id == mm.id
-    end
-
-    def test_callbacks
-
-
-        mm = MyModel.new
-        assert !mm.save
-        assert mm.errors.count == 1 # name is required
-
-        # test queued callback before_create
-        mm.name = "Travis"
-        assert mm.save
-        # now nickname should be set on before_create
-        assert mm.nickname == mm.name
-
-        mm2 = MyModel.find(mm.id)
-        assert mm2.nickname = mm.nickname
-        assert mm2.name = mm.name
-
-
-
-    end
-
-    def test_dirty
-        mm = MyModel.new
-        mm.name = "Travis"
-        mm.age = 32
-        mm.cool = true
-        mm.save
-        id = mm.id
-        puts 'id=' + id.to_s
-        # Get the object back
-        mm2 = MyModel.find(id)
-        puts 'got=' + mm2.name + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
-        assert mm2.id == mm.id
-        assert mm2.age == mm.age
-        assert mm2.cool == mm.cool
-
-        mm2.name = "Travis 2"
-        mm2.save(:dirty=>true)
-
-        # todo: how do we assert this?
-
-    end
-
-    # http://api.rubyonrails.org/classes/ActiveRecord/Dirty.html#M002136
-    def test_changed
-        mm = MyModel.new
-        mm.name = "Travis"
-        mm.age = 32
-        mm.cool = true
-        mm.save
-
-        puts 'changed?=' + mm.changed?.to_s
-        assert !mm.changed?
-        assert mm.changed.size == 0
-        assert mm.changes.size == 0
-        assert !mm.name_changed?
-
-        mm.name = "Jim"
-        assert mm.changed?
-        assert mm.changed.size == 1
-        assert mm.changed[0] == "name"
+    def test_count
+        count = MyModel.find(:count) # select 1
+        assert count > 0
 
-        assert mm.changes.size == 1
-        puts 'CHANGES=' + mm.changes.inspect
-        assert mm.changes["name"][0] == "Travis"
-        assert mm.changes["name"][1] == "Jim"
+        mms = MyModel.find(:all) # select 2
+        assert mms.size > 0 # select 3
+        assert mms.size == count # skipped
+        assert SimpleRecord.stats.selects == 3, "should have been 3 select, but was actually #{SimpleRecord.stats.selects}" # count should not have been called twice
 
-        assert mm.name_changed?
-        assert mm.name_was == "Travis"
-        assert mm.name_change[0] == "Travis"
-        assert mm.name_change[1] == "Jim"
+        count = MyModel.find(:count, :conditions=>["name=?", "Travis"])
+        assert count > 0
 
-    end
+        mms = MyModel.find(:all, :conditions=>["name=?", "Travis"])
+        assert mms.size > 0
+        assert mms.size == count
 
-    def test_count
-        count = MyModel.find(:count)
-        assert count > 0
     end
 
     def test_attributes_correct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy-simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -25,6 +25,7 @@ extra_rdoc_files:
 files: 
 - lib/results_array.rb
 - lib/simple_record.rb
+- lib/stats.rb
 - README.markdown
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/