simple_record 1.4.19 → 1.5.1

data/README.markdown

@@ -100,15 +100,15 @@ Querying is similar to ActiveRecord for the most part.
 
 To find all objects that match conditions returned in an Array:
 
-    Company.find(:all, :conditions => ["created_at > ?", 10.days.ago], :order=>"name", :limit=>50)
+    Company.find(:all, :conditions => ["created > ?", 10.days.ago], :order=>"name", :limit=>50)
 
 To find a single object:
 
-    Company.find(:first, :conditions => ["name = ? AND division = ? AND created_at > ?", "Appoxy", "West", 10.days.ago ])
+    Company.find(:first, :conditions => ["name = ? AND division = ? AND created > ?", "Appoxy", "West", 10.days.ago ])
 
 To count objects:
 
-    Company.find(:count, :conditions => ["name = ? AND division = ? AND created_at > ?", "Appoxy", "West", 10.days.ago ])
+    Company.find(:count, :conditions => ["name = ? AND division = ? AND created > ?", "Appoxy", "West", 10.days.ago ])
 
 You can also the dynamic method style, for instance the line below is the same as the Company.find(:first....) line above:
 

data/lib/simple_record.rb

@@ -37,6 +37,7 @@ require File.expand_path(File.dirname(__FILE__) + "/simple_record/errors")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/json")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/logging")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/password")
+require File.expand_path(File.dirname(__FILE__) + "/simple_record/rails2")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/results_array")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/stats")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/translations")
@@ -125,6 +126,7 @@ module SimpleRecord
             SimpleRecord::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
             if options[:connection_mode] == :per_thread
                 @@auto_close_s3 = true
+                # todo: should we init this only when needed?
                 @@s3 = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, {:connection_mode=>:per_thread})
             end
         end
@@ -164,6 +166,16 @@ module SimpleRecord
         include SimpleRecord::Logging
         extend SimpleRecord::Logging::ClassMethods
 
+#        puts 'Is ActiveModel defined? ' + defined?(ActiveModel).inspect
+        if defined?(ActiveModel)
+            extend ActiveModel::Naming
+            include ActiveModel::Conversion
+            include ActiveModel::Validations
+        else
+            attr_accessor :errors
+            include SimpleRecord::Rails2
+        end
+
 
         def self.extended(base)
 
@@ -185,7 +197,7 @@ module SimpleRecord
             #we have to handle the virtuals.
             Attributes.handle_virtuals(attrs)
 
-            @errors=SimpleRecord_errors.new
+#            @errors=SimpleRecord_errors.new
             @dirty = {}
 
             @attributes = {} # sdb values
@@ -215,6 +227,12 @@ module SimpleRecord
         end
 
 
+        def persisted?
+            true
+        end
+        
+
+
         def defined_attributes_local
             # todo: store this somewhere so it doesn't keep going through this
             ret = self.class.defined_attributes
@@ -222,7 +240,7 @@ module SimpleRecord
         end
 
 
-        attr_accessor :errors
+
 
         class << self;
             attr_accessor :domain_prefix
@@ -380,43 +398,12 @@ module SimpleRecord
             return false
         end
 
-        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 new_record?
             # todo: new_record in activesdb should align with how we're defining a new record here, ie: if id is nil
             super
         end
 
-        def invalid?
-            !valid?
-        end
-
-        def validate
-            true
-        end
-
-        def validate_on_create
-            true
-        end
-
-        def validate_on_update
-            true
-        end
 
         @create_domain_called = false
 
@@ -561,6 +548,19 @@ module SimpleRecord
         end
 
 
+        def validate
+            true
+        end
+        
+        def validate_on_create
+            true
+        end
+
+        def validate_on_update
+            true
+        end
+
+
         def pre_save(options)
 
             is_create = self[:id].nil?
@@ -571,7 +571,7 @@ module SimpleRecord
 
             is_create ? validate_on_create : validate_on_update
 #      puts 'AFTER VALIDATIONS, ERRORS=' + errors.inspect
-            if (!@errors.nil? && @errors.length > 0)
+            if (!errors.nil? && errors.size > 0)
 #        puts 'THERE ARE ERRORS, returning false'
                 return false
             end
@@ -1138,7 +1138,7 @@ module SimpleRecord
 
     # This is simply a place holder so we don't keep doing gets to s3 or simpledb if already checked.
     class RemoteNil
-
+      
     end
 
 

data/lib/simple_record/attributes.rb

@@ -146,6 +146,9 @@ module SimpleRecord
         #
         # This method will also create an {association)_id method that will return the ID of the foreign object
         # without actually materializing it.
+        #
+        # options:
+        #     :class_name=>"User" - to change the default class to use
         def belongs_to(association_id, options = {})
             arg = association_id
             arg_s = arg.to_s

data/lib/simple_record/rails2.rb

@@ -0,0 +1,30 @@
+# 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

data/test/temp.rb

@@ -41,3 +41,6 @@ p = MyModel.new
 puts 'p=' + p.inspect.to_s
 puts 'p=' + p.to_s
 puts "p=" + p.inspect
+
+id = 123
+puts 'id&&id ' + (id && id.to_s).inspect

data/test/test_rails3.rb

@@ -0,0 +1,24 @@
+require 'test/unit'
+require 'active_model'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require File.join(File.dirname(__FILE__), "./test_base")
+require "yaml"
+require 'aws'
+require_relative 'my_model'
+require_relative 'my_child_model'
+require_relative 'model_with_enc'
+
+# To test things related to rails 3 like ActiveModel usage.
+class TestRails3 < TestBase
+
+    def test_active_model_defined
+
+        my_model = MyModel.new
+
+        assert (defined?(MyModel.model_name))
+
+
+    end
+
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 19
-  version: 1.4.19
+  - 5
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
+date: 2010-11-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ 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/stats.rb
 - lib/simple_record/translations.rb
@@ -73,6 +74,7 @@ files:
 - test/test_lobs.rb
 - test/test_marshalled.rb
 - test/test_pagination.rb
+- test/test_rails3.rb
 - test/test_results_array.rb
 - test/test_usage.rb
 has_rdoc: true
@@ -126,5 +128,6 @@ test_files:
 - test/test_lobs.rb
 - test/test_marshalled.rb
 - test/test_pagination.rb
+- test/test_rails3.rb
 - test/test_results_array.rb
 - test/test_usage.rb