cassandra_migrations 0.0.1 → 0.0.2

data/lib/cassandra_migrations/cassandra/queries.rb

@@ -4,23 +4,39 @@ module CassandraMigrations
   module Cassandra
     module Queries
   
-      def write!(table, hash)
+      def write!(table, value_hash, options={})
         columns = []
         values = []
         
-        hash.each do |k,v| 
-          columns << k.to_s
-          
-          if v.respond_to?(:strftime)
-            values << "'#{v.strftime('%Y-%m-%d %H:%M:%S%z')}'"
-          elsif v.is_a?(String)
-            values << "'#{v}'"          
-          else
-            values << v.to_s
-          end
+        value_hash.each do |column, value| 
+          columns << column.to_s
+          values << to_cql_value(value)
         end
     
-        execute("INSERT INTO #{table} (#{columns.join(', ')}) VALUES (#{values.join(', ')})")
+        query = "INSERT INTO #{table} (#{columns.join(', ')}) VALUES (#{values.join(', ')})"
+        
+        if options[:ttl]
+          query += " USING TTL #{options[:ttl]}"
+        end
+        
+        execute(query)
+      end
+      
+      def update!(table, selection, value_hash, options={})
+        set_terms = []
+        value_hash.each do |column, value| 
+          set_terms << "#{column} = #{to_cql_value(value)}"
+        end
+        
+        query = "UPDATE #{table}"
+        
+        if options[:ttl]
+          query += " USING TTL #{options[:ttl]}"
+        end
+        
+        query += " SET #{set_terms.join(', ')} WHERE #{selection}"
+        
+        execute(query)
       end
       
       def select(table, options={})
@@ -42,13 +58,25 @@ module CassandraMigrations
       end
       
       def delete!(table, selection, options={})
-        execute("DELETE #{options[:projection]} FROM #{table} WHERE #{selection}")
+        options[:projection] = options[:projection].to_s + ' ' if options[:projection]
+        execute("DELETE #{options[:projection]}FROM #{table} WHERE #{selection}")
       end
       
       def truncate!(table)
         execute("TRUNCATE #{table}")
       end
       
+    private
+    
+      def to_cql_value(value)
+        if value.respond_to?(:strftime)
+          "'#{value.strftime('%Y-%m-%d %H:%M:%S%z')}'"
+        elsif value.is_a?(String)
+          "'#{value}'"          
+        else
+          value.to_s
+        end
+      end
     end
   end
 end

data/spec/cassandra_migrations/cassandra/queries_spec.rb

@@ -0,0 +1,106 @@
+# encoding : utf-8
+require 'spec_helper'
+
+describe CassandraMigrations::Cassandra::Queries do
+  
+  class TestQueryExecutor
+    extend CassandraMigrations::Cassandra::Queries
+  end
+  
+  describe '.write!' do
+    it 'should insert a record into the specified table' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "INSERT INTO people (name, age, height_in_meters, birth_time) VALUES ('John', 24, 1.83, '1989-05-27 08:50:25+0000')"
+      )
+      
+      TestQueryExecutor.write!('people',
+        :name => 'John',
+        :age => 24,
+        :height_in_meters => 1.83,
+        :birth_time => Time.new(1989, 05, 27, 8, 50, 25, 0)
+      )
+    end
+    
+    it 'should set record TTL' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "INSERT INTO people (name) VALUES ('John') USING TTL 3600"
+      )
+      
+      TestQueryExecutor.write!('people', {:name => 'John'}, :ttl => 3600)
+    end
+  end
+  
+  describe '.update!' do
+    it 'should update some record values' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "UPDATE people SET height_in_meters = 1.93, birth_time = '1989-05-28 08:50:25+0000' WHERE name = 'John'"
+      )
+      
+      TestQueryExecutor.update!('people', "name = 'John'",
+        :height_in_meters => 1.93,
+        :birth_time => Time.new(1989, 05, 28, 8, 50, 25, 0)
+      )
+    end
+    
+    it 'should set record TTL' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "UPDATE people USING TTL 3600 SET name = 'Johnny' WHERE name = 'John'"
+      )
+      
+      TestQueryExecutor.update!('people', "name = 'John'", {:name => 'Johnny'}, :ttl => 3600)
+    end
+  end
+  
+  describe '.select' do
+    it 'should make select query with WHERE, ORDER BY and LIMIT' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "SELECT * FROM people WHERE name = 'John' ORDER BY birth_time LIMIT 200"
+      )
+      
+      TestQueryExecutor.select('people', 
+        :selection => "name = 'John'",
+        :order_by => 'birth_time',
+        :limit => 200
+      )
+    end
+    
+    it 'should allow to specify projection (columns loaded)' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "SELECT age, birth_time FROM people WHERE name = 'John'"
+      )
+      
+      TestQueryExecutor.select('people', 
+        :selection => "name = 'John'",
+        :projection => 'age, birth_time'
+      )
+    end
+  end  
+  
+  describe '.delete!' do
+    it 'should delete rows based in a selection' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "DELETE FROM people WHERE name IN ('John', 'Mike')"
+      )
+      
+      TestQueryExecutor.delete!('people', "name IN ('John', 'Mike')")
+    end
+    
+    it 'should delete column based in a selection and projection' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "DELETE age FROM people WHERE name IN ('John', 'Mike')"
+      )
+      
+      TestQueryExecutor.delete!('people', "name IN ('John', 'Mike')", :projection => :age)
+    end
+  end
+  
+  describe '.truncate!' do
+    it 'should clear table' do
+      TestQueryExecutor.should_receive(:execute).with(
+        "TRUNCATE people"
+      )
+      
+      TestQueryExecutor.truncate!('people')
+    end
+  end
+end

data/spec/cassandra_migrations/cassandra_spec.rb

@@ -10,6 +10,7 @@ describe CassandraMigrations::Cassandra do
   
   after do
     CassandraMigrations::Cassandra.shutdown! if CassandraMigrations::Cassandra.client
+    CassandraMigrations::Config.config = nil
   end
   
   describe '.execute' do
@@ -61,41 +62,35 @@ describe CassandraMigrations::Cassandra do
     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
+  describe ".start!" do
+    it "should use configured keyspace" do
+      CassandraMigrations::Cassandra.should_receive(:use).with('cassandra_migrations_development')
+      CassandraMigrations::Cassandra.start!
+    end
+    
+    it "should log missing configuration file or similar error, but swallow exception" do
+      Rails.stub(:root).and_return Pathname.new("spec/fake_fixture_path")
+      
+      Rails.logger = mock('logger')
+      Rails.logger.should_receive(:warn).with('There is no config/cassandra.yml. Skipping connection to Cassandra...')
+      CassandraMigrations::Cassandra.start!
+    end
+  end
+   
+  describe "query interface" do
+    it "should respond to query helper methods" do
+      CassandraMigrations::Cassandra.should respond_to :select
+      CassandraMigrations::Cassandra.should respond_to :write!
+      CassandraMigrations::Cassandra.should respond_to :update!
+      CassandraMigrations::Cassandra.should respond_to :delete!
+      CassandraMigrations::Cassandra.should respond_to :truncate!
+    end
+  end
   
+  describe "keyspace interface" do
+    it "should respond to keyspace helper methods" do
+      CassandraMigrations::Cassandra.should respond_to :create_keyspace!
+      CassandraMigrations::Cassandra.should respond_to :drop_keyspace!
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-30 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/capistrano.rb
+- lib/cassandra_migrations/migration.rb
+- lib/cassandra_migrations/migrator.rb
+- lib/cassandra_migrations/cassandra.rb
+- lib/cassandra_migrations/railtie.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/queries.rb
+- lib/cassandra_migrations/config.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/errors.rb
-- lib/cassandra_migrations/railtie.rb
-- lib/cassandra_migrations/config.rb
-- lib/cassandra_migrations/migrator.rb
-- lib/cassandra_migrations/cassandra.rb
+- lib/cassandra_migrations/migration/table_definition.rb
+- lib/cassandra_migrations/railtie/initializer.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
+- lib/cassandra_migrations/errors.rb
 - template/cassandra.yml
 - spec/cassandra_migrations_spec.rb
 - spec/cassandra_migrations/config_spec.rb
+- spec/cassandra_migrations/cassandra/queries_spec.rb
 - spec/cassandra_migrations/cassandra_spec.rb
 - bin/prepare_for_cassandra
 homepage: https://github.com/hsgubert/cassandra_migrations
@@ -167,4 +168,5 @@ summary: Cassandra schema management for a multi-environment developer.
 test_files:
 - spec/cassandra_migrations_spec.rb
 - spec/cassandra_migrations/config_spec.rb
+- spec/cassandra_migrations/cassandra/queries_spec.rb
 - spec/cassandra_migrations/cassandra_spec.rb