risky 0.1.2 → 0.1.3

data/lib/risky/indexes.rb

@@ -25,11 +25,11 @@ module Risky::Indexes
               from_riak_object(
                 Riak::RObject.new(
                   riak[#{opts[:bucket].inspect}],
-                  value
+                  value.to_s
                 ).walk(:bucket => #{@bucket_name.inspect}).first.first
               )
             rescue Riak::FailedRequest => e
-              raise e unless e.code.to_i == 404
+              raise e unless e.not_found?
               nil
             end
           end
@@ -59,6 +59,7 @@ module Risky::Indexes
       current = opts[:proc][self] rescue self[attr.to_s]
       old = @old_indexed_values[attr]
       @old_indexed_values[attr] = current
+
       unless old == current
         # Remove old index
         if old
@@ -67,7 +68,7 @@ module Risky::Indexes
 
         # Create new index
         unless current.nil?
-          index = Riak::RObject.new(self.class.riak[opts[:bucket]], current)
+          index = Riak::RObject.new(self.class.riak[opts[:bucket]], current.to_s)
           index.content_type = 'text/plain'
           index.data = ''
           index.links = Set.new([@riak_object.to_link('value')])

data/lib/risky/version.rb

@@ -1,3 +1,3 @@
 class Risky
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/risky.rb

@@ -26,7 +26,7 @@ class Risky
     begin
       new(key).reload(opts)
     rescue Riak::FailedRequest => e
-      raise unless e.code.to_i == 404
+      raise e unless e.not_found?
       nil
     end
   end
@@ -84,22 +84,13 @@ class Risky
     casted
   end
 
-  # Counts the number of models via MR
-  def self.count
-    map("
-      function(v) {
-         return [1];
-      };
-    ").reduce("
-      function(counts, arg) {
-        return [
-          counts.reduce(
-            function(acc, value) {
-              return acc + value
-            }, 0)
-        ];
-      }
-    ", :keep => true).run.first
+  # Counts the number of values in the bucket via key streaming
+  def self.count(opts = {:reload => true})
+    count = 0
+    bucket.keys(opts) do |keys|
+      count += keys.length
+    end
+    count
   end
 
   # Returns true when record deleted.
@@ -113,7 +104,9 @@ class Risky
   def self.each
     bucket.keys(:reload => true) do |keys|
       keys.each do |key|
-        yield self[key]
+        if x = self[key]
+          yield x
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: risky
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -07:00
+date: 2011-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency