hyperion-riak 0.1.3 → 0.2.0

data/lib/hyperion/riak/datastore.rb

@@ -54,12 +54,16 @@ module Hyperion
       end
 
       def pack_key(kind, key)
-        kind, riak_key = Hyperion::Key.decompose_key(key)
-        riak_key
+        if key
+          kind, riak_key = Hyperion::Key.decompose_key(key)
+          riak_key
+        end
       end
 
       def unpack_key(kind, riak_key)
-        Hyperion::Key.compose_key(kind, riak_key)
+        if riak_key
+          Hyperion::Key.compose_key(kind, riak_key)
+        end
       end
 
       private

data/lib/hyperion/riak/map_reduce/filter.js.erb

@@ -1,29 +1,50 @@
 function(riak_record) {
-  var data = Riak.mapValuesJson(riak_record)[0];
+  var value, fieldValue, data, isNull;
+
+  isNull = function(value) {
+    return (typeof value === "undefined" || value === null);
+  }
+
+  any = function(value, coll) {
+    for (var i = 0; i < coll.length; i++) {
+      if (value === coll[i]) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  data = Riak.mapValuesJson(riak_record)[0];
   <% filters.each do |filter| %>
-    var value = <%= filter.value.to_json %>
-    var fieldValue = data[<%= filter.field.to_json %>];
+    value = <%= filter.value.to_json %>
+    fieldValue = data[<%= filter.field.to_json %>];
     <% operator = filter.operator %>
-    <% if operator == "contains?" %>
-      var found = false;
-      <% filter.value.each do |item| %>
-        if (fieldValue == <%= item.to_json %>) {
-          found = true;
-        }
-      <% end %>
-      if (!found) {
-        return [];
-      }
-    <% elsif operator == "=" %>
-      if (fieldValue !== value) {
-        return [];
-      }
-    <% elsif operator == "!=" %>
-      if (fieldValue == value) {
+    <% if operator == 'contains?' %>
+       if (!any(fieldValue, <%= filter.value.to_json %>)) {
         return [];
       }
+    <% elsif operator == '=' %>
+      <% if filter.value.nil? %>
+        if (!isNull(fieldValue)) {
+          return [];
+        }
+      <% else %>
+        if (fieldValue !== value) {
+          return [];
+        }
+      <% end %>
+    <% elsif operator == '!=' %>
+      <% if filter.value.nil? %>
+        if (isNull(fieldValue)) {
+          return [];
+        }
+      <% else %>
+        if (fieldValue === value) {
+          return [];
+        }
+      <% end %>
     <% else %>
-      if (!(fieldValue <%= operator %> value)) {
+      if (isNull(fieldValue) || !(fieldValue <%= operator %> value)) {
         return [];
       }
     <% end %>

data/lib/hyperion/riak/optimized_filter_order.rb

@@ -38,7 +38,7 @@ module Hyperion
       end
 
       def can_optimize?
-        !first_equals_filter.nil?
+        !first_equals_filter.nil? && !first_equals_filter.value.nil?
       end
 
       def optimal_index_field

data/lib/hyperion/riak/spec_helper.rb

@@ -2,7 +2,7 @@ def test_app_name
   '_HTEST_'
 end
 
-BUCKETS = ['testing', 'other_testing']
+BUCKETS = ['testing', 'other_testing', 'account', 'shirt']
 
 def empty_buckets(ds)
   client = ds.instance_variable_get(:@client)

data/spec/hyperion/riak/optimized_filter_order_spec.rb

@@ -40,7 +40,14 @@ describe Hyperion::Riak::OptimizedFilterOrder do
       o.optimal_index_field.should == :int
     end
 
-    it 'returns bucket name for optimal_index_value' do
+    it 'does not optimize when value is nil' do
+      filters = [filter(:int, '=', nil)]
+      o = described_class.new(filters, '')
+      o.optimal_index_field.should == '$bucket'
+      o.filters.should == filters
+    end
+
+    it 'returns optimal_index_value' do
       filters = [filter(:int, '=', 1)]
       bucket_name = "hamburgers"
 

data/spec/hyperion/riak/optimized_range_filters_spec.rb

@@ -5,6 +5,7 @@ describe Hyperion::Riak::OptimizedRangeFilters do
   let(:test_less_than_filter) { filter(:test, '<', 1) }
   let(:test_greater_than_filter) { filter(:test, '>', 1) }
   let(:test_equals_filter) { filter(:test, '=', 1) }
+  let(:nil_test_equals_filter) { filter(:test, '=', nil) }
   let(:other_test_less_than_filter) { filter(:other_test, '<', 1) }
   let(:other_test_greater_than_filter) { filter(:other_test, '>', 1) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperion-riak
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: riak-client
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
 description: Riak datastore for Hyperion
 email:
 - myles@8thlight.com