gotime-cassandra_object 4.4.4 → 4.4.5

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/schema.rb

@@ -15,9 +15,18 @@ module CassandraObject
         system_execute "DROP KEYSPACE #{keyspace}"
       end
 
-      def create_column_family(column_family)
-        execute "CREATE COLUMNFAMILY #{column_family} " +
-                "(KEY varchar PRIMARY KEY)"
+      def create_column_family(column_family, options = {})
+        stmt = "CREATE COLUMNFAMILY #{column_family} " +
+               "(KEY varchar PRIMARY KEY)"
+
+        if options.any?
+          with_stmt = options.map do |k,v|
+            "#{k} = #{CassandraCQL::Statement.quote(v)}"
+          end.join(' AND ')
+          stmt << " WITH #{with_stmt}"
+        end
+
+        execute stmt
       end
 
       def alter_column_family_with(with)

data/lib/cassandra_object/tasks/ks.rake

@@ -1,11 +1,27 @@
 ks_namespace = namespace :ks do
   desc 'Create the keyspace in cassandra_config/cassandra.yml for the current environment'
   task create: :environment do
-    CassandraObject::Schema.create_keyspace cassandra_config['keyspace']
+    begin
+      CassandraObject::Schema.create_keyspace cassandra_config['keyspace']
+    rescue Exception => e
+      if e.message =~ /conflicts/
+        p "Keyspace #{cassandra_config['keyspace']} already exists"
+      else
+        raise e
+      end
+    end
   end
 
   task drop: :environment do
-    CassandraObject::Schema.drop_keyspace cassandra_config['keyspace']
+    begin
+      CassandraObject::Schema.drop_keyspace cassandra_config['keyspace']
+    rescue Exception => e
+      if e.message =~ /non existing keyspace/
+        p "Keyspace #{cassandra_config['keyspace']} does not exist"
+      else
+        raise e
+      end
+    end
   end
 
   task reset: [:drop, :setup]

data/test/support/connect.rb

@@ -1,7 +1,6 @@
 CassandraObject::Base.establish_connection(
   keyspace: 'cassandra_object_test',
-  servers: '127.0.0.1:9160',
-  thrift: {timeout: 200}
+  servers: '127.0.0.1:9160'
 )
 
 begin

data/test/support/teardown.rb

@@ -8,11 +8,7 @@ CassandraObject::Base.class_eval do
 
   def self.delete_after_test
     # created_records.reject(&:destroyed?).each(&:destroy)
-    cql = CassandraCQL::Database.new(connection_config.servers, {keyspace: connection_config.keyspace}, connection_config.thrift_options)
-    begin
-      cql.execute "TRUNCATE Issues"
-    rescue
-    end
+    Issue.delete_all
     created_records.clear
   end
 end

data/test/unit/schema_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class CassandraObject::SchemaTest < CassandraObject::TestCase
+  test "create_column_family" do
+    CassandraObject::Schema.create_column_family 'TestRecords', 'compression_parameters:sstable_compression' => 'SnappyCompressor'
+
+    begin
+      CassandraObject::Schema.create_column_family 'TestRecords'
+      assert false, 'TestRecords should already exist'
+    rescue Exception => e
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,6 +156,7 @@ files:
 - test/unit/persistence_test.rb
 - test/unit/savepoints_test.rb
 - test/unit/schema/tasks_test.rb
+- test/unit/schema_test.rb
 - test/unit/scope/batches_test.rb
 - test/unit/scope/finder_methods_test.rb
 - test/unit/scope/query_methods_test.rb