gotime-cassandra_object 4.4.5 → 4.5.0

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rake'
+gem 'mocha'

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/persistence.rb

@@ -29,24 +29,41 @@ module CassandraObject
         end
       end
 
-      def batch
+      def batch_start
         @batch = []
+      end
 
-        with_consistency nil do
-          yield
-        end
+      def batch_statement
+        return nil unless @batch.any?
 
-        if @batch.any?
-          execute_cql [
-            "BEGIN BATCH#{write_option_string}",
+        [
+            "BEGIN BATCH#{write_option_string(true)}",
             @batch * "\n",
             'APPLY BATCH'
-          ] * "\n"
+        ] * "\n"
+      end
+
+      def batch_end
+        if @batch.any?
+          execute_cql batch_statement
         end
       ensure
         @batch = nil
       end
 
+      def batching?
+        !@batch.nil?
+      end
+
+      def batch
+        batch_start
+
+        yield
+
+      ensure
+        batch_end
+      end
+
       def instantiate(id, attributes)
         allocate.tap do |object|
           object.instance_variable_set("@id", id) if id
@@ -74,14 +91,14 @@ module CassandraObject
             execute_cql cql_string, *bind_vars
           end
         end
-      
+
         def typecast_attributes(object, attributes)
           attributes = attributes.symbolize_keys
           Hash[attribute_definitions.map { |k, attribute_definition| [k.to_s, attribute_definition.instantiate(object, attributes[k])] }]
         end
 
-        def write_option_string
-          if base_class.default_consistency
+        def write_option_string(ignore_batching = false)
+          if (ignore_batching || !batching?) && base_class.default_consistency
             " USING CONSISTENCY #{base_class.default_consistency}"
           end
         end

data/lib/cassandra_object/schema/tasks.rb

@@ -8,8 +8,19 @@ module CassandraObject
         end
       end
 
-      def load(filename)
-        `cqlsh -k #{keyspace} -f #{filename} #{server}`
+      def load(io)
+        current_cql = ''
+
+        io.each_line do |line|
+          next if line.blank?
+
+          current_cql << line.rstrip
+
+          if current_cql =~ /;$/
+            CassandraObject::Base.execute_cql current_cql
+            current_cql = ''
+          end
+        end
       end
 
       def column_families

data/lib/cassandra_object/tasks/ks.rake

@@ -38,7 +38,9 @@ ks_namespace = namespace :ks do
 
     task load: :environment do
       filename = ENV['SCHEMA'] || "#{Rails.root}/ks/structure.cql"
-      CassandraObject::Schema.load(filename)
+      File.open(filename) do |file|
+        CassandraObject::Schema.load(file)
+      end
     end
   end
 

data/test/support/connect.rb

@@ -1,6 +1,7 @@
 CassandraObject::Base.establish_connection(
   keyspace: 'cassandra_object_test',
-  servers: '127.0.0.1:9160'
+  servers: '127.0.0.1:9160',
+  thrift: {timeout: 10000}
 )
 
 begin

data/test/support/teardown.rb

@@ -8,7 +8,9 @@ CassandraObject::Base.class_eval do
 
   def self.delete_after_test
     # created_records.reject(&:destroyed?).each(&:destroy)
+    sleep 1
     Issue.delete_all
+  ensure
     created_records.clear
   end
 end

data/test/unit/persistence_test.rb

@@ -29,12 +29,30 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
       first_issue = Issue.create
       second_issue = Issue.create
 
-      assert_raise(CassandraObject::RecordNotFound) { Issue.find first_issue.id }
-      assert_raise(CassandraObject::RecordNotFound) { Issue.find second_issue.id }
+      assert_raise(CassandraObject::RecordNotFound) { Issue.find(first_issue.id) }
+      assert_raise(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
     end
 
-    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find first_issue.id }
-    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find second_issue.id }
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(first_issue.id) }
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
+  end
+
+  test "batch state" do
+    first_issue = Issue.create
+
+    assert !Issue.batching?
+    Issue.batch_start
+
+    second_issue = Issue.create
+    assert Issue.batching?
+
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(first_issue.id) }
+    assert_raise(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
+
+    Issue.batch_end
+
+    assert_nothing_raised(CassandraObject::RecordNotFound) { Issue.find(second_issue.id) }
+
   end
 
   test 'persistance inquiries' do

data/test/unit/schema/tasks_test.rb

@@ -13,4 +13,17 @@ class CassandraObject::Schema::TasksTest < CassandraObject::TestCase
 
     assert_match /Issues/, io.read
   end
+
+  test "load" do
+    CassandraObject::Base.expects(:execute_cql).with("DO STUFF;")
+    CassandraObject::Base.expects(:execute_cql).with("AND MORE;")
+
+    CassandraObject::Schema.load StringIO.new(
+      "DO\n" +
+      " STUFF;\n" +
+      "\n" +
+      "AND\n" +
+      " MORE;\n"
+    )
+  end
 end

metadata

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