eurydice 1.2.3-java → 1.2.4-java

data/.rvmrc

@@ -1 +1 @@
-rvm --create use jruby-1.6.5@eurydice
+rvm --create use jruby-1.7.2@eurydice

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+script: 'rspec spec'
+rvm:
+  # - jruby-19mode
+  - jruby-head
+jdk:
+  - openjdk7
+  # - oraclejdk7
+  # - openjdk6
+services:
+  - cassandra
+before_script:
+  - 'cat /etc/cassandra/cassandra.yaml'
+  - 'cat /etc/init.d/cassandra'
+  - 'cat /usr/local/cassandra/conf/log4j-server.properties'
+  - 'cat /var/log/cassandra/system.log'
+  - '/etc/init.d/cassandra status'
+  - 'CASSANDRA_CONF=/etc/cassandra /usr/local/cassandra/bin/nodetool status'

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 group :development do
   gem 'jruby-openssl'
   gem 'rake'
-  gem 'rspec', '2.7.0' # 2.8.0 doesn't work with JRuby because of JRUBY-6324
+  gem 'rspec'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    eurydice (1.2.3-java)
+    eurydice (1.2.4-java)
       pelops-jars (>= 1.3.0)
 
 GEM
@@ -15,14 +15,14 @@ GEM
     pelops-jars (1.3.0-java)
       cassandra-jars (~> 1.0.0)
     rake (0.9.2)
-    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)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
 
 PLATFORMS
   java
@@ -31,4 +31,4 @@ DEPENDENCIES
   eurydice!
   jruby-openssl
   rake
-  rspec (= 2.7.0)
+  rspec

data/README.mdown

@@ -6,10 +6,10 @@ See the `examples` directory and the specs for usage.
 
 ## Installation & requirements
 
-Tested with JRuby 1.6.2 in 1.9 mode and Cassandra 0.8.1.
+Tested with the latest 1.6.x and 1.7.x versions of JRuby, against the current Datastax Community Edition (1.2.x) [on Travis](https://travis-ci.org/iconara/eurydice).
 
     gem install eurydice
-    
+
 This will also install two dependencies: `pelops-jars` and `cassandra-jars` which contain the Pelops and Cassandra JAR files.
 
 ## Contributors

data/Rakefile

@@ -1,6 +1,11 @@
 # encoding: utf-8
 
 require 'bundler'
+require 'rspec/core/rake_task'
 
 
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/cassandra.rb

@@ -28,14 +28,26 @@ module Cassandra
   }.freeze
 
   MARSHAL_TYPES = {
-    :bytes          => 'org.apache.cassandra.db.marshal.BytesType'.freeze,
-    :ascii          => 'org.apache.cassandra.db.marshal.AsciiType'.freeze,
-    :utf8           => 'org.apache.cassandra.db.marshal.UTF8Type'.freeze,
-    :long           => 'org.apache.cassandra.db.marshal.LongType'.freeze,
-    :lexical_uuid   => 'org.apache.cassandra.db.marshal.LexicalUUIDType'.freeze,
-    :time_uuid      => 'org.apache.cassandra.db.marshal.TimeUUIDType'.freeze,
-    :counter        => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze,
-    :counter_column => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze
+    :ascii             => 'org.apache.cassandra.db.marshal.AsciiType'.freeze,
+    :boolean           => 'org.apache.cassandra.db.marshal.BooleanType'.freeze,
+    :bytes             => 'org.apache.cassandra.db.marshal.BytesType'.freeze,
+    :composite         => 'org.apache.cassandra.db.marshal.CompositeType'.freeze,
+    :counter           => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze,
+    :counter_column    => 'org.apache.cassandra.db.marshal.CounterColumnType'.freeze,
+    :date              => 'org.apache.cassandra.db.marshal.DateType'.freeze,
+    :decimal           => 'org.apache.cassandra.db.marshal.DecimalType'.freeze,
+    :double            => 'org.apache.cassandra.db.marshal.DoubleType'.freeze,
+    :dynamic_composite => 'org.apache.cassandra.db.marshal.DynamicCompositeType'.freeze,
+    :float             => 'org.apache.cassandra.db.marshal.FloatType'.freeze,
+    :int32             => 'org.apache.cassandra.db.marshal.Int32Type'.freeze,
+    :int               => 'org.apache.cassandra.db.marshal.IntegerType'.freeze,
+    :integer           => 'org.apache.cassandra.db.marshal.IntegerType'.freeze,
+    :lexical_uuid      => 'org.apache.cassandra.db.marshal.LexicalUUIDType'.freeze,
+    :long              => 'org.apache.cassandra.db.marshal.LongType'.freeze,
+    :reversed          => 'org.apache.cassandra.db.marshal.ReversedType'.freeze,
+    :time_uuid         => 'org.apache.cassandra.db.marshal.TimeUUIDType'.freeze,
+    :utf8              => 'org.apache.cassandra.db.marshal.UTF8Type'.freeze,
+    :uuid              => 'org.apache.cassandra.db.marshal.UUIDType'.freeze
   }.freeze
   
   INDEX_OPERATORS = {

data/lib/eurydice.rb

@@ -1,10 +1,12 @@
 # encoding: utf-8
 
-require 'java'
+require 'eurydice/column_enumerator'
+require 'eurydice/column_page'
 require 'eurydice/pelops'
 
 module Eurydice
   class EurydiceError < StandardError; end
+  class ConnectionError < EurydiceError; end
   class InvalidRequestError < EurydiceError; end
   class KeyspaceExistsError < InvalidRequestError; end
   class NotFoundError < EurydiceError; end

data/lib/eurydice/column_enumerator.rb

@@ -0,0 +1,110 @@
+# encoding: utf-8
+
+module Eurydice
+  class ColumnEnumeratorBase
+    include Enumerable
+
+    def initialize(column_family, row_key, options={})
+      @column_family, @row_key, @options = column_family, row_key, DEFAULT_OPTIONS.merge(options)
+      @max_retries = @options.delete(:max_retries)
+    end
+
+    def each
+      loop do
+        yield self.next
+      end
+    end
+
+    def rewind
+    end
+
+    private
+
+    FIRST_KEY = "\0".freeze
+    LAST_KEY = ''.freeze
+    DEFAULT_OPTIONS = {:max_column_count => 10_000, :max_retries => 3}.freeze
+  end
+
+  class ColumnEnumerator < ColumnEnumeratorBase
+    def initialize(*args)
+      super
+      rewind
+    end
+
+    def next
+      if @buffer.empty? && @exhausted
+        raise StopIteration
+      elsif @buffer.empty?
+        result = @column_family.get(@row_key, @options.merge(from_column: @offset))
+        keys = result.keys if result
+        if result.nil? || result.empty? || keys.last == @offset
+          @exhausted = true
+          raise StopIteration
+        end
+        result.shift if keys.first == @offset
+        result.each do |pair|
+          @buffer << pair
+        end
+        @offset = keys.last
+      end
+      @buffer.shift
+    end
+
+    def rewind
+      @offset = @options[:from_column] || (@options[:reversed] ? LAST_KEY : FIRST_KEY)
+      @reversed = @options[:reversed]
+      @buffer = []
+      @exhausted = false
+    end
+  end
+
+  class ConcurrentColumnEnumerator < ColumnEnumeratorBase
+    java_import 'java.util.concurrent.Executors'
+    java_import 'java.util.concurrent.ArrayBlockingQueue'
+    java_import 'java.util.concurrent.atomic.AtomicBoolean'
+    java_import 'org.jruby.threading.DaemonThreadFactory'
+
+    def initialize(*args)
+      super
+      @standard_enumerator = ColumnEnumerator.new(*args)
+      @queue = ArrayBlockingQueue.new(@options[:max_column_count] * 2)
+      @fetch_pool = Executors.new_single_thread_executor(DaemonThreadFactory.new(self.class.name))
+      @exhausted = true
+      rewind
+    end
+
+    def next
+      unless @running.get_and_set(true)
+        @fetch_pool.execute do
+          begin
+            while @running.get
+              pair = @standard_enumerator.next
+              @queue.put(pair)
+            end
+          rescue StopIteration
+          end
+          @queue.put(:stop_iteration)
+        end
+      end
+      
+      raise StopIteration if @exhausted
+        
+      value = @queue.take
+      if value == :stop_iteration
+        @exhausted = true
+        raise StopIteration
+      end
+
+      value
+    end
+
+    def rewind
+      @running = AtomicBoolean.new(false)
+      unless @exhausted
+        until @queue.take == :stop_iteration; end
+      end
+      @standard_enumerator.rewind
+      @exhausted = false
+    end
+  end
+end

data/lib/eurydice/column_page.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+module Eurydice
+  class ColumnPage
+    include Enumerable
+
+    attr_reader :page_size
+
+    def initialize(column_family, row_key, page_size, offset=FIRST_OFFSET)
+      @column_family = column_family
+      @row_key = row_key
+      @offset = offset
+      @page_size = page_size
+    end
+
+    def offset
+      if @offset == FIRST_OFFSET
+        slice.keys.first
+      else
+        @offset
+      end
+    end
+
+    def next_page
+      return nil if last?
+      ForwardColumnPage.new(@column_family, @row_key, @page_size, next_page_offset)
+    end
+
+    def prev_page
+      return nil if first?
+      ReverseColumnPage.new(@column_family, @row_key, @page_size, prev_page_offset)
+    end
+
+    def first?
+      @offset == FIRST_OFFSET
+    end
+
+    def last?
+      slice.size <= @page_size
+    end
+
+    def reverse?
+      false
+    end
+
+    def each_column(&block)
+      return self unless block_given?
+      slice.each.with_index do |item,i|
+        yield item if i < @page_size
+      end
+    end
+    alias_method :each, :each_column
+
+    private
+
+    def next_page_offset
+      slice.keys[-2]
+    end
+
+    def prev_page_offset
+      @offset
+    end
+
+    FIRST_OFFSET = "\0".freeze
+
+    def slice
+      @slice ||= @column_family.get(@row_key, from_column: @offset, max_column_count: @page_size + 2, reversed: reverse?)
+    end
+  end
+
+  class ForwardColumnPage < ColumnPage
+    def first?
+      false
+    end
+  end
+
+  class ReverseColumnPage < ColumnPage
+    def last?
+      false
+    end
+
+    def first?
+      slice.size <= @page_size + 1
+    end
+
+    def reverse?
+      true
+    end
+
+    def each_column(&block)
+      return self unless block_given?
+      first = slice.size == @page_size + 2 ? 1 : 0
+      last = slice.size - 2
+      slice.reverse_each.with_index do |item,i|
+        yield item if first <= i && i <= last
+      end
+    end
+
+    private
+
+    def next_page_offset
+      @offset
+    end
+
+    def prev_page_offset
+      slice.keys[-2]
+    end
+  end
+end

data/lib/eurydice/pelops.rb

@@ -108,8 +108,14 @@ module Eurydice
             raise EurydiceError, e.cause.message, e.backtrace
           when Thrift::TTransportException, ::Pelops::TimedOutException
             raise TimeoutError, e.cause.message, e.backtrace
+          when java.net.ConnectException
+            raise ConnectionError, e.cause.message, e.backtrace
           end
         end
+        case e
+        when ::Pelops::NotFoundException
+          raise NotFoundError, e.message, e.backtrace
+        end
         raise e
       end
     

data/lib/eurydice/pelops/column_family.rb

@@ -113,25 +113,15 @@ module Eurydice
         nil
       end
       
-      def each_column(row_key, options={})
-        thrift_exception_handler do
-          reversed = options.fetch(:reversed, false)
-          batch_size = options.fetch(:batch_size, 100)
-          start_beyond = options.fetch(:start_beyond, nil)
-          start_beyond = to_pelops_bytes(start_beyond) if start_beyond
-          selector = @keyspace.create_selector
-          iterator = selector.iterate_columns_from_row(@name, to_pelops_bytes(row_key), start_beyond, reversed, batch_size, get_cl(options))
-          if block_given?
-            iterator.each do |column|
-              yield column_to_kv(column, options)
-            end
-          else
-            Enumerator.new do |y|
-              iterator.each do |column|
-                y << column_to_kv(column, options)
-              end
-            end
-          end
+      def each_column(row_key, options={}, &block)
+        new_options = options.dup
+        new_options[:from_column] = options.delete(:start_beyond) if options.key?(:start_beyond)
+        new_options[:max_column_count] = options.delete(:batch_size) if options.key?(:batch_size)
+        enum = ColumnEnumerator.new(self, row_key, new_options)
+        if block_given?
+          enum.each(&block)
+        else
+          enum
         end
       end
       

data/lib/eurydice/pelops/keyspace.rb

@@ -13,7 +13,7 @@ module Eurydice
         @cluster = cluster
         @pool_name = pool_name
         @driver = driver
-        @batch_key = "#{@name}-batch"
+        @batch_key = "#{@name}-batch-#{object_id}"
       end
     
       def definition(reload=false)

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

data/spec/eurydice/column_enumerator_spec.rb

@@ -0,0 +1,197 @@
+# encoding: utf-8
+
+require_relative '../spec_helper'
+
+
+module Eurydice
+  class FakeColumnFamily
+    def initialize
+    end
+
+    def get(row_key, options)
+      if row_key == 'the_row'
+        if options[:max_column_count] == 3
+          if options[:reversed]
+            case options[:from_column]
+            when ''  then {'g' => 7, 'f' => 6, 'e' => 5}
+            when 'e' then {'e' => 5, 'd' => 4, 'c' => 3, 'b' => 2}
+            when 'b' then {'b' => 2, 'a' => 1}
+            when 'a' then {'a' => 1}
+            end
+          else
+            case options[:from_column]
+            when "\0" then {'a' => 1, 'b' => 2, 'c' => 3}
+            when 'c'  then {'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6}
+            when 'f'  then {'f' => 6, 'g' => 7}
+            when 'g'  then {'g' => 7}
+            end
+          end
+        end
+      end
+    end
+  end
+
+  shared_examples_for 'a column enumerator' do
+    let :column_family do
+      double(:column_family)
+    end
+
+    context 'as an Enumerator' do
+      describe '#next' do
+        context 'in the basic case' do
+          let :enumerator do
+            described_class.new(FakeColumnFamily.new, 'the_row', max_column_count: 3)
+          end
+
+          it 'returns the first column of the row' do
+            k, v = enumerator.next
+            k.should == 'a'
+            v.should == 1
+          end
+
+          it 'returns the second column of the row' do
+            enumerator.next
+            k, v = enumerator.next
+            k.should == 'b'
+            v.should == 2
+          end
+
+          it 'returns each column of the row in order' do
+            columns = []
+            7.times do
+              columns << enumerator.next
+            end
+            columns = [['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]
+          end
+
+          it 'raises StopIteration when all columns have been returned' do
+            7.times { enumerator.next }
+            expect { enumerator.next }.to raise_error(StopIteration)
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+        end
+
+        context 'when enumerating in reverse' do
+          let :enumerator do
+            described_class.new(FakeColumnFamily.new, 'the_row', max_column_count: 3, reversed: true)
+          end
+
+          it 'returns the last column of the row' do
+            enumerator.next.should == ['g', 7]
+          end
+
+          it 'returns the next to last column of the row' do
+            enumerator.next
+            enumerator.next.should == ['f', 6]
+          end
+
+          it 'returns each column of the row in reverse order' do
+            columns = []
+            7.times do
+              columns << enumerator.next
+            end
+            columns = [['g', 7], ['f', 6], ['e', 5], ['d', 4], ['c', 3], ['b', 2], ['a', 1]]
+          end
+
+          it 'raises StopIteration when all column have been returned' do
+            7.times { enumerator.next }
+            expect { enumerator.next }.to raise_error(StopIteration)
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+        end
+
+        context 'with special cases' do
+          let :enumerator do
+            described_class.new(column_family, 'the_row', max_column_count: 3)
+          end
+
+          let :slices do
+            [
+              {'a' => 1, 'b' => 2, 'c' => 3},
+              {'c' => 3, 'd' => 4, 'e' => 5, 'f' => 6},
+              {'f' => 6, 'g' => 7},
+              {'g' => 7},
+            ]
+          end
+
+          it 'raises StopIteration immediately if the row does not exist' do
+            column_family.stub(:get).and_return(nil)
+            enumerator = described_class.new(column_family, 'another_row')
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+
+          it 'raises StopIteration immediately if the row is empty' do
+            column_family.stub(:get).and_return({})
+            enumerator = described_class.new(column_family, 'another_row')
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+
+          it 'correctly handles rows with columns that are exactly the page size' do
+            column_family.stub(:get).with('another_row', max_column_count: 3, from_column: "\0").and_return(slices[0].dup)
+            column_family.stub(:get).with('another_row', max_column_count: 3, from_column: 'c').and_return({'c' => 3})
+            enumerator = described_class.new(column_family, 'another_row', max_column_count: 3)
+            3.times { enumerator.next }
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+
+          it 'correctly handles rows with columns that are less then one page' do
+            column_family.stub(:get).with('another_row', max_column_count: 3, from_column: "\0").and_return({'a' => 1, 'b' => 2})
+            column_family.stub(:get).with('another_row', max_column_count: 3, from_column: 'b').and_return({'b' => 2})
+            enumerator = described_class.new(column_family, 'another_row', max_column_count: 3)
+            2.times { enumerator.next }
+            expect { enumerator.next }.to raise_error(StopIteration)
+          end
+        end
+
+        context 'with a transformer'
+        context 'with query options'
+        context 'when transport errors occur'
+      end
+
+      describe '#rewind' do
+        let :enumerator do
+          described_class.new(FakeColumnFamily.new, 'the_row', max_column_count: 3)
+        end
+
+        it 'resets the enumerator so that it can be used again' do
+          first_results = 7.times.map { enumerator.next }
+          enumerator.rewind
+          second_results = 7.times.map { enumerator.next }
+          first_results.should == second_results
+        end
+      end
+    end
+
+    context 'as an Enumerable' do
+      let :enumerable do
+        described_class.new(FakeColumnFamily.new, 'the_row', max_column_count: 3)
+      end
+
+      describe '#each' do
+        it 'returns each column of the row in order' do
+          columns = []
+          enumerable.each do |k, v|
+            columns << [k, v]
+          end
+          columns = [['a', 1], ['b', 2], ['c', 3], ['d', 4], ['e', 5], ['f', 6], ['g', 7]]
+        end
+      end
+
+      describe '#map' do
+        it 'returns each column of the row in order' do
+          columns = []
+          columns = enumerable.map { |k, v| v }
+          columns = [1, 2, 3, 4, 5, 6, 7]
+        end
+      end
+    end
+  end
+
+  describe ColumnEnumerator do
+    it_behaves_like 'a column enumerator'
+  end
+
+  describe ConcurrentColumnEnumerator do
+    it_behaves_like 'a column enumerator'
+  end
+end

data/spec/eurydice/column_page_spec.rb

@@ -0,0 +1,139 @@
+# encoding: utf-8
+
+require_relative '../spec_helper'
+
+
+module Eurydice
+  describe ColumnPage do
+    before :all do
+      @keyspace_name = "eurydice_test_space_#{rand(1000)}"
+      @cf_name = "column_family_#{rand(1000)}"
+      @cluster = Eurydice.connect(host: ENV['CASSANDRA_HOST'])
+      @keyspace = @cluster.keyspace(@keyspace_name, :create => false)
+      @keyspace.drop! rescue nil
+      @keyspace.create!
+    end
+
+    let :column_family do
+      cf = @keyspace.column_family(@cf_name)
+      cf.insert('xyz', {'a' => '1', 'b' => '2', 'c' => '3', 'd' => '4', 'e' => '5', 'f' => '6', 'g' => '7', 'h' => '8'})
+      cf
+    end
+
+    describe '#next_page' do
+      it 'returns a new page with the correct offset' do
+        page = described_class.new(column_family, 'xyz', 3)
+        page.next_page.offset.should == 'd'
+      end
+
+      it 'returns a new page with the same page size' do
+        page = described_class.new(column_family, 'xyz', 3)
+        page.next_page.page_size.should == 3
+      end
+
+      it 'returns nil if there is no next page' do
+        page = described_class.new(column_family, 'xyz', 6)
+        page.next_page.next_page.should be_nil
+      end
+
+      it 'picks the right offsets when paging through the row' do
+        page = described_class.new(column_family, 'xyz', 3)
+        offsets = []
+        loop do
+          offsets << page.offset
+          page = page.next_page
+          break unless page
+        end
+        offsets.should == ['a','d','g']
+      end
+    end
+
+    describe '#prev_page' do
+      it 'returns a reverse page' do
+        page = described_class.new(column_family, 'xyz', 3).next_page
+        page.prev_page.should be_reverse
+      end
+
+      it 'returns a new page with the correct offset' do
+        page = described_class.new(column_family, 'xyz', 3).next_page
+        page.prev_page.offset.should == 'd'
+      end
+
+      it 'returns a new page with the same page size' do
+        page = described_class.new(column_family, 'xyz', 3).next_page
+        page.prev_page.page_size.should == 3
+      end
+
+      it 'returns nil if there is no previous page' do
+        page = described_class.new(column_family, 'xyz', 3)
+        page.prev_page.should be_nil
+      end
+
+      it 'picks the right offsets when paging through the row' do
+        page = described_class.new(column_family, 'xyz', 3)
+        page = page.next_page until page.last?
+        offsets = []
+        loop do
+          offsets << page.offset
+          page = page.prev_page
+          break unless page
+        end
+        offsets.should == ['g','g','d']
+      end
+    end
+
+    context 'navigating back and forth' do
+      it 'next + prev + next == next' do
+        page = described_class.new(column_family, 'xyz', 3)
+        page.next_page.prev_page.next_page.offset.should == 'd'
+      end
+    end
+
+    context 'with edge cases' do
+      it 'handles the case when row size is divisible by page size' do
+        [2,4,8].each do |page_size|
+          expected_page_count = 8/page_size
+          page = described_class.new(column_family, 'xyz', page_size)
+          page_count = 1
+          until page.last?
+            page = page.next_page
+            page_count += 1
+            page_count.should_not > expected_page_count
+          end
+          page_count.should == expected_page_count
+
+          page_count = 1
+          until page.first?
+            page = page.prev_page
+            page_count += 1
+            page_count.should_not > expected_page_count
+          end
+          page_count.should == expected_page_count
+        end
+      end
+
+      it 'handles the case when previous page is short' do
+        items = []
+        described_class.new(column_family, 'xyz', 3, 'b').prev_page.each_column do |key,value|
+          items << [key,value]
+        end
+        items.should == [%w[a 1]]
+      end
+    end
+
+    describe '#each_column' do
+      it 'yields every item in page' do
+        items = []
+        described_class.new(column_family, 'xyz', 3).each_column do |key,value|
+          items << [key,value]
+        end
+        items.should == [%w[a 1], %w[b 2], %w[c 3]]
+      end
+
+      it 'returns an enumerable unless block is given' do
+        enum = described_class.new(column_family, 'xyz', 3).each_column
+        enum.map { |k,v| v }.should == %w[1 2 3]
+      end
+    end
+  end
+end

data/spec/eurydice/pelops/cluster_spec.rb

@@ -5,7 +5,7 @@ module Eurydice
   module Pelops
     describe Cluster do
       before :all do
-        @cluster = Eurydice.connect
+        @cluster = Eurydice.connect(host: ENV['CASSANDRA_HOST'])
       end
         
       it_behaves_like 'Cluster', @cluster

data/spec/eurydice/pelops/column_family_spec.rb

@@ -7,7 +7,7 @@ module Eurydice
       before :all do
         @keyspace_name = "eurydice_test_space_#{rand(1000)}"
         @cf_name = "column_family_#{rand(1000)}"
-        @cluster = Eurydice.connect
+        @cluster = Eurydice.connect(host: ENV['CASSANDRA_HOST'])
         @keyspace = @cluster.keyspace(@keyspace_name, :create => false)
         @keyspace.drop! rescue nil
         @keyspace.create!

data/spec/eurydice/pelops/keyspace_spec.rb

@@ -6,7 +6,7 @@ module Eurydice
     describe Keyspace do
       before :all do
         @keyspace_name = "eurydice_test_space_#{rand(1000)}"
-        @cluster = Eurydice.connect
+        @cluster = Eurydice.connect(host: ENV['CASSANDRA_HOST'])
         if @cluster.keyspaces.include?(@keyspace_name)
           @cluster.keyspace(@keyspace_name).drop!
         end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ $: << File.expand_path('../../lib', __FILE__)
 require 'bundler/setup'
 require 'eurydice/pelops'
 
+ENV['CASSANDRA_HOST'] ||= 'localhost'
+
 require_relative 'eurydice/support/cluster'
 require_relative 'eurydice/support/column_family'
 require_relative 'eurydice/support/keyspace'

metadata

@@ -1,94 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: eurydice
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.2.3
+version: !ruby/object:Gem::Version
+  version: 1.2.4
+  prerelease:
 platform: java
-authors: 
-  - Theo Hultberg
-autorequire: 
+authors:
+- Theo Hultberg
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-12-31 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: pelops-jars
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.3.0
-    type: :runtime
-    version_requirements: *id001
-description: ""
-email: 
-  - theo@burtcorp.com
+date: 2013-05-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pelops-jars
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    none: false
+  prerelease: false
+  type: :runtime
+description: ''
+email:
+- theo@burtcorp.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .rspec
-  - .rvmrc
-  - Gemfile
-  - Gemfile.lock
-  - README.mdown
-  - Rakefile
-  - eurydice.gemspec
-  - examples/01_connect.rb
-  - examples/02_create_keyspace.rb
-  - examples/03_create_column_family.rb
-  - examples/04_storing_data.rb
-  - examples/05_loading_data.rb
-  - examples/06_cluster_info.rb
-  - examples/common.rb
-  - lib/cassandra.rb
-  - lib/eurydice.rb
-  - lib/eurydice/pelops.rb
-  - lib/eurydice/pelops/cluster.rb
-  - lib/eurydice/pelops/column_family.rb
-  - lib/eurydice/pelops/keyspace.rb
-  - lib/eurydice/pelops/mutator.rb
-  - lib/eurydice/version.rb
-  - spec/eurydice/pelops/cluster_spec.rb
-  - spec/eurydice/pelops/column_family_spec.rb
-  - spec/eurydice/pelops/keyspace_spec.rb
-  - spec/eurydice/support/cluster.rb
-  - spec/eurydice/support/column_family.rb
-  - spec/eurydice/support/keyspace.rb
-  - spec/spec_helper.rb
+files:
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
+- ".travis.yml"
+- Gemfile
+- Gemfile.lock
+- README.mdown
+- Rakefile
+- eurydice.gemspec
+- examples/01_connect.rb
+- examples/02_create_keyspace.rb
+- examples/03_create_column_family.rb
+- examples/04_storing_data.rb
+- examples/05_loading_data.rb
+- examples/06_cluster_info.rb
+- examples/common.rb
+- lib/cassandra.rb
+- lib/eurydice.rb
+- lib/eurydice/column_enumerator.rb
+- lib/eurydice/column_page.rb
+- lib/eurydice/pelops.rb
+- lib/eurydice/pelops/cluster.rb
+- lib/eurydice/pelops/column_family.rb
+- lib/eurydice/pelops/keyspace.rb
+- lib/eurydice/pelops/mutator.rb
+- lib/eurydice/version.rb
+- spec/eurydice/column_enumerator_spec.rb
+- spec/eurydice/column_page_spec.rb
+- spec/eurydice/pelops/cluster_spec.rb
+- spec/eurydice/pelops/column_family_spec.rb
+- spec/eurydice/pelops/keyspace_spec.rb
+- spec/eurydice/support/cluster.rb
+- spec/eurydice/support/column_family.rb
+- spec/eurydice/support/keyspace.rb
+- spec/spec_helper.rb
 homepage: http://github.com/iconara/eurydice
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
 rubyforge_project: eurydice
-rubygems_version: 1.8.9
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Ruby wrapper for the Pelops library
 test_files: []
-