Refreshed gem

.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.byebug_history
 .config
 .project
 coverage

.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.4.1

Appraisals

@@ -1,9 +1,5 @@
-%w(3.2 4.0 4.2).each do |rails_version|
+%w(3.2 4.0 4.2 5.0 5.1).each do |rails_version|
   appraise "rails-#{rails_version}" do
     gem "rails", "~> #{rails_version}.0"
   end
 end
-
-appraise "rails-5.0.0.rc1" do
-  gem "rails", "~> 5.0.0.rc1"
-end

README.md

@@ -231,6 +231,7 @@ Additionally, this project aims for compatiblity with Rails 3.2 and above. For t
 * Henrique Gubert - @hsgubert
 * Brian Sam-Bodden - @bsbodden
 * Sid Tantia - @sstgithub
+* Nathan Brazil - @bitaxis
 * [and more...](https://github.com/hsgubert/cassandra_migrations/graphs/contributors)
 
 ## Acknowledgements

cassandra_migrations.gemspec

@@ -6,7 +6,7 @@ require 'cassandra_migrations/version'
 Gem::Specification.new do |s|
   s.name        = 'cassandra_migrations'
   s.version     = CassandraMigrations::VERSION
-  s.date        = '2016-06-14'
+  s.date        = '2018-04-17'
   s.license     = 'MIT'
   s.summary     = 'Cassandra schema management for a multi-environment developer.'
   s.description = 'A gem to manage Cassandra database schema for Rails. This gem offers migrations and environment specific databases out-of-the-box for Rails users.'
@@ -23,16 +23,16 @@ Gem::Specification.new do |s|
   s.test_files = Dir['s/**/*_s.rb']
 
   # s.add_dependency: Production dependencies
-  s.add_runtime_dependency 'cassandra-driver', '~> 3.0'
-  s.add_runtime_dependency 'rake', '~> 10'
+  s.add_runtime_dependency 'cassandra-driver', '~> 3.2'
+  s.add_runtime_dependency 'rake', '~> 12'
   s.add_runtime_dependency 'rails', '>= 3.2'
-  s.add_runtime_dependency 'colorize', '~> 0.7.3'
+  s.add_runtime_dependency 'colorize', '~> 0.8'
 
   # s.add_development_dependency: Development dependencies
-  s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'
-  s.add_development_dependency 'byebug', '~> 8.2'
+  s.add_development_dependency 'rspec', '~> 3.6'
+  s.add_development_dependency 'byebug', '~> 9.1'
   s.add_development_dependency 'bundler', '~> 1.6'
-  s.add_development_dependency 'simplecov', '~> 0.9'
-  s.add_development_dependency 'coveralls', '~> 0.7'
-  s.add_development_dependency 'appraisal', '~> 1.0'
+  s.add_development_dependency 'simplecov', '~> 0.14'
+  s.add_development_dependency 'coveralls', '~> 0.8'
+  s.add_development_dependency 'appraisal', '~> 2.2'
 end

gemfiles/rails_3.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_4.0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_4.2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.0.0.rc1.gemfile → gemfiles/rails_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0.rc1"
+gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

lib/cassandra_migrations/cassandra.rb

@@ -47,17 +47,47 @@ def self.shutdown!
       self.client = nil
     end
 
+    ##
+    # Use the keyspace specified in an additional keyspace environment of the config/cassandra.yml file.
+    # In order for this to work, such environemnts in the YAML file must have names conforming to the
+    # {prefix}-{environment} format, where {prefix} is some name, and {environment} is one of the main Rails
+    # environment names.  For example, by defining foo1-development, foo1-test and foo1-production in
+    # config/cassandra.yml, a migration can invoke .use_keyspace("foo1") to target the keyspace
+    # specified therein, in accordance with the Rails environment names.  This approach is better than
+    # the .using_keyspace method because it makes a migration targeting an additional keyspace usable
+    # in all Rails environments the application needs to run in.
+    # @param prefix [String] The prefix portion of an additional keyspace environment
+    def self.use_keyspace(prefix, &block)
+      env_name = "#{prefix.to_s}-#{Rails.env}"
+      keyspace = CassandraMigrations::Config.configurations[env_name].keyspace
+      puts "  Use keyspace #{keyspace} from #{env_name} in config/cassandra.yml"
+      use(keyspace)
+      begin
+        # invoke the block in the other namespace
+        block.call
+      ensure
+        # always switch back to the main keyspace
+        use(Config.keyspace)
+      end
+    end
+
     def self.using_keyspace(keyspace, &block)
+      puts "  using_keyspace(#{keyspace})"
       use(keyspace)
-      block.call
-      use(Config.keyspace)
+      begin
+        # invoke the block in the other namespace
+        block.call
+      ensure
+        # always switch back to the main keyspace
+        use(Config.keyspace)
+      end
     end
 
     def self.use(keyspace)
       connect_to_server unless client
 
       begin
-        client.use(keyspace)
+        client.use(keyspace.to_s)
       rescue Exception => e # keyspace does not exist
         puts "#{e} : #{e.message}"
         raise Errors::UnexistingKeyspaceError, keyspace

lib/cassandra_migrations/migration.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "benchmark"
 require 'cassandra_migrations/migration/table_operations'
 require 'cassandra_migrations/migration/column_operations'
 
@@ -14,6 +15,7 @@ class Migration
     # Makes +execute+ method directly available to migrations
     delegate :execute, :to => Cassandra
     delegate :using_keyspace, :to => Cassandra
+    delegate :use_keyspace, :to => Cassandra
 
     # Makes +up+ work if the method in the migration is defined with self.up
     def up
@@ -65,7 +67,7 @@ def migrate(direction)
     end  
 
   private
-  
+
     # Generates output labeled with name of migration and a line that goes up 
     # to 75 characters long in the terminal
     def announce_migration(message)
@@ -81,10 +83,31 @@ def announce_operation(message)
     def announce_suboperation(message)
       puts "  -> " + message
     end
-    
+
     # Gets the name of the migration
     def name
       self.class.name
     end
+
+    ##
+    # Execute contents of a file.
+    def execute_file(path)
+      execute_text File.read(path)
+    end
+
+    ##
+    # Announce and execute some CQL operation.
+    def execute_statement(statement)
+      announce_operation statement
+      execute statement
+    end
+
+    ##
+    # Execute CQL text.
+    def execute_text(text)
+      text.strip.split(/;\s*$/).each do |statement|
+        execute_statement(statement + ";")
+      end
+    end
   end
 end

lib/cassandra_migrations/railtie/generators/cassandra_migration/templates/empty_migration.rb.erb

@@ -1,9 +1,9 @@
 class <%= @migration_class_name %> < CassandraMigrations::Migration
   def up
-
+    raise CassandraMigrations::Errors::MigrationDefinitionError, "Empty up migration!"
   end
 
   def down
-
+    raise CassandraMigrations::Errors::MigrationDefinitionError, "Empty down migration!"
   end
 end

lib/cassandra_migrations/version.rb

@@ -1,3 +1,3 @@
 module CassandraMigrations
-  VERSION = '1.0.0'
+  VERSION = "1.3.1"
 end

spec/cassandra_migrations/cassandra_spec.rb

@@ -52,12 +52,26 @@
     end
 
     it "should raise exception if configured keyspace does not exist" do
+      cql_client_mock = double('cql_client')
+      allow(Client).to receive(:connect).with(:hosts => ['127.0.0.1'], :port => 9042).and_return(cql_client_mock)
+      allow(cql_client_mock).to receive(:use).with('anything').and_raise(Cassandra::Errors::InvalidError)
       expect {
         CassandraMigrations::Cassandra.use('anything')
       }.to raise_exception CassandraMigrations::Errors::UnexistingKeyspaceError
     end
   end
 
+  describe '.use_keyspace' do
+    it 'should set use the specified keyspace by environment yield to the block and then reset the keyspace' do
+      cql_client_mock = double('cql_client')
+      original_keyspace = CassandraMigrations::Config.keyspace
+      allow(Client).to receive(:connect).with(:hosts => ['127.0.0.1'], :port => 9042).and_return(cql_client_mock)
+      allow(cql_client_mock).to receive(:use).with('anything').and_return(nil)
+      allow(cql_client_mock).to receive(:use).with(original_keyspace).and_return(nil)
+      expect { |block| CassandraMigrations::Cassandra.use_keyspace('anything', &block) }.to yield_control
+    end
+  end
+
   describe '.using_keyspace' do
     it 'should set use the specified keyspace yield to the block and then reset the keyspace' do
       cql_client_mock = double('cql_client')

spec/fixtures/config/cassandra.yml

@@ -47,3 +47,35 @@ production:
     class: NetworkTopologyStrategy
     datacenter1: 3
     datacenter2: 2
+
+anything-development:
+  hosts:
+    - 127.0.0.1
+  port: 9042
+  keyspace: cassandra_migrations_development
+  replication:
+    class: SimpleStrategy
+    replication_factor: 1
+
+anything-test:
+  hosts:
+    - 127.0.0.1
+  port: 9042
+  keyspace: my_keyspace_test
+  replication:
+    class: 'SimpleStrategy'
+    replication_factor: 1
+
+anything-production:
+  hosts:
+    - 'cass1.my_app.biz'
+    - 'cass2.my_app.biz'
+    - 'cass3.my_app.biz'
+  port: 9042
+  keyspace: cassandra_migrations_production
+  username: myappuser
+  password: password1
+  replication:
+    class: NetworkTopologyStrategy
+    datacenter1: 3
+    datacenter2: 2