appoxy-simple_record 1.1.16 → 1.1.17

data/lib/simple_record.rb

@@ -81,6 +81,10 @@ module SimpleRecord
         include SimpleRecord::Callbacks
 
 
+        def initialize(attrs={})
+            super
+            # Need to deal with objects passed in. iterate through belongs_to perhaps and if in attrs, set the objects id rather than the object itself
+        end
 
 
         # todo: move into Callbacks module
@@ -181,7 +185,8 @@ module SimpleRecord
 
         def defined_attributes_local
             #puts 'local defined_attributes'
-            self.class.defined_attributes
+            ret = self.class.defined_attributes
+            ret.merge!(self.class.superclass.defined_attributes) if self.class.superclass.respond_to?(:defined_attributes)
         end
 
 
@@ -305,6 +310,9 @@ module SimpleRecord
             end
         end
 
+        def self.has_strings(*args)
+            has_attributes(*args)
+        end
         def self.has_ints(*args)
             has_attributes(*args)
             are_ints(*args)

data/test/test_simple_record.rb

@@ -196,6 +196,7 @@ class TestSimpleRecord < Test::Unit::TestCase
     end
 
     def test_attributes_correct
+        # child should contain child class attributes + parent class attributes
 
         #MyModel.defined_attributes.each do |a|
         #
@@ -207,13 +208,22 @@ class TestSimpleRecord < Test::Unit::TestCase
 
     # ensures that it uses next token and what not
     def test_big_result
-        #110.times do |i|
-        #    MyModel
-        #end
-        #rs = MyModel.find(:all, :limit=>300)
-        #rs.each do |x|
-        #   puts 'x=' + x.id
-        #end
+        mms = MyModel.find(:all)
+        mms.each do |x|
+            x.delete
+        end
+        num_made = 110
+        num_made.times do |i|
+            mm = MyModel.create(:name=>"Travis", :age=>32, :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
@@ -223,9 +233,23 @@ class TestSimpleRecord < Test::Unit::TestCase
         assert !mms.empty?
         assert mms.include?(mms[0])
 
-        assert mms[2,2].size == 2
+        assert mms[2, 2].size == 2
         assert mms[2..5].size == 4
         assert mms[2...5].size == 3
 
     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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy-simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,7 @@ files:
 - lib/simple_record.rb
 - lib/stats.rb
 - README.markdown
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: 
 post_install_message: 
@@ -53,7 +53,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
 - test/my_child_model.rb