cequel 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe85356836d10e62c3efee7ccaaa6ed0f2f38a4
-  data.tar.gz: 77e489f1612b22a165ac4724db174fd901fc7631
+  metadata.gz: 72e24f9cd8e2717c595a60f3826bf274f50241cb
+  data.tar.gz: e1a9ea1d681b534945d96ab4f0d87af7b7a08ef0
 SHA512:
-  metadata.gz: 3ec55765ffbc090cfba486673f3bcc1755b5cd59f360da4dc1e9902bc84bcea33452ddf38c1f5839cf12390d20bcb8c3a46539dbda82d32271ab53fa52ebe54c
-  data.tar.gz: c57c6e55f5b2d20cbdcf4878531b4d8c13d7c69e3a75e4ebc45ded534880a7bc8c296c645ef6d4864e059b98835bbd470144e181af55fa481ca0d29ee7dd5879
+  metadata.gz: 59a1423af086bf7f369f10efa5f37f0fb5c5c0d5c5235d1dfa7aeca84f60ae41712b89da735d5e59b3bdef4f200c8ea1658ba26b4d939dcd399370b4e7004f02
+  data.tar.gz: 8e5cf589b91e25dd6533c06241b862723a81b6a738d6f1df31d4a7fc0d71a9693ef995b08c1d5c27eb80c3b7d6b7c51398f59345286a6a03fb94ccc1140c9d3e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.4.2
+
+* Allow setting a key attribute to what it already is
+* Don't reset model updater/deleter if save results in an error
+* Read `:default_consistency` from cequel.yml
+* `:max_retries` configuration parameter for customization of maximum retries that will be made to reconnect to cassandra
+
 ## 1.4.1
 
 * Cequel::Record::descendants doesn't return weakrefs

data/Gemfile.lock

@@ -1,25 +1,26 @@
 PATH
   remote: .
   specs:
-    cequel (1.4.1)
+    cequel (1.4.2)
       activemodel (>= 3.1, < 5.0)
       cql-rb (>= 1.2, < 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
-    activesupport (4.1.1)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    appraisal (0.5.2)
+    appraisal (1.0.2)
       bundler
       rake
+      thor (>= 0.14.0)
     ast (2.0.0)
     builder (3.2.2)
     byebug (2.7.0)
@@ -27,55 +28,55 @@ GEM
       debugger-linecache (~> 1.2)
     coderay (1.1.0)
     columnize (0.8.9)
-    cql-rb (2.0.0)
+    cql-rb (2.0.3)
       ione (~> 1)
-    debugger (1.6.6)
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.4)
+    debugger-ruby_core_source (1.3.5)
     diff-lcs (1.2.5)
-    ffi (1.9.3-java)
+    ffi (1.9.4-java)
     ffi2-generators (0.1.1)
-    i18n (0.6.9)
-    ione (1.1.2)
+    i18n (0.6.11)
+    ione (1.1.4)
     json (1.8.1)
     json (1.8.1-java)
     method_source (0.8.2)
-    minitest (5.3.4)
+    minitest (5.4.1)
     parser (2.1.9)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    psych (2.0.5)
-    racc (1.4.11)
+    psych (2.0.6)
+    racc (1.4.12)
     rainbow (2.0.0)
     rake (10.3.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    rspec-mocks (2.99.2)
     rubocop (0.19.1)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.7)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.6.0)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -181,7 +182,7 @@ GEM
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.6)
+    rubysl-date (2.0.8)
     rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
@@ -278,14 +279,16 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
-    slop (3.5.0)
+    slop (3.6.0)
     spoon (0.0.4)
       ffi
+    thor (0.19.1)
     thread_safe (0.3.4)
     thread_safe (0.3.4-java)
     timecop (0.7.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    wwtd (0.5.5)
     yard (0.8.7.4)
 
 PLATFORMS
@@ -293,7 +296,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (~> 0.5)
+  appraisal (~> 1.0)
   byebug (~> 2.7)
   cequel!
   debugger (~> 1.6)
@@ -305,4 +308,5 @@ DEPENDENCIES
   rubocop (~> 0.19.0)
   rubysl (~> 2.0)
   timecop (~> 0.7)
+  wwtd (~> 0.5)
   yard (~> 0.6)

data/README.md

@@ -7,7 +7,7 @@ Cequel is a Ruby ORM for [Cassandra](http://cassandra.apache.org/) using
 [![Build Status](https://travis-ci.org/cequel/cequel.png?branch=master)](https://travis-ci.org/cequel/cequel)
 [![Dependency Status](https://gemnasium.com/cequel/cequel.png)](https://gemnasium.com/cequel/cequel)
 [![Code Climate](https://codeclimate.com/github/cequel/cequel.png)](https://codeclimate.com/github/cequel/cequel)
-[![Inline docs](http://inch-pages.github.io/github/cequel/cequel.png)](http://inch-pages.github.io/github/cequel/cequel)
+[![Inline docs](http://inch-ci.org/github/cequel/cequel.png)](http://inch-ci.org/github/cequel/cequel)
 
 `Cequel::Record` is an ActiveRecord-like domain model layer that exposes
 the robust data modeling capabilities of CQL3, including parent-child

data/Rakefile

@@ -2,7 +2,7 @@ require 'yaml'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'appraisal'
+require 'wwtd/tasks'
 require File.expand_path('../lib/cequel/version', __FILE__)
 
 RUBY_VERSIONS = YAML.load_file(File.expand_path('../.travis.yml', __FILE__))['rvm']
@@ -11,7 +11,7 @@ task :default => :release
 task :release => [
   :verify_changelog,
   :rubocop,
-  :"test:all",
+  :wwtd,
   :build,
   :tag,
   :update_stable,
@@ -53,23 +53,6 @@ RSpec::Core::RakeTask.new(:test) do |t|
   t.rspec_opts = '-b'
 end
 
-namespace :bundle do
-  desc 'Run bundler for all environments'
-  task :all do
-    abort unless all_rubies('bundle')
-    abort unless all_rubies('rake', 'appraisal:install')
-  end
-
-  desc 'Update to latest dependencies on all environments'
-  task :update_all do
-    gemfiles = File.expand_path("../gemfiles", __FILE__)
-    FileUtils.rm_r(gemfiles, :verbose => true) if File.exist?(gemfiles)
-    abort unless system('bundle', 'update')
-    abort unless all_rubies('bundle')
-    abort unless all_rubies('rake', 'appraisal:install')
-  end
-end
-
 desc 'Check style with Rubocop'
 Rubocop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb']
@@ -86,12 +69,6 @@ namespace :test do
   end
 end
 
-namespace :test do
-  task :all do
-    abort unless all_rubies('rake', 'appraisal', 'test:concise')
-  end
-end
-
 desc 'Update changelog'
 task :changelog do
   require './lib/cequel/version.rb'
@@ -114,9 +91,3 @@ task :verify_changelog do
     abort "Changelog is not up-to-date."
   end
 end
-
-def all_rubies(*command)
-  !RUBY_VERSIONS.find do |version|
-    !system('rvm', version, 'do', *command)
-  end
-end

data/Vagrantfile

@@ -136,7 +136,9 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
     service cassandra start
   SH
 
-  versions = (0..8).map { |p| "2.0.#{p}" } + (0..16).map { |p| "1.2.#{p}" }
+  versions = (0..0).map { |p| "2.1.#{p}" } +
+             (0..10).map { |p| "2.0.#{p}" } +
+             (0..19).map { |p| "1.2.#{p}" }
   versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|

data/lib/cequel/metal/batch.rb

@@ -59,6 +59,11 @@ module Cequel
         end
         @keyspace.execute_with_consistency(
           @statement.args.first, @statement.args.drop(1), @consistency)
+        execute_on_complete_hooks
+      end
+
+      def on_complete(&block)
+        on_complete_hooks << block
       end
 
       #
@@ -91,14 +96,21 @@ module Cequel
 
       private
 
+      attr_reader :on_complete_hooks
+
       def reset
         @statement = Statement.new
         @statement_count = 0
+        @on_complete_hooks = []
       end
 
       def begin_statement
         "BEGIN #{"UNLOGGED " if unlogged?}BATCH\n"
       end
+
+      def execute_on_complete_hooks
+        on_complete_hooks.each { |hook| hook.call }
+      end
     end
   end
 end

data/lib/cequel/metal/batch_manager.rb

@@ -44,12 +44,12 @@ module Cequel
             fail ArgumentError,
                  "Already in an unlogged batch; can't start a logged batch."
           end
-          return yield
+          return yield(current_batch)
         end
 
         begin
           self.current_batch = new_batch
-          yield.tap { new_batch.apply }
+          yield(new_batch).tap { new_batch.apply }
         ensure
           self.current_batch = nil
         end

data/lib/cequel/metal/keyspace.rb

@@ -21,6 +21,8 @@ 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 [Symbol] the default consistency for queries in this keyspace
       # @since 1.1.0
       attr_writer :default_consistency
@@ -98,6 +100,8 @@ module Cequel
       #   single Cassandra instance to connect to
       # @option configuration [Integer] :port (9042) port on which to connect
       #   to all specified hosts
+      # @option configuration [Integer] :max_retries maximum number of retries
+      #   on connection failure
       # @option configuration [Array<String>] :hosts list of Cassandra
       #   instances to connect to (hostnames only)
       # @option configuration [String] :username user to auth with (leave blank
@@ -115,9 +119,12 @@ module Cequel
         @configuration = configuration
 
         @hosts, @port = extract_hosts_and_port(configuration)
-        @credentials = extract_credentials(configuration)
+        @credentials  = extract_credentials(configuration)
+        @max_retries  = extract_max_retries(configuration)
 
         @name = configuration[:keyspace]
+        @default_consistency = configuration[:default_consistency].try(:to_sym)
+
         # reset the connections
         clear_active_connections!
       end
@@ -153,6 +160,10 @@ module Cequel
       #
       # Execute a CQL query in this keyspace
       #
+      #   If a connection error occurs, will retry a maximum number of
+      #   time (default 3) before re-raising the original connection
+      #   error.
+      #
       # @param statement [String] CQL string
       # @param bind_vars [Object] values for bind variables
       # @return [Enumerable] the results of the query
@@ -160,7 +171,16 @@ module Cequel
       # @see #execute_with_consistency
       #
       def execute(statement, *bind_vars)
-        execute_with_consistency(statement, bind_vars, default_consistency)
+        retries = max_retries
+
+        begin
+          execute_with_consistency(statement, bind_vars, default_consistency)
+        rescue Cql::NotConnectedError, Ione::Io::ConnectionError
+          clear_active_connections!
+          raise if retries < 0
+          retries -= 1
+          retry
+        end
       end
 
       #
@@ -269,6 +289,10 @@ module Cequel
       def extract_credentials(configuration)
         configuration.slice(:username, :password).presence
       end
+
+      def extract_max_retries(configuration)
+        configuration.fetch(:max_retries, 3)
+      end
     end
   end
 end

data/lib/cequel/metal/updater.rb

@@ -144,20 +144,22 @@ module Cequel
       end
 
       def write_to_statement(statement, options)
-        prepare_column_updates
+        all_statements, all_bind_vars = statements_with_column_updates
         statement.append("UPDATE #{table_name}")
           .append(generate_upsert_options(options))
           .append(" SET ")
-          .append(statements.join(', '), *bind_vars)
+          .append(all_statements.join(', '), *all_bind_vars)
       end
 
-      def prepare_column_updates
+      def statements_with_column_updates
+        all_statements, all_bind_vars = statements.dup, bind_vars.dup
         column_updates.each_pair do |column, value|
           prepare_upsert_value(value) do |binding, *values|
-            statements << "#{column} = #{binding}"
-            bind_vars.concat(values)
+            all_statements << "#{column} = #{binding}"
+            all_bind_vars.concat(values)
           end
         end
+        [all_statements, all_bind_vars]
       end
     end
   end

data/lib/cequel/metal/writer.rb

@@ -26,7 +26,7 @@ module Cequel
       # Execute the statement as a write operation
       #
       # @param options [Options] options
-      # @opiton options [Symbol] :consistency what consistency level to use for
+      # @option options [Symbol] :consistency what consistency level to use for
       #   the operation
       # @option options [Integer] :ttl time-to-live in seconds for the written
       #   data

data/lib/cequel/record/persistence.rb

@@ -280,10 +280,10 @@ module Cequel
 
       def update(options = {})
         assert_keys_present!
-        connection.batch do
+        connection.batch do |batch|
+          batch.on_complete { @updater, @deleter = nil }
           updater.execute(options)
           deleter.execute(options.except(:ttl))
-          @updater, @deleter = nil
         end
       end
 
@@ -312,18 +312,22 @@ module Cequel
         fail UnknownAttributeError, "unknown attribute: #{name}" unless column
         value = column.cast(value) unless value.nil?
 
-        super.tap do
-          unless new_record?
-            if key_attributes.keys.include?(name)
-              fail ArgumentError,
-                   "Can't update key #{name} on persisted record"
-            end
-
-            if value.nil?
-              deleter.delete_columns(name)
-            else
-              updater.set(name => value)
-            end
+        if !new_record? && key_attributes.keys.include?(name)
+          if read_attribute(name) != value
+            fail ArgumentError,
+                 "Can't update key #{name} on persisted record"
+          end
+        else
+          super.tap { stage_attribute_update(name, value) }
+        end
+      end
+
+      def stage_attribute_update(name, value)
+        unless new_record?
+          if value.nil?
+            deleter.delete_columns(name)
+          else
+            updater.set(name => value)
           end
         end
       end

data/lib/cequel/record/timestamps.rb

@@ -14,6 +14,7 @@ module Cequel
     #
     # @example Record class with timestamps
     #   class Blog
+    #     include Cequel::Record
     #     key :subdomain, :text
     #     column :name, :text
     #

data/lib/cequel/version.rb

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

data/spec/examples/metal/keyspace_spec.rb

@@ -82,7 +82,36 @@ describe Cequel::Metal::Keyspace do
                            port: Cequel::SpecSupport::Helpers.port,
                            keyspace: "totallymadeup"
 
-      expect(nonexistent_keyspace.exists?).to be_false
+      expect(nonexistent_keyspace.exists?).to be false
+    end
+  end
+
+  describe "#execute" do
+    let(:statement) { "SELECT id FROM posts" }
+
+    context "without a connection error" do
+      it "executes a CQL query" do
+        expect { cequel.execute(statement) }.not_to raise_error
+      end
+    end
+
+    context "with a connection error" do
+      after(:each) do
+        RSpec::Mocks.proxy_for(cequel).reset
+      end
+
+      it "reconnects to cassandra with a new client after first failed connection" do
+        allow(cequel).to receive(:execute_with_consistency)
+          .with(statement, [], nil)
+          .and_raise(Ione::Io::ConnectionError)
+          .once
+
+        expect(cequel).to receive(:execute_with_consistency)
+          .with(statement, [], :quorum)
+          .once
+
+        expect { cequel.execute(statement) }.not_to raise_error
+      end
     end
   end
 end

data/spec/examples/record/persistence_spec.rb

@@ -103,6 +103,13 @@ describe Cequel::Record::Persistence do
           }.to raise_error(ArgumentError)
         end
 
+        it 'should allow setting a key value to the same thing it already is' do
+          expect {
+            blog.subdomain = 'cequel'
+            blog.save
+          }.to_not raise_error
+        end
+
         it 'should save with specified consistency' do
           expect_query_with_consistency(/UPDATE/, :one) do
             blog.name = 'Cequel'
@@ -125,6 +132,23 @@ describe Cequel::Record::Persistence do
             .to eq((timestamp.to_f * 1_000_000).to_i)
           Blog.connection.schema.truncate_table(Blog.table_name)
         end
+
+        it 'should not query database if no attributes have been changed' do
+          disallow_queries!
+          blog.save
+        end
+
+        it 'should not mark itself as clean if save failed at Cassandra level' do
+          blog.name = 'Pizza'
+          with_client_error(Cql::QueryError.new(1, 'error')) do
+            begin
+              blog.save
+            rescue Cql::QueryError
+            end
+          end
+          blog.save
+          subject[:name].should == 'Pizza'
+        end
       end
     end
 

data/spec/support/helpers.rb

@@ -114,6 +114,15 @@ module Cequel
         cequel.client.should_not_receive(:execute)
       end
 
+      def with_client_error(error)
+        cequel.client.stub(:execute).and_raise(error)
+        begin
+          yield
+        ensure
+          cequel.client.unstub(:execute)
+        end
+      end
+
       def expect_query_with_consistency(matcher, consistency)
         expect(cequel.client).to receive(:execute).with(matcher, consistency)
           .and_call_original

data/templates/config/cequel.yml

@@ -3,11 +3,13 @@ development:
   host: '127.0.0.1'
   port: 9042
   keyspace: <%= app_name %>_development
+  max_retries: 3
 
 test:
   host: '127.0.0.1'
   port: 9042
   keyspace: <%= app_name %>_test
+  max_retries: 3
 
 production:
   hosts:
@@ -18,3 +20,4 @@ production:
   keyspace: <%= app_name %>_production
   username: 'myappuser'
   password: 'password1'
+  max_retries: 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Mat Brown
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -64,6 +64,20 @@ dependencies:
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"