cassandra_migrations 0.0.1.pre7 → 0.0.1

data/lib/cassandra_migrations/config.rb

@@ -15,6 +15,10 @@ module CassandraMigrations
     def self.load_config
       begin
         self.config = YAML.load_file(Rails.root.join("config", "cassandra.yml"))[Rails.env]
+      
+        if config.nil?
+          raise Errors::MissingConfigurationError, "No configuration for #{Rails.env} environment! Complete your config/cassandra.yml."
+        end
       rescue Errno::ENOENT
         raise Errors::MissingConfigurationError
       end

data/lib/cassandra_migrations/errors.rb

@@ -1,9 +1,19 @@
 # encoding: utf-8
 
+require 'colorize'
+
 module CassandraMigrations
   module Errors
 
     class CassandraError < StandardError
+      def initialize(msg)
+        # Makes all exception messages red
+        if msg.frozen?
+          super(msg.dup.red)
+        else
+          super(msg.red)
+        end
+      end
     end
     
     class ClientNotStartedError < CassandraError
@@ -13,8 +23,8 @@ module CassandraMigrations
     end
     
     class MissingConfigurationError < CassandraError
-      def initialize
-        super("config/cassandra.yml is missing! Run 'prepare_for_cassandra .' in the rails root directory.")
+      def initialize(msg=nil)
+        super(msg || "config/cassandra.yml is missing! Run 'prepare_for_cassandra .' in the rails root directory.")
       end
     end
     

data/spec/cassandra_migrations/cassandra_spec.rb

@@ -3,11 +3,6 @@ require 'spec_helper'
 
 describe CassandraMigrations::Cassandra do
   
-  it "should initialize without client or config" do
-    CassandraMigrations::Cassandra.client.should be_nil
-    CassandraMigrations::Cassandra.config.should be_nil
-  end
-  
   before do
     Rails.stub(:root).and_return Pathname.new("spec/fixtures")
     Rails.stub(:env).and_return ActiveSupport::StringInquirer.new("development")
@@ -17,72 +12,90 @@ describe CassandraMigrations::Cassandra do
     CassandraMigrations::Cassandra.shutdown! if CassandraMigrations::Cassandra.client
   end
   
-  describe ".start!" do
-    it "should raise exception if config/cassandra.yaml is not found" do
-      Rails.stub(:root).and_return Pathname.new("wrong_path")
-      
-      expect do
-        CassandraMigrations::Cassandra.start!
-      end.to raise_exception CassandraMigrations::Cassandra::Errors::MissingConfigurationError
-    end
-    
-    it "should load config/cassandra.yaml environment specific part in self.config" do
-      begin
-        CassandraMigrations::Cassandra.start!
-      rescue
-      end
-      
-      CassandraMigrations::Cassandra.config.should == {
-        'host' => "127.0.0.1",
-        'port' => 9042,
-        'keyspace' => "cassandra_migrations_development",
-        'replication' => {
-          'class' => "SimpleStrategy",
-          'replication_factor' => 1
-        }
-      }
-    end
-    
-    it "should use host and port configurations to create cassandra client" do
+  describe '.execute' do
+    it 'should connect to cassandra using host and port configured' do
       cql_client_mock = Cql::Client.new
-      cql_client_mock.should_receive(:connect)
-      cql_client_mock.stub(:use)
       Cql::Client.should_receive(:new).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
-      
-      CassandraMigrations::Cassandra.start!
+      cql_client_mock.should_receive(:connect)
+      cql_client_mock.should_receive(:execute).with('anything').and_return(nil)
+    
+      CassandraMigrations::Cassandra.execute('anything').should be_nil
     end
     
-    it "should raise exception if not able to connect to cassandra host" do
+    it 'raise exception if there is something wrong with the connection' do
       cql_client_mock = Cql::Client.new
-      cql_client_mock.stub(:connect).and_raise Cql::Io::ConnectionError
-      Cql::Client.stub(:new).and_return cql_client_mock
-      
-      expect do
-        CassandraMigrations::Cassandra.start!
-      end.to raise_exception CassandraMigrations::Cassandra::Errors::ConnectionError
+      Cql::Client.should_receive(:new).and_return(cql_client_mock)
+      cql_client_mock.should_receive(:connect).and_raise(Cql::Io::ConnectionError)
+
+      expect {    
+        CassandraMigrations::Cassandra.execute('anything')
+      }.to raise_exception CassandraMigrations::Errors::ConnectionError
     end
     
-    it "should automatically use configured keyspace" do
-      CassandraMigrations::Cassandra.should_receive(:use).with('cassandra_migrations_development')
-      CassandraMigrations::Cassandra.start!
+    it 'should return a QueryResult if the query returns something' do
+      CassandraMigrations::Cassandra.client = Cql::Client.new
+      
+      result_mock = mock('result_mock')
+      CassandraMigrations::Cassandra.client.should_receive(:execute).with('anything').and_return(result_mock)
+      
+      result = CassandraMigrations::Cassandra.execute('anything')
+      result.should_not be_nil
+      result.should be_a(CassandraMigrations::Cassandra::QueryResult)
     end
   end
   
   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.should_receive(:use).with('anything').and_return(nil)
+    
+      CassandraMigrations::Cassandra.use('anything').should be_nil
+    end
+    
     it "should raise exception if configured keyspace does not exist" do
-      expect do
-        CassandraMigrations::Cassandra.start!
-      end.to raise_exception CassandraMigrations::Cassandra::Errors::UnexistingKeyspaceError
+      expect {
+        CassandraMigrations::Cassandra.use('anything')
+      }.to raise_exception CassandraMigrations::Errors::UnexistingKeyspaceError
     end
   end
   
-  describe "query interface" do
-    it "should respond to query methods" do
-      CassandraMigrations::Cassandra.should respond_to :select
-      CassandraMigrations::Cassandra.should respond_to :write
-      CassandraMigrations::Cassandra.should respond_to :delete
-      CassandraMigrations::Cassandra.should respond_to :truncate 
-    end
-  end
+  # describe ".start!" do
+    # it "should use host and port configurations to create cassandra client" do
+      # cql_client_mock = Cql::Client.new
+      # cql_client_mock.should_receive(:connect)
+      # cql_client_mock.stub(:use)
+      # Cql::Client.should_receive(:new).with(:host => '127.0.0.1', :port => 9042).and_return(cql_client_mock)
+#       
+      # CassandraMigrations::Cassandra.start!
+    # end
+#     
+    # it "should raise exception if not able to connect to cassandra host" do
+      # cql_client_mock = Cql::Client.new
+      # cql_client_mock.stub(:connect).and_raise Cql::Io::ConnectionError
+      # Cql::Client.stub(:new).and_return cql_client_mock
+#       
+      # expect do
+        # CassandraMigrations::Cassandra.start!
+      # end.to raise_exception CassandraMigrations::Cassandra::Errors::ConnectionError
+    # end
+#     
+    # it "should automatically use configured keyspace" do
+      # CassandraMigrations::Cassandra.should_receive(:use).with('cassandra_migrations_development')
+      # CassandraMigrations::Cassandra.start!
+    # end
+  # end
+#   
+#   
+#   
+  # describe "query interface" do
+    # it "should respond to query methods" do
+      # CassandraMigrations::Cassandra.should respond_to :select
+      # CassandraMigrations::Cassandra.should respond_to :write
+      # CassandraMigrations::Cassandra.should respond_to :delete
+      # CassandraMigrations::Cassandra.should respond_to :truncate 
+    # end
+  # end
   
 end

data/spec/cassandra_migrations/config_spec.rb

@@ -0,0 +1,36 @@
+# encoding : utf-8
+require 'spec_helper'
+
+describe CassandraMigrations::Config do
+  
+  before do
+    CassandraMigrations::Config.config = nil
+  end
+  
+  it 'should fetch values in config for the right environment' do
+    Rails.stub(:root).and_return Pathname.new("spec/fixtures")
+    Rails.stub(:env).and_return ActiveSupport::StringInquirer.new("development")
+    
+    CassandraMigrations::Config.keyspace.should == 'cassandra_migrations_development'
+    CassandraMigrations::Config.replication.should == {'class' => "SimpleStrategy", 'replication_factor' => 1 }
+  end
+  
+  it 'should raise exception if there are no configs for environment' do
+    Rails.stub(:root).and_return Pathname.new("spec/fixtures")
+    Rails.stub(:env).and_return ActiveSupport::StringInquirer.new("fake_environment")
+    
+    expect {
+      CassandraMigrations::Config.keyspace
+    }.to raise_exception CassandraMigrations::Errors::MissingConfigurationError
+  end
+  
+  it 'should raise exception if there are no config file' do
+    Rails.stub(:root).and_return Pathname.new("spec/fake_path")
+    Rails.stub(:env).and_return ActiveSupport::StringInquirer.new("development")
+    
+    expect {
+      CassandraMigrations::Config.keyspace
+    }.to raise_exception CassandraMigrations::Errors::MissingConfigurationError
+  end
+end
+  

data/spec/cassandra_migrations_spec.rb

@@ -6,8 +6,9 @@ describe CassandraMigrations do
     defined?(CassandraMigrations).should be_true
     defined?(CassandraMigrations::Railtie).should be_true
     defined?(CassandraMigrations::Cassandra).should be_true
-    defined?(CassandraMigrations::Cassandra::Query).should be_true
-    defined?(CassandraMigrations::Cassandra::Errors).should be_true
-    defined?(CassandraMigrations::Cassandra::Migrator).should be_true
+    defined?(CassandraMigrations::Errors).should be_true
+    defined?(CassandraMigrations::Migration).should be_true
+    defined?(CassandraMigrations::Migrator).should be_true
+    defined?(CassandraMigrations::Config).should be_true
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre7
-  prerelease: 6
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Henrique Gubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -115,28 +115,29 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cassandra_migrations.rb
-- lib/cassandra_migrations/config.rb
-- lib/cassandra_migrations/capistrano.rb
+- lib/cassandra_migrations/cassandra/keyspace_operations.rb
 - lib/cassandra_migrations/cassandra/queries.rb
 - lib/cassandra_migrations/cassandra/query_result.rb
-- lib/cassandra_migrations/cassandra/keyspace_operations.rb
-- lib/cassandra_migrations/railtie/tasks.rake
-- 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/migration/table_operations.rb
+- lib/cassandra_migrations/migration/table_definition.rb
+- lib/cassandra_migrations/migration/column_operations.rb
 - lib/cassandra_migrations/migration.rb
-- lib/cassandra_migrations/migrator.rb
 - lib/cassandra_migrations/errors.rb
-- lib/cassandra_migrations/migration/column_operations.rb
-- lib/cassandra_migrations/migration/table_definition.rb
-- lib/cassandra_migrations/migration/table_operations.rb
-- lib/cassandra_migrations/cassandra.rb
 - lib/cassandra_migrations/railtie.rb
+- lib/cassandra_migrations/config.rb
+- lib/cassandra_migrations/migrator.rb
+- lib/cassandra_migrations/cassandra.rb
+- 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/generators/cassandra_migration/USAGE
+- lib/cassandra_migrations/railtie/tasks.rake
+- lib/cassandra_migrations/railtie/initializer.rb
+- lib/cassandra_migrations/capistrano.rb
+- lib/cassandra_migrations.rb
 - template/cassandra.yml
-- spec/cassandra_migrations/cassandra_spec.rb
 - spec/cassandra_migrations_spec.rb
+- spec/cassandra_migrations/config_spec.rb
+- spec/cassandra_migrations/cassandra_spec.rb
 - bin/prepare_for_cassandra
 homepage: https://github.com/hsgubert/cassandra_migrations
 licenses:
@@ -164,5 +165,6 @@ signing_key:
 specification_version: 3
 summary: Cassandra schema management for a multi-environment developer.
 test_files:
-- spec/cassandra_migrations/cassandra_spec.rb
 - spec/cassandra_migrations_spec.rb
+- spec/cassandra_migrations/config_spec.rb
+- spec/cassandra_migrations/cassandra_spec.rb