risky 0.1.0 → 0.1.2

data/README.markdown

@@ -1,24 +1,31 @@
 Risky
 =====
 
+(Hey guys, I'll be porting over tests from our internal suite in the next few evenings. --Kyle)
+
 A simple, lightweight object layer for Riak.
 
+    $ gem install risky
+
     class User < Risky
       bucket :users
     end
 
     User.new('clu', 'fights' => 'for the users').save
-
     User['clu']['fights'] #=> 'for the users'
 
 Built on top of seancribb's excellent riak-client, Risky provides basic
 infrastructure for designing models with attributes (including defaults and
-casting to/from JSON), validation, lifecycle callbacks, link-walking,
-mapreduce, and more. Modules are available for timestamps, chronologically ordered lists, and basic secondary indexes.
+casting to/from JSON), conflict resolution, validation, lifecycle callbacks,
+link-walking, mapreduce, and more. Modules are available for timestamps,
+chronologically ordered lists, and basic secondary indexes.
 
-Risky does not provide the rich API of Ripple, but it also does not require activesupport. It strives to be understandable, minimal, and modular. Magic is avoided in favor of module composition and a compact API.
+Risky does not provide the rich API of Ripple, but it also does not require
+activesupport. It strives to be understandable, minimal, and modular. Magic is
+avoided in favor of module composition and a compact API.
 
-Risky stores every instance of a model in a given bucket, indexed by key. Objects are stored as JSON hashes.
+Risky stores every instance of a model in a given bucket, indexed by key.
+Objects are stored as JSON hashes.
 
 Show me the code!
 -----------------
@@ -38,8 +45,8 @@ Show me the code!
       value :created_at, :class => Time
 
       # Provides User.by_name. Changing the name stores an object in the
-      # users_by_name bucket, with key user.name, linking back to us. A validate
-      # function is used to ensure uniqueness before saving.
+      # users_by_name bucket, with key user.name, linking back to us. A
+      # validate function is used to ensure uniqueness before saving.
       index :name, :unique => true
 
       # Here, a custom proc returns the key used for the index.

data/lib/risky.rb

@@ -1,4 +1,5 @@
 class Risky
+  require 'set'
   require 'riak'
 
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
@@ -6,13 +7,16 @@ class Risky
   # Exceptions
   require 'risky/invalid'
   require 'risky/not_found'
+
+  # Fix threading autoload bugs
+  require 'risky/threadsafe'
   
   # Plugins
   require 'risky/cron_list'
   require 'risky/indexes'
   require 'risky/timestamps'
 
-  include Enumerable
+  extend Enumerable
 
   # Get a model by key. Returns nil if not found. You can also pass opts to
   # #reload (e.g. :r, :merge => false).
@@ -228,9 +232,21 @@ class Risky
 
   # The Riak::Client backing this model class.
   def self.riak
-    @riak ||= superclass.riak
+    if c = Thread.current["#{self}.riak"]
+      c
+    elsif @riak and @riak.respond_to? :call
+      Thread.current["#{self}.riak"] = @riak.call(self)
+    elsif @riak
+      Thread.current["#{self}.riak"] = @riak
+    else
+      superclass.riak
+    end
   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".
   def self.riak=(client)
     @riak = client
   end
@@ -282,7 +298,7 @@ class Risky
     key = key.to_s unless key.nil?
 
     @riak_object ||= Riak::RObject.new(self.class.bucket, key)
-    @riak_object.content_type = 'application/javascript'
+    @riak_object.content_type = 'application/json'
 
     @new = true
     @merged = false
@@ -457,6 +473,7 @@ class Risky
     end
 
     @riak_object.raw_data = @values.to_json
+	@riak_object.content_type = "application/json"
     
     store_opts = {}
     store_opts[:w] = opts[:w] if opts[:w]

data/lib/risky/cron_list.rb

@@ -20,8 +20,13 @@ module Risky::CronList
     end
 
     def merge(versions)
+      # Order versions chronologically
       p = super(versions)
-      items = sort_items(versions.map(&:items).flatten!.uniq)
+      items = sort_items(
+        versions.inject([]) do |list, version|
+          list |= version.items.reverse
+        end.reverse
+      )
 
       if limit = self.limit
         p.items = items[0...limit]

data/lib/risky/indexes.rb

@@ -70,7 +70,7 @@ module Risky::Indexes
           index = Riak::RObject.new(self.class.riak[opts[:bucket]], current)
           index.content_type = 'text/plain'
           index.data = ''
-          index.links = Set.new([@riak_robject.to_link('value')])
+          index.links = Set.new([@riak_object.to_link('value')])
           index.store
         end
       end

data/lib/risky/threadsafe.rb

@@ -0,0 +1,42 @@
+# Autoload is broken with threading.
+Riak::Bucket
+Riak::Client
+Riak::Link
+Riak::WalkSpec
+Riak::RObject
+
+Riak::FailedRequest
+Riak::MapReduceError
+
+Riak::Util::Escape
+Riak::Util::Headers
+Riak::Util::Multipart
+Riak::Util::Translation
+
+Riak::Client::HTTPBackend
+Riak::Client::HTTPBackend::RequestHeaders
+Riak::Client::HTTPBackend::TransportMethods
+Riak::Client::HTTPBackend::ObjectMethods
+Riak::Client::HTTPBackend::Configuration
+
+Riak::Client::NetHTTPBackend
+
+Riak::MapReduce
+Riak::MapReduce::Phase
+
+I18n::ArgumentError
+I18n::Backend
+I18n::Backend::Base
+I18n::Backend::Simple
+I18n::Config
+I18n::ExceptionHandler
+I18n::Gettext
+I18n::InvalidLocale
+I18n::InvalidLocaleData
+I18n::InvalidPluralizationData
+I18n::Locale
+I18n::MissingInterpolationArgument
+I18n::MissingTranslationData
+I18n::ReservedInterpolationKey
+I18n::Tests
+I18n::UnknownFileType

data/lib/risky/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: risky
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kyle Kingsbury
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -07:00
+date: 2011-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: riak-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
+        - 0
         - 0
-        - 8
-        - 2
-        version: 0.8.2
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 description: 
@@ -40,13 +43,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/risky/invalid.rb
-- lib/risky/not_found.rb
+- lib/risky.rb
 - lib/risky/version.rb
-- lib/risky/timestamps.rb
+- lib/risky/not_found.rb
 - lib/risky/indexes.rb
+- lib/risky/invalid.rb
+- lib/risky/timestamps.rb
+- lib/risky/threadsafe.rb
 - lib/risky/cron_list.rb
-- lib/risky.rb
 - LICENSE
 - README.markdown
 has_rdoc: true
@@ -59,25 +63,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
       segments: 
       - 1
       - 8
       - 6
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: risky
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby ORM for the Riak distributed database.