cassandra_migrations 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2adbd178415bd43d539d236b8a2c46b21e8a7f72
-  data.tar.gz: 1216e38539fdebb43798770efdefe8c091c19bb4
+  metadata.gz: c965a29df3ab284126e40f87b121b36ac7265bd8
+  data.tar.gz: 1f51f693edccafb89757145d09d110e1e80906f1
 SHA512:
-  metadata.gz: 015a4ec736b6900eb9fe8a24da10baea299752718ac025b487decf15fbe5cad684951da2e282af0d8df178b35556f7d32fb1cc7127e79f8313a2e5486ab9ba5a
-  data.tar.gz: 276c5d3a589d3e73a9f61f96d8cdc78eb76584d8f23c04cfe05f8db37fae59bca11c0cf8e402d13f972e8af92f21121ad2155a313a650c9bd7fe0fc59e77cbe9
+  metadata.gz: 46a1436db58fb04065c16cefb5438131b45fe64f129ced77eaeade85844b301f8855d8aabd51acfae5c0b6f388065a8a79ef66a4e5473f4c2a80f23ac0256959
+  data.tar.gz: 86926b224d24685da9b83ab312754446135f346618e5489d91bf4e3fc63f25f00c6806f1be4043f26b1198bf5b345ed63e3dbfe8114fac8b3a5f69c691775b68

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -7,23 +7,26 @@ module CassandraMigrations
 
       def create_keyspace!(env)
         config = Config.configurations[env]
-        validate_config(config)
-
-        execute(
-          "CREATE KEYSPACE #{config.keyspace} \
-           WITH replication = { \
-             'class':'#{config.replication['class']}', \
-             'replication_factor': #{config.replication['replication_factor']} \
-           }"
-        )
+        execute(create_keyspace_statement(config))
         begin
           use(config.keyspace)
-        rescue StandardErorr => exception
+        rescue StandardError => exception
           drop_keyspace!(env)
           raise exception
         end
       end
 
+      def create_keyspace_statement(config)
+        validate_config(config)
+        <<-CQL.strip_heredoc
+          CREATE KEYSPACE #{config.keyspace}
+          WITH replication = {
+            'class': '#{config.replication['class']}',
+            #{replication_options_statement(config)}
+          }
+        CQL
+      end
+
       def drop_keyspace!(env)
         config = Config.configurations[env]
         begin
@@ -37,19 +40,30 @@ module CassandraMigrations
 
       def validate_config(config)
         if config.keyspace.nil?
-          raise Errors::MissingConfigurationError.new("Configuration of 'keyspace' is required in config.yml, but none is defined.")
-        end
-        unless config_includes_replication?(config)
-          raise Errors::MissingConfigurationError.new("Configuration for 'replication' is required in config.yml, but none is defined.")
+          raise Errors::MissingConfigurationError.new("Configuration of 'keyspace' is required in config/cassandra.yml, but none is defined.")
+        elsif config_requires_replication?(config) && !config_includes_replication?(config)
+          raise Errors::MissingConfigurationError.new("Configuration for 'replication' is required in config/cassandra.yml, but none is defined.")
         end
         true
       end
 
+      def config_requires_replication?(config)
+        config.replication['class'] == 'SimpleStrategy'
+      end
+
       def config_includes_replication?(config)
         config.replication &&
         config.replication['class'] &&
         config.replication['replication_factor']
       end
+
+      def replication_options_statement(config)
+        if config.replication['class'] == "SimpleStrategy"
+         "'replication_factor': #{config.replication['replication_factor']}"
+        elsif config.replication['class'] == "NetworkTopologyStrategy"
+          config.replication.reject{ |k,v| k == 'class' }.map { |k,v| "'#{k}': #{v}" }.join(", ")
+        end
+      end
     end
   end
 end

data/lib/cassandra_migrations/version.rb

@@ -0,0 +1,3 @@
+module CassandraMigrations
+  VERSION = '0.2.6'
+end

data/lib/cassandra_migrations.rb

@@ -1,3 +1,4 @@
+require 'cassandra_migrations/version'
 require 'cassandra_migrations/config'
 require 'cassandra_migrations/errors'
 require 'cassandra_migrations/cassandra'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Henrique Gubert
@@ -9,13 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
@@ -23,6 +26,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
 - !ruby/object:Gem::Dependency
@@ -43,14 +49,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -72,6 +78,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
@@ -79,6 +88,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
@@ -137,6 +149,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 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.
 email:
@@ -169,6 +195,7 @@ files:
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/templates/empty_migration.rb.erb
 - lib/cassandra_migrations/railtie/initializer.rb
 - lib/cassandra_migrations/railtie/tasks.rake
+- lib/cassandra_migrations/version.rb
 homepage: https://github.com/hsgubert/cassandra_migrations
 licenses:
 - MIT