gotime-cassandra_object 4.7.2 → 4.7.3

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.7.2'
+  s.version = '4.7.3'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/schema.rb

@@ -31,12 +31,25 @@ module CassandraObject
         execute statement_with_options(stmt, options)
       end
 
-      def alter_column_family(column_family, options)
-        stmt = "ALTER TABLE #{column_family}"
+      def alter_column_family(column_family, instruction, options = {})
+        stmt = "ALTER TABLE #{column_family} #{instruction}"
         execute statement_with_options(stmt, options)
       end
 
-      def add_index()
+      def drop_column_family(column_family)
+        stmt = "DROP TABLE #{column_family}"
+        execute stmt
+      end
+
+      def add_index(column_family, column, index_name = nil)
+        stmt = "CREATE INDEX #{index_name.nil? ? '' : index_name} ON #{column_family} (#{column})"
+        execute stmt
+      end
+
+      def drop_index(index_name)
+        # If the index was not given a name during creation, the index name is <columnfamily_name>_<column_name>_idx.
+        stmt = "DROP INDEX #{index_name}"
+        execute stmt
       end
 
       private

data/lib/cassandra_object/types/float_type.rb

@@ -9,7 +9,6 @@ module CassandraObject
 
       def decode(str)
         return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a Float") unless str.kind_of?(String) && str.match(REGEX)
         str.to_f
       end
     end

data/lib/cassandra_object/types/integer_type.rb

@@ -9,7 +9,6 @@ module CassandraObject
 
       def decode(str)
         return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into an Integer") unless str.kind_of?(String) && str.match(REGEX)
         str.to_i
       end
     end

data/lib/cassandra_object/types/time_type.rb

@@ -15,8 +15,7 @@ module CassandraObject
       end
 
       def decode(str)
-        return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(TimeType::REGEX)
+        return nil unless str && str.match(TimeType::REGEX)
         Time.xmlschema(str).in_time_zone
       end
     end

data/test/support/connect.rb

@@ -1,7 +1,9 @@
 CassandraObject::Base.config = {
   keyspace: 'cassandra_object_test',
   servers: '127.0.0.1:9160',
-  thrift: {timeout: 10000}
+  thrift: {
+    timeout: 5
+  }
 }
 
 begin

data/test/unit/schema_test.rb

@@ -10,4 +10,38 @@ class CassandraObject::SchemaTest < CassandraObject::TestCase
     rescue Exception => e
     end
   end
+
+  test "drop_column_family" do
+    CassandraObject::Schema.create_column_family 'TestCFToDrop'
+
+    CassandraObject::Schema.drop_column_family 'TestCFToDrop'
+
+    begin
+      CassandraObject::Schema.drop_column_family 'TestCFToDrop'
+      assert false, 'TestCFToDrop should not exist'
+    rescue Exception => e
+    end
+  end
+
+  test "create_index" do
+    CassandraObject::Schema.create_column_family 'TestIndexed'
+
+    CassandraObject::Schema.alter_column_family 'TestIndexed', "ADD id_value varchar"
+
+    CassandraObject::Schema.add_index 'TestIndexed', 'id_value'
+  end
+
+  test "drop_index" do
+    CassandraObject::Schema.create_column_family 'TestDropIndexes'
+
+    CassandraObject::Schema.alter_column_family 'TestDropIndexes', "ADD id_value1 varchar"
+    CassandraObject::Schema.alter_column_family 'TestDropIndexes', "ADD id_value2 varchar"
+
+    CassandraObject::Schema.add_index 'TestDropIndexes', 'id_value1'
+    CassandraObject::Schema.add_index 'TestDropIndexes', 'id_value2', 'special_name'
+
+    CassandraObject::Schema.drop_index 'TestDropIndexes_id_value1_idx'
+    CassandraObject::Schema.drop_index 'special_name'
+  end
+
 end

data/test/unit/types/float_type_test.rb

@@ -10,11 +10,8 @@ class CassandraObject::Types::FloatTypeTest < CassandraObject::Types::TestCase
   end
 
   test 'decode' do
+    assert_equal 0.0, coder.decode('xyz')
     assert_equal 3.14, coder.decode('3.14')
     assert_equal 5, coder.decode('5')
-
-    assert_raise ArgumentError do
-      coder.decode('xyz')
-    end
   end
 end

data/test/unit/types/integer_type_test.rb

@@ -12,6 +12,7 @@ class CassandraObject::Types::IntegerTypeTest < CassandraObject::Types::TestCase
 
   test 'decode' do
     assert_nil coder.decode('')
+    assert_equal 0, coder.decode('abc')
     assert_equal 3, coder.decode('3')
     assert_equal -3, coder.decode('-3')
   end

data/test/unit/types/time_type_test.rb

@@ -4,4 +4,10 @@ class CassandraObject::Types::TimeTypeTest < CassandraObject::Types::TestCase
   test 'encode' do
     assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(Time.utc(2004, 12, 24, 1, 2, 3))
   end
+
+  test 'decode' do
+    assert_nil coder.decode(nil)
+    assert_nil coder.decode('bad format')
+    assert_equal Time.utc(2004, 12, 24, 1, 2, 3), coder.decode('2004-12-24T01:02:03.000000Z')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel