cassandra_migrations 0.0.2 → 0.0.3

data/lib/cassandra_migrations/cassandra.rb

@@ -61,8 +61,7 @@ module CassandraMigrations
       Rails.logger.try(:info, "Connecting to Cassandra on #{Config.host}:#{Config.port}")
       
       begin
-        self.client = Cql::Client.new(:host => Config.host, :port => Config.port)
-        client.connect
+        self.client = Cql::Client.connect(:host => Config.host, :port => Config.port)
       rescue Cql::Io::ConnectionError => e
         raise Errors::ConnectionError, e.message      
       end

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -46,7 +46,7 @@ module CassandraMigrations
         elsif @columns_name_type_hash.empty?
           raise Errors::MigrationDefinitionError('No column to add.')
         else
-          raise Errors::MigrationDefinitionError('Only one column ca be added at once.')
+          raise Errors::MigrationDefinitionError('Only one column can be added at once.')
         end
         
         cql
@@ -99,6 +99,16 @@ module CassandraMigrations
         define_primary_keys(column_name) if options[:primary_key]
       end
       
+      def uuid(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = :uuid
+        define_primary_keys(column_name) if options[:primary_key]
+      end
+      
+      def timeuuid(column_name, options={})
+        @columns_name_type_hash[column_name.to_sym] = :timeuuid
+        define_primary_keys(column_name) if options[:primary_key]
+      end
+      
       def define_primary_keys(*keys)
         if !@primary_keys.empty?
           raise Errors::MigrationDefinitionError('Primary key defined twice for the same table.')

data/lib/cassandra_migrations/railtie/generators/cassandra_migration/USAGE

@@ -6,7 +6,7 @@ Description:
     current date and time
 
 Example:
-    rails generate migration create_tweets
+    rails generate cassandra_migration create_tweets
 
     This will create:
       db/cassandra_migrate/20080514090912_create_tweets.rb

data/spec/cassandra_migrations/cassandra_spec.rb

@@ -9,24 +9,21 @@ describe CassandraMigrations::Cassandra do
   end
   
   after do
-    CassandraMigrations::Cassandra.shutdown! if CassandraMigrations::Cassandra.client
+    CassandraMigrations::Cassandra.client = nil
     CassandraMigrations::Config.config = nil
   end
   
   describe '.execute' do
     it 'should connect to cassandra using host and port configured' do
-      cql_client_mock = Cql::Client.new
-      Cql::Client.should_receive(:new).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
-      cql_client_mock.should_receive(:connect)
+      cql_client_mock = mock('cql_client')
+      Cql::Client.should_receive(:connect).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
       cql_client_mock.should_receive(:execute).with('anything').and_return(nil)
     
       CassandraMigrations::Cassandra.execute('anything').should be_nil
     end
     
     it 'raise exception if there is something wrong with the connection' do
-      cql_client_mock = Cql::Client.new
-      Cql::Client.should_receive(:new).and_return(cql_client_mock)
-      cql_client_mock.should_receive(:connect).and_raise(Cql::Io::ConnectionError)
+      Cql::Client.should_receive(:connect).and_raise(Cql::Io::ConnectionError)
 
       expect {    
         CassandraMigrations::Cassandra.execute('anything')
@@ -34,7 +31,7 @@ describe CassandraMigrations::Cassandra do
     end
     
     it 'should return a QueryResult if the query returns something' do
-      CassandraMigrations::Cassandra.client = Cql::Client.new
+      CassandraMigrations::Cassandra.client = mock('cql_client')
       
       result_mock = mock('result_mock')
       CassandraMigrations::Cassandra.client.should_receive(:execute).with('anything').and_return(result_mock)
@@ -47,9 +44,8 @@ describe CassandraMigrations::Cassandra do
   
   describe '.use' do
     it 'should connect to cassandra using host and port configured' do
-      cql_client_mock = Cql::Client.new
-      Cql::Client.should_receive(:new).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
-      cql_client_mock.should_receive(:connect)
+      cql_client_mock = mock('cql_client')
+      Cql::Client.should_receive(:connect).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
       cql_client_mock.should_receive(:use).with('anything').and_return(nil)
     
       CassandraMigrations::Cassandra.use('anything').should be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre7
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre7
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement