gotime-cassandra_object 4.2.2 → 4.3.0

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/connection.rb

@@ -16,6 +16,16 @@ module CassandraCQL
 end
 
 module CassandraObject
+  class Config
+    attr_accessor :servers, :keyspace, :thrift_options
+
+    def initialize(options)
+      self.servers  = Array.wrap(options[:servers] || "127.0.0.1:9160")
+      self.keyspace = options[:keyspace]
+      self.thrift_options = (options[:thrift] || {}).symbolize_keys
+    end
+  end
+
   module Connection
     extend ActiveSupport::Concern
     
@@ -24,17 +34,12 @@ module CassandraObject
     end
 
     module ClassMethods
-      DEFAULT_OPTIONS = {
-        servers: "127.0.0.1:9160",
-        thrift: {}
-      }
-
       def establish_connection(spec)
-        self.connection_config = spec.reverse_merge(DEFAULT_OPTIONS)
+        self.connection_config = Config.new(spec)
       end
 
       def cql
-        @@cql ||= CassandraCQL::Database.new(connection_config[:servers], {keyspace: connection_config[:keyspace]}, connection_config[:thrift].symbolize_keys)
+        @@cql ||= CassandraCQL::Database.new(connection_config.servers, {keyspace: connection_config.keyspace}, connection_config.thrift_options)
       end
 
       def execute_cql(cql_string, *bind_vars)

data/lib/cassandra_object/schema.rb

@@ -1,5 +1,9 @@
+require 'cassandra_object/schema/tasks'
+
 module CassandraObject
   class Schema
+    extend Tasks
+
     class << self
       def create_keyspace(keyspace)
         system_execute "CREATE KEYSPACE #{keyspace} " +
@@ -21,7 +25,6 @@ module CassandraObject
       end
 
       def add_index()
-        
       end
 
       private
@@ -30,7 +33,7 @@ module CassandraObject
         end
 
         def system_execute(cql)
-          @system_cql ||= CassandraCQL::Database.new(CassandraObject::Base.connection_config[:servers], keyspace: 'system')
+          @system_cql ||= CassandraCQL::Database.new(CassandraObject::Base.connection_config.servers, keyspace: 'system')
           @system_cql.execute cql
         end
     end

data/lib/cassandra_object/schema/tasks.rb

@@ -0,0 +1,33 @@
+module CassandraObject
+  class Schema
+    module Tasks
+      def dump(io)
+        column_families.each do |column_family|
+          io.puts run_command("DESCRIBE COLUMNFAMILY #{column_family}")
+          io.puts
+        end
+      end
+
+      def load(filename)
+        `cqlsh -k #{keyspace} -f #{filename} #{server}`
+      end
+
+      def column_families
+        run_command('DESCRIBE COLUMNFAMILIES').split.sort
+      end
+
+      private
+        def run_command(command)
+          `echo "#{command};" | cqlsh -k #{keyspace} #{server}`.sub(/^(.*)$/, '').strip
+        end
+
+        def keyspace
+          CassandraObject::Base.connection_config.keyspace
+        end
+
+        def server
+          CassandraObject::Base.connection_config.servers.first.gsub(/:.*/, '')
+        end
+    end
+  end
+end

data/lib/cassandra_object/tasks/ks.rake

@@ -1,4 +1,4 @@
-namespace :ks do
+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']
@@ -8,6 +8,26 @@ namespace :ks do
     CassandraObject::Schema.drop_keyspace cassandra_config['keyspace']
   end
 
+  task reset: [:drop, :setup]
+
+  task setup: :create do
+    filename = ENV['SCHEMA'] || "#{Rails.root}/ks/structure.cql"
+    CassandraObject::Schema.load(filename)
+  end
+
+  namespace :structure do
+    task dump: :environment do
+      filename = ENV['SCHEMA'] || "#{Rails.root}/ks/structure.cql"
+      File.open(filename, "w:utf-8") do |file|
+        CassandraObject::Schema.dump(file)
+      end
+    end
+  end
+
+  task :_dump do
+    ks_namespace["structure:dump"].invoke
+  end
+
   private
     def cassandra_config
       @cassandra_config ||= begin

data/test/unit/connection_test.rb

@@ -15,16 +15,16 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
       thrift: {'timeout' => 10}
     )
     # 
-    assert_equal 'place_directory_development', TestObject.connection_config[:keyspace]
-    assert_equal 10, TestObject.connection_config[:thrift]['timeout']
+    assert_equal ['192.168.0.100:9160'], TestObject.connection_config.servers
+    assert_equal 'place_directory_development', TestObject.connection_config.keyspace
+    assert_equal 10, TestObject.connection_config.thrift_options[:timeout]
   end
 
   test 'establish_connection defaults' do
     TestObject.establish_connection(
       keyspace: 'place_directory_development'
     )
-    # 
-    # assert_equal 'place_directory_development', TestObject.connection.keyspace
-    assert_equal "127.0.0.1:9160", TestObject.connection_config[:servers]
+
+    assert_equal ["127.0.0.1:9160"], TestObject.connection_config.servers
   end
 end

data/test/unit/schema/tasks_test.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class CassandraObject::Schema::TasksTest < CassandraObject::TestCase
+  test "column_families" do
+    assert_equal ['Issues'], CassandraObject::Schema.column_families
+  end
+
+  test "dump" do
+    io = StringIO.new
+
+    CassandraObject::Schema.dump(io)
+    io.rewind
+
+    assert_match /Issues/, io.read
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -112,6 +112,7 @@ files:
 - lib/cassandra_object/railtie.rb
 - lib/cassandra_object/savepoints.rb
 - lib/cassandra_object/schema.rb
+- lib/cassandra_object/schema/tasks.rb
 - lib/cassandra_object/scope.rb
 - lib/cassandra_object/scope/batches.rb
 - lib/cassandra_object/scope/finder_methods.rb
@@ -154,6 +155,7 @@ files:
 - test/unit/log_subscriber_test.rb
 - test/unit/persistence_test.rb
 - test/unit/savepoints_test.rb
+- test/unit/schema/tasks_test.rb
 - test/unit/scope/batches_test.rb
 - test/unit/scope/finder_methods_test.rb
 - test/unit/scope/query_methods_test.rb