lib/riak/bucket_properties.rb in riak-client-2.2.0.pre1 vs lib/riak/bucket_properties.rb in riak-client-2.2.0

@@ -28,11 +28,11 @@
       end
       @cached_props = nil
       return true
     end
 
-    # Take bucket properties from a given {Hash} or {Riak::BucketProperties} 
+    # Take bucket properties from a given {Hash} or {Riak::BucketProperties}
     # object.
     # @param [Hash<String, Object>, Riak::BucketProperties] other
     def merge!(other)
       cached_props.merge! other
     end
@@ -52,16 +52,23 @@
 
     # Write a bucket property
     # @param [String] property_name
     # @param [Object] value
     def []=(property_name, value)
+      value = unwrap_index(value) if property_name == 'search_index'
       cached_props[property_name.to_s] = value
     end
 
     private
     def cached_props
       @cached_props ||= client.backend do |be|
         be.bucket_properties_operator.get bucket
       end
+    end
+
+    def unwrap_index(value)
+      return value.name if value.is_a? Riak::Search::Index
+
+      value
     end
   end
 end