riak-record 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4634d0a8658d10c47899dd710c7952d6d129e1f2
-  data.tar.gz: 51df5cf9ca86b4aa9aec46c8213111642b9f0d36
+  metadata.gz: 7ac4b19f9c1851d3ad91962afa2bf5feb098659b
+  data.tar.gz: 1f0f42bde745441a2e853749e6d1506b503a1487
 SHA512:
-  metadata.gz: 32b6c185d2bcc27ff1fd6cebd9097d31df3a1cce646f66b80ea59066e338cec8437e6249750b235b16f888cb61fa3ccf400bccba213866e78d6cc24a925a0193
-  data.tar.gz: 09cdc00d887a3c22fa6b8265f4f80bb03affea55a4f3b4a1059f3bf6d7975d7769e76c9ce8c8c2d1d85a64178fc691f1060919ed58a540614ce04624e69f96c9
+  metadata.gz: d2ddfc8567dde15c17386c2f2949f22f90c21c649773b9dfe554711ad3b151cd73dc1a058b45b3d203051ebbc4b5b745e6a84edc1be92dd794bd96fa4da21f14
+  data.tar.gz: 7005462108cdb4a7cca7a6e8639f8fbee34e60f147a85d93d1b062b70960993af8d57371f87ef33e23767baf90b0aea1e315b33843aeda62412a16aab31530b2

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/lib/riak_record/base.rb

@@ -128,6 +128,10 @@ module RiakRecord
       finder.count
     end
 
+    def self.keys
+      finder.keys
+    end
+
     def self.first(n = 1)
       finder.first(n)
     end

data/lib/riak_record/finder/basic.rb

@@ -31,6 +31,10 @@ module Finder
       all.dup # new array
     end
 
+    def keys
+      @keys ||= Riak::SecondaryIndex.new(@bucket, @index, @value).keys
+    end
+
     def each
       all.each{|o| yield o}
     end
@@ -102,9 +106,7 @@ module Finder
     def pluck_by_map_reduce(attribute, timeout = nil)
       pluck_by_index = @finder_class.index_names[attribute.to_sym].present?
       parsed_attribute = pluck_by_index ? "v.values[0].metadata.index.#{@finder_class.index_names[attribute.to_sym]}" : "JSON.parse(v.values[0].data).#{attribute}"
-      mr = Riak::MapReduce.new(@finder_class.client).
-        index(@bucket, @index, @value).
-        map("function(v){ return [#{parsed_attribute}] }", :keep => true)
+      mr = new_map_reduce.map("function(v){ return [#{parsed_attribute}] }", :keep => true)
       mr.timeout = timeout if timeout.present?
       mr.run
     end
@@ -112,22 +114,26 @@ module Finder
     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).
-        index(@bucket, @index, @value).
-        map("function(v){ var h = {}; h[#{parsed_attribute}] = 1; return [h] }", :keep => false).
-        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
+      mr = new_map_reduce.map("function(v){ var h = {}; h[#{parsed_attribute}] = 1; return [h] }", :keep => false).
+        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)
+      mr.timeout = timeout if timeout.present?
+      mr.run.first
     end
 
     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
+      mr = new_map_reduce.map("function(v){ return [1] }", :keep => false).
+        reduce(['riak_kv_mapreduce','reduce_sum'], :keep => true)
+      mr.timeout = timeout if timeout.present?
+      mr.run.first
     end
 
 
   private
 
+    def new_map_reduce
+      Riak::MapReduce.new(@finder_class.client).index(@bucket, @index, @value)
+    end
+
     def load_started?
       @load_complete || @loaded_objects.count > 0
     end

data/lib/riak_record/finder/erlang_enhanced.rb

@@ -3,17 +3,14 @@ module RiakRecord
 
     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 = new_map_reduce.map(['riak_record_kv_mapreduce', map_method], :keep => true, :arg => [map_arg])
       mr.timeout = timeout if timeout.present?
       mr.run
     end
 
     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).
+      mr = new_map_reduce.
         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?
@@ -21,8 +18,7 @@ module RiakRecord
     end
 
     def count_map_reduce(timeout = nil)
-      mr = Riak::MapReduce.new(@finder_class.client).
-        index(@bucket, @index, @value).
+      mr = new_map_reduce.
         map(['riak_record_kv_mapreduce', 'map_count_found'], :keep => false).
         reduce(['riak_kv_mapreduce','reduce_sum'], :keep => true)
       mr.timeout = timeout if timeout.present?

data/riak-record.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: riak-record 0.7.2 ruby lib
+# stub: riak-record 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "riak-record"
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Robert Graff"]
-  s.date = "2014-10-28"
+  s.date = "2014-10-29"
   s.description = "RiakRecord is a thin and immature wrapper around riak-ruby-client. It creates a bucket for\n  each class, provides a simple finder, and creates attribute reader."
   s.email = "robert_graff@yahoo.com"
   s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/riak_record/finder/basic.rb",
     "lib/riak_record/finder/erlang_enhanced.rb",
     "map_reduce/riak_record_kv_mapreduce.erl",
+    "riak-record-0.7.2.gem",
     "riak-record.gemspec",
     "spec/riak_record/associations_spec.rb",
     "spec/riak_record/base_spec.rb",

data/spec/riak_record/base_spec.rb

@@ -258,6 +258,12 @@ describe RiakRecord::Base do
           end
         end
 
+        describe "keys" do
+          it "should reutrn all the keys in the bucket" do
+            expect(ExampleB.keys).to include("1","2")
+          end
+        end
+
         describe "count" do
           it "should count all objects in the bucket" do
             sleep(2) # wait for riak to collect ghosts

data/spec/riak_record/finder_spec.rb

@@ -40,12 +40,22 @@ RSpec.shared_examples "riak_record_finder" do
       expect( pop_finder.all.map(&:id).sort ).to eq(@pop_artists.map(&:id).sort)
     end
 
-    it "should not return all the record that do not match the conditions" do
+    it "should not return all the records that do not match the conditions" do
       expect( pop_finder.all.map(&:id) ).to_not include(@rock_artists.map(&:id))
     end
 
   end
 
+  describe "keys" do
+    it "should return all the keys that match the conditions" do
+      expect( pop_finder.keys.sort ).to eq(@pop_artists.map(&:id).sort)
+    end
+
+    it "should not return all the keys that do not match the conditions" do
+      expect( pop_finder.keys ).to_not include(@rock_artists.map(&:id))
+    end
+  end
+
   describe "count" do
     it "should return the count by map reduce" do
       expect(pop_finder).to receive(:count_map_reduce).and_call_original

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak-record
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Robert Graff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
@@ -163,6 +163,7 @@ files:
 - lib/riak_record/finder/basic.rb
 - lib/riak_record/finder/erlang_enhanced.rb
 - map_reduce/riak_record_kv_mapreduce.erl
+- riak-record-0.7.2.gem
 - riak-record.gemspec
 - spec/riak_record/associations_spec.rb
 - spec/riak_record/base_spec.rb