simple_record 1.0.10 → 1.1.17

data/lib/stats.rb

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

data/test/my_child_model.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require 'my_model'
+
+class MyChildModel < SimpleRecord::Base
+    belongs_to :my_model
+    has_attributes :name, :child_attr
+
+end
+
+
+=begin
+
+
+puts 'word'
+
+mm = MyModel.new
+puts 'word2'
+
+mcm = MyChildModel.new
+
+puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
+#puts 'mcm=' + mcm.instance_methods(false)
+puts 'mcm class vars = ' + mcm.class.class_variables.inspect
+puts mcm.class == MyChildModel
+puts 'saved? ' + mm.save.to_s
+puts mm.errors.inspect
+
+puts "mm attributes=" + MyModel.defined_attributes.inspect
+puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
+
+mcm2 = MyChildModel.new
+puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
+
+=end

data/test/my_model.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+class MyModel < SimpleRecord::Base
+
+    has_strings :name, :nickname
+    has_ints :age, :save_count
+    has_booleans :cool
+    has_dates :birthday
+
+
+    #callbacks
+    before_create :set_nickname
+
+    after_save :bump_save_count
+
+    def set_nickname
+        self.nickname = name if self.nickname.blank?
+    end
+
+    def bump_save_count
+        puts 'save_count=' + save_count.to_s
+        if save_count.nil?
+            self.save_count = 1
+        else
+            self.save_count += 1
+        end
+         puts 'save_count=' + self.save_count.to_s
+    end
+
+    def validate
+        errors.add("name", "can't be empty.") if name.blank?
+    end
+
+    def validate_on_create
+        errors.add("save_count", "should be zero.") if !save_count.blank? && save_count > 0
+    end
+
+    def validate_on_update
+        puts 'save_count = ' + save_count.to_s
+        errors.add("save_count", "should not be zero.") if save_count.blank? || save_count == 0
+    end
+
+    def atts
+        @@attributes
+    end
+
+end

data/test/paging_array_test.rb

@@ -0,0 +1,15 @@
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
+
+array = SimpleRecord::ResultsArray.new()
+#array.extend(ResultsArray)
+
+500.times do |i|
+    array << "_ob_" + i.to_s
+end
+
+array.each do |v|
+    puts v.to_s
+end
+
+puts array[10]

data/test/temp_test.rb

@@ -0,0 +1,63 @@
+# rubymine won't run 1.9 tests
+
+require 'minitest/unit'
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'right_aws'
+require 'my_model'
+require 'my_child_model'
+
+
+def setup
+    @config = YAML::load(File.read('test-config.yml'))
+    puts 'akey=' + @config['amazon']['access_key']
+    puts 'skey=' + @config['amazon']['secret_key']
+    RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
+    SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+end
+
+def teardown
+    RightAws::ActiveSdb.close_connection()
+end
+
+def test_dates
+    mm = MyModel.new
+    mm.name = "Travis"
+    mm.age = 32
+    mm.cool = true
+    mm.created = DateTime.now - 10
+    mm.updated = DateTime.now
+    mm.birthday = Time.now - (3600 * 24 * 365 * 10)
+    puts 'before save=' + mm.inspect
+    mm.save
+    puts 'after save=' + mm.inspect
+
+    mms = MyModel.find(:all, :conditions => ["created > ?", DateTime.now - 1])
+    puts 'mms=' + mms.inspect
+
+end
+
+def test_date_comparisons
+
+    t = SimpleRecord::Base.pad_and_offset(Time.now)
+    puts t
+    dt = SimpleRecord::Base.pad_and_offset(DateTime.now)
+    puts dt
+    dt_tomorrow = SimpleRecord::Base.pad_and_offset(DateTime.now + 1)
+
+
+    puts 'compare=' + (t <=> dt).to_s
+    puts 'compare=' + (t <=> dt_tomorrow).to_s
+
+    dts = DateTime.parse(dt_tomorrow)
+    puts dts.to_s
+    ts = Time.parse(dt)
+    puts ts.to_s
+end
+
+setup
+
+#test_dates
+    test_date_comparisons
+
+teardown

data/test/test_simple_record.rb

@@ -1,4 +1,4 @@
-require 'minitest/unit'
+require 'test/unit'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
 require "yaml"
 require 'right_aws'
@@ -8,36 +8,50 @@ require 'my_child_model'
 class TestSimpleRecord < Test::Unit::TestCase
 
     def setup
-        @config = YAML::load(File.read('test-config.yml'))
-        puts 'akey=' + @config['amazon']['access_key']
-        puts 'skey=' + @config['amazon']['secret_key']
-        RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'], :port=>80, :protocol=>"http")
+        @config = YAML::load(File.open(File.expand_path("~/.amazon/simple_record_tests.yml")))
+        #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_")
     end
 
     def teardown
-        RightAws::ActiveSdb.close_connection()
+        SimpleRecord.close_connection()
     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
+        #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
-        mm2 = MyModel.find(:all, :conditions=>["name =4?", "1"])
+        assert_raise RightAws::AwsError do
+            mm2 = MyModel.find(:all, :conditions=>["name =4?", "1"])
+        end
     end
 
     def test_batch_save
@@ -56,7 +70,7 @@ class TestSimpleRecord < Test::Unit::TestCase
         items.each do |item|
             puts 'id=' + item.id
             new_item = MyModel.find(item.id)
-            puts 'new=' + new_item.inspect
+            #puts 'new=' + new_item.inspect
             assert item.id == new_item.id
             assert item.name == new_item.name
             assert item.cool == new_item.cool
@@ -82,39 +96,209 @@ class TestSimpleRecord < Test::Unit::TestCase
     end
 
     def test_callbacks
-        # these DO NOT work right now, all objects get all callbacks
-        #	I tried like this, seem to be getting somewhere.
-        #
-        #  class << self;
-        #  @@callbacks.each do |callback|
-        #    #we first have to make an initialized array for each of the callbacks, to prevent problems if they are not called
-        #    puts 'setting callback ' + callback.to_s + ' on ' + self.inspect
-        #    eval %{
-        #
-        #        # add the methods to the class
-        #        def #{callback}(*args)
-        #        args.each do |arg|
-        #          cb_names = self.instance_variable_get(:@#{callback}_names)
-        #          cb_names = [] if cb_names.nil?
-        #          cb_names << arg.to_s if cb_names.index(arg.to_s).nil?
-        #          self.instance_variable_set(:@#{callback}_names, cb_names)
-        #        end
-        ##      asdf    @@#{callback}_names=args.map{|arg| arg.to_s}
-        #      end
+
+
+        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"
+
+        assert mm.changes.size == 1
+        puts 'CHANGES=' + mm.changes.inspect
+        assert mm.changes["name"][0] == "Travis"
+        assert mm.changes["name"][1] == "Jim"
+
+        assert mm.name_changed?
+        assert mm.name_was == "Travis"
+        assert mm.name_change[0] == "Travis"
+        assert mm.name_change[1] == "Jim"
+
+    end
+
+    def test_count
+
+        SimpleRecord.stats.clear
+
+        count = MyModel.find(:count) # select 1
+        assert count > 0
+
+        mms = MyModel.find(:all) # select 2
+        assert mms.size > 0 # select 3
+        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
+
+        count = MyModel.find(:count, :conditions=>["name=?", "Travis"])
+        assert count > 0
+
+        mms = MyModel.find(:all, :conditions=>["name=?", "Travis"])
+        assert mms.size > 0
+        assert mms.size == count
+
+    end
+
+    def test_select
+        # just passes through to find
+        MyModel.select(:count)
+    end
+
+    def test_attributes_correct
+        # child should contain child class attributes + parent class attributes
+
+        #MyModel.defined_attributes.each do |a|
         #
-        #        # now we run the methods in the callback array for this class
-        #send :define_method, "run_#{callback}" do
-        ##        def run_#{callback}
-        #          cb_names = self.instance_variable_get(:@#{callback}_names)
-        #          cb_names.each { |name|
-        #          unless eval(name)
-        #            return false
-        #          end
-        #          }
-        #          return true
-        #        end
-        #    }
-        #  end
-        #  end
+        #end
+        #MyChildModel.defined_attributes.inspect
+
+    end
+
+    # ensures that it uses next token and what not
+    def test_big_result
+        mms = MyModel.find(:all)
+        puts 'mms.size=' + mms.size.to_s
+        i = 0
+        mms.each do |x|
+            puts 'deleting=' + i.to_s
+            x.delete
+            i+=1
+        end
+        num_made = 110
+        num_made.times do |i|
+            mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
+        end
+        rs = MyModel.find(:all) # should get 100 at a time
+        assert rs.size == num_made
+        i = 0
+        rs.each do |x|
+            #puts 'x=' + x.id
+            i+=1
+        end
+        assert i == num_made
     end
+
+    def test_results_array
+        mms = MyModel.find(:all) # select 2
+        assert !mms.first.nil?
+        assert !mms.last.nil?
+        assert !mms.empty?
+        assert mms.include?(mms[0])
+
+        assert mms[2, 2].size == 2
+        assert mms[2..5].size == 4
+        assert mms[2...5].size == 3
+
+    end
+
+    def test_random_index
+        create_my_models(120)
+        mms = MyModel.find(:all)
+        o = mms[85]
+        puts 'o=' + o.inspect
+        assert !o.nil?
+        o = mms[111]
+        puts 'o=' + o.inspect
+        assert !o.nil?
+    end
+
+    # Use to populate db
+    def create_my_models(count)
+        batch = []
+        count.times do |i|
+            mm = MyModel.new(:name=>"model_" + i.to_s)
+            batch << mm
+        end
+        MyModel.batch_save batch
+
+
+    end
+
+    def test_objects_in_constructor
+        mm = MyModel.new(:name=>"model1")
+        mm.save
+        mcm = MyChildModel.new(:name=>"johnny", :my_model=>mm)
+        mcm.save
+
+        assert !mcm.my_model.nil?
+
+        mcm = MyChildModel.find(mcm.id)
+        assert !mcm.my_model.nil?
+
+    end
+
+    def test_validations
+        mm = MyModel.new()
+        assert mm.invalid?
+        assert mm.errors.size == 1
+        mm.name = "abcd"
+        assert mm.valid?
+        assert mm.errors.size == 0
+
+        mm.save_count = 2
+        assert mm.invalid?
+
+        mm.save_count = nil
+
+        assert mm.save, mm.errors.inspect
+
+        assert mm.valid?, mm.errors.inspect
+        assert mm.save_count == 1
+
+    end
+
+    def test_funny_names
+        MyModel.find(:all, :order=>"order")
+    end
+
 end