curator 0.6.0 → 0.7.0

data/lib/curator/memory/data_store.rb

@@ -14,15 +14,18 @@ module Curator
         bucket = _bucket_name(options[:collection_name])
         object = options[:value]
         key = options[:key]
-        indexed_values = options.fetch(:index, {})
+        indexes = options.fetch(:index, {})
 
         key = _generate_key(bucket) unless key
 
         _records(bucket).store(key, object)
-        indexed_values.each do |index_name, indexed_value|
+        indexes.each do |index_name, index_data|
           index = _index(bucket, index_name)
-          index[indexed_value] ||= []
-          index[indexed_value] << key unless index[indexed_value].include?(key)
+
+          _normalized_index_values(index_data).each do |index_value|
+            index[index_value] ||= []
+            index[index_value] << key unless index[index_value].include?(key)
+          end
         end
 
         key
@@ -86,6 +89,14 @@ module Curator
         _indices(bucket)[index_name] ||= {}
       end
 
+      def self._normalized_index_values(indexed_data)
+        if indexed_data.is_a?(Array)
+          indexed_data
+        else
+          [indexed_data]
+        end
+      end
+
       def self._generate_key(bucket)
         keys = _records(bucket).keys
         keys = [0] if keys.empty?

data/lib/curator/riak/data_store.rb

@@ -25,8 +25,8 @@ module Curator
         object = ::Riak::RObject.new(bucket, options[:key])
         object.content_type = options.fetch(:content_type, "application/json")
         object.data = options[:value]
-        options.fetch(:index, {}).each do |index_name, index_value|
-          object.indexes["#{index_name}_bin"] << index_value
+        options.fetch(:index, {}).each do |index_name, index_data|
+          object.indexes["#{index_name}_bin"] << _normalized_index_data(index_data)
         end
         result = object.store
         result.key
@@ -69,6 +69,14 @@ module Curator
       def self._find_key_by_index(bucket, index_name, query)
         bucket.get_index("#{index_name}_bin", query)
       end
+
+      def self._normalized_index_data(index_data)
+        if index_data.is_a?(Array)
+          index_data.join(", ")
+        else
+          index_data
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport