cassandra-driver 3.0.0.beta.1 → 3.0.0.rc.1

data/lib/cassandra/udt.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ module Cassandra
         assign = !field.chomp!('=').nil?
 
         return super if assign && args.empty?
-        return super unless @name_to_type.has_key?(field)
+        return super unless @name_to_type.key?(field)
 
         if assign
           value = args.first
@@ -58,7 +58,7 @@ module Cassandra
         field = method.to_s
         field.chomp!('=')
 
-        return true if @name_to_type.has_key?(field)
+        return true if @name_to_type.key?(field)
         super
       end
 
@@ -94,15 +94,15 @@ module Cassandra
         when ::Integer
           if field < 0 || field >= @fields.size
             raise ::IndexError,
-              "field index #{field} is not present in UDT: " \
-              "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}" 
+                  "field index #{field} is not present in UDT: " \
+                  "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}"
           end
           @values[@fields[field][0]]
         when ::String
-          unless @name_to_type.has_key?(field)
+          unless @name_to_type.key?(field)
             raise ::KeyError,
-              "field #{field} is not defined in UDT: " \
-              "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}" 
+                  "field #{field} is not defined in UDT: " \
+                  "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}"
           end
           @values[field]
         else
@@ -127,16 +127,16 @@ module Cassandra
         when ::Integer
           if field < 0 || field >= @fields.size
             raise ::IndexError,
-              "field index #{field} is not present in UDT: " \
-              "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}" 
+                  "field index #{field} is not present in UDT: " \
+                  "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}"
           end
           Util.assert_type(@fields[field][1], value)
           @values[@fields[field][0]] = value
         when ::String
-          unless @name_to_type.has_key?(field)
+          unless @name_to_type.key?(field)
             raise ::KeyError,
-              "field #{field} is not defined in UDT: " \
-              "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}" 
+                  "field #{field} is not defined in UDT: " \
+                  "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)}"
           end
           Util.assert_type(@name_to_type[field], value)
           @values[field] = value
@@ -165,14 +165,14 @@ module Cassandra
       end
 
       def inspect
-        "#<Cassandra::UDT:0x#{self.object_id.to_s(16)} #{to_s}>"
+        "#<Cassandra::UDT:0x#{object_id.to_s(16)} #{self}>"
       end
 
       def eql?(other)
         (other.is_a?(Strict) && @values.all? {|n, v| v == other[n]}) ||
-        (other.is_a?(UDT) && other == self)
+          (other.is_a?(UDT) && other == self)
       end
-      alias :== :eql?
+      alias == eql?
     end
 
     include Enumerable
@@ -200,24 +200,24 @@ module Cassandra
       values = Array(values.first) if values.one?
 
       Util.assert_not_empty(values,
-        "user-defined type must contain at least one value"
-      )
+                            'user-defined type must contain at least one value'
+                           )
 
       if values.first.is_a?(::Array)
         @values = values.map do |pair|
           Util.assert(pair.size == 2,
-            "values of a user-defined type must be an Array of name and " \
-            "value pairs, #{pair.inspect} given"
-          )
+                      'values of a user-defined type must be an Array of name and ' \
+                      "value pairs, #{pair.inspect} given"
+                     )
           name, value = pair
 
           [String(name), value]
         end
       else
-        Util.assert((values.size % 2) == 0,
-          "values of a user-defined type must be an Array of alternating " \
-          "names and values pairs, #{values.inspect} given"
-        )
+        Util.assert(values.size.even?,
+                    'values of a user-defined type must be an Array of alternating ' \
+                    "names and values pairs, #{values.inspect} given"
+                   )
         @values = values.each_slice(2).map do |(name, value)|
           [String(name), value]
         end
@@ -321,9 +321,7 @@ module Cassandra
       when ::String
         index = @values.index {|(n, _)| field == n}
 
-        unless index
-          raise ::KeyError, "Unsupported field #{field.inspect}"
-        end
+        raise ::KeyError, "Unsupported field #{field.inspect}" unless index
 
         @values[index][1]
       else
@@ -348,7 +346,7 @@ module Cassandra
       true
     end
 
-    alias :include? :has_field?
+    alias include? has_field?
 
     # Sets value of the field.
     #
@@ -371,9 +369,7 @@ module Cassandra
       when ::String
         index = @values.index {|(n, _)| field == n}
 
-        unless index
-          raise ::KeyError, "Unsupported field #{field.inspect}"
-        end
+        raise ::KeyError, "Unsupported field #{field.inspect}" unless index
 
         @values[index][1] = value
       else
@@ -410,21 +406,21 @@ module Cassandra
 
     # @private
     def inspect
-      "#<Cassandra::UDT:0x#{self.object_id.to_s(16)} #{to_s}>"
+      "#<Cassandra::UDT:0x#{object_id.to_s(16)} #{self}>"
     end
 
     # @private
     def eql?(other)
       other.is_a?(UDT) && @values.all? {|(n, v)| v == other[n]}
     end
-    alias :== :eql?
+    alias == eql?
 
     # @private
     def hash
       @values.inject(17) do |h, (n, v)|
         h = 31 * h + n.hash
-        h = 31 * h + v.hash
+        31 * h + v.hash
       end
     end
   end
-end
+end

data/lib/cassandra/util.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 
 module Cassandra
   # @private
-  module Util extend self
+  module Util
+    module_function
+
     def encode_hash(hash, io = StringIO.new)
       first = true
 
@@ -111,7 +113,7 @@ module Cassandra
 
       io.string
     end
-    alias :encode :encode_object
+    alias encode encode_object
 
     def encode_time(time, io = StringIO.new)
       encode_string(time.to_s, io)
@@ -190,7 +192,8 @@ module Cassandra
       when UDT
         Types.udt('unknown', 'unknown', object.map {|k, v| [k, guess_type(v)]})
       else
-        raise ::ArgumentError, "Unable to guess the type of the argument: #{object.inspect}"
+        raise ::ArgumentError,
+              "Unable to guess the type of the argument: #{object.inspect}"
       end
     end
 
@@ -212,7 +215,8 @@ module Cassandra
     def assert_instance_of_one_of(kinds, value, message = nil, &block)
       unless kinds.any? {|kind| value.is_a?(kind)}
         message   = yield if block_given?
-        message ||= "value must be an instance of one of #{kinds.inspect}, #{value.inspect} given"
+        message ||= "value must be an instance of one of #{kinds.inspect}, " \
+            "#{value.inspect} given"
 
         raise ::ArgumentError, message
       end
@@ -221,7 +225,8 @@ module Cassandra
     def assert_responds_to(method, value, message = nil, &block)
       unless value.respond_to?(method)
         message   = yield if block_given?
-        message ||= "value #{value.inspect} must respond to #{method.inspect}, but doesn't"
+        message ||= "value #{value.inspect} must respond to #{method.inspect}, " \
+            "but doesn't"
 
         raise ::ArgumentError, message
       end
@@ -230,7 +235,8 @@ module Cassandra
     def assert_responds_to_all(methods, value, message = nil, &block)
       unless methods.all? {|method| value.respond_to?(method)}
         message   = yield if block_given?
-        message ||= "value #{value.inspect} must respond to all methods #{methods.inspect}, but doesn't"
+        message ||= "value #{value.inspect} must respond to all methods " \
+            "#{methods.inspect}, but doesn't"
 
         raise ::ArgumentError, message
       end
@@ -239,14 +245,14 @@ module Cassandra
     def assert_not_empty(value, message = nil, &block)
       if value.empty?
         message   = yield if block_given?
-        message ||= "value cannot be empty"
+        message ||= 'value cannot be empty'
 
         raise ::ArgumentError, message
       end
     end
 
     def assert_file_exists(path, message = nil, &block)
-      unless ::File.exists?(path)
+      unless ::File.exist?(path)
         message   = yield if block_given?
         message ||= "expected file at #{path.inspect} to exist, but it doesn't"
 
@@ -266,7 +272,8 @@ module Cassandra
     def assert_size(size, value, message = nil, &block)
       unless value.size == size
         message   = yield if block_given?
-        message ||= "value #{value.inspect} must have size equal to #{size.inspect}, but doesn't"
+        message ||= "value #{value.inspect} must have size equal to " \
+            "#{size.inspect}, but doesn't"
 
         raise ::ArgumentError, message
       end
@@ -275,7 +282,7 @@ module Cassandra
     def assert(condition, message = nil, &block)
       unless condition
         message   = yield if block_given?
-        message ||= "assertion failed"
+        message ||= 'assertion failed'
 
         raise ::ArgumentError, message
       end
@@ -311,11 +318,11 @@ module Cassandra
     # @private
     COLON = ': '.freeze
     # @private
-    QUOT = ?'.freeze
+    QUOT = "'".freeze
     # @private
     ESC_QUOT = "''".freeze
     # @private
-    DBL_QUOT = ?".freeze
+    DBL_QUOT = '"'.freeze
     # @private
     PRN_OPN = '('.freeze
     # @private

data/lib/cassandra/uuid.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,19 +25,20 @@ module Cassandra
   # If you want to generate UUIDs see {Cassandra::Uuid::Generator}.
   #
   class Uuid
-    # Creates a new UUID either from a string (expected to be on the standard 8-4-4-4-12 form, or just 32 characters without hyphens), or from a 128 bit number.
+    # Creates a new UUID either from a string (expected to be on the standard 8-4-4-4-12
+    # form, or just 32 characters without hyphens), or from a 128 bit number.
     #
     # @param uuid [String] a 32 char uuid
     #
     # @raise [ArgumentError] if the string does not conform to the expected format
     #
     def initialize(uuid)
-      case uuid
-      when String
-        @n = from_s(uuid)
-      else
-        @n = uuid
-      end
+      @n = case uuid
+           when String
+             from_s(uuid)
+           else
+             uuid
+           end
     end
 
     # Returns a string representation of this UUID in the standard 8-4-4-4-12 form.
@@ -48,7 +49,7 @@ module Cassandra
         s.insert(20, HYPHEN)
         s.insert(16, HYPHEN)
         s.insert(12, HYPHEN)
-        s.insert( 8, HYPHEN)
+        s.insert(8, HYPHEN)
         s
       end
     end
@@ -69,13 +70,13 @@ module Cassandra
     def value
       @n
     end
-    alias_method :to_i, :value
+    alias to_i value
 
     # @private
     def eql?(other)
-      other.respond_to?(:value) && self.value == other.value
+      other.respond_to?(:value) && value == other.value
     end
-    alias_method :==, :eql?
+    alias == eql?
 
     private
 
@@ -93,15 +94,21 @@ module Cassandra
       # @private
       def from_s(str)
         str = str.gsub(HYPHEN, EMPTY_STRING)
-        raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
-        raise ::ArgumentError, "invalid value for Integer(): \"#{str}\"" unless str =~ HEX_RE
+        unless str.length == 32
+          raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}"
+        end
+        unless str =~ HEX_RE
+          raise ::ArgumentError, "invalid value for Integer(): \"#{str}\""
+        end
         Integer(str, 16)
       end
     else
       # @private
       def from_s(str)
         str = str.gsub(HYPHEN, EMPTY_STRING)
-        raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
+        unless str.length == 32
+          raise ::ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}"
+        end
         Integer(str, 16)
       end
     end

data/lib/cassandra/uuid/generator.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,8 +44,10 @@ module Cassandra
       # @param [Object<#now>] clock used to generate timeuuid from current time
       #
       # @raise [ArgumentError] if clock doesn't respond to `now`
-      def initialize(node_id = (::SecureRandom.random_number(2**47) | 0x010000000000), clock_id = ::SecureRandom.random_number(65536), clock = ::Time)
-        raise ::ArgumentError, "invalid clock" unless clock.respond_to?(:now)
+      def initialize(node_id = (::SecureRandom.random_number(2**47) | 0x010000000000),
+                     clock_id = ::SecureRandom.random_number(65536),
+                     clock = ::Time)
+        raise ::ArgumentError, 'invalid clock' unless clock.respond_to?(:now)
 
         @node_id  = Integer(node_id)
         @clock_id = Integer(clock_id)
@@ -150,8 +152,8 @@ module Cassandra
       #
       # @see Time.at
       def at(*args)
-        raise ::ArgumentError, "not enough arguments" if args.empty?
-        raise ::ArgumentError, "too many arguments"   if args.size > 3
+        raise ::ArgumentError, 'not enough arguments' if args.empty?
+        raise ::ArgumentError, 'too many arguments'   if args.size > 3
 
         if args.first.is_a?(::Time)
           time   = args.shift

data/lib/cassandra/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.0.0.beta.1'.freeze
+  VERSION = '3.0.0.rc.1'.freeze
 end

data/lib/datastax/cassandra.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.rc.1
 platform: ruby
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -77,6 +77,7 @@ files:
 - lib/cassandra/auth.rb
 - lib/cassandra/auth/providers.rb
 - lib/cassandra/auth/providers/password.rb
+- lib/cassandra/cassandra_logger.rb
 - lib/cassandra/cluster.rb
 - lib/cassandra/cluster/client.rb
 - lib/cassandra/cluster/connection_pool.rb
@@ -109,6 +110,7 @@ files:
 - lib/cassandra/execution/trace.rb
 - lib/cassandra/executors.rb
 - lib/cassandra/function.rb
+- lib/cassandra/function_collection.rb
 - lib/cassandra/future.rb
 - lib/cassandra/host.rb
 - lib/cassandra/keyspace.rb
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Datastax Ruby Driver for Apache Cassandra