cassandra_migrations 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77de13dc274012a0854ed3626d60f4a0ac73af3d
-  data.tar.gz: 4a17b0acf23ebaae56d88e4ba1572342fc248b03
+  metadata.gz: 937a04d1bf915cd899134c271aa645421259fb3b
+  data.tar.gz: c0916a9b1fb7be0b142ad0515a3fca628953fe9c
 SHA512:
-  metadata.gz: aab3f0ddd91d81d590cbe6ad16dcbbff317ca9358f5ef924d099867316f0c145db9f53dcc67db658c077184b23a783a89047f3dc76094571b858e42bdba0526a
-  data.tar.gz: 20ab748bf68a98bcbaf5524b1cc5ef7d76ccafff0735559e5c83747b459f0f9ffdd50931b64489265187f00484d5686755d1a8c6f23e3444cbce730794cb8854
+  metadata.gz: 557970e72c79f1b37035948c3f4990b99afd4a92c0e794d9251a252b9143a7f7a67be3767ef5fdbc4f204a990427d294d2eb351330561eae85935c445a8a571c
+  data.tar.gz: 38be1b8793e029e2d912699421c572906f60ceca0939b69951b4553e4b2f34fa5a0f51d9d570cfe95bf333add26447cb798afd1bab58c1f27f7730a4c04557dd

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -4,27 +4,29 @@ module CassandraMigrations
   module Cassandra
     module KeyspaceOperations
   
-      def create_keyspace!
+      def create_keyspace!(env)
+        config = Config.configurations[env]
         begin
           execute(
-            "CREATE KEYSPACE #{Config.keyspace} \
+            "CREATE KEYSPACE #{config.keyspace} \
              WITH replication = { \ 
-               'class':'#{Config.replication['class']}', \
-               'replication_factor': #{Config.replication['replication_factor']} \
+               'class':'#{config.replication['class']}', \
+               'replication_factor': #{config.replication['replication_factor']} \
              }"
           )
-          use(Config.keyspace)
+          use(config.keyspace)
         rescue Exception => exception
-          drop_keyspace!
+          drop_keyspace!(env)
           raise exception
         end
       end
       
-      def drop_keyspace!
+      def drop_keyspace!(env)
+        config = Config.configurations[env]
         begin
-          execute("DROP KEYSPACE #{Config.keyspace}")
+          execute("DROP KEYSPACE #{config.keyspace}")
         rescue Cql::QueryError
-          raise Errors::UnexistingKeyspaceError, Config.keyspace
+          raise Errors::UnexistingKeyspaceError, config.keyspace
         end
       end
     

data/lib/cassandra_migrations/cassandra.rb

@@ -38,7 +38,13 @@ module CassandraMigrations
       client.close if client.connected?
       self.client = nil
     end
-    
+
+    def self.using_keyspace(keyspace, &block)
+      use(keyspace)
+      block.call
+      use(Config.keyspace)
+    end
+
     def self.use(keyspace)
       connect_to_server unless client
 

data/lib/cassandra_migrations/config.rb

@@ -2,23 +2,32 @@
 
 module CassandraMigrations
   module Config
-  
-    mattr_accessor :config
-    
+
+    FIELDS = %w(host port keyspace replication)
+
+    Configuration = Struct.new(*FIELDS.map(&:to_sym))
+
+    mattr_writer :configurations
+
+    def self.configurations
+      @configurations || load_config
+    end
+
     def self.method_missing(method_sym, *arguments, &block)
-      load_config unless config    
-      config[method_sym.to_s]
+      load_config unless configurations
+      self.configurations[Rails.env].send(method_sym)
     end
     
   private
 
     def self.load_config
       begin
-        self.config = YAML.load(ERB.new(File.new(Rails.root.join("config", "cassandra.yml")).read).result)[Rails.env]
-      
-        if config.nil?
+        configs = YAML.load(ERB.new(File.new(Rails.root.join("config", "cassandra.yml")).read).result)
+        configurations = Hash[configs.map {|env, config| [env, Configuration.new(*(FIELDS.map {|k| config[k]}))]}]
+        if configurations[Rails.env].nil?
           raise Errors::MissingConfigurationError, "No configuration for #{Rails.env} environment! Complete your config/cassandra.yml."
         end
+        configurations
       rescue Errno::ENOENT
         raise Errors::MissingConfigurationError
       end

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -76,6 +76,14 @@ module CassandraMigrations
           raise Errors::MigrationDefinitionError, 'No columns defined for table.'
         end
 
+        if (@columns_name_type_hash.values.include? :counter)
+          non_key_columns = @columns_name_type_hash.keys - @primary_keys
+          counter_columns = [@columns_name_type_hash.select { |name, type| type == :counter }.first[0]]
+          if (non_key_columns - counter_columns).present?
+            raise Errors::MigrationDefinitionError, 'Non key fields not allowed in tables with counter'
+          end
+        end
+
         key_info = (@primary_keys - @partition_keys)
         key_info = ["(#{@partition_keys.join(', ')})", *key_info] if @partition_keys.any?
 
@@ -102,6 +110,10 @@ module CassandraMigrations
         cql
       end
 
+      def options
+        @options ? " WITH %s" % (@options.map {|option| build_option(option)}.join(" AND ")) : ''
+      end
+
       def boolean(column_name, options={})
         @columns_name_type_hash[column_name.to_sym] = column_type_for(:boolean, options)
         define_primary_keys(column_name) if options[:primary_key]
@@ -168,6 +180,13 @@ module CassandraMigrations
         define_primary_keys(column_name) if options[:primary_key]
       end
 
+      def counter(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = column_type_for(:counter, options)
+        if options[:primary_key]
+          raise Errors::MigrationDefinitionError, 'Counter columns cannot be primary keys'
+        end
+      end
+
       def list(column_name, options={})
         type = options[:type]
         if type.nil?
@@ -226,11 +245,15 @@ module CassandraMigrations
         @partition_keys = keys.flatten
       end
 
+      def define_options(hash)
+        @options = hash
+      end
+
       private
 
       PASSTHROUGH_TYPES = [:text, :ascii, :decimal, :double, :boolean,
                            :uuid, :timeuuid, :inet, :timestamp, :list,
-                           :map, :set]
+                           :map, :set, :counter]
       TYPES_MAP = { string: :varchar,
                     datetime: :timestamp,
                     binary: :blob }
@@ -240,6 +263,11 @@ module CassandraMigrations
                         float: { 4 => :float, 8 => :double, nil => :float }
                       }
 
+      SPECIAL_OPTIONS_MAP = {
+                      compact_storage: 'COMPACT STORAGE',
+                      clustering_order: 'CLUSTERING ORDER'
+                    }
+
       def column_type_for(type, options={})
         cql_type = type if PASSTHROUGH_TYPES.include?(type)
         cql_type ||= TYPES_MAP[type]
@@ -253,6 +281,19 @@ module CassandraMigrations
         cql_type
       end
 
+      def build_option(option)
+        name, value = option
+        cql_name = SPECIAL_OPTIONS_MAP.fetch(name, name.to_s)
+        case name
+          when :clustering_order
+            "#{cql_name} BY (#{value})"
+          when :compact_storage
+            cql_name
+          else
+            "#{cql_name} = #{value}"
+        end
+      end
+
     end
   end
 end

data/lib/cassandra_migrations/migration/table_operations.rb

@@ -20,6 +20,7 @@ module CassandraMigrations
         table_definition = TableDefinition.new
         table_definition.define_primary_keys(options[:primary_keys]) if options[:primary_keys]
         table_definition.define_partition_keys(options[:partition_keys]) if options[:partition_keys]
+        table_definition.define_options(options[:options]) if options[:options]
 
         yield table_definition if block_given?
 
@@ -28,6 +29,7 @@ module CassandraMigrations
         create_cql =  "CREATE TABLE #{table_name} ("
         create_cql << table_definition.to_create_cql
         create_cql << ")"
+        create_cql << table_definition.options
         
         announce_suboperation create_cql
         
@@ -63,6 +65,14 @@ module CassandraMigrations
         execute drop_index_cql        
       end
 
+      def add_options(table_name, options)
+        announce_operation "add_options_#{table_name}"
+        add_options_cql = "ALTER TABLE #{properties_cql(options)}"
+        announce_suboperation drop_index_cql
+
+        execute add_options_cql
+      end
+
     end
   end
 end

data/lib/cassandra_migrations/migration.rb

@@ -13,6 +13,7 @@ module CassandraMigrations
     
     # Makes +execute+ method directly available to migrations
     delegate :execute, :to => Cassandra
+    delegate :using_keyspace, :to => Cassandra
     
     # Makes +up+ work if the method in the migration is defined with self.up
     def up

data/lib/cassandra_migrations/railtie/tasks.rake

@@ -12,7 +12,7 @@ namespace :cassandra do
       CassandraMigrations::Cassandra.start!
       puts "Keyspace #{CassandraMigrations::Config.keyspace} already exists!"
     rescue CassandraMigrations::Errors::UnexistingKeyspaceError
-      CassandraMigrations::Cassandra.create_keyspace!
+      CassandraMigrations::Cassandra.create_keyspace!(Rails.env)
       puts "Created keyspace #{CassandraMigrations::Config.keyspace}"
     end
   end
@@ -20,7 +20,7 @@ namespace :cassandra do
   desc 'Drop keyspace in config/cassandra.yml for the current environment'
   task :drop do
     begin
-      CassandraMigrations::Cassandra.drop_keyspace!
+      CassandraMigrations::Cassandra.drop_keyspace!(Rails.env)
       puts "Dropped keyspace #{CassandraMigrations::Config.keyspace}"
     rescue CassandraMigrations::Errors::UnexistingKeyspaceError
       puts "Keyspace #{CassandraMigrations::Config.keyspace} does not exist... cannot be dropped"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Henrique Gubert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,28 +59,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 description: A gem to manage Cassandra database schema for Rails. This gem offers
-  migrations and environment sific databases out-of-the-box for Rails users.
+  migrations and environment specific databases out-of-the-box for Rails users.
 email:
 - guberthenrique@hotmail.com
 - bsbodden@integrallis.com