cequel 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c50053063595b07ec25edb5c847006eaa12ed8
-  data.tar.gz: 574cce3d4c75fe7150bb647abdfc1baa2c68a666
+  metadata.gz: 37fbccb394100663a372dde3d9308a890091e36c
+  data.tar.gz: 2f594bf403ed6ba55ee54aa2c495c8c60fb6bb3a
 SHA512:
-  metadata.gz: 5d45ddd9e7368275d347b8104849a41de8ad1db6ecd1e5811e1bb8ad88cbdd9fa19df92fcbe8bafed2cf46bc147d5981202eca0875423f6a753ac756d09c18f0
-  data.tar.gz: 35a041419ee196ddb8c8acd06f523fa0b808c9ad109f99122792bcda0bea2ef76f65a3420b455327092f5c2a39e1029285ff066cd1a9e5f10b9aa99f8702e0cb
+  metadata.gz: 4f9d5c21fd006ce0e5021e3d6d3e144d5f27c075b56831fc0c766a9040a294e3c30dcf9e107fdb0f9b9f8677c490882a0bd6378a2af3d83a117e98e0fc39b098
+  data.tar.gz: 6c4122980edd642cefb3056c2f8fe3c236cf3bc89db38e1328c52ed4365b386fef83a799afc9d08e82c0b5d3b5f14e9f013008b22fb27a78e3d1e75ee822b099

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.2.5
+
+* Fix `puts` behavior when passed a Record instance
+* Fix batch loading of record sets with bounds on first of multiple clustering
+  columns
+* Fix load order of namespaced models for migrations
+
 ## 1.2.4
 
 * Apply empty attribute values when hydrating records

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    cequel (1.2.4)
+    cequel (1.2.5)
       activemodel (>= 3.1, < 5.0)
       cql-rb (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -20,20 +20,20 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    ast (1.1.0)
+    ast (2.0.0)
     builder (3.2.2)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
     coderay (1.1.0)
-    columnize (0.3.6)
+    columnize (0.8.9)
     cql-rb (1.2.1)
     debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
       debugger-ruby_core_source (~> 1.3.2)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
+    debugger-ruby_core_source (1.3.4)
     diff-lcs (1.2.5)
     ffi (1.9.3-java)
     ffi2-generators (0.1.1)
@@ -41,9 +41,9 @@ GEM
     json (1.8.1)
     json (1.8.1-java)
     method_source (0.8.2)
-    minitest (5.3.2)
-    parser (2.1.7)
-      ast (~> 1.1)
+    minitest (5.3.4)
+    parser (2.1.9)
+      ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     pry (0.9.12.6)
@@ -58,7 +58,7 @@ GEM
     psych (2.0.5)
     racc (1.4.11)
     rainbow (2.0.0)
-    rake (10.2.2)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -73,7 +73,7 @@ GEM
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.4.2)
+    ruby-progressbar (1.5.1)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)

data/Vagrantfile

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

data/lib/cequel/record/record_set.rb

@@ -660,10 +660,35 @@ module Cequel
       end
 
       def find_nested_batches_from(row, options, &block)
-        if next_range_key_column
-          at(row[range_key_name])
-            .next_batch_from(row)
-            .find_rows_in_batches(options, &block)
+        return unless next_range_key_column
+
+        without_bounds_on(range_key_column)[row[range_key_name]]
+          .next_batch_from(row)
+          .find_rows_in_batches(options, &block)
+      end
+
+      # @return [RecordSet] self but without any bounds conditions on
+      # the specified column.
+      #
+      # @private
+      def without_bounds_on(column)
+        without_lower_bound_on(column)
+          .without_upper_bound_on(column)
+      end
+
+      def without_lower_bound_on(column)
+        if lower_bound && lower_bound.column == column
+          scoped(lower_bound: nil)
+        else
+          self
+        end
+      end
+
+      def without_upper_bound_on(column)
+        if upper_bound && upper_bound.column == column
+          scoped(upper_bound: nil)
+        else
+          self
         end
       end
 

data/lib/cequel/record/scoped.rb

@@ -19,7 +19,8 @@ module Cequel
         def_delegators :current_scope,
                        *(RecordSet.public_instance_methods(false) +
                          BulkWrites.public_instance_methods -
-                         Object.instance_methods)
+                         Object.instance_methods -
+                         [:to_ary])
 
         # @private
         def current_scope

data/lib/cequel/record/tasks.rb

@@ -21,7 +21,8 @@ namespace :cequel do
 
     migration_table_names = Set[]
     models_dir_path = "#{Rails.root.join('app', 'models')}/"
-    Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
+    model_files = Dir.glob(Rails.root.join('app', 'models', '**', '*.rb'))
+    model_files.sort.each do |file|
       watch_namespaces = ["Object"]
       model_file_name = file.sub(/^#{Regexp.escape(models_dir_path)}/, "")
       dirname = File.dirname(model_file_name)

data/lib/cequel/version.rb

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

data/spec/examples/record/record_set_spec.rb

@@ -856,4 +856,48 @@ describe Cequel::Record::RecordSet do
         should == postgres_posts.drop(2).map(&:permalink)
     end
   end
+
+  context "table clustered on time and uuid" do
+    model(:BlogView) do
+      key :blog_subdomain, :ascii
+      key :view_time, :timestamp
+      key :sk, :uuid, auto: true
+    end
+
+    let!(:blog_1_views){
+      4.times
+        .map{|i| BlogView.create!(blog_subdomain: "blog-1",
+                                  view_time: now - i.minutes) }
+        .sort_by(&:view_time)
+    }
+
+    it "can execute multi-batch queries with range on partial cluster key" do
+      expect{|blk| BlogView['blog-1']
+          .in( blog_1_views.first.view_time .. now )
+          .find_each(batch_size: 2, &blk)}
+        .to yield_successive_args *blog_1_views
+    end
+
+    it "can execute multi-batch queries with range on partial key excluding beginning of partition" do
+      expect{|blk| BlogView['blog-1']
+          .in( blog_1_views.second.view_time .. now )
+          .find_each(batch_size: 2, &blk)}
+        .to yield_successive_args *blog_1_views.drop(1)
+    end
+
+    it "can execute multi-batch queries with range on partial key excluding end of partition" do
+      expect{|blk| BlogView['blog-1']
+          .in( blog_1_views.first.view_time .. blog_1_views[-2].view_time )
+          .find_each(batch_size: 2, &blk)}
+        .to yield_successive_args *blog_1_views[0..-2]
+    end
+
+    it "can execute queries with range on partial cluster key" do
+      expect{|blk| BlogView['blog-1']
+          .in( blog_1_views.first.view_time .. now )
+          .find_each(&blk)}
+        .to yield_successive_args *blog_1_views
+    end
+  end
+
 end

data/spec/examples/record/scoped_spec.rb

@@ -11,4 +11,12 @@ describe Cequel::Record::Scoped do
   it 'should use current scoped key values to populate new record' do
     Post['bigdata'].new.blog_subdomain.should == 'bigdata'
   end
+
+  it "should not mess up class' #puts" do
+    StringIO.new.tap do |out|
+      out.puts Post
+      out.string.should == "Post\n"
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Mat Brown
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel