riik 0.2.0 → 0.3.0

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -2,3 +2,5 @@ source :rubygems
 
 # Specify your gem's dependencies in riik.gemspec
 gemspec
+
+gem 'tddium'

data/Gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: .
+  specs:
+    riik (0.3.0)
+      excon
+      riak-client
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activesupport (3.0.5)
+    addressable (2.2.6)
+    beefcake (0.3.2)
+    builder (2.1.2)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    excon (0.7.12)
+    guard (0.8.8)
+      thor (~> 0.14.6)
+    guard-ctags-bundler (0.0.3)
+      guard (>= 0.4.0)
+    guard-rspec (0.5.7)
+      guard (>= 0.8.4)
+    guard-yard (1.0.2)
+      guard (>= 0.2.2)
+      yard (>= 0.7.0)
+    highline (1.6.8)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    i18n (0.6.0)
+    json (1.6.1)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    redcarpet (1.17.2)
+    riak-client (0.9.8)
+      beefcake (= 0.3.2)
+      builder (~> 2.1.2)
+      i18n (>= 0.4.0)
+    ripple (0.9.5)
+      activemodel (~> 3.0.0)
+      activesupport (~> 3.0.0)
+      riak-client (~> 0.9.5)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    tddium (1.0.1)
+      bundler
+      highline
+      json
+      tddium_client (~> 0.1.1)
+      thor
+    tddium_client (0.1.2)
+      httparty
+      json
+    thor (0.14.6)
+    vcr (1.11.3)
+    webmock (1.7.8)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
+    yard (0.7.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  guard
+  guard-ctags-bundler
+  guard-rspec
+  guard-yard
+  rake (~> 0.9.2)
+  rdoc
+  redcarpet
+  riik!
+  ripple
+  rspec
+  tddium
+  vcr
+  webmock
+  yard

data/lib/riik/document.rb

@@ -104,13 +104,16 @@ module Riik
     # Create or return the current Riak client object.
     #
     # @return [Riak::RObject]
-    # @private
     #
     def robject
-      @robject ||= Riak::RObject.new(bucket).tap do |object|
+      key = self.respond_to?(:default_key) ? self.default_key : nil
+
+      @robject ||= Riak::RObject.new(bucket, key).tap do |object|
         object.content_type = "application/json"
       end
     end
   end
 
+
+
 end

data/lib/riik/version.rb

@@ -1,3 +1,3 @@
 module Riik
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/riik.gemspec

@@ -38,4 +38,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('guard-rspec')
   gem.add_development_dependency('guard-yard')
   gem.add_development_dependency('guard-ctags-bundler')
+
+  gem.add_development_dependency('tddium')
 end

data/spec/fixtures/vcr_cassettes/creation_of_nonexistent_default_key.yml

@@ -0,0 +1,34 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :put
+    uri: http://127.0.0.1:8098/riak/riik_defaultkeyperson/key-Fat?returnbody=true
+    body: ! '{"first_name":"Fat","last_name":"Mike"}'
+    headers:
+      accept:
+      - multipart/mixed, application/json;q=0.7, */*;q=0.5
+      x-riak-clientid:
+      - OR6jNQ==
+      content-type:
+      - application/json
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      x-riak-vclock:
+      - a85hYGBgzGDKBVIcypz/fvodtZDMYEpky2NlOLw65gRfFgA=
+      vary:
+      - Accept-Encoding
+      server:
+      - MochiWeb/1.1 WebMachine/1.9.0 (participate in the frantic)
+      link:
+      - </riak/riik_defaultkeyperson>; rel="up"
+      date:
+      - Wed, 14 Dec 2011 05:10:27 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '39'
+    body: ! '{"first_name":"Fat","last_name":"Mike"}'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/loading_of_valid_default_key.yml

@@ -0,0 +1,36 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :get
+    uri: http://127.0.0.1:8098/riak/riik_defaultkeyperson/key-Fat
+    body: 
+    headers:
+      accept:
+      - multipart/mixed, application/json;q=0.7, */*;q=0.5
+      x-riak-clientid:
+      - OR6jNQ==
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      x-riak-vclock:
+      - a85hYGBgzGDKBVIcypz/fvodtZDMYEpky2NlOLw65gRfFgA=
+      vary:
+      - Accept-Encoding
+      server:
+      - MochiWeb/1.1 WebMachine/1.9.0 (participate in the frantic)
+      link:
+      - </riak/riik_defaultkeyperson>; rel="up"
+      last-modified:
+      - Wed, 14 Dec 2011 03:34:45 GMT
+      etag:
+      - ! '"5ABAkxudMeKGIQ2rvyD947"'
+      date:
+      - Wed, 14 Dec 2011 05:10:27 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '39'
+    body: ! '{"first_name":"Fat","last_name":"Mike"}'
+    http_version: '1.1'

data/spec/lib/performance_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'ripple'
-require 'benchmark'
 
 module Riik
 
@@ -28,15 +26,15 @@ module Riik
       end
     end
 
-    context 'when creating 300 records' do 
+    context 'when creating 1000 records' do 
       it 'is faster than ripple' do 
         ripple_time = Benchmark.realtime do 
-          300.times.each do |i|
+          1000.times.each do |i|
             RippleDocument.create(:number => i)
           end
         end
         riik_time = Benchmark.realtime do 
-          300.times.each do |i|
+          1000.times.each do |i|
             RiikDocument.create(:number => i)
           end
         end
@@ -44,15 +42,15 @@ module Riik
       end
     end
 
-    context 'when creating 1000 records' do 
+    context 'when creating 10000 records' do 
       it 'is faster than ripple' do 
         ripple_time = Benchmark.realtime do 
-          1000.times.each do |i|
+          10000.times.each do |i|
             RippleDocument.create(:number => i)
           end
         end
         riik_time = Benchmark.realtime do 
-          1000.times.each do |i|
+          10000.times.each do |i|
             RiikDocument.create(:number => i)
           end
         end

data/spec/lib/riik/document/persistence_spec.rb

@@ -18,6 +18,24 @@ module Riik
           end
         end
 
+        context 'once created with a default key' do 
+          let(:person) do 
+            VCR.use_cassette('creation_of_nonexistent_default_key') do 
+              DefaultKeyPerson.create(attributes)
+            end
+          end
+
+          it 'should exist in riak correctly' do
+            VCR.use_cassette('loading_of_valid_default_key') do 
+              subject.bucket.get(subject.default_key).should be_an_instance_of(Riak::RObject)
+
+              attributes.each do |key, value|
+                subject.send(key).should == value
+              end
+            end
+          end
+        end
+
         context 'once created' do 
           let(:person) do 
             VCR.use_cassette('creation_of_nonexistent_key') do 

data/spec/spec_helper.rb

@@ -5,7 +5,11 @@ $LOAD_PATH << File.join(PROJECT_ROOT, "lib")
 
 Bundler.require
 
+Dir[File.join(PROJECT_ROOT,"spec/support/**/*.rb")].each {|f| require f}
+
 require 'riik'
+require 'ripple'
+require 'benchmark'
 
 require 'vcr'
 
@@ -24,4 +28,22 @@ module Riik
     property :first_name
     property :last_name
   end
+
+  class DefaultKeyPerson
+    include Riik::Document
+
+    property :first_name
+    property :last_name
+
+    def default_key 
+      "key-#{first_name}"
+    end
+  end
+end
+
+# Ripple configuration.
+#
+if ENV['TDDIUM_RIAK_HOST']
+  Riik.client   = Riak::Client.new({:host => ENV['TDDIUM_RIAK_HOST'], :http_port => ENV['TDDIUM_RIAK_HTTP_PORT'].to_i})
+  Ripple.client = Riak::Client.new({:host => ENV['TDDIUM_RIAK_HOST'], :http_port => ENV['TDDIUM_RIAK_HTTP_PORT'].to_i})
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riik
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &11983080 !ruby/object:Gem::Requirement
+  requirement: &6801680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11983080
+  version_requirements: *6801680
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &11982220 !ruby/object:Gem::Requirement
+  requirement: &6800200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11982220
+  version_requirements: *6800200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11981240 !ruby/object:Gem::Requirement
+  requirement: &6798460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11981240
+  version_requirements: *6798460
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11980600 !ruby/object:Gem::Requirement
+  requirement: &6797700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11980600
+  version_requirements: *6797700
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &11980100 !ruby/object:Gem::Requirement
+  requirement: &6797080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11980100
+  version_requirements: *6797080
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &11979540 !ruby/object:Gem::Requirement
+  requirement: &6795880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11979540
+  version_requirements: *6795880
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &11979020 !ruby/object:Gem::Requirement
+  requirement: &6794860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11979020
+  version_requirements: *6794860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11978500 !ruby/object:Gem::Requirement
+  requirement: &6793980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11978500
+  version_requirements: *6793980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11977820 !ruby/object:Gem::Requirement
+  requirement: &6808420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *11977820
+  version_requirements: *6808420
 - !ruby/object:Gem::Dependency
   name: ripple
-  requirement: &11977240 !ruby/object:Gem::Requirement
+  requirement: &6807280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11977240
+  version_requirements: *6807280
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12025440 !ruby/object:Gem::Requirement
+  requirement: &6805440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12025440
+  version_requirements: *6805440
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &12024880 !ruby/object:Gem::Requirement
+  requirement: &6804460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12024880
+  version_requirements: *6804460
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &12024380 !ruby/object:Gem::Requirement
+  requirement: &6803340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12024380
+  version_requirements: *6803340
 - !ruby/object:Gem::Dependency
   name: guard-ctags-bundler
-  requirement: &12023860 !ruby/object:Gem::Requirement
+  requirement: &6801980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12023860
+  version_requirements: *6801980
+- !ruby/object:Gem::Dependency
+  name: tddium
+  requirement: &7472780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7472780
 description: Lightweight object mapper for Riak.
 email:
 - cmeiklejohn@criticalpair.com
@@ -178,6 +189,7 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.markdown
@@ -189,8 +201,10 @@ files:
 - lib/riik/document/persistence.rb
 - lib/riik/version.rb
 - riik.gemspec
+- spec/fixtures/vcr_cassettes/creation_of_nonexistent_default_key.yml
 - spec/fixtures/vcr_cassettes/creation_of_nonexistent_key.yml
 - spec/fixtures/vcr_cassettes/deletion_of_valid_key.yml
+- spec/fixtures/vcr_cassettes/loading_of_valid_default_key.yml
 - spec/fixtures/vcr_cassettes/loading_of_valid_key.yml
 - spec/fixtures/vcr_cassettes/updating_of_valid_key.yml
 - spec/lib/performance_spec.rb
@@ -199,6 +213,7 @@ files:
 - spec/lib/riik/document_spec.rb
 - spec/lib/riik_spec.rb
 - spec/spec_helper.rb
+- spec/support/.gitkeep
 homepage: http://critialpair.com
 licenses: []
 post_install_message: 
@@ -213,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3432467302917107998
+      hash: -21663660701635647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3432467302917107998
+      hash: -21663660701635647
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11