extendi-cassandra_object 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f33ea4a5998a0a9037609d93c924510d3274631
-  data.tar.gz: 34a9ee8f8b1069418b21752e1435f6ed16d461c1
+  metadata.gz: efe17be3c5e2444bff2078ff198a4103e590a436
+  data.tar.gz: 5bfd5a2ec7ab2393478ca07102627d62707422b2
 SHA512:
-  metadata.gz: 8a4a65a5eadb7f814e16f7c35a84cac6359526e2e1fdce9114a787af32dd96d9340905ffe3240b1241c6c706f9accbc5a95036928d2d2851cd8e5839d3127dd4
-  data.tar.gz: 668273dbc3a7113e62b874866aa3a27d72b90f8fb6003dd062c873a3ccea5cc7b477faebc2e1831f53043bdfe224ae3b5d5b751697ee191f849f5c4f3521972e
+  metadata.gz: 19d0cd635b148b38e5c9a85faab5595d65b45c94ec32387e3f7b2188e6e3cc3b5924e8bc63ad3d957ad25ab1ac5ca57cfe1d7fd02bed8429070e9c24cfa48cd0
+  data.tar.gz: 3b63a775a8af44163f983b5d933407aa977c5e33ea92f165723909fe806c07499600fca99eee34a98c8e4e175c5d88c40a686c400f2c5a1cb8a24fd3becfb0a3

data/extendi-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'extendi-cassandra_object'
-  s.version = '1.0.5'
+  s.version = '1.0.6'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ['Duccio Giovannelli', 'gotime']

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -30,14 +30,14 @@ module CassandraObject
             str << "ALLOW FILTERING" if @scope.klass.allow_filtering
             return [] << str.delete_if(&:blank?) * ' '
           end
-          @scope.id_values.map { |id|
+          @scope.id_values.map do |id|
             str = [
                 "SELECT #{select_string} FROM #{@scope.klass.column_family}",
                 where_string_async(id)
             ]
             str << "ALLOW FILTERING" if @scope.klass.allow_filtering
             str.delete_if(&:blank?) * ' '
-          }
+          end
         end
 
         def where_string_async(id)
@@ -110,17 +110,17 @@ module CassandraObject
       def execute(statement, arguments = [])
         ActiveSupport::Notifications.instrument('cql.cassandra_object', cql: statement) do
           type_hints = []
-          arguments.map { |a| type_hints << CassandraObject::Types::TypeHelper.guess_type(a) } if !arguments.nil?
+          arguments.each { |a| type_hints << CassandraObject::Types::TypeHelper.guess_type(a) } unless arguments.nil?
           connection.execute statement, arguments: arguments, type_hints: type_hints, consistency: consistency, page_size: config[:page_size]
         end
       end
 
       def execute_async(queries, arguments = [])
-        futures = queries.map { |q|
+        futures = queries.map do |q|
           ActiveSupport::Notifications.instrument('cql.cassandra_object', cql: q) do
             connection.execute_async q, arguments: arguments, consistency: consistency, page_size: config[:page_size]
           end
-        }
+        end
         futures.map do |future|
           rows = future.get
           rows
@@ -169,7 +169,7 @@ module CassandraObject
 
       def delete(table, key, ids)
         ids = [ids] if !ids.is_a?(Array)
-        statement = "DELETE FROM #{table} WHERE #{key} IN (#{ids.map { |id| "'#{id}'" }.join(',')})"
+        statement = "DELETE FROM #{table} WHERE #{key} IN (#{ids.map{|id| "'#{id}'"}.join(',')})"
         execute(statement, nil)
       end
 

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -30,17 +30,17 @@ module CassandraObject
                 "SELECT #{select_string} FROM #{@scope.klass.column_family}",
                 where_string_async(nil)
             ]
-            str << "ALLOW FILTERING" if @scope.klass.allow_filtering
+            str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
             return [] << str.delete_if(&:blank?) * ' '
           end
-          @scope.id_values.map { |id|
+          @scope.id_values.map do |id|
             str = [
                 "SELECT #{select_string} FROM #{@scope.klass.column_family}",
                 where_string_async(id)
             ]
-            str << "ALLOW FILTERING" if @scope.klass.allow_filtering
+            str << 'ALLOW FILTERING' if @scope.klass.allow_filtering
             str.delete_if(&:blank?) * ' '
-          }
+          end
         end
 
         def where_string_async(id)
@@ -142,9 +142,9 @@ module CassandraObject
         query << " LIMIT #{scope.limit_value}" if scope.limit_value == 1
         ids = []
         new_next_cursor = nil
-        execute_async([query], nil, per_page, next_cursor).map do |item|
-          item.rows.map { |x| ids << x[primary_key_column] }
-          new_next_cursor = item.paging_state if !item.last_page?
+        execute_async([query], nil, per_page, next_cursor).each do |item|
+          item.rows.each { |x| ids << x[primary_key_column] }
+          new_next_cursor = item.paging_state unless item.last_page?
         end
         return {ids: ids, new_next_cursor: new_next_cursor}
       end
@@ -154,19 +154,35 @@ module CassandraObject
         queries.compact! if queries.present?
         raise CassandraObject::RecordNotFound if !queries.present?
 
-        arguments = scope.select_values.select { |sv| sv != :column1 }.map(&:to_s)
-        arguments += scope.where_values.select.each_with_index { |_, i| i.odd? }.reject { |c| c.empty? }.map(&:to_s)
+        arguments = scope.select_values.select{ |sv| sv != :column1 }.map(&:to_s)
+        arguments += scope.where_values.select.each_with_index{ |_, i| i.odd? }.reject{ |c| c.empty? }.map(&:to_s)
         records = execute_async(queries, arguments).map do |item|
           # pagination
           elems = []
           loop do
-            item.rows.map { |x| elems << x }
+            item.rows.each{ |x| elems << x }
             break if item.last_page?
             item = item.next_page
           end
           elems
         end
-        records.flatten!
+        {results: records.flatten!}
+      end
+
+      def select_paginated(scope)
+        queries = QueryBuilder.new(self, scope).to_query_async
+        queries.compact! if queries.present?
+        raise CassandraObject::RecordNotFound if !queries.present?
+
+        arguments = scope.select_values.select{ |sv| sv != :column1 }.map(&:to_s)
+        arguments += scope.where_values.select.each_with_index{ |_, i| i.odd? }.reject{ |c| c.empty? }.map(&:to_s)
+        new_next_cursor = nil
+        records = []
+        execute_async(queries, arguments, scope.limit_value, scope.next_cursor).each do |item|
+          new_next_cursor = item.paging_state unless item.last_page?
+          item.rows.each{ |x| records << x }
+        end
+        return {results: records, new_next_cursor: new_next_cursor}
       end
 
       def insert(table, id, attributes, ttl = nil)

data/lib/cassandra_object/scope.rb

@@ -34,13 +34,13 @@ module CassandraObject
       if klass.respond_to?(method_name)
         scoping { klass.send(method_name, *args, &block) }
       elsif Array.method_defined?(method_name)
-        to_a.send(method_name, *args, &block)
+        execute.send(method_name, *args, &block)
       else
         super
       end
     end
 
-    def select_records
+    def select_records(auto_paginate = true)
       results = []
       records = {}
       new_next_cursor = nil
@@ -50,24 +50,25 @@ module CassandraObject
           records[key] = attributes
         end
       else
-        if @is_all
+        if @is_all && @id_values.empty?
           pre = klass.adapter.pre_select(self, @limit_value, @next_cursor)
-          new_next_cursor = pre[:new_next_cursor]
+          new_next_cursor ||= pre[:new_next_cursor]
           return {results: [], next_cursor: new_next_cursor} if pre[:ids].empty? # fix last query all if ids is empty
-          self.id_values = pre[:ids]
+          @id_values = pre[:ids]
         end
 
-        resp = klass.adapter.select(self)
+        resp = auto_paginate ? klass.adapter.select(self) : klass.adapter.select_paginated(self)
         primary_key_column = klass.adapter.primary_key_column
-        resp.each do |cql_row|
+        new_next_cursor ||= resp[:new_next_cursor]
+        resp[:results].each do |cql_row|
           key = cql_row[primary_key_column]
           records[key] ||= {}
           records[key][cql_row.values[1]] = cql_row.values[2]
         end
-
       end
-      # limit
+
       records = records.first(@limit_value) if @limit_value.present?
+
       records.each do |key, attributes|
         if self.raw_response || self.schema_type == :dynamic_attributes
           results << {key => attributes.values.compact.empty? ? attributes.keys : attributes}
@@ -75,11 +76,12 @@ module CassandraObject
           results << klass.instantiate(key, attributes)
         end
       end
-      results = results.reduce({}, :merge) if self.schema_type == :dynamic_attributes
+      results = results.reduce({}, :merge!) if self.schema_type == :dynamic_attributes
       if @is_all
         return {results: results, next_cursor: new_next_cursor}
+      else
+        return results
       end
-      return results
     end
 
   end

data/lib/cassandra_object/scope/finder_methods.rb

@@ -15,16 +15,23 @@ module CassandraObject
         nil
       end
 
+      def find_in_batches(id, next_cursor = nil)
+        obj = self.clone
+        obj.is_all = true
+        obj.next_cursor = next_cursor
+        obj.where_ids(id).execute_paged
+      end
+
       def find_all_in_batches(next_cursor = nil)
         obj = self.clone
         obj.is_all = true
         obj.next_cursor = next_cursor
-        obj.to_a
+        obj.execute
       end
 
       def first
         return limit(1).find_all_in_batches[:results].first if self.schema_type == :dynamic_attributes || self.schema_type == :schemaless
-        limit(1).to_a.first
+        limit(1).execute.first
       end
 
       private
@@ -33,7 +40,7 @@ module CassandraObject
         if id.blank?
           raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
         elsif self.schema_type == :dynamic_attributes
-          record = where_ids(id).to_a
+          record = where_ids(id).execute
           raise CassandraObject::RecordNotFound if record.empty?
           record
         elsif record = where_ids(id)[0]
@@ -47,7 +54,7 @@ module CassandraObject
         ids = ids.flatten
         return [] if ids.empty?
         ids = ids.compact.map(&:to_s).uniq
-        where_ids(ids).to_a
+        where_ids(ids).execute
       end
     end
   end

data/lib/cassandra_object/scope/query_methods.rb

@@ -21,7 +21,7 @@ module CassandraObject
 
       def select(*values, &block)
         if block_given?
-          to_a.select(&block)
+          execute.select(&block)
         else
           clone.select!(*values)
         end
@@ -60,10 +60,14 @@ module CassandraObject
         clone.limit! value
       end
 
-      def to_a
+      def execute
         select_records
       end
 
+      def execute_paged
+        select_records(false)
+      end
+
     end
   end
 end

data/test/unit/core_test.rb

@@ -52,4 +52,14 @@ class CassandraObject::CoreTest < CassandraObject::TestCase
     issue = Issue.create
     assert issue.inspect =~ /^#<Issue id: \"\w+\", created_at: \".+\", updated_at: \".+\", description: \".+\">$/
   end
+
+  test 'inspect schema' do
+    issue = IssueSchema.create(title: 'tit', description: 'desc')
+    assert issue.inspect =~ /^#<IssueSchema id: \"\w+\", title: \".+\", description: \".+\", created_at: \".+\", updated_at: \".+\">$/
+  end
+
+  test 'inspect dynamic' do
+    issue = IssueDynamic.create(key: '1', title: 'tit', dynamic_field1: 'one', dynamic_field2: 'two')
+    assert issue.inspect =~ /^{:key=>\".+\", :title=>\".+\", :dynamic_field1=>\".+\", :dynamic_field2=>\".+\"}$/
+  end
 end

data/test/unit/scope/finder_methods_test.rb

@@ -39,10 +39,32 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     second_issue = IssueDynamic.create(key: '2', title: 'tit', dynamic_field1: 'one', dynamic_field2: 'two')
     res = IssueDynamic.find_all_in_batches
     reobjected = res[:results].map { |key, val| {key: key }.merge(val) }
+    IssueDynamic.delete(['1', '2'])
 
     assert_equal [first_issue, second_issue].size, reobjected.size
   end
 
+  test 'find by key in batches dynamic paged' do
+    100.times.each do |i|
+      IssueDynamic.create(key: '1', title: 'tit', "dynamic_field_#{i}" => ['a'])
+      IssueDynamic.create(key: '2', title: 'tit', "dynamic_field_#{i}" => ['a'])
+    end
+
+    resp = IssueDynamic.limit(10).find_in_batches('1')
+    columns = resp[:results]['1']
+    assert_equal 10, columns.size
+    assert_equal 'dynamic_field_0', columns.keys.first
+
+    cursor = resp[:next_cursor]
+    resp = IssueDynamic.limit(10).find_in_batches('1', cursor)
+    columns = resp[:results]['1']
+    assert_equal 10, columns.size
+    assert_equal 'dynamic_field_18', columns.keys.first
+
+    IssueDynamic.delete(['1', '2'])
+  end
+
+
   test 'find all in batches dynamic paged' do
 
     issues = []
@@ -104,9 +126,9 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
   test 'where' do
     # todo make better tests
     # mono parameter
-    res1 = Issue.cql_response.where("column1 < 'poi'").to_a
+    res1 = Issue.cql_response.where("column1 < 'poi'").execute
     # bi parameter
-    res = Issue.cql_response.where('column1 < ?', 'poi').to_a
+    res = Issue.cql_response.where('column1 < ?', 'poi').execute
   end
 
   # test 'limit in first' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -200,3 +200,4 @@ signing_key:
 specification_version: 4
 summary: Cassandra ActiveModel
 test_files: []
+has_rdoc: