risky 0.1.7 → 0.1.8

data/lib/risky/version.rb

@@ -1,3 +1,3 @@
 class Risky
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/risky.rb

@@ -86,9 +86,9 @@ class Risky
   end
 
   # Counts the number of values in the bucket via key streaming
-  def self.count(opts = {:reload => true})
+  def self.count
     count = 0
-    bucket.keys(opts) do |keys|
+    bucket.keys do |keys|
       count += keys.length
     end
     count
@@ -103,7 +103,7 @@ class Risky
 
   # Iterate over all items using key streaming.
   def self.each
-    bucket.keys(:reload => true) do |keys|
+    bucket.keys do |keys|
       keys.each do |key|
         if x = self[key]
           yield x
@@ -244,29 +244,28 @@ class Risky
 
   # The Riak::Client backing this model class.
   def self.riak
-    if c = Thread.current["#{self}.riak"]
-      c
+    if @riak_client
+      @riak_client
     elsif @riak and @riak.respond_to? :call
-      Thread.current["#{self}.riak"] = @riak.call(self)
+      @riak_client = @riak.call(self)
     elsif @riak
-      Thread.current["#{self}.riak"] = @riak
+      @riak_client = @riak
     else
       superclass.riak
     end
   end
 
-  # Forces this model and thread's Riak client to be reset.
+  # Forces this model's Riak client to be reset.
   # If your @riak proc can choose between multiple hosts, calling this on
   # failure will allow subsequent requests to proceed on another host.
   def self.riak!
-    Thread.current["#{self}.riak"] = nil
+    @riak_client = nil
     riak
   end
 
   # Sets the Riak Client backing this model class. If client is a lambda (or
   # anything responding to #call), it will be invoked to generate a new client
-  # every time Risky feels it is appropriate. Clients are stored in
-  # thread-local storage, under "Classname.riak".
+  # every time Risky feels it is appropriate.
   def self.riak=(client)
     @riak = client
   end
@@ -497,7 +496,7 @@ class Risky
     end
 
     @riak_object.raw_data = MultiJson.encode @values
-	@riak_object.content_type = "application/json"
+	  @riak_object.content_type = "application/json"
     
     store_opts = {}
     store_opts[:w] = opts[:w] if opts[:w]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: risky
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000 -08:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &69243700 !ruby/object:Gem::Requirement
+  requirement: &14512980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,25 +22,26 @@ dependencies:
         version: 1.0.0.beta
   type: :runtime
   prerelease: false
-  version_requirements: *69243700
+  version_requirements: *14512980
 description: 
 email: aphyr@aphyr.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/risky/all.rb
-- lib/risky/invalid.rb
-- lib/risky/not_found.rb
+- lib/risky.rb
 - lib/risky/resolver.rb
-- lib/risky/threadsafe.rb
 - lib/risky/version.rb
-- lib/risky/timestamps.rb
+- lib/risky/invalid.rb
+- lib/risky/all.rb
+- lib/risky/not_found.rb
 - lib/risky/indexes.rb
+- lib/risky/timestamps.rb
+- lib/risky/threadsafe.rb
 - lib/risky/cron_list.rb
-- lib/risky.rb
 - LICENSE
 - README.markdown
+has_rdoc: true
 homepage: https://github.com/aphyr/risky
 licenses: []
 post_install_message: 
@@ -60,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: risky
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby ORM for the Riak distributed database.