eurydice 1.1.0.b4-java → 1.1.1.b1-java

data/Gemfile

@@ -1,11 +1,9 @@
 source :rubygems
 
-gem 'pelops-jars', '1.3.0.b3'
-
 gemspec
 
 group :development do
   gem 'jruby-openssl'
   gem 'rake'
-  gem 'rspec'
+  gem 'rspec', '2.7.0' # 2.8.0 doesn't work with JRuby because of JRUBY-6324
 end

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    eurydice (1.1.0.b3-java)
-      pelops-jars (>= 1.2.9)
+    eurydice (1.1.0.b4-java)
+      pelops-jars (>= 1.3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     bouncy-castle-java (1.5.0146.1)
     cassandra-jars (1.0.0-java)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    pelops-jars (1.3.0.b3-java)
+    pelops-jars (1.3.0-java)
       cassandra-jars (~> 1.0.0)
     rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    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.6.0)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   java
@@ -30,6 +30,5 @@ PLATFORMS
 DEPENDENCIES
   eurydice!
   jruby-openssl
-  pelops-jars (= 1.3.0.b3)
   rake
-  rspec
+  rspec (= 2.7.0)

data/eurydice.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'eurydice'
   
-  s.add_dependency 'pelops-jars', '>= 1.2.9'
+  s.add_dependency 'pelops-jars', '>= 1.3.0'
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = %w(lib)

data/examples/01_connect.rb

@@ -5,7 +5,7 @@ require_relative 'common'
 
 # Connect to the default host (localhost) and port (9160), these can be
 # overridden by passing then :host and :port options.
-cluster = Eurydice.connect(:timeout => 3000)
+cluster = Eurydice.connect
 
 # Get a reference to a keyspace, it will be created if it does not exist
 # (pass the option :create => false to not automatically create the keyspace).

data/lib/eurydice/pelops/column_family.rb

@@ -47,34 +47,20 @@ module Eurydice
       end
     
       def delete_column(row_key, column_key, options={})
-        thrift_exception_handler do
-          mutator = @keyspace.create_mutator
-          mutator.delete_column(@name, row_key, to_pelops_bytes(column_key))
-          mutator.execute(get_cl(options))
+        batch(options) do |b|
+          b.delete_column(row_key, column_key)
         end
       end
     
       def delete_columns(row_key, column_keys, options={})
-        thrift_exception_handler do
-          mutator = @keyspace.create_mutator
-          mutator.delete_columns(@name, row_key, column_keys.map { |k| to_pelops_bytes(k) })
-          mutator.execute(get_cl(options))
+        batch(options) do |b|
+          b.delete_columns(row_key, column_keys)
         end
       end
     
       def update(row_key, properties, options={})
-        thrift_exception_handler do
-          types = options[:validations] || {}
-          key_type = options[:comparator]
-          mutator = @keyspace.create_mutator
-          columns = properties.map do |k, v|
-            key = to_pelops_bytes(k, key_type)
-            value = to_pelops_bytes(v, types[k])
-            ttl = options.fetch(:ttl, mutator.class::NO_TTL)
-            mutator.new_column(key, value, ttl)
-          end
-          mutator.write_columns(@name, row_key, columns)
-          mutator.execute(get_cl(options))
+        batch(options) do |b|
+          b.update(row_key, properties, options)
         end
       end
       alias_method :insert, :update
@@ -170,6 +156,15 @@ module Eurydice
         end
       end
       
+      def batch(options={})
+        batch = Batch.new(@name, @keyspace)
+        if block_given?
+          yield batch
+          batch.execute!(options)
+        end
+        nil
+      end
+      
     private
     
       EMPTY_STRING = ''.freeze
@@ -252,10 +247,53 @@ module Eurydice
         end
         return key, value
       end
-  
-      def get_cl(options)
-        cl = options.fetch(:consistency_level, options.fetch(:cl, :one))
-        Cassandra::CONSISTENCY_LEVELS[cl]
+      
+      module ConsistencyLevelHelpers
+        def get_cl(options)
+          cl = options.fetch(:consistency_level, options.fetch(:cl, :one))
+          Cassandra::CONSISTENCY_LEVELS[cl]
+        end
+      end
+      
+      include ConsistencyLevelHelpers
+      
+      class Batch
+        include ExceptionHelpers
+        include ByteHelpers
+        include ConsistencyLevelHelpers
+        
+        def initialize(name, keyspace)
+          @name = name
+          @keyspace = keyspace
+          @mutator = @keyspace.create_mutator
+        end
+        
+        def delete_column(row_key, column_key)
+          @mutator.delete_column(@name, row_key, to_pelops_bytes(column_key))
+        end
+    
+        def delete_columns(row_key, column_keys)
+          @mutator.delete_columns(@name, row_key, column_keys.map { |k| to_pelops_bytes(k) })
+        end
+    
+        def update(row_key, properties, options={})
+          types = options[:validations] || {}
+          key_type = options[:comparator]
+          columns = properties.map do |k, v|
+            key = to_pelops_bytes(k, key_type)
+            value = to_pelops_bytes(v, types[k])
+            ttl = options.fetch(:ttl, @mutator.class::NO_TTL)
+            @mutator.new_column(key, value, ttl)
+          end
+          @mutator.write_columns(@name, row_key, columns)
+        end
+        alias_method :insert, :update
+        
+        def execute!(options={})
+          thrift_exception_handler do
+            @mutator.execute(get_cl(options))
+          end
+        end
       end
     end
   end

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.1.0.b4'
+  VERSION = '1.1.1.b1'
 end

data/spec/eurydice/pelops/cluster_spec.rb

@@ -4,36 +4,11 @@ require_relative '../../spec_helper'
 module Eurydice
   module Pelops
     describe Cluster do
-      it 'can connect' do
+      before :all do
         @cluster = Eurydice.connect
-        @cluster.should be_connected
       end
-  
-      describe '#keyspace' do
-        before do
-          @cluster = Eurydice.connect
-          @keyspace_name = "eurydice_test_space_#{rand(1000)}"
-          if @cluster.keyspaces.include?(@keyspace_name)
-            @cluster.keyspace(@keyspace_name).drop!
-          end
-        end
         
-        after do
-          @keyspace.drop! rescue nil
-        end
-    
-        it 'creates a keyspace' do
-          @keyspace = @cluster.keyspace(@keyspace_name)
-          @keyspace.exists?.should be_true
-        end
-  
-        it 'defers the creation of a keyspace with :create => false' do
-          @keyspace = @cluster.keyspace(@keyspace_name, :create => false)
-          @keyspace.exists?.should be_false
-          @keyspace.create!
-          @keyspace.exists?.should be_true
-        end
-      end
+      it_behaves_like 'Cluster', @cluster
     end
   end
 end