cassandra-driver 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg3NTI1OTYyMmViMzc5OWU4YjQyYTViYmQyMDFmZmNjOTIzMGExNg==
+    MjJiMTUxNjdlNWI3Y2M3Mzk3NzFiMjQ4NDEzMGNlMTJiYmQyM2Q2MA==
   data.tar.gz: !binary |-
-    NjI3OWQyZDc0NTM1MmE4M2VlMWVhM2EwMTRlMGVjYzdjODQyOGIzNw==
+    ZTIzZjE2NzFjNTI5YTEyZDUxMWUxMjdiYzEwOTg2Nzc0YzhjZDFjZA==
 SHA512:
   metadata.gz: !binary |-
-    ZGFhMWZjYWUyMTdlYzllODBmNGVjMTkzZjU5YWYyN2M3MjQwZmVhNTI3NzIz
-    ZGFiYTA3NzAyNWU0MWQ4Njg1OWFhNTViNTQ0NDFmMDU4NmQwMWQ3OTFkNjBj
-    NTdlM2ZjOTAwYTA5Njk4ZWQ2Nzk3ZjQ1OWM1MWU5YzcyODcwZmY=
+    YmNiNDQxMmI3OTdhN2FhOTA3Njc2NjlhMmE1ZTkzNTRmOWZkNjVjNTRiZTc5
+    MjViMDFkMWU1NzRhODIxY2UxMWUxNGVjMGE1N2Y0ZTZlMzQ1NDA5YjFlNDcw
+    MDk3ZTdjNjM2YjUyMjIwOTZmY2VkN2M4OTY3NGVmNWUzYTgwZGM=
   data.tar.gz: !binary |-
-    YTQ0MDg5ZjI3Yzg5MGRiOGI1YTdlMjgwZGIxZjI1Y2ZkZDVhZWYwOGFkYTJi
-    MzIyOTY1OTY1ODgzMjhkYWY2ODYxYTIzZTRiYzI5OWRjODIwN2FmM2FlYTVk
-    YWFjOGNkMjY3OGJhYjhjZmE5ODMzMzgzMGNjNGU5ZmMyZTllYWI=
+    YmMwN2E5NmIyNWJlNTE3ZjEyMzM0MDI4MmU0NzFlMTM5MGQ5YjkzYWE3ZTk4
+    OGI2NDZjNTI0MzA1NjdlMjUxYTBiMTFkY2VmZTZmNWEwZjk1MWFiMjlmNDc3
+    ZmViMDVkNjFkMGU3ZGNmYTgwZjg2YzkxODI5YTE0NzE4NzMxMGI=

data/README.md

@@ -83,7 +83,7 @@ gem install cassandra-driver
 Install via Gemfile
 
 ```ruby
-gem 'cassandra-driver', '~> 1.0.0'
+gem 'cassandra-driver'
 ```
 
 __Note__: if you want to use compression you should also install [snappy](http://rubygems.org/gems/snappy) or [lz4-ruby](http://rubygems.org/gems/lz4-ruby). [Read more about compression.](http://datastax.github.io/ruby-driver/features/#compression)
@@ -93,7 +93,7 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/master/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
 
-## What's new in v1.1.0
+## What's new in v1.1.1
 
 Current release introduces the following new features:
 

data/lib/cassandra/cluster/client.rb

@@ -213,6 +213,8 @@ module Cassandra
       end
 
       def batch(statement, options)
+        return @futures.error(Errors::ClientError.new("Batch statements are not supported by the current version of Apache Cassandra")) if @connection_options.protocol_version < 2
+
         timeout  = options.timeout
         keyspace = @keyspace
         plan     = @load_balancing_policy.plan(keyspace, statement, options)

data/lib/cassandra/cluster/schema.rb

@@ -225,7 +225,7 @@ module Cassandra
           max_index = nil
 
           columns.each do |cl|
-            if cl['type'].upcase == 'CLUSTERING_KEY'
+            if cl['type'].to_s.upcase == 'CLUSTERING_KEY'
               index = cl['component_index'] || 0
 
               if max_index.nil? || index > max_index
@@ -284,7 +284,7 @@ module Cassandra
             next if row['column_name'].empty?
 
             column = create_column(row)
-            type   = row['type']
+            type   = row['type'].to_s
             index  = row['component_index'] || 0
 
             case type.upcase
@@ -321,7 +321,7 @@ module Cassandra
 
         if column['index_type'].nil?
           index   = nil
-        elsif column['index_type'].upcase == 'CUSTOM' || !column['index_options']
+        elsif column['index_type'].to_s.upcase == 'CUSTOM' || !column['index_options']
           index   = Column::Index.new(column['index_name'])
         else
           options = ::JSON.load(column['index_options'])

data/lib/cassandra/future.rb

@@ -201,6 +201,7 @@ module Cassandra
             end
           end
         end
+        promise.future
       end
     end
 
@@ -233,6 +234,11 @@ module Cassandra
       @@factory.all(*futures)
     end
 
+    # Returns a new promise instance
+    def self.promise
+      @@factory.promise
+    end
+
     # @private
     def initialize(signal)
       @signal = signal

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Theo Hultberg