cassandra-driver 1.0.0.rc.1 → 1.0.0

data/lib/cassandra/future.rb

@@ -48,6 +48,8 @@ module Cassandra
       def initialize(error)
         raise ::ArgumentError, "error must be an exception, #{error.inspect} given" unless error.is_a?(::Exception)
 
+        error.set_backtrace(caller) unless error.backtrace
+
         @error = error
       end
 
@@ -471,6 +473,8 @@ module Cassandra
           raise ::ArgumentError, "error must be an exception, #{error.inspect} given"
         end
 
+        error.set_backtrace(caller) unless error.backtrace
+
         return unless @state == :pending
 
         listeners = nil

data/lib/cassandra/keyspace.rb

@@ -106,6 +106,11 @@ module Cassandra
     end
     alias :== :eql?
 
+    # @return [String] a CLI-friendly keyspace representation
+    def inspect
+      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @name=#{@name}>"
+    end
+
     # @private
     def update_table(table)
       tables = @tables.dup

data/lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb

@@ -60,8 +60,13 @@ module Cassandra
           datacenter              = datacenter && String(datacenter)
           max_remote_hosts_to_use = max_remote_hosts_to_use && Integer(max_remote_hosts_to_use)
 
-          raise ::ArgumentError, "datacenter cannot be empty" if datacenter && datacenter.empty?
-          raise ::ArgumentError, "max_remote_hosts_to_use must be nil or >= 0" if max_remote_hosts_to_use && max_remote_hosts_to_use < 0
+          unless datacenter.nil?
+            Util.assert_not_empty(datacenter) { "datacenter cannot be empty" }
+          end
+
+          unless max_remote_hosts_to_use.nil?
+            Util.assert(max_remote_hosts_to_use >= 0) { "max_remote_hosts_to_use must be nil or >= 0" }
+          end
 
           @datacenter = datacenter
           @max_remote = max_remote_hosts_to_use

data/lib/cassandra/load_balancing/policies/token_aware.rb

@@ -92,9 +92,7 @@ module Cassandra
         def initialize(wrapped_policy)
           methods = [:host_up, :host_down, :host_found, :host_lost, :distance, :plan]
 
-          unless methods.all? {|method| wrapped_policy.respond_to?(method)}
-            raise ::ArgumentError, "supplied policy must be a Cassandra::LoadBalancing::Policy, #{wrapped_policy.inspect} given"
-          end
+          Util.assert_responds_to_all(methods, wrapped_policy) { "supplied policy must respond to #{methods.inspect}, but doesn't" }
 
           @policy = wrapped_policy
         end

data/lib/cassandra/load_balancing/policies/white_list.rb

@@ -35,12 +35,9 @@ module Cassandra
         # @param wrapped_policy [Cassandra::LoadBalancing::Policy] actual policy to filter
         # @raise [ArgumentError] if arguments are of unexpected types
         def initialize(ips, wrapped_policy)
-          raise ::ArgumentError, "ips must be enumerable" unless ips.respond_to?(:each)
+          Util.assert_instance_of(::Enumerable, ips) { "ips must be an Enumerable, #{ips.inspect} given" }
           methods = [:host_up, :host_down, :host_found, :host_lost, :distance, :plan]
-
-          unless methods.all? {|method| wrapped_policy.respond_to?(method)}
-            raise ::ArgumentError, "supplied policy must be a Cassandra::LoadBalancing::Policy, #{wrapped_policy.inspect} given"
-          end
+          Util.assert_responds_to_all(methods, wrapped_policy) { "supplied policy must respond to #{methods.inspect}, but doesn't" }
 
           @ips    = ::Set.new
           @policy = wrapped_policy
@@ -52,7 +49,7 @@ module Cassandra
             when ::String
               @ips << ::IPAddr.new(ip)
             else
-              raise ::ArgumentError, "ips must contain only instance of String or IPAddr, #{ip.inspect} given"
+              raise ::ArgumentError, "each ip must be a String or IPAddr, #{ip.inspect} given"
             end
           end
         end

data/lib/cassandra/null_logger.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+#--
+# Copyright 2013-2014 DataStax, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#++
+
+module Cassandra
+  # @private
+  class NullLogger
+    def close(*); end
+    def debug(*); end
+    def debug?; false end
+    def error(*); end
+    def error?; false end
+    def fatal(*); end
+    def fatal?; false end
+    def info(*); end
+    def info?; false end
+    def unknown(*); end
+    def warn(*); end
+    def warn?; false end
+  end
+end

data/lib/cassandra/protocol/cql_protocol_handler.rb

@@ -344,6 +344,8 @@ module Cassandra
       end
 
       def schedule_heartbeat
+        return unless @heartbeat_interval
+
         timer = nil
 
         @lock.synchronize do
@@ -360,6 +362,8 @@ module Cassandra
       end
 
       def reschedule_termination
+        return unless @idle_timeout
+
         timer = nil
 
         @lock.synchronize do

data/lib/cassandra/protocol/requests/query_request.rb

@@ -39,11 +39,7 @@ module Cassandra
       end
 
       def write(protocol_version, buffer)
-        if protocol_version > 1
-          buffer.append_long_string(@cql)
-        else
-          buffer.append_long_string(serialized_cql)
-        end
+        buffer.append_long_string(@cql)
         buffer.append_consistency(@consistency)
         if protocol_version > 1
           flags  = 0
@@ -108,12 +104,6 @@ module Cassandra
 
       private
 
-      def serialized_cql
-        return @cql if @values.nil? || @values.empty?
-        i = -1
-        @cql.gsub('?') { Util.encode(@values[i += 1]) }
-      end
-
       def self.guess_type(value)
         type = TYPE_GUESSES[value.class]
         if type == :map

data/lib/cassandra/result.rb

@@ -180,10 +180,9 @@ module Cassandra
       # Returns true when there are no more pages to load.
       #
       # This is only relevant when you have requested paging of the results with
-      # the `:page_size` option to {Cassandra::Client::Client#execute} or
-      # {Cassandra::Client::PreparedStatement#execute}.
+      # the `:page_size` option to {Cassandra::Session#execute}.
       #
-      # @see Cassandra::Client::Client#execute
+      # @see Cassandra::Session#execute
       def last_page?
         true
       end
@@ -191,10 +190,9 @@ module Cassandra
       # Returns the next page or nil when there is no next page.
       #
       # This is only relevant when you have requested paging of the results with
-      # the `:page_size` option to {Cassandra::Client::Client#execute} or
-      # {Cassandra::Client::PreparedStatement#execute}.
+      # the `:page_size` option to {Cassandra::Session#execute_async}.
       #
-      # @see Cassandra::Client::Client#execute
+      # @see Cassandra::Session#execute_async
       def next_page_async(options = nil)
         @futures.value(nil)
       end

data/lib/cassandra/session.rb

@@ -61,6 +61,9 @@ module Cassandra
     #   Therefore, make sure to pass empty `options` when executing a statement
     #   with the last parameter required to be a map datatype.
     #
+    # @note Positional arguments are only supported on Apache Cassandra 2.0 and
+    #   above.
+    #
     # @return [Cassandra::Future<Cassandra::Result>]
     #
     # @see Cassandra::Session#execute A list of errors this future can be

data/lib/cassandra/statements/prepared.rb

@@ -50,7 +50,11 @@ module Cassandra
       #   original cql passed to {Cassandra::Session#prepare}
       # @return [Cassandra::Statements::Bound] bound statement
       def bind(*args)
-        raise ::ArgumentError, "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" if args.size != @params_metadata.size
+        Util.assert_equal(@params_metadata.size, args.size) { "expecting exactly #{@params_metadata.size} bind parameters, #{args.size} given" }
+
+        @params_metadata.each_with_index do |metadata, i|
+          Util.assert_type(metadata[3], args[i]) { "argument for #{metadata[2].inspect} must be #{metadata[3].inspect}, #{args[i]} given" }
+        end
 
         return Bound.new(@cql, @params_metadata, @result_metadata, args) if @params_metadata.empty?
 

data/lib/cassandra/table.rb

@@ -231,6 +231,11 @@ module Cassandra
       cql << ';'
     end
 
+    # @return [String] a CLI-friendly table representation
+    def inspect
+      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @keyspace=#{@keyspace} @name=#{@name}>"
+    end
+
     # @return [Boolean] whether this table is equal to the other
     def eql?(other)
       other.is_a?(Table) &&

data/lib/cassandra/util.rb

@@ -137,6 +137,136 @@ module Cassandra
       DBL_QUOT + name + DBL_QUOT
     end
 
+    def assert_type(type, value, message = nil, &block)
+      return if value.nil?
+
+      case type
+      when ::Array
+        case type.first
+        when :list
+          assert_instance_of(::Array, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :set
+          assert_instance_of(::Set, value, message, &block)
+          value.each do |v|
+            assert_type(type[1], v)
+          end
+        when :map
+          assert_instance_of(::Hash, value, message, &block)
+          value.each do |k, v|
+            assert_type(type[1], k)
+            assert_type(type[2], v)
+          end
+        else
+          raise ::RuntimeError, "unsupported complex type #{type.inspect}"
+        end
+      else
+        case type
+        when :ascii then assert_instance_of(::String, value, message, &block)
+        when :bigint then assert_instance_of(::Numeric, value, message, &block)
+        when :blob then assert_instance_of(::String, value, message, &block)
+        when :boolean then assert_instance_of_one_of([::TrueClass, ::FalseClass], value, message, &block)
+        when :counter then assert_instance_of(::Numeric, value, message, &block)
+        when :decimal then assert_instance_of(::BigDecimal, value, message, &block)
+        when :double then assert_instance_of(::Float, value, message, &block)
+        when :float then assert_instance_of(::Float, value, message, &block)
+        when :inet then assert_instance_of(::IPAddr, value, message, &block)
+        when :int then assert_instance_of(::Numeric, value, message, &block)
+        when :text then assert_instance_of(::String, value, message, &block)
+        when :varchar then assert_instance_of(::String, value, message, &block)
+        when :timestamp then assert_instance_of(::Time, value, message, &block)
+        when :timeuuid then assert_instance_of(TimeUuid, value, message, &block)
+        when :uuid then assert_instance_of(Uuid, value, message, &block)
+        when :varint then assert_instance_of(::Numeric, value, message, &block)
+        else
+          raise ::RuntimeError, "unsupported type #{type.inspect}"
+        end
+      end
+    end
+
+    def assert_instance_of(kind, value, message = nil, &block)
+      unless value.is_a?(kind)
+        message   = yield if block_given?
+        message ||= "value must be an instance of #{kind}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    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"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    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"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    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"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_not_empty(value, message = nil, &block)
+      if value.empty?
+        message   = yield if block_given?
+        message ||= "value cannot be empty"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_file_exists(path, message = nil, &block)
+      unless ::File.exists?(path)
+        message   = yield if block_given?
+        message ||= "expected file at #{path.inspect} to exist, but it doesn't"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_one_of(range, value, message = nil, &block)
+      unless range.include?(value)
+        message   = yield if block_given?
+        message ||= "value must be included in #{value.inspect}, #{value.inspect} given"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert(condition, message = nil, &block)
+      unless condition
+        message   = yield if block_given?
+        message ||= "assertion failed"
+
+        raise ::ArgumentError, message
+      end
+    end
+
+    def assert_equal(expected, actual, message = nil, &block)
+      unless expected == actual
+        message   = yield if block_given?
+        message ||= "expected #{actual.inspect} to equal #{expected.inspect}"
+
+        raise ::ArgumentError, message
+      end
+    end
+
     # @private
     LOWERCASE_REGEXP = /[[:lower:]\_]*/
     # @private

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '1.0.0.rc.1'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre9
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0.pre9
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -75,24 +75,12 @@ files:
 - lib/cassandra/auth.rb
 - lib/cassandra/auth/providers.rb
 - lib/cassandra/auth/providers/password.rb
-- lib/cassandra/client.rb
-- lib/cassandra/client/batch.rb
-- lib/cassandra/client/client.rb
-- lib/cassandra/client/column_metadata.rb
-- lib/cassandra/client/connection_manager.rb
-- lib/cassandra/client/connector.rb
-- lib/cassandra/client/execute_options_decoder.rb
-- lib/cassandra/client/null_logger.rb
-- lib/cassandra/client/peer_discovery.rb
-- lib/cassandra/client/prepared_statement.rb
-- lib/cassandra/client/query_result.rb
-- lib/cassandra/client/request_runner.rb
-- lib/cassandra/client/result_metadata.rb
-- lib/cassandra/client/void_result.rb
 - lib/cassandra/cluster.rb
 - lib/cassandra/cluster/client.rb
+- lib/cassandra/cluster/connection_pool.rb
 - lib/cassandra/cluster/connector.rb
 - lib/cassandra/cluster/control_connection.rb
+- lib/cassandra/cluster/failed_connection.rb
 - lib/cassandra/cluster/metadata.rb
 - lib/cassandra/cluster/options.rb
 - lib/cassandra/cluster/registry.rb
@@ -125,6 +113,7 @@ files:
 - lib/cassandra/load_balancing/policies/round_robin.rb
 - lib/cassandra/load_balancing/policies/token_aware.rb
 - lib/cassandra/load_balancing/policies/white_list.rb
+- lib/cassandra/null_logger.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/protocol/cql_byte_buffer.rb
 - lib/cassandra/protocol/cql_protocol_handler.rb
@@ -205,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.2