cassandra-driver 3.0.0.rc.2-java → 3.0.2-java

data/lib/cassandra/tuple.rb

@@ -55,7 +55,7 @@ module Cassandra
       end
 
       def inspect
-        "#<Cassandra::Tuple:0x#{object_id.to_s(16)} #{self}>"
+        "#<Cassandra::Tuple:0x#{object_id.to_s(16)} types=#{@types.inspect}, []=#{@values.inspect}>"
       end
     end
 
@@ -114,7 +114,7 @@ module Cassandra
 
     # @private
     def inspect
-      "#<Cassandra::Tuple:0x#{object_id.to_s(16)} #{self}>"
+      "#<Cassandra::Tuple:0x#{object_id.to_s(16)} []=#{@values.inspect}>"
     end
 
     # @private

data/lib/cassandra/types.rb

@@ -1389,8 +1389,8 @@ module Cassandra
       # @raise [ArgumentError] if the value is invalid
       # @return [void]
       def assert(value, message = nil, &block)
-        raise ::NotImplementedError,
-              "unable to assert a value for custom type: #{@name.inspect}"
+        Util.assert_instance_of(CustomData, value, message, &block)
+        Util.assert_equal(self, value.class.type, message, &block)
       end
 
       # @return [String] a cassandra representation of this type

data/lib/cassandra/util.rb

@@ -162,8 +162,13 @@ module Cassandra
     end
 
     def escape_name(name)
-      return name if name[LOWERCASE_REGEXP] == name
-      DBL_QUOT + name + DBL_QUOT
+      # If name only contains lower-case chars and it's not a reserved word, return it
+      # as-is. Otherwise, quote.
+      return name if name[LOWERCASE_REGEXP] == name && !RESERVED_WORDS.include?(name)
+
+      # Replace double-quotes within name with two double-quotes (if any) and surround the whole
+      # thing with double-quotes
+      DBL_QUOT + name.gsub('"', '""') + DBL_QUOT
     end
 
     def guess_type(object)
@@ -191,6 +196,7 @@ module Cassandra
         Types.udt(object.keyspace, object.name, object.types)
       when UDT
         Types.udt('unknown', 'unknown', object.map {|k, v| [k, guess_type(v)]})
+      when Cassandra::CustomData then object.class.type
       else
         raise ::ArgumentError,
               "Unable to guess the type of the argument: #{object.inspect}"
@@ -327,5 +333,133 @@ module Cassandra
     PRN_OPN = '('.freeze
     # @private
     PRN_CLS = ')'.freeze
+    RESERVED_WORDS = Set.new(%w(
+                               add
+                               aggregate
+                               all
+                               allow
+                               alter
+                               and
+                               apply
+                               as
+                               asc
+                               ascii
+                               authorize
+                               batch
+                               begin
+                               bigint
+                               blob
+                               boolean
+                               by
+                               called
+                               clustering
+                               columnfamily
+                               compact
+                               contains
+                               count
+                               counter
+                               create
+                               custom
+                               date
+                               decimal
+                               delete
+                               desc
+                               describe
+                               distinct
+                               double
+                               drop
+                               entries
+                               execute
+                               exists
+                               filtering
+                               finalfunc
+                               float
+                               from
+                               frozen
+                               full
+                               function
+                               functions
+                               grant
+                               if
+                               in
+                               index
+                               inet
+                               infinity
+                               initcond
+                               input
+                               insert
+                               int
+                               into
+                               is
+                               json
+                               key
+                               keys
+                               keyspace
+                               keyspaces
+                               language
+                               limit
+                               list
+                               login
+                               map
+                               materialized
+                               modify
+                               nan
+                               nologin
+                               norecursive
+                               nosuperuser
+                               not
+                               null
+                               of
+                               on
+                               options
+                               or
+                               order
+                               password
+                               permission
+                               permissions
+                               primary
+                               rename
+                               replace
+                               returns
+                               revoke
+                               role
+                               roles
+                               schema
+                               select
+                               set
+                               sfunc
+                               smallint
+                               static
+                               storage
+                               stype
+                               superuser
+                               table
+                               text
+                               time
+                               timestamp
+                               timeuuid
+                               tinyint
+                               to
+                               token
+                               trigger
+                               truncate
+                               ttl
+                               tuple
+                               type
+                               unlogged
+                               update
+                               use
+                               user
+                               users
+                               using
+                               uuid
+                               values
+                               varchar
+                               varint
+                               view
+                               where
+                               with
+                               writetime
+                             )).freeze
   end
 end

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.0.0.rc.2'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.2
 platform: java
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - lib/cassandra/compression.rb
 - lib/cassandra/compression/compressors/lz4.rb
 - lib/cassandra/compression/compressors/snappy.rb
+- lib/cassandra/custom_data.rb
 - lib/cassandra/driver.rb
 - lib/cassandra/errors.rb
 - lib/cassandra/execution/info.rb
@@ -190,6 +191,9 @@ files:
 - lib/cassandra/table.rb
 - lib/cassandra/time.rb
 - lib/cassandra/time_uuid.rb
+- lib/cassandra/timestamp_generator.rb
+- lib/cassandra/timestamp_generator/simple.rb
+- lib/cassandra/timestamp_generator/ticking_on_duplicate.rb
 - lib/cassandra/tuple.rb
 - lib/cassandra/types.rb
 - lib/cassandra/udt.rb
@@ -219,9 +223,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.8