simple_record 2.0.5 → 2.1.0

data/README.markdown

@@ -70,6 +70,11 @@ This is required because SimpleDB only has strings so SimpleRecord needs to know
       has_booleans :is_nerd
     end
 
+### Multi-value attributes
+
+SimpleDB supports having multiple values for the same attribute so to use this feature, simply set an attribute to an
+array of values.
+
 ### belongs_to
 
 Creates a many-to-one relationship. Can only have one per belongs_to call.
@@ -207,13 +212,34 @@ Use per_thread connection mode and close the connection after each request.
 
 ### Disable ActiveRecord so you don't have to setup another database
 
-This is most helpful on windows so Rails doesn't need sqlite or mysql gems/drivers installed which are painful to install on windows. In environment.rb, add 'config.frameworks -= [ :active_record ]', should look something like:
+#### Rails 2
+
+This is most helpful on windows so Rails doesn't need sqlite or mysql gems/drivers installed which are painful to install on windows.
+In environment.rb, add 'config.frameworks -= [ :active_record ]', so it should look something like:
 
     Rails::Initializer.run do |config|
       config.frameworks -= [ :active_record ]
       ....
     end
 
+#### Rails 3
+
+At the top of application.rb, comment out `require 'rails/all` and add the following:
+
+    #require 'rails/all'
+    %w(
+      action_controller
+      action_mailer
+      active_resource
+      rails/test_unit
+    ).each do |framework|
+      begin
+        require "#{framework}/railtie"
+      rescue LoadError
+      end
+    end
+
+This is the same as rails/all minus active_record.
 
 ## Large Objects (LOBS)
 

data/lib/simple_record.rb

@@ -28,6 +28,13 @@ require 'aws'
 require 'base64'
 require 'active_support'
 require 'active_support/core_ext'
+begin
+  # comment out line below to test rails2 validations
+  require 'active_model'
+rescue LoadError => ex
+  puts "ActiveModel not available, falling back."
+end
+require File.expand_path(File.dirname(__FILE__) + "/simple_record/validations")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/attributes")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/active_sdb")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/callbacks")
@@ -36,7 +43,6 @@ 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")
@@ -170,14 +176,28 @@ module SimpleRecord
 
 
 #        puts 'Is ActiveModel defined? ' + defined?(ActiveModel).inspect
+
+
     if defined?(ActiveModel)
+      @@active_model = true
       extend ActiveModel::Naming
       include ActiveModel::Conversion
       include ActiveModel::Validations
+      extend ActiveModel::Callbacks # for ActiveRecord like callbacks
+      include ActiveModel::Validations::Callbacks
+      define_model_callbacks :save, :create, :update, :destroy
+      include SimpleRecord::Callbacks3
+      alias_method :am_valid?, :valid?
+
+
     else
+      @@active_model = false
+      puts "using rails2 validations."
       attr_accessor :errors
-      include SimpleRecord::Rails2
+      include SimpleRecord::Callbacks
     end
+    include SimpleRecord::Validations
+
 
     include SimpleRecord::Translations
 #        include SimpleRecord::Attributes
@@ -185,7 +205,6 @@ module SimpleRecord
     include SimpleRecord::Attributes
     extend SimpleRecord::Sharding::ClassMethods
     include SimpleRecord::Sharding
-    include SimpleRecord::Callbacks
     include SimpleRecord::Json
     include SimpleRecord::Logging
     extend SimpleRecord::Logging::ClassMethods
@@ -362,11 +381,10 @@ module SimpleRecord
     end
 
     def clear_errors
-#      @errors=SimpleRecord_errors.new
-      if not (defined?(ActiveModel))
-        @errors=SimpleRecord_errors.new
-      else
+      if defined?(ActiveModel)
         @errors = ActiveModel::Errors.new(self)
+      else
+        @errors=SimpleRecord_errors.new
       end
     end
 
@@ -398,9 +416,6 @@ module SimpleRecord
       self.updated
     end
 
-    def read_attribute_for_validation(key)
-      @attributes[key.to_s]
-    end
 
     def cache_store
       @@cache_store
@@ -429,8 +444,9 @@ module SimpleRecord
     #   - :dirty => true - Will only store attributes that were modified. To make it save regardless and have it update the :updated value, include this and set it to false.
     #   - :domain => Explicitly define domain to use.
     #
+
     def save(options={})
-#            puts 'SAVING: ' + self.inspect if SimpleRecord.logging?
+      puts 'SAVING: ' + self.inspect if SimpleRecord.logging?
       # todo: Clean out undefined values in @attributes (in case someone set the attributes hash with values that they hadn't defined)
       clear_errors
       # todo: decide whether this should go before pre_save or after pre_save? pre_save dirties "updated" and perhaps other items due to callbacks
@@ -441,6 +457,7 @@ module SimpleRecord
       is_create = self[:id].nil?
       ok        = pre_save(options) # Validates and sets ID
       if ok
+#        puts 'ok'
         begin
           dirty = @dirty
 #                    puts 'dirty before=' + @dirty.inspect
@@ -449,48 +466,119 @@ module SimpleRecord
             return true if @dirty.size == 0 # This should probably never happen because after pre_save, created/updated dates are changed
             options[:dirty_atts] = @dirty
           end
-          to_delete                = get_atts_to_delete
-          SimpleRecord.stats.saves += 1
+          to_delete = get_atts_to_delete
+
 
           if self.class.is_sharded?
             options[:domain] = sharded_domain
           end
 
-          if super(options)
-            self.class.cache_results(self)
-            delete_niled(to_delete)
-            save_lobs(dirty)
-            after_save_cleanup
-            if (is_create ? run_after_create : run_after_update) && run_after_save
-#                            puts 'all good?'
-              return true
-            else
-              return false
-            end
+          if @@active_model
+            x = save_super(dirty, is_create, options, to_delete)
+#            puts 'save_super result = ' + x.to_s
+            return x
           else
-            return false
+#            puts 'not activemodel callbacks'
+            return save_super(dirty, is_create, options, to_delete)
           end
         rescue Aws::AwsError => ex
-          # puts "RESCUED in save: " + $!
-          # Domain is created in aws lib now using :create_domain=>true
-#                    if (domain_ok(ex, options))
-#                        if !@create_domain_called
-#                            @create_domain_called = true
-#                            save(options)
-#                        else
-#                            raise $!
-#                        end
-#                    else
-#                        raise $!
-#                    end
           raise ex
         end
       else
-        #@debug = "not saved"
+#        puts 'returning false'
         return false
       end
     end
 
+    if @@active_model
+      alias_method :old_save, :save
+
+      def save(options={})
+#        puts 'extended save'
+        x = create_or_update
+#        puts 'save x=' + x.to_s
+        x
+      end
+    end
+
+    def create_or_update #:nodoc:
+#      puts 'create_or_update'
+      ret = true
+      _run_save_callbacks do
+        result = new_record? ? create : update
+#        puts 'save_callbacks result=' + result.inspect
+        ret = result
+      end
+      ret
+    end
+
+    def create #:nodoc:
+      puts '3 create'
+      ret = true
+      _run_create_callbacks do
+        x = old_save
+#        puts 'create old_save result=' + x.to_s
+        ret = x
+      end
+      ret
+    end
+
+#
+    def update(*) #:nodoc:
+      puts '3 update'
+      ret = true
+      _run_update_callbacks do
+        x = old_save
+#        puts 'update old_save result=' + x.to_s
+        ret = x
+      end
+      ret
+    end
+
+
+    def save!(options={})
+      save(options) || raise(RecordNotSaved.new(self))
+    end
+
+    # this is a bit wonky, save! should call this, not sure why it's here.
+    def save_with_validation!(options={})
+      save!
+    end
+
+    def self.create(attributes={})
+#            puts "About to create in domain #{domain}"
+      super
+    end
+
+    def self.create!(attributes={})
+      item = self.new(attributes)
+      item.save!
+      item
+    end
+
+
+    def save_super(dirty, is_create, options, to_delete)
+      SimpleRecord.stats.saves += 1
+      if save2(options)
+        self.class.cache_results(self)
+        delete_niled(to_delete)
+        save_lobs(dirty)
+        after_save_cleanup
+        unless @@active_model
+          if (is_create ? run_after_create : run_after_update) && run_after_save
+#                            puts 'all good?'
+            return true
+          else
+            return false
+          end
+        end
+        return true
+      else
+        return false
+      end
+    end
+
+
     def save_lobs(dirty=nil)
 #            puts 'dirty.inspect=' + dirty.inspect
       dirty = @dirty if dirty.nil?
@@ -600,26 +688,6 @@ module SimpleRecord
       "lobs/#{self.id}_single_clob"
     end
 
-    def save!(options={})
-      save(options) || raise(RecordNotSaved.new(nil, self))
-    end
-
-    # this is a bit wonky, save! should call this, not sure why it's here.
-    def save_with_validation!(options={})
-      save!
-    end
-
-    def self.create(attributes={})
-#            puts "About to create in domain #{domain}"
-      super
-    end
-
-    def self.create!(attributes={})
-      item = self.new(attributes)
-      item.save!
-      item
-    end
-
 
     def self.get_encryption_key()
       key = SimpleRecord.options[:encryption_key]
@@ -630,28 +698,20 @@ module SimpleRecord
       return key
     end
 
-    def validate
-      true
-    end
-
-    def validate_on_create
-      true
-    end
-
-    def validate_on_update
-      true
-    end
-
-
     def pre_save(options)
 
+
+      ok        = true
       is_create = self[:id].nil?
-      ok        = run_before_validation && (is_create ? run_before_validation_on_create : run_before_validation_on_update)
-      return false unless ok
+      unless @@active_model
+        ok = run_before_validation && (is_create ? run_before_validation_on_create : run_before_validation_on_update)
+        return false unless ok
+      end
 
 #      validate()
 #      is_create ? validate_on_create : validate_on_update
       if !valid?
+        puts 'not valid'
         return false
       end
 #
@@ -661,23 +721,26 @@ module SimpleRecord
 #        return false
 #      end
 
-      ok = run_after_validation && (is_create ? run_after_validation_on_create : run_after_validation_on_update)
-      return false unless ok
+      unless @@active_model
+        ok = run_after_validation && (is_create ? run_after_validation_on_create : run_after_validation_on_update)
+        return false unless ok
+      end
 
-      ok = respond_to?('before_save') ? before_save : true
-      if ok
-        if is_create && respond_to?('before_create')
-          ok = before_create
-        elsif !is_create && respond_to?('before_update')
-          ok = before_update
+      # Now for callbacks
+      unless @@active_model
+        ok = respond_to?('before_save') ? before_save : true
+        if ok
+          if is_create && respond_to?('before_create')
+            ok = before_create
+          elsif !is_create && respond_to?('before_update')
+            ok = before_update
+          end
         end
-      end
-      if ok
-        ok = run_before_save && (is_create ? run_before_create : run_before_update)
-      end
-      if ok
-        # Now translate all fields into SimpleDB friendly strings
-#                convert_all_atts_to_sdb()
+        if ok
+          ok = run_before_save && (is_create ? run_before_create : run_before_update)
+        end
+      else
+
       end
       prepare_for_update
       ok
@@ -779,10 +842,15 @@ module SimpleRecord
     end
 
     def destroy
-      return run_before_destroy && delete && run_after_destroy
+      if @@active_model
+        _run_destroy_callbacks do
+          delete
+        end
+      else
+        return run_before_destroy && delete && run_after_destroy
+      end
     end
 
-
     def delete_niled(to_delete)
 #            puts 'to_delete=' + to_delete.inspect
       if to_delete.size > 0
@@ -861,6 +929,11 @@ module SimpleRecord
       if params.size > 1
         options = params[1]
       end
+      conditions = options[:conditions]
+      if conditions && conditions.is_a?(String)
+        conditions           = [conditions]
+        options[:conditions] = conditions
+      end
 
       if !options[:shard_find] && is_sharded?
         # then break off and get results across all shards
@@ -958,7 +1031,8 @@ module SimpleRecord
     def self.convert_condition_params(options)
       return if options.nil?
       conditions = options[:conditions]
-      if !conditions.nil? && conditions.size > 1
+      return if conditions.nil?
+      if conditions.size > 1
         # all after first are values
         conditions.collect! { |x|
           Translations.pad_and_offset(x)

data/lib/simple_record/active_sdb.rb

@@ -856,7 +856,7 @@ module SimpleRecord
             #   - :except => Array of attributes to NOT save
             #
             # compare to +put+ method
-            def save(options={})
+            def save2(options={})
                 options[:create_domain] = true if options[:create_domain].nil?
                 pre_save2
                 atts_to_save = @attributes.dup

data/lib/simple_record/attributes.rb

@@ -346,14 +346,14 @@ module SimpleRecord
                         begin
                             single_clob = s3_bucket(false, :s3_bucket=>:new).get(single_clob_id)
                             single_clob = JSON.parse(single_clob)
-                            puts "single_clob=" + single_clob.inspect
+#                            puts "single_clob=" + single_clob.inspect
                             single_clob.each_pair do |name2,val|
                                 @lobs[name2.to_sym] = val
                             end
                             ret = @lobs[name]
                             SimpleRecord.stats.s3_gets += 1
                         rescue Aws::AwsError => ex
-                            if ex.include? /NoSuchKey/
+                            if ex.include?(/NoSuchKey/) || ex.include?(/NoSuchBucket/)
                                 ret = nil
                             else
                                 raise ex
@@ -365,7 +365,7 @@ module SimpleRecord
                             # puts 'got from s3 ' + ret.inspect
                             SimpleRecord.stats.s3_gets += 1
                         rescue Aws::AwsError => ex
-                            if ex.include? /NoSuchKey/
+                            if ex.include?(/NoSuchKey/) || ex.include?(/NoSuchBucket/)
                                 ret = nil
                             else
                                 raise ex