sessionm-cassandra_object 4.0.6 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539bceeb4486ffdd621cb72f76d716f870f4e18a
-  data.tar.gz: 45e22b538f31d1c1657be029fac182f8e16b618f
+  metadata.gz: a5c25269842c2a62630aa2accf056e3d15464f12
+  data.tar.gz: e74ccbb479ce36b61c48700e9ff79b971f196f25
 SHA512:
-  metadata.gz: 85e074b00d7e502eb1b7e20d42dd2b6b47a4cd2de6e5dc324612636f3db5c9f130d17ca4d9f3d7aa3ff667efc16fe817ef819158a449e7c1b923a71e43674bff
-  data.tar.gz: e2d391a541f081c3e262ecd61eeeeff0144c7cdce355873795800578818559eee845170baf132d54549252358c1ac6114a656413d495d8d68ef5b3fa28b325c9
+  metadata.gz: c0c095994244bf02b66e8f1197b756f0fc523d3f1bfc6935a48ad33d5abe3fdd72ea1e816ebe0ba93511ee9e832e2986ecc23d7062ede08c942aba509c07cd6e
+  data.tar.gz: 682992879ccf1e9fdc81436511fb90358dbe05eadf10952064f18a4a7dcc119b73c816768f474eac921af91c8743228d1c0927886ddb35a7e6a7fd328ff81723

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -163,6 +163,10 @@ module CassandraObject
                   ) || {}
         end
 
+        def keyspace
+          session.keyspace
+        end
+
         def has_table?(name)
           self.cluster.keyspace(session.keyspace).has_table? name
         end
@@ -174,6 +178,30 @@ module CassandraObject
         def column_families
           @column_families ||= self.cluster.keyspace(session.keyspace).tables.inject({}) { |hsh, table| hsh[table.name] = table; hsh }
         end
+
+        def schema(reload=false)
+          if reload
+            remove_instance_variable(:@schema_cache) if instance_variable_defined?(:@schema_cache)
+            remove_instance_variable(:@column_families) if instance_variable_defined?(:@column_families)
+          end
+        end
+
+        def add_column_family(column_family)
+          value_type = column_family.column_type == 'Standard' ? 'text' : 'counter'
+
+          query = <<-CQL
+CREATE TABLE "#{column_family.name}" (
+  key blob,
+  column1 text,
+  value #{value_type},
+  PRIMARY KEY (key, column1)
+)
+CQL
+
+          self.execute(query)
+
+          self.column_families[column_family.name.to_s] = column_family
+        end
       end
     end
   end

data/lib/cassandra_object/connection.rb

@@ -42,17 +42,18 @@ module CassandraObject
         self.connection_spec = spec
       end
 
+      @@connection = nil
       def connection
-        @connection ||= CassandraObject::Adapters::CassandraDriver.new(self.connection_spec).client
+        @@connection ||= CassandraObject::Adapters::CassandraDriver.new(self.connection_spec).client
       end
 
       def connection?
-        !! @connection
+        !! @@connection
       end
 
       def disconnect!
-        @connection.try(:close)
-        @connection = nil
+        @@connection.try(:close)
+        @@connection = nil
       end
 
       def with_connection(*args)

data/lib/cassandra_object/schema/migration.rb

@@ -102,5 +102,16 @@ module CassandraObject
       end
 
     end
+
+    class ColumnFamily < Struct.new(:name,
+                                    :keyspace,
+                                    :comparator_type,
+                                    :column_type,
+                                    :compaction_strategy,
+                                    :row_cache_provider,
+                                    :default_validation_class,
+                                    :subcomparator_type
+                                   )
+    end
   end
 end

data/lib/cassandra_object/tasks/column_family.rb

@@ -28,7 +28,7 @@ module CassandraObject
         }.merge(options)
 
         # this won't work with cassandra-driver
-        cf = Cassandra::ColumnFamily.new
+        cf = CassandraObject::Schema::ColumnFamily.new
         cf.name = name.to_s
         cf.keyspace = @keyspace.to_s
         options.each do |option, value|
@@ -83,15 +83,3 @@ module CassandraObject
   end
 
 end
-
-class Cassandra
-  class ColumnFamily
-    def with_fields(options)
-      struct_fields.collect { |f| f[1][:name] }.each do |f|
-        send("#{f}=", options[f.to_sym] || options[f.to_s])
-      end
-      self
-    end
-  end
-end
-

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.6'
+  s.version = '4.0.7'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/spec/cassandra_object/schema/migration_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe CassandraObject::Schema::Migration do
+  context "create_column_family" do
+    it "should create a new standard column family" do
+      expect(Issue.connection.column_families['Foobars'].present?).to be false
+      CassandraObject::Schema::Migration.create_column_family("Foobars") do |cf|
+        cf.column_type = 'Standard'
+        cf.comparator_type = 'UTF8Type'
+        cf.default_validation_class = 'UTF8Type'
+      end
+      expect(Issue.connection.column_families['Foobars'].present?).to be true
+    end
+
+    it "should create a new counter column family" do
+      expect(Issue.connection.column_families['FooCounters'].present?).to be false
+      CassandraObject::Schema::Migration.create_column_family("FooCounters") do |cf|
+        cf.column_type = 'Counter'
+        cf.comparator_type = 'UTF8Type'
+        cf.default_validation_class = 'UTF8Type'
+      end
+      expect(Issue.connection.column_families['FooCounters'].present?).to be true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
 platform: ruby
 authors:
 - Michael Koziarski
@@ -100,6 +100,7 @@ files:
 - spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
 - spec/cassandra_object/persistence_spec.rb
+- spec/cassandra_object/schema/migration_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
 - spec/support/db/migrate/001_create_test_tables.rb
@@ -160,6 +161,7 @@ test_files:
 - spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
 - spec/cassandra_object/persistence_spec.rb
+- spec/cassandra_object/schema/migration_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
 - spec/support/db/migrate/001_create_test_tables.rb