persistence.rb in ripple-1.0.0.beta2

- old
+ new

@@ -6,12 +6,12 @@
       extend ActiveSupport::Concern
 
       module ClassMethods
 
         # Instantiates a new record, applies attributes from a block, and saves it
-        def create(attrs={}, &block)
-          new(attrs, &block).tap {|s| s.save }
+        def create(*args, &block)
+          new(*args, &block).tap {|s| s.save }
         end
 
         # Destroys all records one at a time.
         # Place holder while :delete to bucket is being developed.
         def destroy_all
@@ -24,92 +24,107 @@
         def quorums
           @quorums ||= {}
         end
       end
 
-      module InstanceMethods
-        # @private
-        def initialize
-          super
-          @new = true
+      # @private
+      def initialize
+        super
+        @new = true
+        @deleted = false
+      end
+      
+      # Determines whether this document has been deleted or not.
+      def deleted?
+        @deleted
+      end
+      
+      # Determines whether this is a new document.
+      def new?
+        @new || false
+      end
+      
+      # Updates a single attribute and then saves the document
+      # NOTE: THIS SKIPS VALIDATIONS! Use with caution.
+      # @return [true,false] whether the document succeeded in saving
+      def update_attribute(attribute, value)
+        send("#{attribute}=", value)
+        save(:validate => false)
+      end
+      
+      # Writes new attributes and then saves the document
+      # @return [true,false] whether the document succeeded in saving
+      def update_attributes(attrs)
+        self.attributes = attrs
+        save
+      end
+      
+      # Saves the document in Riak.
+      # @return [true,false] whether the document succeeded in saving
+      def save(*args)
+        really_save(*args)
+      end
+      
+      def really_save(*args)
+        update_robject
+        robject.store(self.class.quorums.slice(:w,:dw))
+        self.key = robject.key
+        @new = false
+        true
+      end
+      
+      # Reloads the document from Riak
+      # @return self
+      def reload
+        return self if new?
+        @robject = @robject.reload(:force => true)
+        self.__send__(:raw_attributes=, @robject.data.except("_type"))
+        reset_associations
+        self
+      end
+      
+      # Deletes the document from Riak and freezes this instance
+      def destroy!
+        robject.delete(self.class.quorums.slice(:rw)) unless new?
+        @deleted = true
+        freeze
+      end
+      
+      def destroy
+        destroy!
+        true
+      rescue Riak::FailedRequest
+        false
+      end
+      
+      # Freeze the attributes hash instead of the record itself to avoid
+      # errors when calling methods on frozen records.
+      def freeze
+        @attributes.freeze
+      end
+      
+      # Returns +true+ if the attributes hash has been frozen.
+      def frozen?
+        @attributes.frozen?
+      end
+      
+      attr_writer :robject
+      
+      def robject
+        @robject ||= Riak::RObject.new(self.class.bucket, key).tap do |obj|
+          obj.content_type = "application/json"
         end
-
-        # Determines whether this is a new document.
-        def new?
-          @new || false
-        end
-
-        # Updates a single attribute and then saves the document
-        # NOTE: THIS SKIPS VALIDATIONS! Use with caution.
-        # @return [true,false] whether the document succeeded in saving
-        def update_attribute(attribute, value)
-          send("#{attribute}=", value)
-          save(:validate => false)
-        end
-
-        # Writes new attributes and then saves the document
-        # @return [true,false] whether the document succeeded in saving
-        def update_attributes(attrs)
-          self.attributes = attrs
-          save
-        end
-
-        # Saves the document in Riak.
-        # @return [true,false] whether the document succeeded in saving
-        def save(*args)
-          really_save(*args)
-        end
-
-        def really_save(*args)
-          update_robject
-          robject.store(self.class.quorums.slice(:w,:dw))
-          self.key = robject.key
-          @new = false
-          true
-        end
-
-        # Reloads the document from Riak
-        # @return self
-        def reload
-          return self if new?
-          @robject = @robject.reload(:force => true)
-          self.__send__(:raw_attributes=, @robject.data.except("_type"))
-          reset_associations
-          self
-        end
-
-        # Deletes the document from Riak and freezes this instance
-        def destroy
-          robject.delete(self.class.quorums.slice(:rw)) unless new?
-          freeze
-          true
-        rescue Riak::FailedRequest
-          false
-        end
-
-        # Freezes the document, preventing further modification.
-        def freeze
-          @attributes.freeze; super
-        end
-
-        attr_writer :robject
-
-        def robject
-          @robject ||= Riak::RObject.new(self.class.bucket, key).tap do |obj|
-            obj.content_type = "application/json"
-          end
-        end
-
-        def update_robject
-          robject.key = key if robject.key != key
-          robject.content_type = 'application/json'
-          robject.data = attributes_for_persistence
-        end
-
-        private
-        def attributes_for_persistence
-          raw_attributes.merge("_type" => self.class.name)
-        end
+      end
+      
+      def update_robject
+        robject.key = key if robject.key != key
+        robject.content_type = 'application/json'
+        robject.data = attributes_for_persistence
+      end
+      
+      private
+      def attributes_for_persistence
+        raw_attributes.merge("_type" => self.class.name)
       end
     end
   end
 end