cequel 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e428934f7aef3a261e5ee1c06b940ea008fd17de
-  data.tar.gz: 49a65b153251cb761a8421c56268d5b9c83d6966
+  metadata.gz: 2ff9eed6cd9463e5896643152fd7314b4df3324e
+  data.tar.gz: 6e62173d98fa94f77d6022ca22501ae778e40139
 SHA512:
-  metadata.gz: 623e015fa5d288ca1302eafaec1ada9aa0224b23a28c854e6e69e3dd7dfaa6d5e32a768291ecb9d23d2b3eb4f80a272fe57ef045cb4651f5a69217a264cafb3e
-  data.tar.gz: 5ddbd20b44c69675be0025cea406961dad9a336b91853ae68b30914138e4b78c23baff03be79278a387b24d0a827e676485db78c045d5d5e9ffc40adcf902ed3
+  metadata.gz: 4ad422adb85827d83efa126565c8d43f4c1b34626a154e2f627fcdb7d04e0567d6635941cc88bfa622a3f79aeec875fd30da653ecbe9c71f0f9a45a1bc738c1b
+  data.tar.gz: 1d157437a9c7d435412a22206d8e2103b2b214c494acdd2719a3aae8d7ef5969dd674036b271f823bd026aa50b664afd99413afc5b4edb0bfd61cb2f249f773c

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.0.3
+
+* Add synchronization around use of @cluster and other variables Fix ([PR 333](https://github.com/cequel/cequel/pull/333))
+* expose if the dataset is on the last page ([PR 335](https://github.com/cequel/cequel/pull/335))
+* Delegate error handling to a policy object, allow for arbitrary options to be passed to cassandra driver gem ([PR 336](https://github.com/cequel/cequel/pull/336))
+* Fixes README.md ([PR 340](https://github.com/cequel/cequel/pull/340))
+* skip synchronizing materialized view ([PR 346](https://github.com/cequel/cequel/pull/346))
+* Fixed link to cassandra documentation ([PR 347](https://github.com/cequel/cequel/pull/347))
+
+
 ## 2.0.2
 
 * Fix intermittent failures around preparing statements ([PR 330](https://github.com/cequel/cequel/pull/330))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (2.0.2)
+    cequel (2.0.3)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 

data/README.md

@@ -231,7 +231,7 @@ multiple queries in your logs if you're iterating over a huge result set.
 CQL has [special handling for the `timeuuid`
 type](https://docs.datastax.com/en/cql/3.3/cql/cql_reference/uuid_type_r.html),
 which allows you to return a rows whose UUID keys correspond to a range of
-timestamps. 
+timestamps.
 
 Cequel automatically constructs timeuuid range queries if you pass a `Time`
 value for a range over a `timeuuid` column. So, if you want to get the posts
@@ -393,7 +393,7 @@ Both read and write consistency default to `QUORUM`.
 ### Compression ###
 
 Cassandra supports [frame compression](http://datastax.github.io/ruby-driver/features/#compression),
-which can give you a performance boost if your requests or responses are big. To enable it you can 
+which can give you a performance boost if your requests or responses are big. To enable it you can
 specify `client_compression` to use in cequel.yaml.
 
 ```yaml
@@ -539,14 +539,6 @@ essentially the same thing: both simply persist the given column data at the
 given key(s). So, you may think you are creating a new record, but in fact
 you're overwriting data at an existing record:
 
-#### Counting ####
-
-Counting is not the same as in a RDB, as it can have a much longer runtime and
-can put unexpected load on your cluster. As a result Cequel does not support
-this feature. It is still possible to execute raw cql to get the counts, should
-you require this functionality.
-`MyModel.connection.execute('select count(*) from table_name;').first['count']`
-
 ``` ruby
 # I'm just creating a blog here.
 blog1 = Blog.create!(
@@ -566,6 +558,14 @@ above code will just overwrite the `name` in that row.  Note that the
 `description` will not be touched by the second statement; upserts only work on
 the columns that are given.
 
+#### Counting ####
+
+Counting is not the same as in a RDB, as it can have a much longer runtime and
+can put unexpected load on your cluster. As a result Cequel does not support
+this feature. It is still possible to execute raw cql to get the counts, should
+you require this functionality.
+`MyModel.connection.execute('select count(*) from table_name;').first['count']`
+
 ## Compatibility ##
 
 ### Rails ###

data/lib/cequel.rb

@@ -8,6 +8,7 @@ require 'cassandra'
 
 require 'cequel/errors'
 require 'cequel/util'
+require 'cequel/metal/policy/cassandra_error'
 require 'cequel/metal'
 require 'cequel/schema'
 require 'cequel/type'

data/lib/cequel/metal/data_set.rb

@@ -579,10 +579,26 @@ module Cequel
         end
       end
 
+      #
+      # Exposes current paging state for stateless pagination
+      #
+      # @return [String] or nil
+      #
+      # @see http://docs.datastax.com/en/developer/ruby-driver/3.0/api/cassandra/result/#paging_state-instance_method
+      #
       def next_paging_state
         results.paging_state
       end
 
+      #
+      # @return [Boolean] Returns whether no more pages are available
+      #
+      # @see http://docs.datastax.com/en/developer/ruby-driver/3.0/api/cassandra/result/#last_page?-instance_method
+      #
+      def last_page?
+        results.last_page?
+      end
+
       # rubocop:enable LineLength
 
       #

data/lib/cequel/metal/keyspace.rb

@@ -21,10 +21,6 @@ module Cequel
       attr_reader :hosts
       # @return Integer port to connect to Cassandra nodes on
       attr_reader :port
-      # @return Integer maximum number of retries to reconnect to Cassandra
-      attr_reader :max_retries
-      # @return Float delay between retries to reconnect to Cassandra
-      attr_reader :retry_delay
       # @return [Symbol] the default consistency for queries in this keyspace
       # @since 1.1.0
       attr_writer :default_consistency
@@ -34,6 +30,10 @@ module Cequel
       attr_reader :ssl_config
       # @return [Symbol] The client compression option
       attr_reader :client_compression
+      # @return [Hash] A hash of additional options passed to Cassandra, if any
+      attr_reader :cassandra_options
+      # @return [Object] The error policy object in use by this keyspace 
+      attr_reader :error_policy
 
       #
       # @!method write(statement, *bind_vars)
@@ -52,7 +52,7 @@ module Cequel
       #   consistency. Will be included the current batch operation if one is
       #   present.
       #
-      #   @param (see #execute_with_consistency)
+      #   @param (see #execute_with_options)
       #   @return [void]
       #
       def_delegator :write_target, :execute_with_options,
@@ -94,8 +94,8 @@ module Cequel
       # @see Cequel.connect
       #
       def initialize(configuration={})
-        configure(configuration)
         @lock = Monitor.new
+        configure(configuration)
       end
 
       #
@@ -122,8 +122,12 @@ module Cequel
       #   certificate
       # @option configuration [String] :private_key path to ssl client private
       #   key
-      # @option configuartion [String] :passphrase the passphrase for client
+      # @option configuration [String] :passphrase the passphrase for client
       #   private key
+      # @option configuration [String] :cassandra_error_policy A mixin for 
+      #   handling errors from Cassandra
+      # @option configuration [Hash] :cassandra_options A hash of arbitrary
+      #   options to pass to Cassandra
       # @return [void]
       #
       def configure(configuration = {})
@@ -132,11 +136,11 @@ module Cequel
                "with Cassandra. The :thrift option is deprecated and ignored."
         end
         @configuration = configuration
-
+        
+        @error_policy = extract_cassandra_error_policy(configuration)
+        @cassandra_options = extract_cassandra_options(configuration)
         @hosts, @port = extract_hosts_and_port(configuration)
         @credentials  = extract_credentials(configuration)
-        @max_retries  = extract_max_retries(configuration)
-        @retry_delay  = extract_retry_delay(configuration)
         @ssl_config = extract_ssl_config(configuration)
 
         @name = configuration[:keyspace]
@@ -184,7 +188,7 @@ module Cequel
       # @param bind_vars [Object] values for bind variables
       # @return [Enumerable] the results of the query
       #
-      # @see #execute_with_consistency
+      # @see #execute_with_options
       #
       def execute(statement, *bind_vars)
         execute_with_options(Statement.new(statement, bind_vars), { consistency: default_consistency })
@@ -211,7 +215,7 @@ module Cequel
                         end
 
         log('CQL', statement) do
-          client_retry do
+          error_policy.execute_stmt(self) do
             client.execute(cql, options)
           end
         end
@@ -230,7 +234,7 @@ module Cequel
               else
                 statement
               end
-        client_retry do
+        error_policy.execute_stmt(self) do
           client.prepare(cql)
         end
       end
@@ -241,15 +245,17 @@ module Cequel
       # @return [void]
       #
       def clear_active_connections!
-        if defined? @client
-          remove_instance_variable(:@client)
-        end
-        if defined? @client_without_keyspace
-          remove_instance_variable(:@client_without_keyspace)
-        end
-        if defined? @cluster
-          @cluster.close
-          remove_instance_variable(:@cluster)
+        synchronize do
+          if defined? @client
+            remove_instance_variable(:@client)
+          end
+          if defined? @client_without_keyspace
+            remove_instance_variable(:@client_without_keyspace)
+          end
+          if defined? @cluster
+            @cluster.close
+            remove_instance_variable(:@cluster)
+          end
         end
       end
 
@@ -308,21 +314,6 @@ module Cequel
       def_delegator :lock, :synchronize
       private :lock
 
-      def client_retry
-        retries = max_retries
-        begin
-          yield
-        rescue Cassandra::Errors::NoHostsAvailable,
-               Cassandra::Errors::ExecutionError,
-               Cassandra::Errors::TimeoutError
-          clear_active_connections!
-          raise if retries == 0
-          retries -= 1
-          sleep(retry_delay)
-          retry
-        end
-      end
-
       def client_without_keyspace
         synchronize do
           @client_without_keyspace ||= cluster.connect
@@ -334,6 +325,7 @@ module Cequel
           options.merge!(credentials) if credentials
           options.merge!(ssl_config) if ssl_config
           options.merge!(compression: client_compression) if client_compression
+          options.merge!(cassandra_options) if cassandra_options
         end
       end
 
@@ -373,14 +365,6 @@ module Cequel
         configuration.slice(:username, :password).presence
       end
 
-      def extract_max_retries(configuration)
-        configuration.fetch(:max_retries, 3)
-      end
-
-      def extract_retry_delay(configuration)
-        configuration.fetch(:retry_delay, 0.5)
-      end
-
       def extract_ssl_config(configuration)
         ssl_config = {}
         ssl_config[:ssl] = configuration.fetch(:ssl, nil)
@@ -391,7 +375,24 @@ module Cequel
         ssl_config.each { |key, value| ssl_config.delete(key) unless value }
         ssl_config
       end
-
+      
+      def extract_cassandra_error_policy(configuration)
+        value = configuration.fetch(:cassandra_error_policy, ::Cequel::Metal::Policy::CassandraError::ClearAndRetryPolicy)
+        # Accept a class name as a string, create an instance of it 
+        if value.is_a?(String)
+          value.constantize.new(configuration)
+        # Accept a class, instantiate it
+        elsif value.is_a?(Class)
+          value.new(configuration)
+        # Accept a value, assume it is a ready to use policy object
+        else 
+          value
+        end
+      end
+      
+      def extract_cassandra_options(configuration)
+        configuration[:cassandra_options]
+      end
     end
   end
 end

data/lib/cequel/metal/policy/cassandra_error.rb

@@ -0,0 +1,75 @@
+# -*- encoding : utf-8 -*-
+module Cequel
+  module Metal
+    module Policy
+      module CassandraError
+        class ErrorPolicyBase                  
+          # This class is used by the Keyspace object to dictate 
+          # how a failure from Cassandra is handled.
+          # The only method defined is 
+          #   execute_stmt(keyspace)
+          # The first argument is an instance of the Keyspace class
+          # This method may raise an error to abort the operation,
+          # 
+          # The specific instance is chosen by passing configuration options
+          # See Keyspace#configure
+          
+          # On instantiation, the configuraiton hash passed to Cequel is 
+          # available here
+          def initialize(options = {})
+          end
+                    
+          def execute_stmt(keyspace)
+            raise NotImplementedError, "#execute_stmt must be implemented in #{self.class.name}"
+          end
+        end
+         
+        class ClearAndRetryPolicy < ErrorPolicyBase 
+          # @return Integer maximum number of retries to reconnect to Cassandra
+          attr_reader :max_retries
+          # @return Float delay between retries to reconnect to Cassandra
+          attr_reader :retry_delay
+          # @return Boolean if this policy clears connections before retry
+          attr_reader :clear_before_retry
+          def initialize(options = {})
+            @max_retries = options.fetch(:max_retries, 3)
+            @retry_delay = options.fetch(:retry_delay, 0.5)
+            @clear_before_retry = !!options.fetch(:clear_before_retry, true)
+            
+            if @retry_delay <= 0.0
+              raise ArgumentError, "The value for retry must be a positive number, not '#{@retry_delay}'"
+            end
+          end 
+          
+          def execute_stmt(keyspace)
+            retries_remaining = max_retries
+            begin
+              yield
+            rescue Cassandra::Errors::NoHostsAvailable,
+                  Cassandra::Errors::ExecutionError,
+                  Cassandra::Errors::TimeoutError => exc
+              raise error if retries_remaining == 0
+              sleep(retry_delay)
+              keyspace.clear_active_connections! if clear_before_retry
+              retries_remaining -= 1
+              retry                    
+            end
+          end 
+        end
+        
+        module RetryPolicy 
+          def self.new(options = {})
+            options[:clear_before_retry] = false 
+            ClearAndRetryPolicy.new(options)
+          end 
+        end
+        
+        class RaisePolicy < ErrorPolicyBase
+          def execute_stmt(keyspace)
+            yield
+          end           
+        end
+      end 
+    end
+  end 
+end 

data/lib/cequel/record/persistence.rb

@@ -173,7 +173,7 @@ module Cequel
       # @param options [Options] options for save
       # @option options [Boolean] :validate (true) whether to run validations
       #   before saving
-      # @option options [Symbol] :consistency (:quorum) what consistency with
+      # @option options [Symbol] :consistency what consistency with
       #   which to persist the changes
       # @option options [Integer] :ttl time-to-live of the updated rows in
       #   seconds
@@ -211,7 +211,7 @@ module Cequel
       # Remove this record from the database
       #
       # @param options [Options] options for deletion
-      # @option options [Symbol] :consistency (:quorum) what consistency with
+      # @option options [Symbol] :consistency what consistency with
       #   which to persist the deletion
       # @option options [Time] :timestamp the writetime to use for the deletion
       #

data/lib/cequel/record/record_set.rb

@@ -488,6 +488,10 @@ module Cequel
         data_set.next_paging_state
       end
 
+      def last_page?
+        data_set.last_page?
+      end
+
       #
       # @overload first
       #   @return [Record] the first record in this record set

data/lib/cequel/record/schema.rb

@@ -80,8 +80,21 @@ module Cequel
         # @return [void]
         #
         def synchronize_schema
+          reader = get_table_reader
+          return if reader.materialized_view?
           Cequel::Schema::TableSynchronizer
-            .apply(connection, read_schema, table_schema)
+            .apply(connection, reader.read, table_schema)
+        end
+
+        #
+        # Return a {TableReader} instance
+        #
+        # @return [Schema::TableReader] object
+        #
+        def get_table_reader
+          fail MissingTableNameError unless table_name
+
+          connection.schema.get_table_reader(table_name)
         end
 
         #
@@ -92,9 +105,7 @@ module Cequel
         #   table in the database
         #
         def read_schema
-          fail MissingTableNameError unless table_name
-
-          connection.schema.read_table(table_name)
+          table_reader.read
         end
 
         #

data/lib/cequel/schema/keyspace.rb

@@ -118,6 +118,14 @@ module Cequel
         TableReader.read(keyspace, name)
       end
 
+      #
+      # @param name [Symbol] name of the table to read
+      # @return [TableReader] object
+      #
+      def get_table_reader(name)
+        TableReader.get(keyspace, name)
+      end
+
       #
       # Create a table in the keyspace
       #
@@ -190,6 +198,16 @@ module Cequel
         keyspace.execute("DROP TABLE #{name}")
       end
 
+      #
+      # Drop this materialized view from the keyspace
+      #
+      # @param name [Symbol] name of the materialized view to drop
+      # @return [void]
+      #
+      def drop_materialized_view(name)
+        keyspace.execute("DROP MATERIALIZED VIEW #{name}")
+      end
+
       #
       # Create or update a table to match a given schema structure. The desired
       # schema structure is defined by the directives given in the block; this

data/lib/cequel/schema/table_reader.rb

@@ -29,6 +29,16 @@ module Cequel
         new(keyspace, table_name).read
       end
 
+      #
+      # Return a {TableReader} instance
+      #
+      # @param (see #initialize)
+      # @return [TableReader] object
+      #
+      def self.get(keyspace, table_name)
+        new(keyspace, table_name)
+      end
+
       #
       # @param keyspace [Metal::Keyspace] keyspace to read the table from
       # @param table_name [Symbol] name of the table to read
@@ -59,6 +69,18 @@ module Cequel
         end
       end
 
+      #
+      # Check if it is materialized view
+      #
+      # @return [boolean] true if it is materialized view
+      #
+      # @api private
+      #
+      def materialized_view?
+        cluster.keyspace(keyspace.name)
+          .has_materialized_view?(table_name.to_s)
+      end
+
       protected
 
       attr_reader :keyspace, :table_name, :table
@@ -150,18 +172,20 @@ module Cequel
       end
 
       def table_data
-        @table_data ||=
-          begin
-            cluster = keyspace.cluster
-            cluster.refresh_schema
+        @table_data ||= cluster.keyspace(keyspace.name)
+          .table(table_name.to_s)
+      end
 
-            fail(NoSuchKeyspaceError, "No such keyspace #{keyspace.name}") if
-              !cluster.has_keyspace?(keyspace.name)
+      def cluster
+        @cluster ||= begin
+          cluster = keyspace.cluster
+          cluster.refresh_schema
 
-            cluster
-              .keyspace(keyspace.name)
-              .table(table_name.to_s)
-          end
+          fail(NoSuchKeyspaceError, "No such keyspace #{keyspace.name}") if
+            !cluster.has_keyspace?(keyspace.name)
+
+          cluster
+        end
       end
     end
   end

data/lib/cequel/type.rb

@@ -195,7 +195,7 @@ module Cequel
     #
     # `ascii` columns store 7-bit ASCII character data
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Ascii < String
@@ -215,7 +215,7 @@ module Cequel
     # `blob` columns store arbitrary bytes of data, represented as 8-bit ASCII
     # strings of hex digits
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Blob < String
@@ -239,7 +239,7 @@ module Cequel
     #
     # `boolean` types store boolean values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Boolean < Base
@@ -256,7 +256,7 @@ module Cequel
     # counter columns cannot be updated without Cassandra internally reading
     # the existing state of the column
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Counter < Base
@@ -277,7 +277,7 @@ module Cequel
     #
     # `decimal` columns store decimal numeric values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Decimal < Base
@@ -290,7 +290,7 @@ module Cequel
     #
     # `double` columns store 64-bit floating-point numeric values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Double < Base
@@ -303,7 +303,7 @@ module Cequel
     #
     # `inet` columns store IP addresses
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Inet < Base
@@ -316,7 +316,7 @@ module Cequel
     #
     # `int` columns store 32-bit integer values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Int < Base
@@ -333,7 +333,7 @@ module Cequel
     #
     # `float` columns store 32-bit floating-point numeric values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Float < Double; end
@@ -342,7 +342,7 @@ module Cequel
     #
     # `bigint` columns store 64-bit integer values
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Bigint < Int
@@ -357,7 +357,7 @@ module Cequel
     # `varchar` columns; the names can be used interchangeably. Text columns do
     # not have a length limit
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Text < String
@@ -406,7 +406,7 @@ module Cequel
     # created using the {Cequel.uuid} method, and a value can be checked to see
     # if it is a UUID recognized by Cequel using the {Cequel.uuid?} method.
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Uuid < Base
@@ -435,7 +435,7 @@ module Cequel
     # functionality presumes the use of type 1 UUIDs, which encode the
     # timestamp of their creation.
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Timeuuid < Uuid
@@ -452,7 +452,7 @@ module Cequel
     #
     # `varint` columns store arbitrary-length integer data
     #
-    # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
+    # @see https://cassandra.apache.org/doc/latest/cql/types.html
     #   CQL3 data type documentation
     #
     class Varint < Int

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/spec/examples/metal/keyspace_spec.rb

@@ -115,6 +115,100 @@ describe Cequel::Metal::Keyspace do
       expect(connect.client_compression).to eq client_compression
     end
   end
+  
+  describe '#cassandra_options' do 
+    let(:cassandra_options) { {foo: :bar} }
+    let(:connect) do
+      Cequel.connect host: Cequel::SpecSupport::Helpers.host,
+          port: Cequel::SpecSupport::Helpers.port,
+          cassandra_options: cassandra_options
+    end
+    it 'passes the cassandra options as part of the client options' do 
+      expect(connect.send(:client_options)).to have_key(:foo)
+    end
+  end
+  
+  describe 'cassandra error handling' do
+    let(:connect_options) do 
+      {
+        host: Cequel::SpecSupport::Helpers.host,
+          port: Cequel::SpecSupport::Helpers.port
+      } 
+    end 
+    
+    let(:default_connect) do 
+      Cequel.connect(connect_options)
+    end 
+    
+    class SpecCassandraErrorHandler
+      def initialize(options = {})
+      end
+      
+      def execute_stmt(keyspace)
+        yield
+      end      
+    end
+    
+    it 'uses the error handler passed in as a string' do 
+      obj = Cequel.connect connect_options.merge(
+          cassandra_error_policy: 'SpecCassandraErrorHandler')
+          
+      expect(obj.error_policy.class).to equal(SpecCassandraErrorHandler)
+    end 
+    
+    it 'uses the error handler passed in as a module' do 
+      obj = Cequel.connect connect_options.merge(
+          cassandra_error_policy: SpecCassandraErrorHandler)
+          
+      expect(obj.error_policy.class).to equal(SpecCassandraErrorHandler)
+    end
+    
+    it 'uses the instance of an error handler passed in' do
+      policy = SpecCassandraErrorHandler.new 
+      
+      obj = Cequel.connect connect_options.merge(
+          cassandra_error_policy: policy)
+          
+      expect(obj.error_policy).to equal(policy)
+    end
+    
+    it 'responds to error policy' do
+      # Always defined, even if config does not specify it 
+      expect(default_connect).to respond_to(:error_policy)
+    end
+    
+    it 'calls execute_stmt on the error policy' do 
+      policy = ::Cequel::Metal::Policy::CassandraError::RetryPolicy.new 
+      
+      obj = Cequel.connect connect_options.merge(
+          cassandra_error_policy: policy)
+      expect(policy).to receive(:execute_stmt).at_least(:once)
+      obj.execute_with_options(Cequel::Metal::Statement.new('select * from system.peers;'))
+    end 
+    
+    it 'rejects a negative value for retry delay' do 
+      expect { Cequel.connect connect_options.merge(
+        retry_delay: -1.0)
+      }.to raise_error(ArgumentError)
+    end
+    
+    it 'accepts a configured value for retry delay' do
+      obj = Cequel.connect connect_options.merge(
+        retry_delay: 1337.0)
+      
+      # do not compare floats exactly, it is error prone
+      # the value is passed to the error policy
+      expect(obj.error_policy.retry_delay).to be_within(0.1).of(1337.0) 
+    end
+    
+    it 'can clear active connections' do       
+      expect {
+        default_connect.clear_active_connections!
+      }.to change {
+        default_connect.client
+      }
+    end   
+  end
 
   describe "#execute" do
     let(:statement) { "SELECT id FROM posts" }

data/spec/examples/schema/table_reader_spec.rb

@@ -396,4 +396,40 @@ describe Cequel::Schema::TableReader do
       [Cequel::Schema::DataColumn.new(:value, :text)]
     ) }
   end
+
+  describe 'materialized view exists', thrift: true do
+    let!(:name) { table_name }
+    let(:view_name) { "#{name}_view" }
+    before do
+      cequel.execute <<-CQL
+        CREATE TABLE #{table_name} (
+          blog_subdomain text,
+          permalink ascii,
+          PRIMARY KEY (blog_subdomain, permalink)
+        )
+      CQL
+      cequel.execute <<-CQL
+        CREATE MATERIALIZED VIEW #{view_name} AS
+          SELECT blog_subdomain, permalink
+          FROM #{name}
+          WHERE blog_subdomain IS NOT NULL AND permalink IS NOT NULL
+          PRIMARY KEY ( blog_subdomain, permalink )
+      CQL
+    end
+    after do
+      cequel.schema.drop_materialized_view(view_name)
+    end
+
+    context 'when materialized_view' do
+      let(:reader) { cequel.schema.get_table_reader(view_name) }
+      subject { reader }
+      its(:materialized_view?) { should eq true }
+    end
+
+    context 'when table' do
+      let(:reader) { cequel.schema.get_table_reader(name) }
+      subject { reader }
+      its(:materialized_view?) { should eq false }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -219,6 +219,7 @@ files:
 - lib/cequel/metal/keyspace.rb
 - lib/cequel/metal/logging.rb
 - lib/cequel/metal/new_relic_instrumentation.rb
+- lib/cequel/metal/policy/cassandra_error.rb
 - lib/cequel/metal/request_logger.rb
 - lib/cequel/metal/row.rb
 - lib/cequel/metal/row_specification.rb