cassandra_migrations 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d089b09a2a03caa0cb2787d2de0e8d2f2db278bc
-  data.tar.gz: a1f2fbc186ff690aa33c58306f6d193c19fb3643
+  metadata.gz: 2adbd178415bd43d539d236b8a2c46b21e8a7f72
+  data.tar.gz: 1216e38539fdebb43798770efdefe8c091c19bb4
 SHA512:
-  metadata.gz: c2606317f233f502898569d15903ad5816b106e69cd1d29831677a8215bf38cc0d20bffe8fe4bb76df13619e2728ae796751b9b0246acd3039f469b7c9411ee3
-  data.tar.gz: 36bae513a0ae96563a2c989148baaa24c9d6bde62baba44fa0fcb03cd2f9a12f286dd37bfb3ba30b1b44c99e40059a6e34870a185faf171a99acbc7797ee42a9
+  metadata.gz: 015a4ec736b6900eb9fe8a24da10baea299752718ac025b487decf15fbe5cad684951da2e282af0d8df178b35556f7d32fb1cc7127e79f8313a2e5486ab9ba5a
+  data.tar.gz: 276c5d3a589d3e73a9f61f96d8cdc78eb76584d8f23c04cfe05f8db37fae59bca11c0cf8e402d13f972e8af92f21121ad2155a313a650c9bd7fe0fc59e77cbe9

data/lib/cassandra_migrations/cassandra/keyspace_operations.rb

@@ -7,16 +7,18 @@ 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']} \
+           }"
+        )
         begin
-          execute(
-            "CREATE KEYSPACE #{config.keyspace} \
-             WITH replication = { \
-               'class':'#{config.replication['class']}', \
-               'replication_factor': #{config.replication['replication_factor']} \
-             }"
-          )
           use(config.keyspace)
-        rescue Exception => exception
+        rescue StandardErorr => exception
           drop_keyspace!(env)
           raise exception
         end
@@ -26,11 +28,28 @@ module CassandraMigrations
         config = Config.configurations[env]
         begin
           execute("DROP KEYSPACE #{config.keyspace}")
-        rescue ::Cassandra::Errors::QueryError
+        rescue ::Cassandra::Errors::ConfigurationError
           raise Errors::UnexistingKeyspaceError, config.keyspace
         end
       end
 
+      private
+
+      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.")
+        end
+        true
+      end
+
+      def config_includes_replication?(config)
+        config.replication &&
+        config.replication['class'] &&
+        config.replication['replication_factor']
+      end
     end
   end
 end

data/lib/cassandra_migrations/cassandra/queries.rb

@@ -41,6 +41,7 @@ module CassandraMigrations
 
       def select(table, options={})
         query_string = "SELECT #{options[:projection] || '*'} FROM #{table}"
+        options[:secondary_options] ||= {}
 
         if options[:selection]
           query_string << " WHERE #{options[:selection]}"
@@ -58,7 +59,40 @@ module CassandraMigrations
           query_string << " ALLOW FILTERING"
         end
 
-        execute(query_string)
+        #Secondary options
+        if options[:page_size]
+          options[:secondary_options][:page_size] = options[:page_size]
+        end
+
+        if options[:consistency]
+          options[:secondary_options][:consistency] = options[:consistency]
+        end
+
+        if options[:trace]
+          options[:secondary_options][:trace] = options[:trace]
+        end
+
+        if options[:timeout]
+          options[:secondary_options][:timeout] = options[:timeout]
+        end
+
+        if options[:serial_consistency]
+          options[:secondary_options][:serial_consistency] = options[:serial_consistency]
+        end
+
+        if options[:paging_state]
+          options[:secondary_options][:paging_state] = options[:paging_state]
+        end
+
+        if options[:arguments]
+          options[:secondary_options][:arguments] = options[:arguments]
+        end
+
+        if options[:secondary_options].length > 0
+          execute(query_string, options[:secondary_options])
+        else
+          execute(query_string)
+        end
       end
 
       def delete!(table, selection, options={})
@@ -93,7 +127,7 @@ module CassandraMigrations
 
       def get_column_type(table, column)
         column_info = client.execute("SELECT VALIDATOR FROM system.schema_columns WHERE keyspace_name = '#{client.keyspace}' AND columnfamily_name = '#{table}' AND column_name = '#{column}'")
-        SYMBOL_FOR_TYPE[column_info.first['validator']]
+        SYMBOL_FOR_TYPE[(column_info.first['validator'].split(/[\.(]/) & SYMBOL_FOR_TYPE.keys).first]
       end
 
       def to_cql_value(column, value, table, options={})
@@ -113,13 +147,13 @@ module CassandraMigrations
           if value == ""
             value = 'null'
           else
-            value = value
+            value = value.gsub("'", "''")
           end
         end
       end
 
       def string_to_cql(value)
-        "'#{value}'"
+        "'#{value.gsub("'", "''")}'"
       end
 
       def datetime_to_cql(value)
@@ -138,7 +172,7 @@ module CassandraMigrations
       end
 
       def hash_to_cql(value, operation)
-        "#{operation}{ #{value.reduce([]) {|sum, (key, value)| sum << "'#{key}': '#{value}'" }.join(", ") } }"
+        "#{operation}{ #{value.reduce([]) {|sum, (k, v)| sum << "'#{k}': #{to_cql_value(nil, v, nil)}" }.join(", ") } }"
       end
 
     end

data/lib/cassandra_migrations/cassandra.rb

@@ -28,8 +28,15 @@ module CassandraMigrations
     def self.restart!
       raise Errors::ClientNotStartedError unless client
 
-      client.close if client && client.connected?
-      self.client = nil
+      restart
+    end
+
+    def self.restart
+      if client
+        client.close if client.connected?
+        self.client = nil
+      end
+
       start!
     end
 
@@ -57,10 +64,10 @@ module CassandraMigrations
       end
     end
 
-    def self.execute(cql)
+    def self.execute(*cql)
       connect_to_server unless client
       Rails.logger.try(:info, "\e[1;35m [Cassandra Migrations] \e[0m #{cql.to_s}")
-      result = client.execute(cql)
+      result = client.execute(*cql)
       QueryResult.new(result) if result
     end
 
@@ -68,7 +75,6 @@ module CassandraMigrations
 
     def self.connect_to_server
       connection_params = Config.connection_config_for_env
-      Rails.logger.try(:info, "Connecting to Cassandra on #{connection_params}")
 
       begin
         self.client = Client.connect(connection_params)

data/lib/cassandra_migrations/cql-rb-wrapper.rb

@@ -34,13 +34,12 @@ end
 
 class Client
   def self.connect(options)
-    if defined?(Spring)
-      Spring.after_fork do
-        @cluster = Cassandra.cluster(options)
-      end
-    else
-      @cluster = Cassandra.cluster(options)
+    Rails.logger.try(:info, "Connecting to Cassandra cluster: #{options}")
+
+    unless @cluster = Cassandra.cluster(options)
+      raise CassandraMigrations::Errors::ClusterError.new(options)
     end
+
     self.new(@cluster)
   end
 
@@ -48,6 +47,7 @@ class Client
     if @sessions[keyspace]
       @session = @sessions[keyspace]
     else
+      Rails.logger.try(:info, "Creating Cassandra session: #{keyspace.inspect}")
       @session = @cluster.connect(keyspace)
       @sessions[keyspace] = @session
     end
@@ -57,9 +57,11 @@ class Client
     @cluster = cluster
     @sessions = {}
     if keyspace
+      Rails.logger.try(:info, "Creating Cassandra session: #{keyspace.inspect}")
       @session = cluster.connect(keyspace)
       @sessions[keyspace] = @session
     else
+      Rails.logger.try(:info, "Creating Cassandra session: [no keyspace]")
       @session = @cluster.connect()
       @sessions[:default] = @session
     end
@@ -85,6 +87,7 @@ class Client
   end
 
   def close
+    Rails.logger.try(:info, "Closing Cassandra session: #{@session.inspect}")
     @session.close
   end
 

data/lib/cassandra_migrations/errors.rb

@@ -34,6 +34,12 @@ module CassandraMigrations
       end
     end
 
+    class ClusterError < CassandraError
+      def initialize(cluster_opts, e = nil)
+        super(%[Could not connect to cluster at #{cluster_opts}. Is Cassandra running? #{"(#{e.message})" if e}])
+      end
+    end
+
     class ConnectionError < CassandraError
       def initialize(msg)
         super(msg)

data/lib/cassandra_migrations/migration/table_operations.rb

@@ -65,26 +65,6 @@ module CassandraMigrations
         execute drop_index_cql
       end
 
-      def create_table(table_name, options = {})
-        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?
-
-        announce_operation "create_table(#{table_name})"
-
-        create_cql =  "CREATE TABLE #{table_name} ("
-        create_cql << table_definition.to_create_cql
-        create_cql << ")"
-        create_cql << table_definition.options
-
-        announce_suboperation create_cql
-
-        execute create_cql
-      end
-
     end
   end
 end

data/lib/cassandra_migrations/migrator.rb

@@ -43,7 +43,7 @@ module CassandraMigrations
     def self.read_current_version
       begin
         Cassandra.select(METADATA_TABLE, :selection => "data_name='version'", :projection => 'data_value').first['data_value'].to_i
-      rescue ::Cassandra::Errors::QueryError => e # table cassandra_migrations_metadata does not exist
+      rescue ::Cassandra::Errors::InvalidError => e # table cassandra_migrations_metadata does not exist
         Cassandra.execute("CREATE TABLE #{METADATA_TABLE} (data_name varchar PRIMARY KEY, data_value varchar)")
         Cassandra.write!(METADATA_TABLE, {:data_name => 'version', :data_value => '0'})
         return 0

data/lib/cassandra_migrations/railtie/generators/cassandra_configuration/USAGE

@@ -0,0 +1,11 @@
+Description:
+    Generates a default cassandra database configuration
+
+Example:
+    rails generate cassandra_configuration
+
+    This will create:
+      config/cassandra.yml
+
+    Inside this file a default configuration will be ready for completion:
+

data/lib/cassandra_migrations/railtie/generators/cassandra_configuration/cassandra_configuration_generator.rb

@@ -0,0 +1,32 @@
+class CassandraConfigurationGenerator < Rails::Generators::Base
+  source_root File.expand_path('templates', File.dirname(__FILE__))
+
+  # Creates configuration file and migration directory
+  #
+  # Any public method in the generator is run automatically when
+  # the generator is run. To understand fully see
+  # http://asciicasts.com/episodes/218-making-generators-in-rails-3
+
+  def generate_configuration
+    require 'fileutils'
+    require 'colorize'
+
+    # create cassandra.yaml
+    if File.exists?(File.expand_path('config/cassandra.yml'))
+      puts "[skip] 'config/cassandra.yml' already exists".yellow
+    else
+      puts "[new] creating 'config/cassandra.yml' (please update with your own configurations!)".green
+      template "cassandra.yml", "config/cassandra.yml"
+    end
+
+    # create db/cassandra_migrations
+    if File.exists?(File.expand_path('db/cassandra_migrate'))
+      puts "[skip] 'db/cassandra_migrate' already exists".yellow
+    else
+      puts "[new] creating 'db/cassandra_migrate' directory".green
+      FileUtils.mkdir(File.expand_path('db/cassandra_migrate'))
+    end
+
+    puts '[done]'.green
+  end
+end

data/lib/cassandra_migrations/railtie/generators/cassandra_configuration/templates/cassandra.yml

@@ -0,0 +1,31 @@
+development:
+  hosts:
+    - 127.0.0.1
+  port: 9042
+  keyspace: my_keyspace_dev
+  replication:
+    class: SimpleStrategy
+    replication_factor: 1
+
+test:
+  hosts:
+    - 127.0.0.1
+  port: 9042
+  keyspace: cassandra_migrations_test
+  replication:
+    class: 'SimpleStrategy'
+    replication_factor: 1
+
+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

data/lib/cassandra_migrations/railtie/initializer.rb

@@ -11,20 +11,19 @@
 
 module CassandraMigrations
 
+  Cassandra.start!
+
+  if defined?(Spring)
+    Spring.after_fork do
+      Cassandra.restart
+    end
+  end
+
   if defined?(PhusionPassenger)
     PhusionPassenger.on_event(:starting_worker_process) do |forked|
       if forked
-        if Cassandra.client
-          Rails.logger.info "Passenger process forked: reconnecting to Cassandra..."
-          Cassandra.restart!
-        else
-          Rails.logger.info "Passenger process forked: connecting to Cassandra..."
-          Cassandra.start!
-        end
+        Cassandra.restart
       end
     end
-  else
-    Cassandra.start!
   end
-  
 end

data/lib/cassandra_migrations/railtie/tasks.rake

@@ -51,18 +51,26 @@ namespace :cassandra do
     end
   end
 
-  desc 'Resets and prepares cassandra database (all data will be lost)'
+  namespace :migrate do
+    desc 'Resets and prepares cassandra database (all data will be lost)'
+    task :reset do
+      Rake::Task['cassandra:drop'].execute
+      Rake::Task['cassandra:create'].execute
+      Rake::Task['cassandra:migrate'].execute
+    end
+  end
+
   task :setup do
-    Rake::Task['cassandra:drop'].execute
+    puts "DEPRECATION WARNING: `cassandra:setup` rake task has been deprecated, use `cassandra:migrate:reset` instead"
     Rake::Task['cassandra:create'].execute
     Rake::Task['cassandra:migrate'].execute
   end
 
   namespace :test do
-    desc 'Load the development schema in to the test keyspace'
+    desc 'Load the development schema in to the test keyspace via a full reset'
     task :prepare do
       Rails.env = 'test'
-      Rake::Task['cassandra:setup'].execute
+      Rake::Task['cassandra:migrate:reset'].execute
     end
   end
 
@@ -71,4 +79,6 @@ namespace :cassandra do
     puts "Current version: #{CassandraMigrations::Migrator.read_current_version}"
   end
 
+  task
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Henrique Gubert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -82,19 +82,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '8.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,12 +142,10 @@ description: A gem to manage Cassandra database schema for Rails. This gem offer
 email:
 - guberthenrique@hotmail.com
 - bsbodden@integrallis.com
-executables:
-- prepare_for_cassandra
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/prepare_for_cassandra
 - lib/cassandra_migrations.rb
 - lib/cassandra_migrations/capistrano.rb
 - lib/cassandra_migrations/cassandra.rb
@@ -163,12 +161,14 @@ files:
 - lib/cassandra_migrations/migration/table_operations.rb
 - lib/cassandra_migrations/migrator.rb
 - lib/cassandra_migrations/railtie.rb
+- lib/cassandra_migrations/railtie/generators/cassandra_configuration/USAGE
+- lib/cassandra_migrations/railtie/generators/cassandra_configuration/cassandra_configuration_generator.rb
+- lib/cassandra_migrations/railtie/generators/cassandra_configuration/templates/cassandra.yml
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/cassandra_migration_generator.rb
 - lib/cassandra_migrations/railtie/generators/cassandra_migration/templates/empty_migration.rb.erb
 - lib/cassandra_migrations/railtie/initializer.rb
 - lib/cassandra_migrations/railtie/tasks.rake
-- template/cassandra.yml
 homepage: https://github.com/hsgubert/cassandra_migrations
 licenses:
 - MIT
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Cassandra schema management for a multi-environment developer.

data/bin/prepare_for_cassandra

@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'fileutils'
-require 'colorize'
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{File.basename($0)} [path]"
-
-  opts.on("-h", "--help", "Displays this help info") do
-    puts opts
-    exit 0
-  end
-
-  begin
-    opts.parse!(ARGV)
-  rescue OptionParser::ParseError => e
-    warn e.message
-    puts opts
-    exit 1
-  end
-end
-
-if ARGV.empty?
-  abort "Please specify the directory of a rails appilcation, e.g. `#{File.basename($0)} .'"
-elsif !File.directory?(ARGV.first)
-  abort "`#{ARGV.first}' is not a directory."
-elsif ARGV.length > 1
-  abort "Too many arguments; please specify only the directory of the rails application."
-end
-
-rails_root = ARGV.first
-
-# create cassandra.yaml
-if File.exists?(File.expand_path('config/cassandra.yml', rails_root))
-  puts "[skip] 'config/cassandra.yml' already exists".yellow
-else
-  puts "[new] creating 'config/cassandra.yml' (please update with your own configurations!)".green
-  FileUtils.cp(
-    File.expand_path('../template/cassandra.yml', File.dirname(__FILE__)),
-    File.expand_path('config/cassandra.yml', rails_root)
-  )
-end
-
-# create db/cassandra_migrations
-if File.exists?(File.expand_path('db/cassandra_migrate', rails_root))
-  puts "[skip] 'db/cassandra_migrate' already exists".yellow
-else
-  puts "[new] creating 'db/cassandra_migrate' directory".green
-  FileUtils.mkdir(File.expand_path('db/cassandra_migrate', rails_root))
-end
-
-puts '[done] prepared for cassandra!'.green
-puts ''
-puts 'Your steps from here are:'.green
-puts '  1. configure '.green + 'config/cassandra.yml'.red
-puts '  2. run '.green + 'rake cassandra:setup'.red + ' and try starting your application'.green
-puts '  3. create your first migration with '.green + 'rails g cassandra_migration'.red
-puts '  4. apply your migration with '.green + 'rake cassandra:migrate'.red
-puts '  5. run '.green + 'rake cassandra:test:prepare'.red + ' and start testing'.green
-puts '  6. have lots of fun!'.green.blink
-

data/template/cassandra.yml

@@ -1,23 +0,0 @@
-development:
-  hosts: ['127.0.0.1']
-  port: 9042
-  keyspace: 'my_keyspace_name'
-  replication:
-    class: 'SimpleStrategy'
-    replication_factor: 1
-
-test:
-  hosts: ['127.0.0.1']
-  port: 9042
-  keyspace: 'my_keyspace_name_test'
-  replication:
-    class: 'SimpleStrategy'
-    replication_factor: 1
-
-production:
-  hosts: ['127.0.0.1']
-  port: 9042
-  keyspace: 'my_keyspace_name_production'
-  replication:
-    class: 'SimpleStrategy'
-    replication_factor: 1