cassandra_migrations 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c965a29df3ab284126e40f87b121b36ac7265bd8
-  data.tar.gz: 1f51f693edccafb89757145d09d110e1e80906f1
+  metadata.gz: a28e40a6fe9323547d4484bdfb6ace0bf2dee21c
+  data.tar.gz: 7a2215ba07262a12038b7bf5cd7c6ac4582db4a9
 SHA512:
-  metadata.gz: 46a1436db58fb04065c16cefb5438131b45fe64f129ced77eaeade85844b301f8855d8aabd51acfae5c0b6f388065a8a79ef66a4e5473f4c2a80f23ac0256959
-  data.tar.gz: 86926b224d24685da9b83ab312754446135f346618e5489d91bf4e3fc63f25f00c6806f1be4043f26b1198bf5b345ed63e3dbfe8114fac8b3a5f69c691775b68
+  metadata.gz: 2d795b210e5eefd853eb25ba8b3d8bfce1955aa1645e751e6a98cc995cdc96b6f7be46367ddec6263ed29fb2a94bb55634adf68ffcb49b643bddbad8e2a4ed3e
+  data.tar.gz: e602f7cec7715b2d7bc16bdd5390cb1b75fa269d09bd038b0f0ff562a7bb71898e8ab1d273df4cbdc6e56fcf8591dc5436ceb1a4679d33f2104806c7d1254c63

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'cassandra'
+require 'active_support/core_ext/string/strip'
 
 module CassandraMigrations
   module Cassandra

data/lib/cassandra_migrations/errors.rb

@@ -52,5 +52,11 @@ module CassandraMigrations
       end
     end
 
+    class MigrationNamingError < CassandraError
+      def initialize(msg)
+        super(msg)
+      end
+    end
+
   end
 end

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -247,6 +247,10 @@ module CassandraMigrations
           when :compact_storage
             cql_name
           else
+            #if complex option with nested hash, convert keys and values to proper string value
+            if value.is_a?(Hash)
+              value = "{#{value.map {|k, v| "'#{k}':'#{v}'"}.join(',')}}"
+            end
             "#{cql_name} = #{value}"
         end
       end

data/lib/cassandra_migrations/migrator.rb

@@ -81,11 +81,16 @@ private
     end
 
     def self.get_class_from_migration_name(filename)
-      filename.match(/[0-9]{14}_(.+)\.rb$/).captures.first.camelize.constantize
+      migration_name = filename.match(/[0-9]+_(.+)\.rb$/).captures.first.camelize
+      migration_name.constantize
+    rescue NameError => e
+      raise Errors::MigrationNamingError, "Migration file names must match the class name in the migration—could not find class #{migration_name}."
     end
 
-    def self.get_version_from_migration_name(migration_name)
-      migration_name.match(/([0-9]{14})_.+\.rb$/).captures.first.to_i
+    def self.get_version_from_migration_name(filename)
+      filename.match(/\/([0-9]+)_.+\.rb$/).captures.first.to_i
+    rescue
+      raise Errors::MigrationNamingError, "Migration file names must start with a numeric version prefix."
     end
   end
 end

data/lib/cassandra_migrations/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Henrique Gubert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -17,7 +17,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
@@ -49,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