From a483cd7edc6f620ce05d447785beecb0e690a468 Mon Sep 17 00:00:00 2001 From: Andy Caldwell Date: Wed, 30 Jan 2013 15:16:18 +0000 Subject: [PATCH 1/2] Add delete function and tidy up unified code --- lib/active_column/base.rb | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/active_column/base.rb b/lib/active_column/base.rb index 27e158f..e944e4c 100644 --- a/lib/active_column/base.rb +++ b/lib/active_column/base.rb @@ -53,20 +53,29 @@ def initialize(attrs = {}) end end - def save() + def save value = { SimpleUUID::UUID.new.to_s => self.to_json } - key_parts = self.class.keys.each_with_object( {} ) do |key_config, key_parts| - key_parts[key_config.key] = self.send(key_config.func) - end - keys = self.class.generate_keys(key_parts) - keys.each do |key| ActiveColumn.connection.insert(self.class.column_family, key, value) end - self + return self end + def delete + value = { SimpleUUID::UUID.new.to_s => self.to_json } + keys.each do |key| + ActiveColumn.connection.remove(self.class.column_family, key, value) + end + end + + def keys + key_parts = self.class.keys.each_with_object( {} ) do |key_config, key_parts| + key_parts[key_config.key] = self.send(key_config.func) + end + keys = self.class.generate_keys(key_parts) + end + class Base include ActiveColumn end From 54e331de6601355d412dbaa416e74de8efd8b739 Mon Sep 17 00:00:00 2001 From: Andy Caldwell Date: Wed, 30 Jan 2013 15:35:45 +0000 Subject: [PATCH 2/2] Fix delete function --- lib/active_column/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_column/base.rb b/lib/active_column/base.rb index e944e4c..9093353 100644 --- a/lib/active_column/base.rb +++ b/lib/active_column/base.rb @@ -65,7 +65,7 @@ def save def delete value = { SimpleUUID::UUID.new.to_s => self.to_json } keys.each do |key| - ActiveColumn.connection.remove(self.class.column_family, key, value) + ActiveColumn.connection.remove(self.class.column_family, key) end end