risky 0.1.4 → 0.1.5

data/lib/risky/all.rb

@@ -0,0 +1,4 @@
+require 'risky/cron_list'
+require 'risky/indexes'
+require 'risky/resolver'
+require 'risky/timestamps'

data/lib/risky/resolver.rb

@@ -0,0 +1,74 @@
+module Risky::Resolver
+  # Makes it easy to resolve conflicts in an object in different ways.
+  #
+  # class User
+  #   include Risky::Resolver
+  #   value :union, :resolve => :union
+  #   value :union, :resolve => lambda do |xs| xs.first end
+ 
+  module ClassMethods
+    def merge(versions)
+      p = super(versions).clone
+     
+      # For each field, use the given resolver to merge all the conflicting
+      # values together.
+      values.each do |value, opts|
+        next unless resolver = opts[:resolve]
+
+        # Convert symbols and such to callables.
+        unless resolver.respond_to? :call
+          resolver = begin
+            # Try our resolvers
+            Resolvers.method resolver
+          rescue
+            # Try a class method
+            method resolver
+          end
+        end
+
+        # Resolve and set
+        p.send("#{value}=", resolver.call(
+          versions.map do |version|
+            version.send value
+          end
+        ))
+      end
+
+      p
+    end
+  end
+
+  module Resolvers
+    extend self
+
+    def intersection(xs)
+      xs.compact.inject do |i, x|
+        i & x
+      end
+    end
+    
+    def max(xs)
+      xs.compact.max
+    end
+
+    def merge(xs)
+      xs.compact.inject do |m, x|
+        m.merge x
+      end
+    end
+
+    def min(xs)
+      xs.compact.min
+    end
+
+    def union(xs)
+      xs.compact.inject do |u, x|
+        u | x
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+end

data/lib/risky/version.rb

@@ -1,3 +1,3 @@
 class Risky
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/risky.rb

@@ -1,9 +1,10 @@
 class Risky
   require 'set'
   require 'riak'
+  require 'multi_json'
 
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
- 
+
   # Exceptions
   require 'risky/invalid'
   require 'risky/not_found'
@@ -11,7 +12,7 @@ class Risky
   # Fix threading autoload bugs
   require 'risky/threadsafe'
   
-  # Plugins
+  # Default plugins
   require 'risky/cron_list'
   require 'risky/indexes'
   require 'risky/timestamps'
@@ -258,7 +259,7 @@ class Risky
   # 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
+    Thread.current["#{self}.riak"] = nil
     riak
   end
 
@@ -416,9 +417,11 @@ class Risky
       self.merged = true
     else
       # Not merging
-      self.values = self.class.cast(JSON.parse(riak_object.raw_data)) rescue {}
+      self.values = self.class.cast(MultiJson.decode(riak_object.raw_data)) rescue {}
       self.class.values.each do |k, v|
-        values[k] ||= (v[:default].clone rescue v[:default])
+        if values[k].nil?
+          values[k] = (v[:default].clone rescue v[:default])
+        end
       end
       self.riak_object = riak_object
       self.new = false
@@ -491,7 +494,7 @@ class Risky
       return false unless valid?
     end
 
-    @riak_object.raw_data = @values.to_json
+    @riak_object.raw_data = MultiJson.encode @values
 	@riak_object.content_type = "application/json"
     
     store_opts = {}

metadata

@@ -1,87 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: risky
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -07:00
+date: 2011-10-03 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: riak-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: &13973420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - pre
+      - !ruby/object:Gem::Version
         version: 1.0.0.pre
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *13973420
 description: 
 email: aphyr@aphyr.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/risky.rb
+- lib/risky/resolver.rb
+- lib/risky/version.rb
 - lib/risky/invalid.rb
+- lib/risky/all.rb
 - lib/risky/not_found.rb
-- lib/risky/threadsafe.rb
-- lib/risky/version.rb
-- lib/risky/timestamps.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: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: risky
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby ORM for the Riak distributed database.
 test_files: []
-