riak-record 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2c2cddb2404fb67c841c07fc0834d675316b8e
-  data.tar.gz: ea745d2eaffd595e3ccbb626f69166fb7c7349cb
+  metadata.gz: 85acfab0540c576334b9040c88a76e04c5a9d59f
+  data.tar.gz: db8d4bb1ad14f2b93866512641a7d13d13068f44
 SHA512:
-  metadata.gz: 5c639fa02eff967d10dccec7b9677aa6e26fb0d9e22e7da40fd31d7381e5f00ed572f00a982d34f9307da8b39df82f51631ecdb5c11bc57bc8af187147a0f4b6
-  data.tar.gz: 4114ff4f1766e9c59e5fc2d07fd31ae18a311e1ed7d41d056a8a53fb124d6d0973ef032cc25f0a9bc4418b6471c0d37c9f3729db0988d5ebdf14d85419ec08a2
+  metadata.gz: 6abaf2c13290039a9d166fa0ac863259b9bb7a4b4235be3a59a339c25f478e956b61e7acf4117288d6748770231fb27e621e691a04161097d945c8118bb7b4e7
+  data.tar.gz: b3420c21d49b66f30ce5ff1a1d7fdc0c5e5232dcc35ebd3a933b1bbec2b01f0a07374d4dfe41e7677796506bbd448846fa89a020fe0577225dd876b3d253f91c

data/Gemfile

@@ -1,10 +1,7 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "riak-client", "~> 2.0.0"
+
 group :development do
   gem "rspec", "~> 3.1.0"
   gem "rdoc", "~> 3.12"

data/Gemfile.lock

@@ -2,7 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
+    beefcake (1.0.0)
     builder (3.2.2)
+    cert_validator (0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -20,6 +22,8 @@ GEM
       oauth2
     hashie (3.3.1)
     highline (1.6.21)
+    i18n (0.6.11)
+    innertube (1.0.2)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -47,6 +51,12 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    riak-client (2.0.0)
+      beefcake (~> 1.0)
+      cert_validator (~> 0.0.1)
+      i18n (>= 0.4.0)
+      innertube (~> 1.0.2)
+      multi_json (~> 1.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -73,5 +83,6 @@ DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 2.0.1)
   rdoc (~> 3.12)
+  riak-client (~> 2.0.0)
   rspec (~> 3.1.0)
   simplecov

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/riak-record.rb

@@ -1,14 +1,22 @@
+require 'riak'
+
 class RiakRecord
   attr_reader :riak_object
 
-  def initialize(riak_object)
-    @riak_object = riak_object
+  def initialize(r = nil)
+    r = self.class.bucket.new(r) if r.nil? || r.is_a?(String)
+    raise ArgumentError unless r.is_a? Riak::RObject
+    @riak_object = r
   end
 
   def data
     riak_object.data
   end
 
+  def save
+    riak_object.store
+  end
+
   def self.bucket_name(name = :not_a_name)
     @bucket_name = name unless name == :not_a_name
     @bucket_name
@@ -20,22 +28,35 @@ class RiakRecord
 
   def self.record_attributes(*attributes)
     attributes.each do |method_name|
-      send :define_method, method_name do
+      define_method(method_name) do
           data[method_name]
       end
+
+      define_method("#{method_name}=".to_sym) do |value|
+        data[method_name] = value
+      end
     end
   end
 
-
   def self.find(key_or_keys)
-    if key_or_keys.is_a?(Array)
-      bucket.get_many(key_or_keys).map{ |r| self.new(r) }
-    else
-      r = bucket.get(key_or_keys)
-      self.new(r) unless r.nil?
+    return find_many(key_or_keys) if key_or_keys.is_a?(Array)
+
+    begin
+      self.new(bucket.get(key_or_keys.to_s))
+    rescue Riak::FailedRequest => e
+      if e.not_found?
+        nil
+      else
+        raise e
+      end
     end
   end
 
+  def self.find_many(keys)
+    hash = bucket.get_many(keys.map(&:to_s))
+    keys.map{ |k| hash[k] }
+  end
+
   def self.client=(client)
     @@client = client
   end

data/riak-record.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: riak-record 0.0.2 ruby lib
+# stub: riak-record 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "riak-record"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Robert Graff"]
-  s.date = "2014-09-17"
+  s.date = "2014-09-18"
   s.description = "RiakRecord is a thin and immature wrapper around riak-ruby-client. It creates a bucket for\n  each class, provides a simple finder, and creates attribute reader."
   s.email = "robert_graff@yahoo.com"
   s.extra_rdoc_files = [
@@ -41,12 +41,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<riak-client>, ["~> 2.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 3.1.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
+      s.add_dependency(%q<riak-client>, ["~> 2.0.0"])
       s.add_dependency(%q<rspec>, ["~> 3.1.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -54,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<riak-client>, ["~> 2.0.0"])
     s.add_dependency(%q<rspec>, ["~> 3.1.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/riak-record_spec.rb

@@ -1,11 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-
-class ExampleClient
-end
-
-RiakRecord.client = ExampleClient.new
-
 class ExampleA < RiakRecord
   bucket_name 'example_a'
   record_attributes :attribute1, :attribute2
@@ -26,6 +20,33 @@ describe "RiakRecord" do
     expect(ExampleA.client).to eq(ExampleB.client)
   end
 
+  describe "new" do
+    context "when passed in an RObject" do
+      let(:robject) { Riak::RObject.new("a-key") }
+      let(:record) { ExampleA.new(robject) }
+      it "should wrap it" do
+        expect(record.riak_object).to eq(robject)
+        expect(record).to be_a(ExampleA)
+      end
+    end
+    context "when passed in a string" do
+      let(:key) { 'judy' }
+      let(:record) { ExampleA.new(key) }
+      it "should create an RObject with that id" do
+        expect(record).to be_a(ExampleA)
+        expect(record.riak_object).to be_a(Riak::RObject)
+        expect(record.riak_object.key).to eq(key)
+      end
+    end
+    context "when passed in nil" do
+      let(:record) { ExampleA.new() }
+      it "should create an RObject with no id" do
+        expect(record).to be_a(ExampleA)
+        expect(record.riak_object).to be_a(Riak::RObject)
+      end
+    end
+  end
+
   describe "find" do
     let(:bucket){ double }
     let(:array){ Array.new }
@@ -39,26 +60,36 @@ describe "RiakRecord" do
     end
 
     it "should take a string and return nil if not found" do
-      allow(bucket).to receive(:get).with("a-key").and_return(nil)
+      e = Riak::FailedRequest.new("not found")
+      allow(e).to receive(:not_found?).and_return(true)
+      allow(bucket).to receive(:get).with("a-key").and_raise(e)
       expect( ExampleA.find("a-key") ).to be_nil
     end
 
     it "should take a string and return an instance of Example" do
-      allow(bucket).to receive(:get).with("a-key").and_return(double)
+      allow(bucket).to receive(:get).with("a-key").and_return(Riak::RObject.new("a-key"))
       expect( ExampleA.find("a-key") ).to be_an_instance_of(ExampleA)
     end
   end
 
   describe "record_attributes" do
-    let(:riak_object) { double(:data => data) }
+    let(:riak_object) { Riak::RObject.new("obj").tap{|r| r.data = data } }
     let(:data) { {:attribute1 => "1"} }
-    it "should respond to each attribute" do
-      expect( ExampleA.new(riak_object) ).to respond_to(:attribute1)
-      expect( ExampleA.new(riak_object) ).to respond_to(:attribute2)
+    let(:record) { ExampleA.new(riak_object) }
+    it "should read and write each attribute" do
+      expect{
+        record.attribute1=('b')
+      }.to change{record.attribute1}.from("1").to('b')
+
+      expect{
+        record.attribute2 = 'c'
+      }.to change{record.attribute2}.from(nil).to('c')
+
     end
 
     it "should return attribute from riak_object data" do
       expect( ExampleA.new(riak_object).attribute1 ).to eq("1")
     end
+
   end
 end

data/spec/spec_helper.rb

@@ -20,6 +20,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'riak-record'
 
+RiakRecord.client = Riak::Client.new(:host => 'localhost', :pb_port => '8087')
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: riak-record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Robert Graff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: riak-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement