extendi-cassandra_object 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a831b81ddc138be335b66caa6f64598f9c1cb851
-  data.tar.gz: c6df634be44a3a7486ce52ffd0948fc1ed86c0a0
+  metadata.gz: ecd527d822a4895c5206c941bf16083025307c42
+  data.tar.gz: 918d17478765af790449a2545818856358854e35
 SHA512:
-  metadata.gz: fecfdfa99fccb6b7856f06109b0ca122ad1a4e0ca7d3d402e78e654fc9083cb17a6d1bb5d648e14e002a39139575e29eaa1aecb436a27f092d509ff67a0ee0e1
-  data.tar.gz: 69843e5f6e0d5c8235466c3a05bb308b8f914de88d58d44c7dacf24a6a60dedcce065fd931ee6b3926df364e367c1b26c801abec100615d4e3918ad85ec142f5
+  metadata.gz: d14760b8e19cfaf29a8b18822b37ba8e19140c3e679b35bd05425650f0c750180dd7428e544a98068d5c719241c5f0b61e2df5a89ab90ea29712f4062b92fe8a
+  data.tar.gz: 700146529ef52a4046b0d7f39bdfedc2b09c3889f878a724bad17af14e00f113feb15977709eed4ecafb33f6a8414643c8a609b690b6861f9fbc8e0fcb051374

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 .idea
 .byebug_history
 .ruby-version
+TAGS

data/extendi-cassandra_object.gemspec

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

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -41,7 +41,7 @@ module CassandraObject
         end
 
         def where_string_async(id)
-          wheres = @scope.where_values.dup
+          wheres = @scope.where_values.dup.select.each_with_index { |_, i| i.even? }
           wheres << "#{@scope._key} = '#{id}'" if !id.nil?
           "WHERE #{wheres * ' AND '}" if wheres.any?
         end
@@ -139,7 +139,8 @@ module CassandraObject
       def select(scope)
         queries = QueryBuilder.new(self, scope).to_query_async
         # todo paginate
-        cql_rows = execute_async(queries).map{|item| item.rows.map{|x| x}}.flatten!
+        arguments = scope.where_values.select.each_with_index{ |_, i| i.odd? }.reject{ |c| c.blank? }
+        cql_rows = execute_async(queries, arguments).map{|item| item.rows.map{|x| x}}.flatten!
         cql_rows.each do |cql_row|
           attributes = cql_row.to_hash
           key = attributes.delete(scope._key)
@@ -176,10 +177,23 @@ module CassandraObject
         execute_batchable(queries)
       end
 
-      def delete(table, key, ids)
+      def delete(scope, ids, attributes = {})
         ids = [ids] if !ids.is_a?(Array)
-        statement = "DELETE FROM #{table} WHERE #{key} IN (#{ids.map{|id| "'#{id}'"}.join(',')})"
-        execute(statement, nil)
+        statement = "DELETE FROM #{scope.column_family} WHERE #{scope._key} IN (#{ids.map{|id| '?'}.join(',')})"
+        arguments = ids
+        unless attributes.blank?
+          statement += " AND #{attributes.keys.map{ |k| "#{k} = ?" }.join(' AND ')}"
+          arguments += attributes.values
+        end
+        execute(statement, arguments)
+      end
+
+      def delete_single(obj)
+        keys = obj.class._keys
+        wheres = keys.map{ |k| "#{k} = ?" }.join(' AND ')
+        arguments = keys.map{ |k| obj.attributes[k] }
+        statement = "DELETE FROM #{obj.class.column_family} WHERE #{wheres}"
+        execute(statement, arguments)
       end
 
       def execute_batch(statements)

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -223,7 +223,6 @@ module CassandraObject
         execute_batchable(queries)
       end
 
-
       def delete(table, ids)
         ids = [ids] if !ids.is_a?(Array)
         arguments = nil

data/lib/cassandra_object/base.rb

@@ -27,6 +27,10 @@ module CassandraObject
 
     include Serialization
 
+    def self.timestamps
+      true
+    end
+
   end
 end
 

data/lib/cassandra_object/model.rb

@@ -31,7 +31,11 @@ module CassandraObject
 
     def _key
       # todo only first key
-      keys.tr('()','').split(',').first
+      _keys.first
+    end
+
+    def _keys
+      keys.tr('()','').gsub(/\s+/, "").split(',')
     end
 
     def keys=(value)

data/lib/cassandra_object/persistence.rb

@@ -48,21 +48,25 @@ module CassandraObject
 
       def delete(ids, attributes = [])
         ids = [ids] if !ids.is_a?(Array)
-        if !attributes.empty?
+
+        if self.schema_type == :standard
+          attrs = attributes.is_a?(Array) ? {} : attributes
+          adapter.delete self, ids, attrs
+        elsif attributes.blank?
+          adapter.delete column_family, ids
+        else
           attr = {}
           attributes.each{|a| attr[a] = nil}
           ids.each do |id|
             adapter.update column_family, id, encode_attributes(attr)
           end
-        else
-          if self.schema_type == :standard
-            adapter.delete column_family, self._key, ids
-          else
-            adapter.delete column_family, ids
-          end
         end
       end
 
+      def delete_schema(obj)
+        adapter.delete_single(obj)
+      end
+
       def insert_record(id, attributes)
         attributes = attributes.dup
         attributes[self._key] = id if self.schema_type == :standard
@@ -152,7 +156,12 @@ module CassandraObject
     end
 
     def destroy
-      self.class.remove(id)
+      if self.class.schema_type == :standard
+        self.class.delete_schema self
+      else
+        self.class.remove(id)
+      end
+
       @destroyed = true
     end
 

data/lib/cassandra_object/scope.rb

@@ -47,7 +47,8 @@ module CassandraObject
 
       if self.schema_type == :standard
         klass.adapter.select(self) do |key, attributes|
-          records[key] = attributes
+          records[key] ||= []
+          records[key] << attributes
         end
       else
         if @is_all && @id_values.empty?
@@ -73,7 +74,11 @@ module CassandraObject
         if self.raw_response || self.schema_type == :dynamic_attributes
           results << {key => attributes.values.compact.empty? ? attributes.keys : attributes}
         else
-          results << klass.instantiate(key, attributes)
+          if attributes.is_a?(Array)
+            attributes.each{ |attrs| results << klass.instantiate(key, attrs) }
+          else
+            results << klass.instantiate(key, attributes)
+          end
         end
       end
       results = results.reduce({}, :merge!) if self.schema_type == :dynamic_attributes

data/lib/cassandra_object/timestamps.rb

@@ -7,12 +7,16 @@ module CassandraObject
       attribute :updated_at, type: :time
 
       before_create do
-        self.created_at ||= Time.current
-        self.updated_at ||= Time.current
+        if self.class.timestamps
+          self.created_at ||= Time.current
+          self.updated_at ||= Time.current
+        end
       end
 
       before_update if: :changed? do
-        self.updated_at = Time.current
+        if self.class.timestamps
+          self.updated_at = Time.current
+        end
       end
     end
   end

data/lib/cassandra_object/types/type_helper.rb

@@ -50,7 +50,6 @@ module CassandraObject
           end
         else
 
-
           case object
             when ::String then
               Cassandra::Types.varchar

data/test/support/cassandra.rb

@@ -22,7 +22,7 @@ CassandraObject::Base.config = {
 
 begin
   CassandraObject::Schema.drop_keyspace 'cassandra_object_test', true
-  CassandraObject::Schema.drop_keyspace 'blah', true
+  CassandraObject::Schema.drop_keyspace 'Blah', true
 rescue Exception => e
   puts e.message
 end
@@ -31,6 +31,7 @@ sleep 1
 CassandraObject::Schema.create_keyspace 'cassandra_object_test'
 CassandraObject::Schemaless.create_column_family 'Issues'
 CassandraObject::Schema.create_column_family 'IssueSchemas', {attributes: 'id text, title text, description text, field float, intero int, created_at timestamp, updated_at timestamp, PRIMARY KEY (id)', options: {}}
+CassandraObject::Schema.create_column_family 'IssueSchemaCks', {attributes: 'id text, type text, date timestamp, value float, PRIMARY KEY (id, type, date)', options: {}}
 CassandraObject::Schemaless.create_column_family 'IssueDynamics'
 CassandraObject::Schemaless.create_column_family 'IssuesCustomConfig'
 CassandraObject::Schema.create_column_family 'IssueSchemaFathers', {attributes: 'id text, title text, field float, created_at timestamp, updated_at timestamp, PRIMARY KEY (id)', options: {}}
@@ -51,6 +52,7 @@ CassandraObject::Base.class_eval do
     # created_records.reject(&:destroyed?).each(&:destroy)
     Issue.delete_all
     IssueSchema.delete_all
+    IssueSchemaCk.delete_all
     IssueDynamic.delete_all
     created_records.clear
   end

data/test/support/issue_schema_ck.rb

@@ -0,0 +1,18 @@
+class IssueSchemaCk < CassandraObject::BaseSchema
+  string :id
+  string :type
+  time :date
+  float :value
+
+  self.allow_filtering = true
+
+  self.keys = '(id, type, date)'
+
+  def self.timestamps
+    false
+  end
+
+  def self.for_key key
+    where_ids(key)
+  end
+end

data/test/test_helper.rb

@@ -13,6 +13,7 @@ require 'support/issue_custom_config'
 require 'support/issue_schema'
 require 'support/issue_schema_child'
 require 'support/issue_schema_father'
+require 'support/issue_schema_ck'
 
 module CassandraObject
   class TestCase < ActiveSupport::TestCase

data/test/unit/persistence_schema_ck_test.rb

@@ -0,0 +1,69 @@
+#!/bin/env ruby
+# encoding: utf-8
+
+require 'test_helper'
+
+class CassandraObject::PersistenceSchemaCkTest < CassandraObject::TestCase
+
+  test 'composite key' do
+    time1 = Time.now
+    time2 = time1 + 1.second
+
+    IssueSchemaCk.create(id: '1', type: 'first', date: time1, value: 1.to_f)
+    IssueSchemaCk.create(id: '1', type: 'second', date: time1, value: 1.to_f)
+    IssueSchemaCk.create(id: '1', type: 'first', date: time2, value: 2.to_f)
+    IssueSchemaCk.create(id: '1', type: 'second', date: time2, value: 2.to_f)
+
+    res = IssueSchemaCk.where('type = ?', 'first').find_by_id([1])
+    assert_equal 2, res.size
+    assert_equal 1, res.first.value
+
+    item = res[0]
+    assert_equal '1', item.id
+    assert_equal time1.to_i, item.date.to_i
+
+    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
+    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)
+    IssueSchemaCk.create(id: '2', type: 'first', date: Time.now, value: 1.to_f)
+
+    IssueSchemaCk.delete('1', type: 'first')
+    assert_equal 2, IssueSchemaCk.find_by_id([1,2]).size
+  end
+
+  test 'delete multiple' 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.create(id: '2', type: 'first', date: Time.now, value: 1.to_f)
+    IssueSchemaCk.create(id: '2', type: 'first', date: Time.now, value: 1.to_f)
+
+    IssueSchemaCk.delete(['1','2'])
+    assert_equal 0, IssueSchemaCk.find_by_id([1]).size
+    assert_equal 0, IssueSchemaCk.find_by_id([2]).size
+  end
+
+  test 'destroy' 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.find_by_id(['1']).first.destroy
+    assert_equal 1, IssueSchemaCk.find_by_id([1]).size
+  end
+
+end

data/test/unit/persistence_schema_test.rb

@@ -95,27 +95,27 @@ class CassandraObject::PersistenceSchemaTest < CassandraObject::TestCase
     assert_equal persisted_issue, reloaded_issue
   end
 
-  test 'remove' do
-    issue = IssueSchema.create(title: 'I rule', description: 'lololol')
-    id = issue.id
-    assert_equal id, IssueSchema.find(id).id
-    IssueSchema.remove(id)
-    assert_raise CassandraObject::RecordNotFound do
-      IssueSchema.find(id)
-    end
-  end
-
-  test 'remove multiple' do
-    ids = []
-    (1..10).each do
-      issue = IssueSchema.create(title: 'I rule', description: 'lololol')
-      ids << issue.id
-    end
-
-    IssueSchema.remove(ids)
-
-    assert_equal [], IssueSchema.find(ids)
-  end
+  # test 'remove' do
+  #   issue = IssueSchema.create(title: 'I rule', description: 'lololol')
+  #   id = issue.id
+  #   assert_equal id, IssueSchema.find(id).id
+  #   IssueSchema.remove(id)
+  #   assert_raise CassandraObject::RecordNotFound do
+  #     IssueSchema.find(id)
+  #   end
+  # end
+
+  # test 'remove multiple' do
+  #   ids = []
+  #   (1..10).each do
+  #     issue = IssueSchema.create(title: 'I rule', description: 'lololol')
+  #     ids << issue.id
+  #   end
+
+  #   IssueSchema.remove(ids)
+
+  #   assert_equal [], IssueSchema.find(ids)
+  # end
 
   test 'ttl' do
     description_test = 'this is the one with ttl'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -139,6 +139,7 @@ files:
 - test/support/issue_dynamic.rb
 - test/support/issue_schema.rb
 - test/support/issue_schema_child.rb
+- test/support/issue_schema_ck.rb
 - test/support/issue_schema_father.rb
 - test/support/reconnection.rb
 - test/test_helper.rb
@@ -159,6 +160,7 @@ files:
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
 - test/unit/log_subscriber_test.rb
+- test/unit/persistence_schema_ck_test.rb
 - test/unit/persistence_schema_test.rb
 - test/unit/persistence_test.rb
 - test/unit/railties/controller_runtime_test.rb