riak-shim 1.0.2 → 1.0.3

data/FUTURE_WORK.md

@@ -22,7 +22,6 @@ unhappy with the current interface.
 - Keep expanding tests
 - find less horrible way to deal with index names
 - find less horrible way to deal with key accessor
-- nice error message when can't connect to db
-- nice error ,essage when back end doesn't support 2i
+- nice error message when back end doesn't support 2i
 - nice error message when secondary index is missing?
 

data/Gemfile

@@ -3,7 +3,6 @@ gemspec
 
 platforms :jruby do
   gem 'jruby-openssl'
-  gem 'json-jruby'
 end
 
 def darwin_only(require_as)

data/Guardfile

@@ -1,5 +1,5 @@
 
-guard 'rspec', :version => 2, :cli => "--color --format nested" do
+guard 'rspec', :cli => "--color --format nested" do
   watch(%r{^spec/(.+)_spec\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^spec/support/*})      { 'spec' }
   watch(%r{^lib/(.+)\.rb$})       { 'spec' }

data/lib/riak-shim/store.rb

@@ -14,13 +14,16 @@ module Riak
 
       DEFAULT_CONFIG_LOCATION = 'config/database.yml'
 
-      # Thrown when we can't find a configuration which matches the
+      # Raised when we can't find a configuration which matches the
       # current RACK_ENV
       class NoSettingsForCurrentEnvError < StandardError; end
 
-      # Thrown when the RACK_ENV environment variable is not set
+      # Raised when the RACK_ENV environment variable is not set
       class RackEnvNotSetError < StandardError; end
 
+      # Raised when we can't connect to Riak
+      class ConnectionError < StandardError; end
+
       # @return [Hash] the configuration for our current environment
       def config
         env = ENV['RACK_ENV'] or raise RackEnvNotSetError.new
@@ -44,8 +47,16 @@ module Riak
       end
 
       def riak
-        @riak ||= Riak::Client.new(:http_backend => :Excon,
+        return @riak if @riak
+
+        @riak = Riak::Client.new(:http_backend => :Excon,
             :nodes => [{:host => config['host'], :http_port => config['http_port']}])
+        unless @riak.ping
+          @riak = nil
+          raise ConnectionError.new("Could not connect to Riak at #{config['host']}:#{config['http_port']}")
+        end
+
+        @riak
       end
 
       # @return [Riak::Bucket] the bucket coresponding to name

data/lib/riak-shim/version.rb

@@ -1,5 +1,5 @@
 module Riak
   module Shim
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/riak-shim.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Riak::Shim::VERSION
 
-  gem.add_dependency 'riak-client', '~>1.1.1'
-  gem.add_dependency 'excon', '~>0.16.10'
-  gem.add_dependency 'uuidtools', '~>2.1.3'
-
+  gem.add_dependency 'riak-client', '~>1.2.0'
+  gem.add_dependency 'excon', '~>0.22.1'
+  gem.add_dependency 'uuidtools', '~>2.1.4'
+  gem.add_dependency 'json'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'gem-release'

data/spec/persistable_spec.rb

@@ -33,15 +33,15 @@ class PersistableExampleWithIndex < PersistableExample
   end
 end
 
-def create_test_data(copies)
-  copies.times do |i|
+def create_test_data(quantity)
+  quantity.times do |i|
     p = PersistableExample.new
     p.foo, p.bar, p.baz = i, i, i
     p.save
   end
 end
 
-describe 'persistable' do
+describe Riak::Shim::Persistable do
   let(:persistable) do
     p = PersistableExample.new ; p.foo = 'boo' ; p.bar = 'who' ; p
   end

data/spec/store_spec.rb

@@ -4,6 +4,18 @@ require 'riak-shim/store'
 describe Riak::Shim::Store do
   let(:store) { Riak::Shim::Store.new }
 
+  # Port finding code stolen without remorse from realweb
+  PORT_RANGE    = 8000..10000
+  def find_port
+    begin
+      port = random_port
+    end while system("lsof -i tcp:#{port} > /dev/null")
+    port
+  end
+
+  def random_port
+    PORT_RANGE.to_a[rand(PORT_RANGE.to_a.size)]
+  end
 
   describe '#config_location' do
     it 'keeps a path of the database config file' do
@@ -53,6 +65,21 @@ describe Riak::Shim::Store do
           expect { store.config }.to raise_error(Riak::Shim::Store::RackEnvNotSetError)
         end
       end
+
+      context 'with no riak at specified coordinates' do
+        before do
+          store.config['host'] = 'localhost'
+          store.config['http_port'] = find_port
+        end
+
+        it 'raises an informative exception' do
+          expect { store.riak }.to raise_error(Riak::Shim::Store::ConnectionError)
+        end
+
+        it 'includes an informative message' do
+          expect { store.riak }.to raise_error(/Could not connect to Riak at/)
+        end
+      end
     end
 
     describe '#config' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-shim
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.10
+        version: 0.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.10
+        version: 0.22.1
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -209,21 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1927379052997659791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1927379052997659791
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A tiny shim between you and riak-client. Reads config/database.yml and generates
@@ -234,4 +244,3 @@ test_files:
 - spec/store_spec.rb
 - spec/support/camelcase.rb
 - spec/support/database.yml
-has_rdoc: