RUBY-162 - cluster.inspect should return more useful info

integration/session_test.rb

@@ -637,11 +637,11 @@ def test_raise_error_on_future_resolution_timeout
       @@ccm_cluster.block_node("node1")
 
       future = session.execute_async("SELECT * FROM users")
-      start_time = Time.now.to_i
+      start_time = Time.now
       assert_raises(Cassandra::Errors::TimeoutError) do
         future.get(2)
       end
-      assert_equal 2, Time.now.to_i - start_time
+      assert_in_delta(2, Time.now - start_time, 0.5)
     ensure
       @@ccm_cluster.unblock_nodes
       cluster && cluster.close

lib/cassandra/cluster.rb

@@ -280,6 +280,11 @@ def close
     def inspect
       "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
       "name=#{name.inspect}, " \
+      "port=#{@connection_options.port}, " \
+      "protocol_version=#{@connection_options.protocol_version}, " \
+      "load_balancing_policy=#{@load_balancing_policy.inspect}, " \
+      "consistency=#{@execution_options.consistency.inspect}, " \
+      "timeout=#{@execution_options.timeout.inspect}, " \
       "hosts=#{hosts.inspect}, " \
       "keyspaces=#{keyspaces.inspect}>"
     end

lib/cassandra/cluster/metadata.rb

@@ -61,7 +61,7 @@ def find_replicas(keyspace, statement)
       end
 
       def update(data)
-        @name        = data['name']
+        @name        = data['cluster_name']
         @partitioner = @partitioners[data['partitioner']]
 
         self

lib/cassandra/load_balancing/policies/dc_aware_round_robin.rb

@@ -155,6 +155,17 @@ def plan(keyspace, statement, options)
 
           Plan.new(local, remote, position)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "datacenter=#{@datacenter.inspect}, " \
+          "use_remote=#{@use_remote.inspect}, " \
+          "max_remote=#{@max_remote.inspect}, " \
+          "local=#{@local.inspect}, " \
+          "remote=#{@remote.inspect}, " \
+          "position=#{@position.inspect}>"
+        end
       end
     end
   end

lib/cassandra/load_balancing/policies/round_robin.rb

@@ -128,6 +128,13 @@ def plan(keyspace, statement, options)
 
           Plan.new(hosts, position)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "hosts=#{@hosts.inspect}, " \
+          "position=#{@position.inspect}>"
+        end
       end
     end
   end

lib/cassandra/load_balancing/policies/token_aware.rb

@@ -136,6 +136,13 @@ def plan(keyspace, statement, options)
 
           Plan.new(replicas, @policy, keyspace, statement, options)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "policy=#{@policy.inspect}, " \
+          "shuffle=#{@shuffle.inspect}>"
+        end
       end
     end
   end

lib/cassandra/load_balancing/policies/white_list.rb

@@ -87,6 +87,13 @@ def host_up(host)
         def host_down(host)
           @policy.host_down(host) if @ips.include?(host.ip)
         end
+
+        # @private
+        def inspect
+          "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "policy=#{@policy.inspect}, " \
+          "ips=#{@ips.inspect}>"
+        end
       end
     end
   end