cassandro 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk1NTEzMjZiNDVhZDgzZWJlZGJiYmY2MGUyYzA1ZTBjMDhmNDQyYg==
+    ZmNlNzM0YjQyYTIyYjAzN2NjMzA5ODJjNjI1N2Y1ODhiNjZhMDBjMQ==
   data.tar.gz: !binary |-
-    MzE4MGMxZmViMWM4MTlmYmY3NmQwYWQ0OWQwYmZhYTE1N2JiZjNhNQ==
+    YjFhNWQyY2UyMzI1YmY0MzBkMjBhODE5NDk3ZjczNTYwYmM0YzU3MA==
 SHA512:
   metadata.gz: !binary |-
-    NTc0Yzc1MjhhODhlZTkxMmRiMThkZTNiMTdkNThlNDQwYTQ4N2U5ZDllYmQ0
-    MjlhNDI3Mjc1NDg3MzQzNGI3ZDc0MWRmN2RjNjMyMThkNzNmYTM5ZjRjNDlm
-    MGE1ZmJlZDNkNjk5ZDhlY2MxN2I4Y2I5OTJkZTZiNGExNDk2M2E=
+    Y2RlYTkzOWM1N2ZlNzQ1MTQ4NjA1YzI0MDNmYWQ3ZTViZTkxZWFjMmE0ZWRj
+    ZDY2MmQyM2U0NWMyMmE5OWZlZjZmNWY4ODg0N2ZmN2NmMzRlZWRiM2I5MzZk
+    NjFlZDM3YzE2NmZiNjViNGIwMjhhNzhhY2NmM2IxYWY5ZDRlZDI=
   data.tar.gz: !binary |-
-    ODExNmZjNDJiNzkyZjNiNTdhZjk0MGU5ZTFiOWEwNjY3YzJhZGEwYjQyZmUw
-    NWJiYjIwMzljYzFiM2VjYTQ5YWVjNWI3MGNmZmFiYzI5NjU1ZWQ5ZDVmMTM3
-    NTUzMGIyN2UyYWUwN2U5ODA3Yjc1NTg0ODM1ZTUwNGM1NGU5NDI=
+    ODI4NjY1YmUwNWZlMTFhMTI5Yzc4ODg0Yzk1ZmYyYWQzNGU1ZTUzMGM0MmQ1
+    NDhmMzQyZGJiMjc1NjY0YTMwYzE2ZWRlYTBjZmViMTJlMDBjZGE4NThlMGVj
+    NTRjZGNlYzFmMmM2ZDk1ZWJjMTdmYWM3NmIwMmUyYzczNDI2YzE=

data/README.md

@@ -1,4 +1,4 @@
-# Cassandro
+# Cassandro [![Gem Version](https://badge.fury.io/rb/cassandro.svg)](http://badge.fury.io/rb/cassandro)
 
 Cassandro is a small Ruby ORM for Apache Cassandra 2.0 and CQL 3.0. Cassandro uses the new Datastax Ruby Driver (official driver).
 

data/cassandro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandro"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
   s.summary = "Ruby ORM for Apache Cassandra"
   s.license = "MIT"
   s.description = "Lightweight Apache Cassandra ORM for Ruby"

data/lib/cassandro/ext/soft_delete.rb

@@ -1,7 +1,18 @@
 module Cassandro
   module SoftDelete
+    module ClassMethods
+      def all(with_deleted = false)
+        results = super()
+
+        results.reject!{ |r| r.deleted } unless with_deleted
+
+        results
+      end
+    end
+
     def self.included(model)
       model.attribute :deleted, :boolean
+      model.extend ClassMethods
     end
 
     def destroy

data/test/cassandro_migration_test.rb

@@ -6,6 +6,8 @@ Protest.describe "Cassandro Migration" do
   end
 
   test "enqueue migrations" do
+    Cassandro::Migration.clean
+
     class FirstMigration < Cassandro::Migration
       version 1
     end

data/test/cassandro_migrator_test.rb

@@ -1,6 +1,7 @@
 require_relative 'helper'
 
 Protest.describe "Cassandro Migrator" do
+  Cassandro.connect(hosts: ['127.0.0.1'], keyspace: 'cassandro_test')
   setup do
     #Cassandro::Migration.cleaassandra::Errors::InvalidError
     Cassandro.client.execute("DROP TABLE IF EXISTS users")

data/test/cassandro_soft_delete_test.rb

@@ -0,0 +1,44 @@
+require_relative 'helper'
+require_relative 'support/tables'
+
+Protest.describe "Cassandro Model Soft Delete" do
+  setup do
+    Cassandro.connect(hosts: ['127.0.0.1'], keyspace: 'cassandro_test')
+
+    class Admin < Cassandro::Model
+      include Cassandro::SoftDelete
+
+      table :admins
+      attribute :nickname, :text
+
+      primary_key :nickname
+    end
+
+
+    Admin.all(true).each do |a|
+      Cassandro.execute("DELETE FROM admins WHERE nickname = '#{a.nickname}'")
+    end
+  end
+
+  test "all not include deleted" do
+
+    me = Admin.create(:nickname => "k4nd4lf")
+    other = Admin.create(:nickname => "Jim")
+
+    me.destroy
+
+    assert !Admin.all.include?(me)
+  end
+
+  test "all should include deleted if asked" do
+    me = Admin.create(:nickname => "k4nd4lf")
+    other = Admin.create(:nickname => "Jim")
+
+    me.destroy
+
+    assert !Admin.all.include?(me)
+
+  end
+end
+
+

data/test/support/tables.rb

@@ -18,3 +18,13 @@ table = <<-TABLEDEF
   )
 TABLEDEF
 SESSION.execute(table)
+
+SESSION.execute("DROP TABLE IF EXISTS admins")
+table = <<-TABLEDEF
+  CREATE TABLE IF NOT EXISTS admins (
+    nickname VARCHAR,
+    deleted BOOLEAN,
+    PRIMARY KEY(nickname)
+  )
+TABLEDEF
+SESSION.execute(table)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandro
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Lautaro Orazi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -77,6 +77,7 @@ files:
 - test/cassandro_migration_test.rb
 - test/cassandro_migrator_test.rb
 - test/cassandro_model_test.rb
+- test/cassandro_soft_delete_test.rb
 - test/cassandro_test.rb
 - test/helper.rb
 - test/support/migrations/animals_table.rb