extendi-cassandra_object 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35c334a18f8c02dcc3fa80aedd61b32d750ad798199d4ead39c4fc5948cf6bc8
-  data.tar.gz: 5d31df130a07772d2334d0c8dc97d14cfd6dd6e7d2bf3f5369d5d84206698a34
+  metadata.gz: db5689a9457f279a1fbe638e83d899b6ca640563b7d1332e8d741fc6afb5834e
+  data.tar.gz: f9d9ad2c05797b892f79c5e57953e20be272b85905365d86a4d62ae793d3e6f4
 SHA512:
-  metadata.gz: 4dce7aed3855ebacfef2b79df27b0b598ca3f7caaa144e468560acbf1b823435ed3564ecd12922909fda502f5f2db69562823fd4e304a533a13af5cf9352d339
-  data.tar.gz: f78455454cb989f92c9190a6c421570e3cbd402b7aa3613aa18d4a334c038ef65b3dafa054b477c0c5d7e5ddf9c587893cf1a69db4489f2aa6e8050b528efd30
+  metadata.gz: f64fad5dbbce31d041661b7033dfd967f576e54f0a9a2375784183622bb24c9ee671c43fc5839e91bd289954441060ec2a96304663354f07abf6f499fa8d97ac
+  data.tar.gz: a410cfabfafa3dee262fa0fa20f4e5670f7306f6691ca4bcb4b21cb8e04c5bb488ab3ff8aa8c61fb5ab33bc805f5a377c3bc823169099f49a697f1b325b5aa2f

data/extendi-cassandra_object.gemspec

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

data/lib/cassandra_object/scope/finder_methods.rb

@@ -50,15 +50,25 @@ module CassandraObject
         end
       end
 
-      def find_some(ids)
-        ids = ids.flatten
+      def find_some(pids)
+        ids = pids.flatten.compact.uniq.map(&:to_s)
         return [] if ids.empty?
-        ids = ids.compact.map(&:to_s).uniq
-        where_ids(ids).execute
+
+        qr = where_ids(ids).execute
+        is_dymnamic = qr.is_a?(Hash)
+
+        results = qr.sort_by do |r|
+          id = r.keys.first if r.is_a?(Hash)
+          id = r[0] if r.is_a?(Array)
+          id = r.id if id.nil?
+          ids.index(id)
+        end
+
+        is_dymnamic ? Hash[results] : results
       end
 
       def not_found(id)
-        raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+        raise CassandraObject::RecordNotFound, "Couldn't find #{name} with key #{id.inspect}"
       end
     end
   end

data/test/unit/persistence_schema_ck_test.rb

@@ -4,7 +4,6 @@
 require 'test_helper'
 
 class CassandraObject::PersistenceSchemaCkTest < CassandraObject::TestCase
-
   test 'composite key' do
     time1 = Time.now
     time2 = time1 + 1.second
@@ -25,19 +24,17 @@ class CassandraObject::PersistenceSchemaCkTest < CassandraObject::TestCase
     item = res[1]
     assert_equal '1', item.id
     assert_equal time2.to_i, item.date.to_i
-
   end
 
   test 'delete' do
     IssueSchemaCk.create(id: '1', type: 'first', date: Time.now, value: 1.to_f)
     IssueSchemaCk.create(id: '1', type: 'second', date: Time.now, value: 1.to_f)
-
     IssueSchemaCk.delete('1')
     assert_equal 0, IssueSchemaCk.find_by_id([1]).size
   end
 
   test 'delete with attributes' do
-    time = Time.now
+    time = Time.now - 10.days
     IssueSchemaCk.create(id: '1', type: 'first', date: time, value: 1.to_f)
     IssueSchemaCk.create(id: '1', type: 'first', date: Time.now, value: 1.to_f)
     IssueSchemaCk.create(id: '2', type: 'first', date: time, value: 1.to_f)
@@ -65,5 +62,4 @@ class CassandraObject::PersistenceSchemaCkTest < CassandraObject::TestCase
     IssueSchemaCk.find_by_id(['1']).first.destroy
     assert_equal 1, IssueSchemaCk.find_by_id([1]).size
   end
-
 end

data/test/unit/scope/finder_methods_test.rb

@@ -26,6 +26,39 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     assert_equal [first_issue, second_issue].to_set, Issue.find([first_issue.id, second_issue.id]).to_set
   end
 
+  test 'IssueDynamic: find with ids sorted' do
+    ids = (0..999).to_a.map(&:to_s)
+    ids.each do |i|
+      IssueDynamic.create(key: i, title: "foo_title_#{i}")
+    end
+    ids_to_find = ids.sample(10)
+    assert_equal ids_to_find, IssueDynamic.find(ids_to_find).keys
+    IssueDynamic.delete_all
+  end
+
+  test 'Issue: find with ids sorted' do
+    ids = (0..999).to_a.map(&:to_s)
+    ids.each do |i|
+      Issue.create(id: i, title: "foo_title_#{i}")
+    end
+    ids_to_find = ids.sample(10)
+    assert_equal ids_to_find, Issue.find(ids_to_find).map(&:id)
+    Issue.delete_all
+  end
+
+  test 'IssueSchemaCk: find with ids sorted' do
+    ids = (0..999).to_a.map(&:to_s)
+    time = Time.now - 10.years
+    ids.each do |i|
+      IssueSchemaCk.create(id: i, type: 'first', date: time, value: 1.to_f)
+      IssueSchemaCk.create(id: i, type: 'first', date: Time.now, value: 1.to_f)
+    end
+    ids_to_find = ids.sample(10)
+    assert_equal ids_to_find.size * 2, IssueSchemaCk.find(ids_to_find).map(&:id).size
+    assert_equal ids_to_find, IssueSchemaCk.find(ids_to_find).map(&:id).uniq
+    IssueSchemaCk.delete_all
+  end
+
   test 'find_by_id' do
     Issue.create.tap do |issue|
       assert_equal issue, Issue.find_by_id(issue.id)
@@ -64,9 +97,7 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     IssueDynamic.delete(['1', '2'])
   end
 
-
   test 'find all in batches dynamic paged' do
-
     issues = []
     100.times.each do |i|
       issues << IssueDynamic.create(key: i, title: 'tit', dynamic_field1: 'one', dynamic_field2: 'two')
@@ -135,5 +166,4 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
   #   first_issue = IssueDynamic.create(key: '1', title: 'tit', dynamic_field1: 'one', dynamic_field2: 'two')
   #   f = IssueDynamic.first
   # end
-
 end

data/test/unit/scope/query_methods_test.rb

@@ -37,5 +37,4 @@ class CassandraObject::Scope::QueryMethodsTest < CassandraObject::TestCase
     foo_issue_columns =  Issue.columns.first
     assert_equal ['created_at', 'description', 'title', 'updated_at'], foo_issue_columns[foo_issue_columns.keys.first]
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel