riakpb 0.2.3 → 0.3.0

data/.gitignore

@@ -3,3 +3,5 @@
 pkg
 *.gem
 .bundle
+
+/riak-pbclient.tmproj

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    riakpb (0.2.3)
+    riakpb (0.3.0)
       activesupport (~> 3.0.0)
-      ruby_protobuf (~> 0.4.8)
+      ruby_protobuf (~> 0.4.9)
       yard (~> 0.6.4)
 
 GEM
@@ -12,24 +12,21 @@ GEM
     activesupport (3.0.3)
     diff-lcs (1.1.2)
     i18n (0.5.0)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby_protobuf (0.4.8)
+    rspec-mocks (2.4.0)
+    ruby_protobuf (0.4.9)
     yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.0)
   i18n (~> 0.5.0)
   riakpb!
-  rspec (~> 2.3.0)
-  ruby_protobuf (~> 0.4.8)
-  yard (~> 0.6.4)
+  rspec (~> 2.4.0)

data/Rakefile

@@ -4,41 +4,18 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-
-
-# task :release => :spec
-
-desc "Run Specs"
-Rspec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern    = "spec/**/*_spec.rb"
-  spec.verbose    = true
-  spec.rspec_opts = ['--color']
-end
-
 require 'yard'
 
+task :release => :spec
+
 desc "Generate YARD docs"
 YARD::Rake::YardocTask.new(:yard) do |t|
   t.files += ['lib/**/*.rb']
 end
 
-desc "Run Unit Specs Only"
+desc "Run Specs"
 Rspec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/riakpb/**/*_spec.rb"
-end
-
-namespace :spec do
-  desc "Run Integration Specs Only"
-  Rspec::Core::RakeTask.new(:integration) do |spec|
-    spec.pattern = "spec/integration/**/*_spec.rb"
-  end
-
-  desc "Run All Specs"
-  Rspec::Core::RakeTask.new(:all) do |spec|
-    spec.pattern = Rake::FileList["spec/**/*_spec.rb"]
-  end
+  spec.pattern    = "spec/**/*_spec.rb"
+  spec.verbose    = true
+  spec.rspec_opts = ['--color']
 end
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]

data/lib/riakpb/client/rpc.rb

@@ -16,7 +16,7 @@ module Riakpb
 
       RECV_LIMIT=1073741824
 
-      attr_reader :req_message, :response, :resp_message_codes, :resp_message, :status
+      attr_reader :req_message, :response, :resp_message_codes, :resp_message, :status, :socket
 
       # Establishes a Client ID with the Riakpb node, for the life of the RPC connection.
       # @param [Client] client the Riakpb::Client object in which this Rpc instance lives
@@ -50,25 +50,26 @@ module Riakpb
       # Opens a TCPSocket connection with the riak host/node
       # @yield [TCPSocket] hands off the socket connection
       # @return [TCPSocket] data that was exchanged with the host/node
-      def with_socket(&block)
-        socket              = TCPSocket.open(@client.host, @client.port)
-        set_client_id(socket) if @set_client_id
+      def with_socket
+        set_client_id unless @set_client_id.nil?
 
-        out                 = yield(socket)
-        socket.close
+        yield(socket)
+      end
 
-        return(out)
+      # @return [TCPSocket] The TCPSocket of the remote riak node
+      def socket
+        @socket ||= TCPSocket.open(@client.host, @client.port)
       end
 
       # Sets the Client ID for the TCPSocket session
       # @param [TCPSocket] socket connection for which the Client ID will be set
       # @return [True/False] whether or not the set client id request succeeded
-      def set_client_id(socket)
+      def set_client_id
         @set_c_id_req     ||= assemble_request( Util::MessageCode::SET_CLIENT_ID_REQUEST,
                                                 @set_client_id.serialize_to_string)
 
         socket.write(@set_c_id_req)
-        set_c_id_resp       = socket.sysread(@limit)
+        set_c_id_resp = socket.sysread(@limit)
 
         resp_code, resp_msg = decode_message(set_c_id_resp)
 
@@ -112,8 +113,6 @@ module Riakpb
 
         value = @buffer + value
 
-#        return {:done => false} if message_remaining?(@resp_message)
-
         response_chunk, @resp_message_codes, @buffer = decode_message(value)
 
         @resp_message_codes.each do |resp_mc|

data/lib/riakpb/version.rb

@@ -1,3 +1,3 @@
 module Riakpb
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/load_stocks.rb

@@ -12,7 +12,7 @@ client = Riakpb::Client.new
 bucket = client["goog"]
 
 CSV.foreach('goog.csv', :headers => true) do |row|
-  @noisy && puts(row.first[1].to_s)
+  puts(row.first[1].to_s) if @noisy
 
   key = bucket[row.first[1].to_s]
   key.content.value = Hash[row.to_a]

data/riakpb.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activesupport', '~> 3.0.0'
-  s.add_dependency 'ruby_protobuf', '~> 0.4.8'
+  s.add_dependency 'ruby_protobuf', '~> 0.4.9'
 
   s.add_dependency 'yard', '~> 0.6.4'
 
-  s.add_development_dependency 'rspec', '~> 2.3.0'
+  s.add_development_dependency 'rspec', '~> 2.4.0'
   s.add_development_dependency 'i18n',  '~> 0.5.0'
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Scott Gonyea
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 -08:00
+date: 2011-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 4
-        - 8
-        version: 0.4.8
+        - 9
+        version: 0.4.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -72,9 +72,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 3
+        - 4
         - 0
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency