gotime-cassandra_object 4.10.2 → 4.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc64be77dc2226fed23bcf8c42c485481c9ce89c
-  data.tar.gz: 01fe5ae6645ce36caf4b5825b31ac985be16a55d
+  metadata.gz: 23bf74ddf71aa7a52c184a5b8f7196c3d701873f
+  data.tar.gz: 3271e9688e9b9a8aaf2e1f95afdf1e9a90f32dbd
 SHA512:
-  metadata.gz: 115a5fb6f7a9286afcec5c80f6bca49c63c86ad6be6a879f4d06446d41bb8c66f251d6ad9400e7c3d5392ed5a2e6070e67450d690339d76e140468984b007516
-  data.tar.gz: 9cab61d72f194b8a66fb4251b107cc3862e07cf580d54c9d5094b71dbe54d041a2a32d8719cc2dc5b38222284c96ab787e9a2449cce4c54f79a46577e9346fbd
+  metadata.gz: d98c2fe396fab3782ccc2aaceb0d04d862d43298036ed58776bbf8c2ee7a630860990d9dbbf42c76c95d6339f1ca33eeb90b65210011a500b91e5e71056423f0
+  data.tar.gz: 7f3a4d08478fabd769dbbc0ffbaf9514b0caba1ab094f8c900fe2b56455e21483431f5d6d1bbbce91a2babea6cd9b718b9cac2efd10adf4b34111e8e8fc9da8a

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/schema.rb

@@ -28,28 +28,26 @@ module CassandraObject
         stmt = "CREATE COLUMNFAMILY #{column_family} " +
                "(KEY varchar PRIMARY KEY)"
 
-        execute statement_with_options(stmt, options)
+        keyspace_execute statement_with_options(stmt, options)
       end
 
       def alter_column_family(column_family, instruction, options = {})
         stmt = "ALTER TABLE #{column_family} #{instruction}"
-        execute statement_with_options(stmt, options)
+        keyspace_execute statement_with_options(stmt, options)
       end
 
       def drop_column_family(column_family)
-        stmt = "DROP TABLE #{column_family}"
-        execute stmt
+        keyspace_execute "DROP TABLE #{column_family}"
       end
 
       def add_index(column_family, column, index_name = nil)
         stmt = "CREATE INDEX #{index_name.nil? ? '' : index_name} ON #{column_family} (#{column})"
-        execute stmt
+        keyspace_execute stmt
       end
 
+      # If the index was not given a name during creation, the index name is <columnfamily_name>_<column_name>_idx.
       def drop_index(index_name)
-        # If the index was not given a name during creation, the index name is <columnfamily_name>_<column_name>_idx.
-        stmt = "DROP INDEX #{index_name}"
-        execute stmt
+        keyspace_execute "DROP INDEX #{index_name}"
       end
 
       private
@@ -65,13 +63,18 @@ module CassandraObject
           stmt
         end
 
-        def execute(cql)
-          CassandraObject::Base.execute_cql cql
+        def db
+          @db ||= CassandraCQL::Database.new(CassandraObject::Base.config.servers, {keyspace: 'system'}, {connect_timeout: 30, timeout: 30})
+        end
+
+        def keyspace_execute(cql)
+          db.execute "USE #{CassandraObject::Base.config.keyspace}"
+          db.execute cql
         end
 
         def system_execute(cql)
-          @system_cql ||= CassandraCQL::Database.new(CassandraObject::Base.config.servers, keyspace: 'system')
-          @system_cql.execute cql
+          db.execute "USE system"
+          db.execute cql
         end
     end
   end

data/test/unit/schema_test.rb

@@ -1,6 +1,21 @@
 require 'test_helper'
 
 class CassandraObject::SchemaTest < CassandraObject::TestCase
+  test "create_keyspace" do
+    CassandraObject::Schema.create_keyspace 'Blah'
+
+    existing_keyspace = false
+    begin
+      CassandraObject::Schema.create_keyspace 'Blah'
+    rescue Exception => e
+      existing_keyspace = true
+    ensure
+      CassandraObject::Schema.drop_keyspace 'Blah'
+    end
+
+    assert existing_keyspace
+  end
+
   test "create_column_family" do
     CassandraObject::Schema.create_column_family 'TestRecords', 'compression_parameters:sstable_compression' => 'SnappyCompressor'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.10.2
+  version: 4.10.3
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel