gotime-cassandra_object 4.10.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7073b42de70860d98b730e0bdc70bea709b52303
-  data.tar.gz: e074884e886d5564c546dc039b9582d0b8029514
+  metadata.gz: a094a6b0709d5666b254585cf07f2e8889abf318
+  data.tar.gz: f13ccf6c6431c0f576110ef956b18eb809367bd5
 SHA512:
-  metadata.gz: f3a6fc60a3b36f91ca85fcd053a8d6578421831b1ff1f184a504ce5fd9991434573acb2f66e0021699389e445fb06c543ba8a60d7cf734f5aefc337343c321bc
-  data.tar.gz: d7504256963ff601ade664dbd8fdf7da672adaef16d5017aeda6e917892f6eef7243f611c55a8aa7ae6812c754649596c1fb6189372bc604e65fe381eda06836
+  metadata.gz: b6fa0ffb1d1c554e906be4adf20ae4c1a0dac7148fa7bff4d15f9574750946f2f41d4833b86058f0d62825529a4a5d6f1e24dc19c8912afd86d2185ac48bbcd5
+  data.tar.gz: 5060c16d39315b8cc1c98855582450715ac3e30162ab9328a148e2fac2bdc6b401f44fd29fbbc2df2b66864fb5b08187c08079a48042f477dea4f9ea9793be94

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.10.0'
+  s.version = '4.10.1'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/persistence.rb

@@ -8,7 +8,13 @@ module CassandraObject
 
     module ClassMethods
       def remove(id)
-        execute_batchable_cql "DELETE FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
+        statement = "DELETE FROM #{column_family}#{write_option_string} WHERE "
+        if id.is_a?(Array)
+          statement += "KEY IN (?)"
+        else
+          statement += "KEY = ?"
+        end
+        execute_batchable_cql statement, id
       end
 
       def delete_all

data/lib/cassandra_object/types/json_type.rb

@@ -1,6 +1,40 @@
 module CassandraObject
   module Types
     class JsonType < BaseType
+      class DirtyHash < Hash
+        attr_accessor :record, :name, :options
+        def initialize(record, name, hash, options)
+          @record   = record
+          @name     = name.to_s
+          @options  = options
+
+          self.merge!(hash)
+          @init_hash = self.hash
+          @init_value = hash
+        end
+
+        def []=(obj, val)
+          modifying do super end
+        end
+
+        def delete(obj)
+          modifying do super end
+        end
+
+        private
+        def modifying
+          result = yield
+
+          if !record.changed_attributes.key?(name) && @init_hash != self.hash
+            record.changed_attributes[name] = @init_value
+          end
+
+          record.send("#{name}=", self)
+
+          result
+        end
+      end
+
       def encode(hash)
         ActiveSupport::JSON.encode(hash)
       end
@@ -8,6 +42,11 @@ module CassandraObject
       def decode(str)
         ActiveSupport::JSON.decode(str)
       end
+
+      def wrap(record, name, value)
+        DirtyHash.new(record, name, Hash(value), options)
+      end
+
     end
   end
 end

data/test/unit/persistence_test.rb

@@ -184,4 +184,40 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     klass = Class.new { include CassandraObject::Persistence }
     assert_equal %w{'a' 'b'}, klass.__send__(:quote_columns, %w{a b})
   end
+
+  test 'remove' do
+    klass = temp_object do
+      string :name
+    end
+
+    record = klass.new(name: 'cool')
+    record.save!
+
+    id = record.id
+    assert_equal id, klass.find(id).id
+
+    klass.remove(id)
+
+    assert_raise CassandraObject::RecordNotFound do
+      klass.find(id)
+    end
+  end
+
+  test 'remove multiple' do
+    klass = temp_object do
+      string :name
+    end
+
+    ids = []
+    (1..10).each do
+      record = klass.new(name: 'cool')
+      record.save!
+      ids << record.id
+    end
+
+    klass.remove(ids)
+
+    assert_equal [], klass.find(ids)
+  end
+
 end

data/test/unit/types/json_type_test.rb

@@ -9,4 +9,69 @@ class CassandraObject::Types::JsonTypeTest < CassandraObject::Types::TestCase
   test 'decode' do
     assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
   end
+
+  test 'setting marks dirty' do
+    record = temp_object do
+      string :name
+      json :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:c] = 3
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, c: 3], record.stuff
+  end
+
+  test 'hash change marks dirty' do
+    record = temp_object do
+      string :name
+      json :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {}]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:v][:data] = 69
+    record.stuff[:v] = record.stuff[:v]
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
+  end
+
+  test 'hash no change does not dirty' do
+    record = temp_object do
+      string :name
+      json :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {data: 69}]
+
+    record.save!
+    assert !record.stuff_changed?
+
+    record.stuff[:v][:data] = 69
+    record.stuff[:v] = record.stuff[:v]
+
+    assert !record.stuff_changed?
+    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
+  end
+
+  test 'delete marks dirty' do
+    record = temp_object do
+      string :name
+      json :stuff
+
+    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
+
+    record.stuff.delete :b
+
+    assert record.stuff_changed?
+    assert_equal Hash[a: 1], record.stuff
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.1
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel