cequel 1.5.0 → 1.6.0

data/Vagrantfile

@@ -11,7 +11,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # please see the online documentation at vagrantup.com.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise64"
+  config.vm.box = "ubuntu/trusty64"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
@@ -45,13 +45,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
   #
-  # config.vm.provider :virtualbox do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
+  config.vm.provider :virtualbox do |vb|
+    vb.memory = 1024
+  end
   #
   # View the documentation for the provider you're using for more
   # information on available options.
@@ -131,14 +127,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     echo "start on runlevel [2345]
 stop on runlevel [06]
 exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
-    sed -i -e 's/rpc_address:.*/rpc_address: 0.0.0.0/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    sed -i -e 's/start_native_transport:.*/start_native_transport: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
-    sed -i -e 's/start_rpc:.*/start_rpc: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
+    sed -i -e 's/.*broadcast_rpc_address:.*/broadcast_rpc_address: 127.0.0.1/' /opt/apache-cassandra-$1/conf/cassandra.yaml
+    sed -i -e 's/^rpc_address:.*/rpc_address: 0.0.0.0/' /opt/apache-cassandra-$1/conf/cassandra.yaml
+    sed -i -e 's/^start_native_transport:.*/start_native_transport: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
+    sed -i -e 's/^start_rpc:.*/start_rpc: true/' /opt/apache-cassandra-$1/conf/cassandra.yaml
     service cassandra start
   SH
 
-  listing = Net::HTTP.get(URI.parse("http://archive.apache.org/dist/cassandra/"))
-  versions = listing.scan(%r(href="(\d+\.\d+\.\d+)/")).map(&:first).grep(/^(1\.2\.|2\.)/)
+  versions = File.read(File.expand_path('../.cassandra-versions', __FILE__)).each_line
+    .map(&:strip).grep(/^(1\.2\.|2\.)/)
   versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|

data/cequel.gemspec

@@ -0,0 +1,42 @@
+require File.expand_path('../lib/cequel/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = 'cequel'
+  s.version = Cequel::VERSION
+  s.authors = [
+    'Mat Brown', 'Aubrey Holland', 'Keenan Brock', 'Insoo Buzz Jung',
+    'Louis Simoneau', 'Peter Williams', 'Kenneth Hoffman', 'Antti Tapio',
+    'Ilya Bazylchuk', 'Dan Cardamore', 'Kei Kusakari', 'Oleh Novosad',
+    'John Smart', 'Angelo Lakra', 'Olivier Lance', 'Tomohiro Nishimura',
+    'Masaki Takahashi', 'G Gordon Worley III', 'Clark Bremer', 'Tamara Temple',
+    'Long On', 'Lucas Mundim'
+  ]
+  s.homepage = "https://github.com/cequel/cequel"
+  s.email = 'mat.a.brown@gmail.com'
+  s.license = 'MIT'
+  s.summary = 'Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3'
+  s.description = <<DESC
+Cequel is an ActiveRecord-like domain model layer for Cassandra that exposes
+the robust data modeling capabilities of CQL3, including parent-child
+relationships via compound primary keys and in-memory atomic manipulation of
+collection columns.
+DESC
+
+  s.files = Dir['lib/**/*.rb', 'templates/**/*', 'spec/**/*.rb', '[A-Z]*']
+  s.test_files = Dir['spec/examples/**/*.rb']
+  s.has_rdoc = true
+  s.extra_rdoc_files = 'README.md'
+  s.required_ruby_version = '>= 1.9'
+  s.add_runtime_dependency 'activemodel', '>= 3.1', '< 5.0'
+  s.add_runtime_dependency 'cassandra-driver', '~> 1.0'
+  s.add_development_dependency 'appraisal', '~> 1.0'
+  s.add_development_dependency 'wwtd', '~> 0.5'
+  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rspec', '~> 3.1'
+  s.add_development_dependency 'rspec-its', '~> 1.0'
+  s.add_development_dependency 'rubocop', '~> 0.28'
+  s.add_development_dependency 'timecop', '~> 0.7'
+  s.add_development_dependency 'travis', '~> 1.7'
+  s.add_development_dependency 'yard', '~> 0.6'
+  s.requirements << 'Cassandra >= 1.2.0'
+end

data/lib/cequel.rb

@@ -4,13 +4,13 @@ require 'delegate'
 require 'active_support'
 require 'active_support/deprecation'
 require 'active_support/core_ext'
-require 'cql'
+require 'cassandra'
 
 require 'cequel/errors'
+require 'cequel/util'
 require 'cequel/metal'
 require 'cequel/schema'
 require 'cequel/type'
-require 'cequel/util'
 require 'cequel/uuids'
 require 'cequel/instrumentation'
 require 'cequel/record'

data/lib/cequel/metal/data_set.rb

@@ -21,7 +21,7 @@ module Cequel
     #
     class DataSet
       include Enumerable
-      extend Forwardable
+      extend Util::Forwardable
 
       # @return [Keyspace] keyspace that this data set's table resides in
       attr_reader :keyspace

data/lib/cequel/metal/keyspace.rb

@@ -9,7 +9,7 @@ module Cequel
     # instance.
     #
     class Keyspace
-      extend Forwardable
+      extend Util::Forwardable
       include Logging
       include MonitorMixin
 
@@ -154,9 +154,7 @@ module Cequel
       #
       def client
         synchronize do
-          @client ||= raw_client.tap do |client|
-            client.use(name) if name
-          end
+          @client ||= cluster.connect(name)
         end
       end
 
@@ -193,8 +191,9 @@ module Cequel
         log('CQL', statement, *bind_vars) do
           begin
             client.execute(sanitize(statement, bind_vars),
-                           consistency || default_consistency)
-          rescue Cql::NotConnectedError, Ione::Io::ConnectionError
+                           consistency: consistency || default_consistency)
+          rescue Cassandra::Errors::NoHostsAvailable,
+                 Ione::Io::ConnectionError => e
             clear_active_connections!
             raise if retries == 0
             retries -= 1
@@ -213,8 +212,11 @@ module Cequel
         if defined? @client
           remove_instance_variable(:@client)
         end
-        if defined? @raw_client
-          remove_instance_variable(:@raw_client)
+        if defined? @client_without_keyspace
+          remove_instance_variable(:@client_without_keyspace)
+        end
+        if defined? @cluster
+          remove_instance_variable(:@cluster)
         end
       end
 
@@ -235,7 +237,7 @@ module Cequel
         CQL
 
         log('CQL', statement, [name]) do
-          raw_client.execute(sanitize(statement, [name])).any?
+          client_without_keyspace.execute(sanitize(statement, [name])).any?
         end
       end
 
@@ -249,15 +251,21 @@ module Cequel
       def_delegator :lock, :synchronize
       private :lock
 
-      def raw_client
+      def cluster
         synchronize do
-          @raw_client ||= Cql::Client.connect(client_options)
+          @cluster ||= Cassandra.cluster(client_options)
+        end
+      end
+
+      def client_without_keyspace
+        synchronize do
+          @client_without_keyspace ||= cluster.connect
         end
       end
 
       def client_options
         {hosts: hosts, port: port}.tap do |options|
-          options[:credentials] = credentials if credentials
+          options.merge!(credentials) if credentials
         end
       end
 
@@ -272,9 +280,9 @@ module Cequel
       def extract_hosts_and_port(configuration)
         hosts, ports = [], Set[]
         ports << configuration[:port] if configuration.key?(:port)
-        Array.wrap(configuration.fetch(
-          :host, configuration.fetch(:hosts, '127.0.0.1'))).each do |host_port|
-
+        host_or_hosts =
+          configuration.fetch(:host, configuration.fetch(:hosts, '127.0.0.1'))
+        Array.wrap(host_or_hosts).each do |host_port|
           host, port = host_port.split(':')
           hosts << host
           if port

data/lib/cequel/metal/logging.rb

@@ -5,7 +5,7 @@ module Cequel
     # Methods to handle logging for {Keyspace} instances
     #
     module Logging
-      extend Forwardable
+      extend Util::Forwardable
       def_delegators :request_logger, :logger, :logger=, :slowlog_threshold,
                      :slowlog_threshold=
 

data/lib/cequel/metal/request_logger.rb

@@ -7,7 +7,7 @@ module Cequel
     # @api private
     #
     class RequestLogger
-      extend Forwardable
+      extend Util::Forwardable
       # @return [::Logger] An instance of Logger that responds to methods for
       #   standard severity levels
       attr_accessor :logger

data/lib/cequel/metal/writer.rb

@@ -11,7 +11,7 @@ module Cequel
     # @api private
     #
     class Writer
-      extend Forwardable
+      extend Util::Forwardable
 
       #
       # @param data_set [DataSet] data set to write to

data/lib/cequel/record.rb

@@ -78,7 +78,7 @@ module Cequel
   #
   module Record
     extend ActiveSupport::Concern
-    extend Forwardable
+    extend Util::Forwardable
 
     included do
       include Properties

data/lib/cequel/record/association_collection.rb

@@ -12,7 +12,7 @@ module Cequel
     #
     class AssociationCollection < DelegateClass(RecordSet)
       include Enumerable
-      extend Forwardable
+      extend Util::Forwardable
 
       #
       # @yield [Record]

data/lib/cequel/record/associations.rb

@@ -65,7 +65,7 @@ module Cequel
       # @see Associations
       #
       module ClassMethods
-        include Forwardable
+        include Util::Forwardable
 
         # @!attribute parent_association
         #   @return [BelongsToAssociation] association declared by

data/lib/cequel/record/belongs_to_association.rb

@@ -9,7 +9,7 @@ module Cequel
     # @since 1.0.0
     #
     class BelongsToAssociation
-      extend Forwardable
+      extend Util::Forwardable
 
       # @return [Class] child class that declared `belongs_to`
       attr_reader :owner_class

data/lib/cequel/record/collection.rb

@@ -53,7 +53,7 @@ module Cequel
     #
     module Collection
       extend ActiveSupport::Concern
-      extend Forwardable
+      extend Util::Forwardable
 
       #
       # @!method loaded?
@@ -137,12 +137,16 @@ module Cequel
       def to_modify(&block)
         if loaded?
           model.__send__("#{column_name}_will_change!")
-          block.call()
+          block.call
         else modifications << block
         end
         self
       end
 
+      def to_update
+        yield unless model.new_record?
+      end
+
       def modifications
         @modifications ||= []
       end
@@ -231,15 +235,17 @@ module Cequel
                "indices"
         end
 
-        if count.nil?
-          updater.list_replace(column_name, first, element)
-        else
-          element = Array.wrap(element)
-          count.times do |i|
-            if i < element.length
-              updater.list_replace(column_name, first+i, element[i])
-            else
-              deleter.list_remove_at(column_name, first+i)
+        to_update do
+          if count.nil?
+            updater.list_replace(column_name, first, element)
+          else
+            element = Array.wrap(element)
+            count.times do |i|
+              if i < element.length
+                updater.list_replace(column_name, first+i, element[i])
+              else
+                deleter.list_remove_at(column_name, first+i)
+              end
             end
           end
         end
@@ -253,7 +259,7 @@ module Cequel
       # @return [List] self
       #
       def clear
-        deleter.delete_columns(column_name)
+        to_update { deleter.delete_columns(column_name) }
         to_modify { super }
       end
 
@@ -265,7 +271,7 @@ module Cequel
       #
       def concat(array)
         array = cast_collection(array)
-        updater.list_append(column_name, array)
+        to_update { updater.list_append(column_name, array) }
         to_modify { super }
       end
 
@@ -277,7 +283,7 @@ module Cequel
       #
       def delete(object)
         object = cast_element(object)
-        updater.list_remove(column_name, object)
+        to_update { updater.list_remove(column_name, object) }
         to_modify { super }
       end
 
@@ -288,7 +294,7 @@ module Cequel
       # @return [List] self
       #
       def delete_at(index)
-        deleter.list_remove_at(column_name, index)
+        to_update { deleter.list_remove_at(column_name, index) }
         to_modify { super }
       end
 
@@ -300,7 +306,7 @@ module Cequel
       #
       def push(*objects)
         objects.map! { |object| cast_element(object) }
-        updater.list_append(column_name, objects)
+        to_update { updater.list_append(column_name, objects) }
         to_modify { super }
       end
       alias_method :<<, :push
@@ -314,7 +320,7 @@ module Cequel
       #
       def replace(array)
         array = cast_collection(array)
-        updater.set(column_name => array)
+        to_update { updater.set(column_name => array) }
         to_modify { super }
       end
 
@@ -326,7 +332,7 @@ module Cequel
       #
       def unshift(*objects)
         objects.map!(&method(:cast_element))
-        updater.list_prepend(column_name, objects.reverse)
+        to_update { updater.list_prepend(column_name, objects.reverse) }
         to_modify { super }
       end
       alias_method :prepend, :unshift
@@ -368,7 +374,7 @@ module Cequel
       #
       def add(object)
         object = cast_element(object)
-        updater.set_add(column_name, object)
+        to_update { updater.set_add(column_name, object) }
         to_modify { super }
       end
       alias_method :<<, :add
@@ -380,7 +386,7 @@ module Cequel
       # @return [Set] self
       #
       def clear
-        deleter.delete_columns(column_name)
+        to_update { deleter.delete_columns(column_name) }
         to_modify { super }
       end
 
@@ -392,7 +398,7 @@ module Cequel
       #
       def delete(object)
         object = cast_element(object)
-        updater.set_remove(column_name, object)
+        to_update { updater.set_remove(column_name, object) }
         to_modify { super }
       end
 
@@ -404,7 +410,7 @@ module Cequel
       #
       def replace(set)
         set = cast_collection(set)
-        updater.set(column_name => set)
+        to_update { updater.set(column_name => set) }
         to_modify { super }
       end
     end
@@ -419,7 +425,7 @@ module Cequel
     #
     class Map < DelegateClass(::Hash)
       include Collection
-      extend Forwardable
+      extend Util::Forwardable
 
       # These methods involve mutation that cannot be expressed as a CQL
       # operation, so are not implemented.
@@ -456,7 +462,7 @@ module Cequel
       #
       def []=(key, value)
         key = cast_key(key)
-        updater.map_update(column_name, key => value)
+        to_update { updater.map_update(column_name, key => value) }
         to_modify { super }
       end
       alias_method :store, :[]=
@@ -468,7 +474,7 @@ module Cequel
       # @return [Map] self
       #
       def clear
-        deleter.delete_columns(column_name)
+        to_update { deleter.delete_columns(column_name) }
         to_modify { super }
       end
 
@@ -480,7 +486,7 @@ module Cequel
       #
       def delete(key)
         key = cast_key(key)
-        deleter.map_remove(column_name, key)
+        to_update { deleter.map_remove(column_name, key) }
         to_modify { super }
       end
 
@@ -492,7 +498,7 @@ module Cequel
       #
       def merge!(hash)
         hash = cast_collection(hash)
-        updater.map_update(column_name, hash)
+        to_update { updater.map_update(column_name, hash) }
         to_modify { super }
       end
       alias_method :update, :merge!
@@ -505,7 +511,7 @@ module Cequel
       #
       def replace(hash)
         hash = cast_collection(hash)
-        updater.set(column_name => hash)
+        to_update { updater.set(column_name => hash) }
         to_modify { super }
       end