message_overlay.rb in riak-client-2.2.0.pre1

- old
+ new

@@ -8,31 +8,11 @@
           RANGE = 1
         end
       end
 
       class RpbBucketProps
-        def clean_hook(newval)
-          if newval.is_a? Array
-            return newval.map{|v| clean_hook v}
-          end
 
-          newval = newval.symbolize_keys if newval.is_a? Hash
-          if newval.is_a?(Hash) && newval[:module] && newval[:function]
-            modfun = RpbModFun.new newval
-            hook = RpbCommitHook.new modfun: modfun
-            newval = hook
-          elsif newval.is_a?(Hash) && newval[:name]
-            hook = RpbCommitHook.new newval
-            newval = hook
-          elsif newval.is_a? String
-            hook = RpbCommitHook.new name: newval
-            newval = hook
-          end
-
-          return newval
-        end
-
         # "repeated" elements with zero items are indistinguishable
         # from a nil, so we have to manage has_precommit/has_postcommit
         # flags.
         def precommit=(newval)
           newval = clean_hook newval
@@ -52,9 +32,51 @@
         end
 
         def has_postcommit=(newval)
           @has_postcommit = newval
           @postcommit ||= [] if newval
+        end
+
+        def chash_keyfun=(newval)
+          @chash_keyfun = clean_modfun newval
+        end
+
+        def linkfun=(newval)
+          @linkfun = clean_modfun newval
+        end
+
+        private
+
+        def clean_hook(newval)
+          if newval.is_a? Array
+            return newval.map{|v| clean_hook v}
+          end
+
+          newval = newval.symbolize_keys if newval.is_a? Hash
+          if newval.is_a?(Hash) && newval[:module] && newval[:function]
+            modfun = RpbModFun.new newval
+            hook = RpbCommitHook.new modfun: modfun
+            newval = hook
+          elsif newval.is_a?(Hash) && newval[:name]
+            hook = RpbCommitHook.new newval
+            newval = hook
+          elsif newval.is_a? String
+            hook = RpbCommitHook.new name: newval
+            newval = hook
+          end
+
+          return newval
+        end
+
+        def clean_modfun(newval)
+          return newval unless newval.is_a? Hash
+
+          newval = newval.symbolize_keys
+          if newval[:mod] && newval[:fun]
+            modfun = RpbModFun.new :'module' => newval[:mod], function: newval[:fun]
+          end
+
+          return modfun
         end
       end
     end
   end
 end