gotime-cassandra_object 4.4.0 → 4.4.3

data/.travis.yml

@@ -1,7 +1,5 @@
-before_install:
-  - cassandra -v
-  - sudo service cassandra start
-  - sleep 3
+services:
+  - cassandra
 rvm:
   - 1.9.2
   - 1.9.3

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/inspect.rb

@@ -3,16 +3,16 @@ module CassandraObject
     def inspect
       inspection = ["#{self.class.primary_key}: #{id.inspect}"]
 
-      @attributes.keys.each do |attribute|
-        inspection << "#{attribute}: #{attribute_for_inspect(attribute)}"
+      @attributes.each do |attribute, value|
+        if value.present?
+          inspection << "#{attribute}: #{attribute_for_inspect(value)}"
+        end
       end
 
       "#<#{self.class} #{inspection * ', '}>"
     end
 
-    def attribute_for_inspect(attr_name)
-      value = read_attribute(attr_name)
-
+    def attribute_for_inspect(value)
       if value.is_a?(String) && value.length > 50
         "#{value[0..50]}...".inspect
       elsif value.is_a?(Date) || value.is_a?(Time)

data/lib/cassandra_object/persistence.rb

@@ -4,7 +4,7 @@ module CassandraObject
 
     module ClassMethods
       def remove(id)
-        execute_cql "DELETE FROM #{column_family} WHERE KEY = ?", id
+        execute_cql "DELETE FROM #{column_family} #{write_option_string} WHERE KEY = ?", id
       end
 
       def delete_all
@@ -20,12 +20,12 @@ module CassandraObject
       def write(id, attributes)
         if (encoded = encode_attributes(attributes)).any?
           insert_attributes = {'KEY' => id}.update encode_attributes(attributes)
-          statement = "INSERT INTO #{column_family} (#{insert_attributes.keys * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})"
+          statement = "INSERT INTO #{column_family} (#{insert_attributes.keys * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','}) #{write_option_string}"
           execute_cql statement, *insert_attributes.values
         end
 
         if (nil_attributes = attributes.select { |key, value| value.nil? }).any?
-          execute_cql "DELETE #{nil_attributes.keys * ','} FROM #{column_family} WHERE KEY = ?", id
+          execute_cql "DELETE #{nil_attributes.keys * ','} FROM #{column_family} #{write_option_string} WHERE KEY = ?", id
         end
       end
 
@@ -53,6 +53,14 @@ module CassandraObject
         attributes = attributes.symbolize_keys
         Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
       end
+
+      private
+      def write_option_string
+        consistency = base_class.default_consistency
+        if consistency
+          "USING CONSISTENCY #{consistency}"
+        end
+      end
     end
 
     def new_record?

data/lib/cassandra_object/scope/finder_methods.rb

@@ -20,8 +20,7 @@ module CassandraObject
       end
 
       def first
-        to_a.first
-        # limit(1).to_a.first
+        limit(1).to_a.first
       end
 
       private

data/lib/cassandra_object/scope/query_methods.rb

@@ -35,9 +35,9 @@ module CassandraObject
       def to_a
         statement = [
           "SELECT #{select_string} FROM #{klass.column_family}",
+          consistency_string,
           where_string,
-          limit_string,
-          consistency_string
+          limit_string
         ].delete_if(&:blank?) * ' '
 
         instantiate_from_cql(statement)

data/test/unit/inspect_test.rb

@@ -8,18 +8,19 @@ class CassandraObject::InspectTest < CassandraObject::TestCase
       integer :other
     end
 
-    assert_equal "#{'x' * 51}...".inspect, object.new(long_string: 'x' * 100).attribute_for_inspect(:long_string)
-    assert_equal "2012-02-14 12:01:02".inspect, object.new(the_time: Time.new(2012, 02, 14, 12, 01, 02)).attribute_for_inspect(:the_time)
-    assert_equal "5", object.new(other: 5).attribute_for_inspect(:other)
+    assert_equal "#{'x' * 51}...".inspect, object.new.attribute_for_inspect('x' * 100)
+    assert_equal "2012-02-14 12:01:02".inspect, object.new.attribute_for_inspect(Time.new(2012, 02, 14, 12, 01, 02))
+    assert_equal "\"foo\"", object.new.attribute_for_inspect('foo')
   end
 
   test 'inspect' do
     object = temp_object do
       string :description
       integer :price
-    end.new(description: "yeah buddy", price: 42)
+    end.new(description: "yeah buddy", price: nil)
 
     assert_match /id/, object.inspect
     assert_match /description/, object.inspect
+    assert_no_match /price/, object.inspect
   end
 end

data/test/unit/persistence_test.rb

@@ -111,4 +111,18 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     persisted_issue.reload
     assert_equal 'say what', persisted_issue.description
   end
+
+  test 'delete with consistency' do
+    issue = Issue.create
+    Issue.with_consistency 'QUORUM' do
+      issue.destroy
+    end
+  end
+
+  test 'insert with consistency' do
+    Issue.with_consistency 'QUORUM' do
+      Issue.create
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel