gotime-cassandra_object 4.7.3 → 4.8.0

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.7.3'
+  s.version = '4.8.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('activemodel', '>= 3.0')
   s.add_runtime_dependency('cassandra-cql')
-  s.add_runtime_dependency('thrift_client', '~> 0.8.0')
+  s.add_runtime_dependency('thrift_client', '~> 0.9.0')
 
   s.add_development_dependency('bundler')
 end

data/lib/cassandra_object/persistence.rb

@@ -2,6 +2,10 @@ module CassandraObject
   module Persistence
     extend ActiveSupport::Concern
 
+    included do
+      class_attribute :batch_statements
+    end
+
     module ClassMethods
       def remove(id)
         execute_batchable_cql "DELETE FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
@@ -30,15 +34,15 @@ module CassandraObject
       end
 
       def batching?
-        !@batch.nil?
+        !batch_statements.nil?
       end
 
       def batch
-        @batch = []
+        self.batch_statements = []
         yield
-        execute_cql(batch_statement) if @batch.any?
+        execute_cql(batch_statement) if batch_statements.any?
       ensure
-        @batch = nil
+        self.batch_statements = nil
       end
 
       def instantiate(id, attributes)
@@ -67,18 +71,18 @@ module CassandraObject
         end
 
         def batch_statement
-          return nil unless @batch.any?
+          return nil unless batch_statements.any?
 
           [
             "BEGIN BATCH#{write_option_string(true)}",
-            @batch * "\n",
+            batch_statements * "\n",
             'APPLY BATCH'
           ] * "\n"
         end
 
         def execute_batchable_cql(cql_string, *bind_vars)
-          if @batch
-            @batch << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
+          if batch_statements
+            batch_statements << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
           else
             execute_cql cql_string, *bind_vars
           end

data/lib/cassandra_object/scope/query_methods.rb

@@ -32,15 +32,17 @@ module CassandraObject
         clone.limit! value
       end
 
-      def to_a
-        statement = [
-          "SELECT #{select_string} FROM #{klass.column_family}",
-          consistency_string,
-          where_string,
-          limit_string
+      def to_cql
+        [
+            "SELECT #{select_string} FROM #{klass.column_family}",
+            consistency_string,
+            where_string,
+            limit_string
         ].delete_if(&:blank?) * ' '
+      end
 
-        instantiate_from_cql(statement)
+      def to_a
+        instantiate_from_cql(to_cql)
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.7.3
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
     none: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
     none: false
 - !ruby/object:Gem::Dependency
   name: bundler