cequel 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14904f7678b99fb9228f1d0e255ece706ac607f
-  data.tar.gz: 9f63a0b4abf6d672c9712d7e5eebe34aae777212
+  metadata.gz: 533e3980f9450dfeafb79127893006ba81fb3b64
+  data.tar.gz: 534f0031b6098578ae6fa1a12668dcf537cca564
 SHA512:
-  metadata.gz: bbad8d78bc4b5752cd0a708948c6f95fa0145679a3d8748ca16084e15b11b6c820817a244083d357799fc05c44c188dfe5703b22527ab1c3de5e36522418eb5c
-  data.tar.gz: c0eaaa9c567b14710dbd73bf58c6fe8ff27bec66b99545a362017206839c5f88c4de146500b50c97fc3c776041534fb1517107bed4e43d69472b7fb3d1ba82ac
+  metadata.gz: bba81999115ee78bd0980340d331f20794aa7aece07cedce42bcd235c6d0a6cfd2e58a67c7a37ccc157972a59de12a1a03918556871740deaa3f452e05728198
+  data.tar.gz: 697022e12729db4a4bbeca38f9569d4452d196b003feb59db93d843f80bebbd672ddc2ffc262dfe263238b3f78776e7d59a1ac7ec4e27531aab38ef6f4a53185

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.8.0
+
+* remove false claims of Rubinius support from readme (we would gratefully accept a PR to fix compatibility)
+* add dirty tracking on unsaved records
+* fix key column order bug on tables with more than 2 key columns
+* trim very large field values to a reasonable size in log messages
+* native CQL paging support
+
 ## 1.7.0
 
 * Support Cassandra up to 2.2

data/Gemfile.lock

@@ -1,54 +1,51 @@
 PATH
   remote: .
   specs:
-    cequel (1.7.0)
+    cequel (1.8.0)
       activemodel (~> 4.0)
       cassandra-driver (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activesupport (4.2.4)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
-    appraisal (1.0.2)
+    addressable (2.4.0)
+    appraisal (1.0.3)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    backports (3.6.4)
+    backports (3.6.8)
     builder (3.2.2)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    cassandra-driver (2.1.4)
+    cassandra-driver (2.1.5)
       ione (~> 1.2)
     coderay (1.1.0)
-    columnize (0.9.0)
+    columnize (0.8.9)
     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.8)
+    debugger-ruby_core_source (1.3.5)
     diff-lcs (1.2.5)
-    ethon (0.7.2)
+    ethon (0.8.1)
       ffi (>= 1.3.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.6)
-    ffi (1.9.6-java)
+    ffi (1.9.10)
     ffi2-generators (0.1.1)
     gh (0.14.0)
       addressable
@@ -57,64 +54,57 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (>= 2.7)
       net-http-pipeline
-    highline (1.6.21)
+    highline (1.7.8)
     i18n (0.7.0)
-    ione (1.2.1)
-    json (1.8.2)
-    json (1.8.2-java)
+    ione (1.2.3)
+    json (1.8.3)
     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.0)
-    multi_json (1.10.1)
+    minitest (5.8.4)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    parser (2.2.0.3)
+    parser (2.1.9)
       ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry (0.9.12.6-java)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-      spoon (~> 0.0)
-    psych (2.0.12)
-    pusher-client (0.6.0)
+    psych (2.0.6)
+    pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     racc (1.4.12)
     rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-its (1.1.0)
+      rspec-support (~> 3.4.0)
+    rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.2.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
-    rubocop (0.29.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
-      powerpack (~> 0.1)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    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.7.1)
+    ruby-progressbar (1.6.0)
     rubysl (2.1.0)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -219,14 +209,14 @@ GEM
     rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
     rubysl-curses (2.0.1)
-    rubysl-date (2.0.9)
+    rubysl-date (2.0.8)
     rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.2)
+    rubysl-erb (2.0.1)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
@@ -244,11 +234,12 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.1.1)
+    rubysl-irb (2.1.0)
+      rb-readline (~> 0.5)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-thread (~> 2.0)
-    rubysl-logger (2.1.0)
+    rubysl-logger (2.0.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
       rubysl-e2mmap (~> 2.0)
@@ -271,7 +262,7 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.2.1)
+    rubysl-openssl (2.2.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
@@ -281,10 +272,10 @@ GEM
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
-    rubysl-pty (2.0.3)
+    rubysl-pty (2.0.2)
     rubysl-rational (2.0.1)
     rubysl-resolv (2.1.0)
-    rubysl-rexml (2.0.4)
+    rubysl-rexml (2.0.2)
     rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
@@ -296,7 +287,7 @@ GEM
     rubysl-stringio (2.0.0)
     rubysl-strscan (2.0.0)
     rubysl-sync (2.0.0)
-    rubysl-syslog (2.1.0)
+    rubysl-syslog (2.0.1)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
     rubysl-thread (2.0.2)
@@ -312,35 +303,30 @@ GEM
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.1.0)
+    rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
     slop (3.6.0)
-    spoon (0.0.4)
-      ffi
     thor (0.19.1)
     thread_safe (0.3.5)
     timecop (0.7.1)
-    travis (1.7.5)
-      addressable (~> 2.3)
+    travis (1.8.2)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
       gh (~> 0.13)
       highline (~> 1.6)
       launchy (~> 2.1)
-      pry (~> 0.9, < 0.10)
       pusher-client (~> 0.4)
       typhoeus (~> 0.6, >= 0.6.8)
-    typhoeus (0.7.1)
-      ethon (>= 0.7.1)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    websocket (1.2.1)
-    wwtd (0.7.0)
+    websocket (1.2.2)
+    wwtd (0.9.1)
     yard (0.8.7.6)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -360,3 +346,6 @@ DEPENDENCIES
   travis (~> 1.7)
   wwtd (~> 0.5)
   yard (~> 0.6)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -1,7 +1,7 @@
 # Cequel #
 
 Cequel is a Ruby ORM for [Cassandra](http://cassandra.apache.org/) using
-[CQL3](http://www.datastax.com/documentation/cql/3.0/webhelp/index.html).
+[CQL3][].
 
 [![Gem Version](https://badge.fury.io/rb/cequel.png)](http://badge.fury.io/rb/cequel)
 [![Build Status](https://travis-ci.org/cequel/cequel.png?branch=master)](https://travis-ci.org/cequel/cequel)
@@ -28,7 +28,7 @@ gem 'cequel'
 
 Cequel does not require Rails, but if you are using Rails, you
 will need version 3.2+. Cequel::Record will read from the configuration file
-`config/cequel.yml` if it is present. You can generate a default configuarion
+`config/cequel.yml` if it is present. You can generate a default configuration
 file with:
 
 ```bash
@@ -115,6 +115,33 @@ class PostsController < ActionController::Base
 end
 ```
 
+Parent child relationship in a namespaced model can be defined using the `class_name` option of `belongs_to` method as follows:
+
+```ruby
+module Blogger
+  class Blog
+    include Cequel::Record
+
+    key :subdomain, :text
+    column :name, :text
+    column :description, :text
+
+    has_many :posts
+  end
+end
+
+module Blogger
+  class Post
+    include Cequel::Record
+
+    belongs_to :blog, class_name: 'Blogger::Blog'
+    key :id, :timeuuid, auto: true
+    column :title, :text
+    column :body, :text
+  end
+end
+```
+
 ### Timestamps ###
 
 If your final primary key column is a `timeuuid` with the `:auto` option set,
@@ -519,9 +546,8 @@ the columns that are given.
 
 ### Ruby ###
 
-* Ruby 2.2, 2.1, 2.0
+* Ruby 2.3, 2.2, 2.1, 2.0
 * JRuby 1.7, 9.0
-* Rubinius 2.5
 
 ### Cassandra ###
 
@@ -587,3 +613,5 @@ the maintainer of Cequel.
 
 Cequel is distributed under the MIT license. See the attached LICENSE for all
 the sordid details.
+
+[CQL3]: http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html

data/Rakefile

@@ -1,7 +1,8 @@
+require 'rubocop'
+require 'rubocop/rake_task'
 require 'yaml'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
 require 'wwtd/tasks'
 require 'travis'
 require File.expand_path('../lib/cequel/version', __FILE__)
@@ -62,12 +63,12 @@ RSpec::Core::RakeTask.new(:test) do |t|
   t.rspec_opts = rspec_opts
 end
 
-desc 'Check style with Rubocop'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb']
-  task.formatters = ['files']
-  task.fail_on_error = true
-end
+# desc 'Check style with Rubocop'
+# RuboCop::RakeTask.new(:rubocop) do |task|
+#   task.patterns = ['lib/**/*.rb']
+#   task.formatters = ['files']
+#   task.fail_on_error = true
+# end
 
 namespace :test do
   desc 'Run the specs with progress formatter'

data/lib/cequel/metal/data_set.rb

@@ -48,6 +48,8 @@ module Cequel
       #   use
       # @since 1.1.0
       attr_reader :query_consistency
+      attr_reader :query_page_size
+      attr_reader :query_paging_state
 
       def_delegator :keyspace, :write_with_consistency
 
@@ -565,6 +567,22 @@ module Cequel
         end
       end
 
+      def page_size(page_size)
+        clone.tap do |data_set|
+          data_set.query_page_size = page_size
+        end
+      end
+
+      def paging_state(paging_state)
+        clone.tap do |data_set|
+          data_set.query_paging_state = paging_state
+        end
+      end
+
+      def next_paging_state
+        results.paging_state
+      end
+
       # rubocop:enable LineLength
 
       #
@@ -582,8 +600,7 @@ module Cequel
       #
       def each
         return enum_for(:each) unless block_given?
-        result = execute_cql(*cql)
-        result.each { |row| yield Row.from_result_row(row) }
+        results.each { |row| yield Row.from_result_row(row) }
       end
 
       #
@@ -655,12 +672,20 @@ module Cequel
 
       protected
 
-      attr_writer :row_limit, :query_consistency
+      attr_writer :row_limit, :query_consistency, :query_page_size, :query_paging_state
 
       private
 
+      def results
+        @results ||= execute_cql(*cql)
+      end
+
       def execute_cql(cql, *bind_vars)
-        keyspace.execute_with_consistency(cql, bind_vars, query_consistency)
+        keyspace.execute_with_options(cql, bind_vars, {
+          consistency: query_consistency,
+          page_size: query_page_size,
+          paging_state: query_paging_state
+        })
       end
 
       def inserter(&block)