cequel 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c970b068b50a1215dc4bf58af07dfc5b1b936214
-  data.tar.gz: c7470426d1cac668b2bd698d7f35608835b2bf0a
+  metadata.gz: a80d11ecb01e9f096a0204ed67d0cfa65a897d59
+  data.tar.gz: 020e36ad78e92832d03b139d5e2999ab37f26239
 SHA512:
-  metadata.gz: 5ce7dfd8aa2d73dc6d6748a789b4cd84ab137fb7c3d98bc70df830c6f64d8fb86a0e4e3fb26de6ce0d0c8167db8fcb8a0a2e3c57799f6847cf239db0ae73e4e0
-  data.tar.gz: 886e98099ef58ee431a76f4560e89ad10e3146a0850293671aa8bef45b852fa1bcdab41d2968639ec24dd7bfcba45c516ac88bf1de0f119f3fecf8b15a0eda95
+  metadata.gz: 3807632c2c476021c1e539835d5a45fc4fbd37ecc61cfd94b1af653f2a2cca28aabcd905df664cfccf6b3ba82004335411fe15dc571bc157168ff4248bc94203
+  data.tar.gz: cf8c648c7a1053687ea86a71ded3cb09cacf6dd277ec936d8401ac95608848fd1991b90ee8546d11803fca238b0e2da43dbfc6262a0a47b4b3f0b8599f751786

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.1
+- fix list modification bug with Cassandra versions > 2.2.10 and 3.11.0
+
 ## 3.0.0
 * Drop support for changing the type of cluster keys as it is no longer support by Cassandra.
 * Drop support for non-option based index specification in table schema DSL. For example, `column :author_name, :text, true` must be rewritten as `column :author_name, :text, index: true`.

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    cequel (3.0.0)
+    cequel (3.0.1)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activesupport (5.0.0.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -21,93 +21,98 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.3.0)
-    backports (3.6.8)
+    backports (3.10.3)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    cassandra-driver (3.0.3)
+    cassandra-driver (3.2.0)
       ione (~> 1.2)
-    coderay (1.1.1)
+    cassandra-driver (3.2.0-java)
+      ione (~> 1.2)
+    coderay (1.1.2)
     columnize (0.9.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
     debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    ethon (0.9.1)
+    diff-lcs (1.3)
+    ethon (0.11.0)
       ffi (>= 1.3.0)
-    faraday (0.9.2)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.14)
-    ffi (1.9.14-java)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.18)
+    ffi (1.9.18-java)
     ffi2-generators (0.1.1)
-    gh (0.14.0)
-      addressable
+    gh (0.15.1)
+      addressable (~> 2.4.0)
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
+      net-http-persistent (~> 2.9)
       net-http-pipeline
     highline (1.7.8)
-    i18n (0.7.0)
-    ione (1.2.3)
-    json (2.0.2)
-    json (2.0.2-java)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    ione (1.2.4)
+    json (2.1.0)
+    json (2.1.0-java)
     launchy (2.4.3)
       addressable (~> 2.3)
     launchy (2.4.3-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
-    method_source (0.8.2)
-    minitest (5.9.1)
-    multi_json (1.12.1)
+    method_source (0.9.0)
+    minitest (5.10.3)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    parser (2.3.1.4)
+    parallel (1.12.0)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.4-java)
+      method_source (~> 0.9.0)
+    pry (0.11.2-java)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
       spoon (~> 0.0)
-    psych (2.1.1)
+    psych (2.2.4)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     racc (1.4.14)
-    rainbow (2.1.0)
+    rainbow (2.2.2)
+      rake
     rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-retry (0.5.3)
-      rspec-core (> 3.3, < 3.6)
-    rspec-support (3.5.0)
-    rubocop (0.43.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.7.0)
+    rspec-retry (0.5.6)
+      rspec-core (> 3.3, < 3.8)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -249,7 +254,7 @@ GEM
     rubysl-mkmf (2.1)
       rubysl-fileutils (~> 2.0)
       rubysl-shellwords (~> 2.0)
-    rubysl-monitor (2.0.0)
+    rubysl-monitor (2.1)
     rubysl-mutex_m (2.0.0)
     rubysl-net-ftp (2.0.1)
     rubysl-net-http (2.0.4)
@@ -265,7 +270,7 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.8.0)
+    rubysl-openssl (2.9)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.1.0)
@@ -286,15 +291,15 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.1.2)
+    rubysl-socket (2.2.1)
       rubysl-fcntl (~> 2.0)
-    rubysl-stringio (2.1.0)
+    rubysl-stringio (2.2)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
     rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.3)
+    rubysl-thread (2.1)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -310,13 +315,13 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.1.0)
     rubysl-zlib (2.0.1)
-    slop (3.6.0)
     spoon (0.0.6)
       ffi
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    timecop (0.8.1)
-    travis (1.8.2)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    timecop (0.9.1)
+    travis (1.8.8)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -327,12 +332,12 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
-    websocket (1.2.3)
+    unicode-display_width (1.3.0)
+    websocket (1.2.4)
     wwtd (0.9.1)
-    yard (0.9.5)
+    yard (0.9.9)
 
 PLATFORMS
   java

data/lib/cequel/metal/data_set.rb

@@ -289,7 +289,9 @@ module Cequel
       #
       def list_remove_at(column, *positions)
         options = positions.extract_options!
-        deleter { list_remove_at(column, *positions) }.execute(options)
+        sorted_positions = positions.sort.reverse
+
+        deleter { list_remove_at(column, *sorted_positions) }.execute(options)
       end
 
       #

data/lib/cequel/record/collection.rb

@@ -217,39 +217,32 @@ module Cequel
       #   @param count [Integer] number of elements to replace
       #   @param elements [Array] new elements to replace in this range
       #
-      def []=(position, *args)
-        if position.is_a?(Range)
-          first, count = position.first, position.count
-        else
-          first, count = position, args[-2]
-        end
+      def []=(*args)
+        if args[0].is_a?(Fixnum) && args.count == 2
+          # single element set/replace
+          elem = cast_element(args[1])
 
-        element = args[-1] =
-          if args[-1].is_a?(Array) then cast_collection(args[-1])
-          else cast_element(args[-1])
+          to_update do
+            set_item(args[0], elem)
           end
+          to_modify { super(args[0], elem) }
 
-        if first < 0
-          fail ArgumentError,
-               "Bad index #{position}: CQL lists do not support negative " \
-               "indices"
-        end
-
-        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
+        else
+          # multi-element set/replace
+          range = if args[0].is_a?(Range)
+                    args[0]
+                  elsif args[0].is_a?(Fixnum) && args[1].is_a?(Fixnum)
+                    args[0]..(args[0]+args[1]-1)
+                  else
+                    Kernel.raise ArgumentError, "[i]=elem or [i,count]=elems or [a..b]=elems"
+                  end
+          elems = cast_collection(Array.wrap(args[-1]))
+
+          to_update do
+            set_range(range, elems, args[-1])
           end
+          to_modify { super(range, elems) }
         end
-        to_modify { super }
       end
 
       #
@@ -337,6 +330,31 @@ module Cequel
         to_modify { super }
       end
       alias_method :prepend, :unshift
+
+      protected
+
+      def set_item(position, elem)
+        elem = cast_element(elem)
+
+        updater.list_replace(column_name, position, elem)
+      end
+
+      def set_range(range, elems, _raw_elems)
+        replace_range = if elems.count < range.count
+                          range.begin..(range.begin+elems.count-1)
+                        else
+                          range
+                        end
+        delete_range = (replace_range.end+1)..range.end
+
+        replace_range.zip(elems).each do |position, elem|
+          updater.list_replace(column_name, position, elem)
+        end
+
+        delete_range.to_a.reverse.each do |position|
+          deleter.list_remove_at(column_name, position)
+        end
+      end
     end
 
     #

data/lib/cequel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel