rico 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - jruby-head
+services:
+  - riak

data/README.md

@@ -1,5 +1,7 @@
 # Rico
 
+[![Build Status](https://secure.travis-ci.org/jcoene/rico.png?branch=master)](https://travis-ci.org/jcoene/rico)
+
 Rico provides primative data types on Riak.
 
 ## Installation
@@ -34,11 +36,11 @@ follows.length                  # => 0
 
 ## Configuration
 
-By default, Rico uses a generic Riak::Client instance for operations. You can specify your own (perhaps inside of a rails initializer) like so:
+By default, Rico uses a generic Riak::Client instance for operations. You can specify your own options for the Riak client (perhaps inside of a rails initializer) like so:
 
 ```ruby
 Rico.configure do |c|
-  c.riak = Riak::Client.new(http_port: 1234, ...)
+  c.options = { http_port: 1234, ... }
 end
 ```
 
@@ -116,8 +118,7 @@ Data is persisted at operation time. For example, List#add(5) will immediately u
 
 ## TODO
 
-- Automatic sibling resolution for simple types
-- Ability to provide sibling resolution callback
+- Ability to provide custom sibling resolution callbacks
 
 ## Contributing
 

data/lib/rico.rb

@@ -40,12 +40,16 @@ module Rico
     @namespace = namespace
   end
 
-  def self.riak
-    @riak ||= Riak::Client.new
+  def self.options
+    @options || {}
+  end
+
+  def self.options=(options)
+    @options = options
   end
 
-  def self.riak=(riak)
-    @riak = riak
+  def self.riak
+    Thread.current[:riak] ||= Riak::Client.new(options)
   end
 end
 

data/lib/rico/array.rb

@@ -59,7 +59,8 @@ module Rico
 
       result -= deletions
 
-      obj = Riak::RObject.new(robject.bucket, robject.key)
+      obj = robject.dup
+      obj.siblings = [obj.siblings.first]
       obj.data = { "_values" => result, "_deletes" => deletions }
       obj
     end

data/lib/rico/resolver.rb

@@ -11,7 +11,7 @@ module Rico
         klass = Rico.const_get(klass_name)
         return nil unless klass.respond_to?(:resolve)
 
-        klass.resolve(robject.siblings)
+        klass.resolve(robject)
       end
     end
   end

data/lib/rico/version.rb

@@ -1,3 +1,3 @@
 module Rico
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/rico.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Rico::VERSION
 
   gem.add_dependency              "riak-client", "~> 1.1"
+
+  gem.add_development_dependency  "rake", "~> 10.0"
   gem.add_development_dependency  "rspec", "~> 2.12"
   gem.add_development_dependency  "guard-rspec", "~> 2.3"
 end

data/spec/rico_spec.rb

@@ -14,13 +14,12 @@ describe Rico do
       Rico.namespace.should eql "myapp"
     end
 
-    it "accepts a riak client instance" do
-      riak = Riak::Client.new
+    it "accepts a hash of options" do
       Rico.configure do |r|
-        r.riak = riak
+        r.options = { http_port: 5151 }
       end
 
-      Rico.riak.should eql riak
+      Rico.options.should eql({ http_port: 5151 })
     end
   end
 

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ module RiakHelpers
 
   def self.reset!
     Rico.namespace = "test"
-    Rico.riak = Riak::Client.new(http_port: 8091)
 
     Riak.disable_list_keys_warnings = true
     b = Rico.bucket(bucket)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rico
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +84,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE