simple_record 2.0.5 → 2.1.0

data/test/test_simple_record.rb

@@ -7,6 +7,7 @@ require 'aws'
 require_relative 'my_model'
 require_relative 'my_child_model'
 require_relative 'model_with_enc'
+require_relative 'my_simple_model'
 
 # Tests for SimpleRecord
 #
@@ -50,7 +51,7 @@ class TestSimpleRecord < TestBase
         sleep 1
         mm2 = MyModel.find(id)
         puts mm2.inspect
-        assert mm2.age.nil?, "doh, age is " + mm2.age.inspect
+        assert mm2.age.nil?, "doh, age should be nil, but it's " + mm2.age.inspect
     end
 
 
@@ -79,7 +80,7 @@ class TestSimpleRecord < TestBase
         assert mm.s1 == "", "mm.s1 is not empty string, it is " + mm.s1.inspect
 
         mm = MyModel.find(id)
-        assert mm.name == "Travis2"
+        assert mm.name == "Travis2", "Name was not Travis2, it was #{mm.name}"
         assert mm.age == 10
         assert mm.cool == false
         assert mm.s1 == "", "mm.s1 is not empty string, it is #{mm.s1.inspect}"
@@ -268,13 +269,14 @@ class TestSimpleRecord < TestBase
 
     # http://api.rubyonrails.org/classes/ActiveRecord/Dirty.html#M002136
     def test_changed
-        mm = MyModel.new
+        mm = MySimpleModel.new
         mm.name = "Travis"
         mm.age = 32
         mm.cool = true
         mm.save
 
         puts 'changed?=' + mm.changed?.to_s
+        p mm.changed
         assert !mm.changed?
         assert mm.changed.size == 0
         assert mm.changes.size == 0
@@ -370,25 +372,6 @@ class TestSimpleRecord < TestBase
 
     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_nil_attr_deletion
         mm = MyModel.new

data/test/test_validations.rb

@@ -0,0 +1,45 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require_relative "test_base"
+require "yaml"
+require 'aws'
+require_relative 'my_model'
+require_relative 'my_child_model'
+require_relative 'model_with_enc'
+
+# Tests for SimpleRecord
+#
+
+class TestSimpleRecord < TestBase
+
+  def test_validations
+    mm = MyModel.new()
+    puts 'invalid? ' + mm.invalid?.to_s
+    assert mm.invalid?, "mm is valid. invalid? returned #{mm.invalid?}"
+    assert mm.errors.size == 1
+    assert !mm.attr_before_create
+    assert !mm.valid?
+    assert mm.save == false, mm.errors.inspect
+    assert mm.attr_before_create
+    assert !mm.attr_after_save
+    assert !mm.attr_after_create
+    mm.name = "abcd"
+    assert mm.valid?, mm.errors.inspect
+    assert mm.errors.size == 0
+
+    mm.save_count = 2
+    assert mm.invalid?
+
+    mm.save_count = nil
+    assert mm.valid?
+    assert mm.save, mm.errors.inspect
+
+    p mm
+    assert mm.attr_after_save
+    assert mm.attr_after_create
+
+    assert mm.valid?, mm.errors.inspect
+    assert mm.save_count == 1
+  end
+end

metadata

@@ -1,46 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple_record
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 5
-  version: 2.0.5
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - Travis Reeder
 - Chad Arimura
 - RightScale
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-05 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-02-08 00:00:00.000000000 -08:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aws
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &26750952 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard, etc. By http://www.appoxy.com
+  prerelease: false
+  version_requirements: *26750952
+description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard,
+  etc. By http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - lib/simple_record.rb
 - lib/simple_record/active_sdb.rb
 - lib/simple_record/attributes.rb
@@ -50,11 +42,11 @@ files:
 - lib/simple_record/json.rb
 - lib/simple_record/logging.rb
 - 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
+- lib/simple_record/validations.rb
 - README.markdown
 - test/conversions_test.rb
 - test/model_with_enc.rb
@@ -62,6 +54,7 @@ files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/my_sharded_model.rb
+- test/my_simple_model.rb
 - test/paging_array_test.rb
 - test/temp.rb
 - test/temp_test.rb
@@ -79,45 +72,40 @@ files:
 - test/test_shards.rb
 - test/test_simple_record.rb
 - test/test_usage.rb
+- test/test_validations.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
-
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: ActiveRecord like interface for Amazon SimpleDB. By http://www.appoxy.com
-test_files: 
+test_files:
 - test/conversions_test.rb
 - test/model_with_enc.rb
 - test/my_base_model.rb
 - test/my_child_model.rb
 - test/my_model.rb
 - test/my_sharded_model.rb
+- test/my_simple_model.rb
 - test/paging_array_test.rb
 - test/temp.rb
 - test/temp_test.rb
@@ -135,3 +123,4 @@ test_files:
 - test/test_shards.rb
 - test/test_simple_record.rb
 - test/test_usage.rb
+- test/test_validations.rb

data/lib/simple_record/rails2.rb

@@ -1,30 +0,0 @@
-# Only used if ActiveModel is not present
-
-module SimpleRecord
-    module Rails2
-
-
-        def valid?
-            errors.clear
-
-#            run_callbacks(:validate)
-            validate
-
-            if new_record?
-#                run_callbacks(:validate_on_create)
-                validate_on_create
-            else
-#                run_callbacks(:validate_on_update)
-                validate_on_update
-            end
-
-            errors.empty?
-        end
-
-
-        def invalid?
-            !valid?
-        end
-
-    end
-end