lib/rico/object.rb in rico-0.4.0 vs lib/rico/object.rb in rico-0.5.0

@@ -1,10 +1,10 @@
 module Rico
   module Object
     extend Forwardable
 
-    def_delegators :riak_object, :conflict?, :content_type, :content_type=, :data, :delete, :store, :raw_data
+    def_delegators :riak_object, :conflict?, :content_type, :content_type=, :delete, :store, :raw_data
 
     attr_accessor :bucket, :key
 
     # Initialize an object with a bucket and key
     #
@@ -15,10 +15,23 @@
     def initialize(bucket, key, options={})
       @bucket, @key = bucket, key
       options.each {|k,v| send("#{k}=", v)}
     end
 
+    # Retrieves data from Riak
+    #
+    # Raises an error on type mismatch
+    def data
+      result = riak_object.data || {}
+
+      if result["_type"] && (result["_type"] != type_key)
+        raise TypeError, "#{@bucket}:#{@key} expected type to be #{type_key}, got #{result["_type"]}"
+      end
+
+      result
+    end
+
     # Sets a new value on the object and stores it
     #
     # value - new value to set
     #
     # Returns the result of the store operation
@@ -34,14 +47,36 @@
       Rico.bucket(@bucket).exists? @key
     end
 
     protected
 
+    # Determines an appropriate type key for the object
+    #
+    # Returns a String
     def type_key
       name = self.class.name.split("::").last
       Rico::TYPES[name]
     end
 
+    # Verifies the result of a given block is of a given type.
+    #
+    # klass - Class to test type
+    # block - Block to call that produces value for test
+    #
+    # Returns the result of the block on success, raises a TypeError on failure
+    def assert_type(klass, &block)
+      value = block.call
+
+      unless value.class == klass
+        raise TypeError, "#{@bucket}:#{@key} expected value to be #{klass.name}, got #{value.class}"
+      end
+
+      value
+    end
+
+    # Instantiates and memoizes a Riak::RObject instance for our bucket and key
+    #
+    # Returns the Riak::RInstance object
     def riak_object
       @riak_object ||= Rico.bucket(@bucket).get_or_new @key
     end
   end
 end