cequel 1.10.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7ff155091be0d5464305a705c0ec81c48f43b63
-  data.tar.gz: 6ddea2f0ae77a64b050cb77d44ead1970b3b1fec
+  metadata.gz: 72c4d009a896299d69e6d3f7aad381238fcb0483
+  data.tar.gz: e90819d05105818943bff45f774499bb63b66ec1
 SHA512:
-  metadata.gz: dc693f1b953c426aaac6b65d51f5ae7038933d8040efe7272733f809784522a60b5575ff3fb9744f2f69c1a51f9c5348eb7195e9a4149faa1ad6f0a8c827e4ce
-  data.tar.gz: b91aee5ec4d83c483a733cac281d1b1c91ac326f63f3b44a95458707edade557420ffcdcd1cd7018421d02504ea8861e585c0e516ad589c426469014664f1912
+  metadata.gz: d5b553d23b9df917acb80018becd971f4a05206a6c03e023f596593ce996706814550fbc40e3d9665a9a32804c82072eed4c64c39b18f2933e5400c25e31204a
+  data.tar.gz: 75e37e197a278752e4f2c7c18bfd712827601131ed61652519c762ae17d9cce954c546fc1e6db849598fecfb14d4b1e329fc037b9afa24c4e7fc6fb8feaf62f0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.0.0
+
+* add support for Cassandra 3.x ([PR 324](https://github.com/cequel/cequel/pull/324))
+* upgrade cassandra driver to 3.x ([PR 323](https://github.com/cequel/cequel/pull/323))
+* add support for storing blobs (via parameterized CQL statements) ([PR 320](https://github.com/cequel/cequel/pull/320))
+* add support for Rails 5 ([PR 310](https://github.com/cequel/cequel/pull/310))
+* drop support for JRuby ([PR 310](https://github.com/cequel/cequel/pull/310))
+* handle missing indexes gracefully ([PR 317](https://github.com/cequel/cequel/pull/317))
+* Dropped support for count, length, and size as it results in unbounded run times and memory usage
+  ([PR 313](https://github.com/cequel/cequel/pull/313))
+
 ## 1.10.0
 
 * `:foreign_key` option for belongs_to associations

data/Gemfile

@@ -15,3 +15,4 @@ end
 gem 'racc', '~> 1.4', :platforms => :rbx
 gem 'rubysl', '~> 2.0', :platforms => :rbx
 gem 'psych', '~> 2.0', :platforms => :rbx
+gem 'activemodel-serializers-xml'

data/Gemfile.lock

@@ -1,51 +1,64 @@
 PATH
   remote: .
   specs:
-    cequel (1.10.0)
-      activemodel (~> 4.0)
-      cassandra-driver (~> 2.0)
+    cequel (2.0.0)
+      activemodel (>= 4.0)
+      cassandra-driver (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activerecord (> 5.x)
+      activesupport (> 5.x)
       builder (~> 3.1)
-    activesupport (4.2.5.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     appraisal (1.0.3)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.2.0)
+    arel (7.1.2)
+    ast (2.3.0)
     backports (3.6.8)
     builder (3.2.2)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    cassandra-driver (2.1.5)
+    cassandra-driver (3.0.3)
       ione (~> 1.2)
-    coderay (1.1.0)
-    columnize (0.8.9)
+    cassandra-driver (3.0.3-java)
+      ione (~> 1.2)
+    coderay (1.1.1)
+    columnize (0.9.0)
+    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.2-java)
     debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.5)
+    debugger-ruby_core_source (1.3.8)
     diff-lcs (1.2.5)
-    ethon (0.8.1)
+    ethon (0.9.1)
       ffi (>= 1.3.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.10)
+    ffi (1.9.14)
+    ffi (1.9.14-java)
     ffi2-generators (0.1.1)
     gh (0.14.0)
       addressable
@@ -57,54 +70,62 @@ GEM
     highline (1.7.8)
     i18n (0.7.0)
     ione (1.2.3)
-    json (1.8.3)
+    json (2.0.2)
+    json (2.0.2-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.8.4)
-    multi_json (1.11.2)
+    minitest (5.9.1)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    parser (2.3.0.7)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.10.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry (0.10.4-java)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    psych (2.0.6)
+      spoon (~> 0.0)
+    psych (2.1.1)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    racc (1.4.12)
+    racc (1.4.14)
     rainbow (2.1.0)
-    rake (10.3.2)
-    rb-readline (0.5.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.43.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    rubysl (2.1.0)
+    ruby-progressbar (1.8.1)
+    rubysl (2.2.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -189,6 +210,7 @@ GEM
       rubysl-tmpdir (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
+      rubysl-unicode_normalize (~> 2.0)
       rubysl-uri (~> 2.0)
       rubysl-weakref (~> 2.0)
       rubysl-webrick (~> 2.0)
@@ -200,22 +222,22 @@ GEM
     rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
     rubysl-cgi (2.0.1)
-    rubysl-cgi-session (2.0.1)
+    rubysl-cgi-session (2.1.0)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
-    rubysl-coverage (2.0.3)
+    rubysl-coverage (2.1)
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.8)
+    rubysl-date (2.0.9)
     rubysl-delegate (2.0.1)
-    rubysl-digest (2.0.3)
+    rubysl-digest (2.0.8)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.1)
+    rubysl-erb (2.0.2)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
@@ -233,16 +255,15 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.1.0)
-      rb-readline (~> 0.5)
+    rubysl-irb (2.1.1)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.0.0)
+    rubysl-logger (2.1.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
-    rubysl-mkmf (2.0.1)
+    rubysl-mkmf (2.1)
       rubysl-fileutils (~> 2.0)
       rubysl-shellwords (~> 2.0)
     rubysl-monitor (2.0.0)
@@ -261,20 +282,20 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.2.0)
+    rubysl-openssl (2.8.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
-    rubysl-ostruct (2.0.4)
-    rubysl-pathname (2.1.0)
+    rubysl-ostruct (2.1.0)
+    rubysl-pathname (2.3)
     rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
-    rubysl-profiler (2.0.1)
+    rubysl-profiler (2.1)
     rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.2)
+    rubysl-pty (2.0.3)
     rubysl-rational (2.0.1)
-    rubysl-resolv (2.1.0)
-    rubysl-rexml (2.0.2)
+    rubysl-resolv (2.1.2)
+    rubysl-rexml (2.0.4)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
@@ -282,14 +303,15 @@ GEM
     rubysl-set (2.0.1)
     rubysl-shellwords (2.0.0)
     rubysl-singleton (2.0.0)
-    rubysl-socket (2.0.1)
-    rubysl-stringio (2.0.0)
+    rubysl-socket (2.1.2)
+      rubysl-fcntl (~> 2.0)
+    rubysl-stringio (2.1.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.0.1)
+    rubysl-syslog (2.1.0)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-thread (2.0.2)
+    rubysl-thread (2.0.3)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
@@ -298,16 +320,20 @@ GEM
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
       rubysl-optparse (~> 2.0)
+    rubysl-unicode_normalize (2.0)
     rubysl-uri (2.0.0)
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.4)
+    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.7.1)
+    thread_safe (0.3.5-java)
+    timecop (0.8.1)
     travis (1.8.2)
       backports
       faraday (~> 0.9)
@@ -321,15 +347,17 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.3)
-    websocket (1.2.2)
+    unicode-display_width (1.1.1)
+    websocket (1.2.3)
     wwtd (0.9.1)
-    yard (0.8.7.6)
+    yard (0.9.5)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activemodel-serializers-xml
   appraisal (~> 1.0)
   byebug (~> 2.7)
   cequel!
@@ -348,4 +376,4 @@ DEPENDENCIES
   yard (~> 0.6)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -24,6 +24,11 @@ Add it to your Gemfile:
 gem 'cequel'
 ```
 
+If you use Rails 5, add this:
+``` ruby
+gem 'activemodel-serializers-xml'
+```
+
 ### Rails integration ###
 
 Cequel does not require Rails, but if you are using Rails, you
@@ -88,8 +93,8 @@ specify the attribute used as the partition key.
 
 Note that the `belongs_to` declaration must come *before* the `key` declaration.
 This is because `belongs_to` defines the
-[partition key](http://www.datastax.com/documentation/cql/3.0/webhelp/index.html#cql/ddl/../../cassandra/glossary/gloss_glossary.html#glossentry_dhv_s24_bk); the `id` column is
-the [clustering column](http://www.datastax.com/documentation/cql/3.0/webhelp/index.html#glossentry_h31_xjk_bk).
+[partition key](http://docs.datastax.com/en/glossary/doc/glossary/gloss_partition_key.html); the `id` column is
+the [clustering column](http://docs.datastax.com/en/glossary/doc/glossary/gloss_clustering_column.html).
 
 Practically speaking, this means that posts are accessed using both the
 `blog_subdomain` (automatically defined by the `belongs_to` association) and the
@@ -224,7 +229,7 @@ multiple queries in your logs if you're iterating over a huge result set.
 #### Time UUID Queries ####
 
 CQL has [special handling for the `timeuuid`
-type](http://www.datastax.com/documentation/cql/3.0/webhelp/index.html#cql/cql_reference/cql_data_types_c.html#reference_ds_axc_xk5_yj),
+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. 
 
@@ -534,6 +539,14 @@ 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!(
@@ -557,6 +570,7 @@ the columns that are given.
 
 ### Rails ###
 
+* 5.0
 * 4.2
 * 4.1
 * 4.0
@@ -564,13 +578,18 @@ the columns that are given.
 ### Ruby ###
 
 * Ruby 2.3, 2.2, 2.1, 2.0
-* JRuby 1.7, 9.0
 
 ### Cassandra ###
 
 * 2.1.x
 * 2.2.x
+* 3.0.x
+
+## Breaking API changes
+
+### 2.0
 
+ * dropped support for jruby (Due to difficult to work around bugs in jruby. PRs welcome to restore jruby compatibility.)
 
 ## Support & Bugs ##
 
@@ -616,8 +635,10 @@ Cequel was written by:
 * Luke Duncalfe
 * Eric Betts
 * Maxim Dobryakov
+* Yi-Cyuan Chen
+* Justin Hannus
 
-Special thanks to [Brewster](https://www.brewster.com), which supported the 0.x
+Special thanks to [Brewster](http://www.brewster.com), which supported the 0.x
 releases of Cequel.
 
 ## Shameless Self-Promotion ##

data/Vagrantfile

@@ -135,9 +135,9 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
   SH
 
   versions = File.read(File.expand_path('../.cassandra-versions', __FILE__)).each_line
-    .map(&:strip).grep(/^2\.[12]\./)
+    .map(&:strip).grep(/(^2\.[12]\.)|(^3.)/)
   versions.each do |version|
-    java_version = version =~ /^1/ ? '6' : '7'
+    java_version = version =~ /^2/ ? '7' : '8'
     config.vm.define version do |machine|
       machine.vm.provision :shell, inline: provision,
         args: [version, java_version]

data/lib/cequel/errors.rb

@@ -8,4 +8,6 @@ module Cequel
   # key)
   #
   InvalidSchemaMigration = Class.new(StandardError)
+
+  NoSuchKeyspaceError = Class.new(StandardError)
 end