riak-record 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5a757a4b15f3c615b49c01dfb9d72bac344359
-  data.tar.gz: 5a713dae30be0c3946251dd913257b21b6e12f5f
+  metadata.gz: 4634d0a8658d10c47899dd710c7952d6d129e1f2
+  data.tar.gz: 51df5cf9ca86b4aa9aec46c8213111642b9f0d36
 SHA512:
-  metadata.gz: 27efbc9af07e592abe8bc5d25139003b1ca094de54c184f24ccabdfc82dbe9becf9700c226855a0bf7cdae3b09038397dbdc461485dc6f7dd098457fd3bc3663
-  data.tar.gz: b9953a8f21cb738f4fa0df3606ddaa1ac209dbe703cad47f1ec4d5c27aa96d3be4b6c0ee74b20dd3b649861f5e18c99305318ed83aca29e86aee5a394ff2a78b
+  metadata.gz: 32b6c185d2bcc27ff1fd6cebd9097d31df3a1cce646f66b80ea59066e338cec8437e6249750b235b16f888cb61fa3ccf400bccba213866e78d6cc24a925a0193
+  data.tar.gz: 09cdc00d887a3c22fa6b8265f4f80bb03affea55a4f3b4a1059f3bf6d7975d7769e76c9ce8c8c2d1d85a64178fc691f1060919ed58a540614ce04624e69f96c9

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/riak_record/base.rb

@@ -132,9 +132,8 @@ module RiakRecord
       finder.first(n)
     end
 
-    # TODO: this is broke
-    def self.page(page_number = 1, page_size = 100)
-      finder.page(page_number, page_size)
+    def self.page(continuation = nil, page_size = nil)
+      finder.page(continuation, page_size)
     end
 
     def self.data_attributes(*attributes)
@@ -182,7 +181,7 @@ module RiakRecord
     end
 
     def self.where(options)
-      RiakRecord::Finder::Basic.new(self, options)
+      finder_class.new(self, options)
     end
 
     def self.find(key_or_keys)

data/lib/riak_record/finder/basic.rb

@@ -109,13 +109,7 @@ module Finder
       mr.run
     end
 
-  private
-
-    def load_started?
-      @load_complete || @loaded_objects.count > 0
-    end
-
-    def count_by_map_reduce(attribute)
+    def count_by_map_reduce(attribute, timeout = nil)
       count_by_index = @finder_class.index_names[attribute.to_sym].present?
       parsed_attribute = count_by_index ? "v.values[0].metadata.index.#{@finder_class.index_names[attribute.to_sym]}" : "JSON.parse(v.values[0].data).#{attribute}"
       Riak::MapReduce.new(@finder_class.client).
@@ -124,13 +118,20 @@ module Finder
         reduce("function(values) { var result = {}; for (var value in values) { for (var key in values[value]) { if (key in result) { result[key] += values[value][key]; } else { result[key] = values[value][key]; }}} return [result]; }", :keep => true).run.first
     end
 
-    def count_map_reduce
+    def count_map_reduce(timeout = nil)
       Riak::MapReduce.new(@finder_class.client).
         index(@bucket, @index, @value).
         map("function(v){ return [1] }", :keep => false).
         reduce(['riak_kv_mapreduce','reduce_sum'], :keep => true).run.first
     end
 
+
+  private
+
+    def load_started?
+      @load_complete || @loaded_objects.count > 0
+    end
+
     def load_next_page(page_size = @page_size)
       return if @load_complete
       if @querier

data/lib/riak_record/finder/erlang_enhanced.rb

@@ -1,38 +1,44 @@
 module RiakRecord
   class Finder::ErlangEnhanced < Finder::Basic
 
-  def pluck_by_map_reduce(attribute, timeout = nil)
-    map_method, map_arg = map_method_for_attribute(attribute, "map_pluck_index", "map_pluck_value")
-    mr = Riak::MapReduce.new(@finder_class.client).
-      index(@bucket, @index, @value).
-      map(['riak_record_kv_mapreduce', map_method], :keep => true, :arg => [map_arg])
-    mr.timeout = timeout if timeout.present?
-    mr.run
-  end
+    def pluck_by_map_reduce(attribute, timeout = nil)
+      map_method, map_arg = map_method_for_attribute(attribute, "map_pluck_index", "map_pluck_value")
+      mr = Riak::MapReduce.new(@finder_class.client).
+        index(@bucket, @index, @value).
+        map(['riak_record_kv_mapreduce', map_method], :keep => true, :arg => [map_arg])
+      mr.timeout = timeout if timeout.present?
+      mr.run
+    end
 
-private
+    def count_by_map_reduce(attribute, timeout = nil)
+      map_method, map_arg = map_method_for_attribute(attribute, "map_count_by_index", "map_count_by_value")
+      mr = Riak::MapReduce.new(@finder_class.client).
+        index(@bucket, @index, @value).
+        map(['riak_record_kv_mapreduce', map_method], :keep => false, :arg => [map_arg]).
+        reduce(['riak_record_kv_mapreduce', 'reduce_count_by'], :keep => true)
+      mr.timeout = timeout if timeout.present?
+      mr.run.first
+    end
+
+    def count_map_reduce(timeout = nil)
+      mr = Riak::MapReduce.new(@finder_class.client).
+        index(@bucket, @index, @value).
+        map(['riak_record_kv_mapreduce', 'map_count_found'], :keep => false).
+        reduce(['riak_kv_mapreduce','reduce_sum'], :keep => true)
+      mr.timeout = timeout if timeout.present?
+      mr.run.first
+    end
 
-  def map_method_for_attribute(attribute, index_method, value_method)
-    count_by_index = @finder_class.index_names[attribute.to_sym].present?
-    map_method = count_by_index ? index_method : value_method
-    map_arg = count_by_index ? @finder_class.index_names[attribute.to_sym] : attribute
-    [map_method, map_arg]
-  end
 
-  def count_by_map_reduce(attribute)
-    map_method, map_arg = map_method_for_attribute(attribute, "map_count_by_index", "map_count_by_value")
-    Riak::MapReduce.new(@finder_class.client).
-      index(@bucket, @index, @value).
-      map(['riak_record_kv_mapreduce', map_method], :keep => false, :arg => [map_arg]).
-      reduce(['riak_record_kv_mapreduce', 'reduce_count_by'], :keep => true).run.first
+  private
+
+    def map_method_for_attribute(attribute, index_method, value_method)
+      count_by_index = @finder_class.index_names[attribute.to_sym].present?
+      map_method = count_by_index ? index_method : value_method
+      map_arg = count_by_index ? @finder_class.index_names[attribute.to_sym] : attribute
+      [map_method, map_arg]
     end
-  end
 
-  def count_map_reduce
-    Riak::MapReduce.new(@finder_class.client).
-      index(@bucket, @index, @value).
-      map(['riak_record_kv_mapreduce', 'map_count_found'], :keep => false).
-      reduce(['riak_kv_mapreduce','reduce_sum'], :keep => true).run.first
   end
 
 end

data/riak-record.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: riak-record 0.7.1 ruby lib
+# stub: riak-record 0.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "riak-record"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-record
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Robert Graff