cequel 1.0.0.pre.6 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720dcb8eb0924dd3f972efba9e93c2d96ae046ab
-  data.tar.gz: 36b08070aa03e28e6f0748e1c6a375e2ca57822f
+  metadata.gz: 6d15e60b9c3a9725632fe70d140449a03dc1e033
+  data.tar.gz: cc8dd115c0639388ee13b77437b3a7ae6addb2ef
 SHA512:
-  metadata.gz: c51e2ab0b17869ca3f6720e1c74b78c6f116ac705cce8aac49925750e4204012a7701ea1ed6ce4b51702a9f0a88ed2aad3d39609e5b57080ca9d2be1b0913fa6
-  data.tar.gz: 1dae89c0e31809ee91f54a137ca22396d8c591b5ebdf85efe9091ef53143674a71d9873b3b84b562c2deeb5eacad8ffd8dfe25d4fcb4706489656c5307e7ec81
+  metadata.gz: 7b710ee3238b02cc47f0b57a9804ee4f729c1cd807e809b7134888f44b066f59330714aaf7460bafae1d702d2eba47f7dff3ac3b8e2f18b30f03bb3e259498c0
+  data.tar.gz: 870947477a6da3d0f72aae1d6f4154293c41da41b1bf7419c4906737ed86d70ebc9598901a2eec2a121a0412955b7c00e4b5cd03df3dd9228597653b64347bd9

data/lib/cequel/metal/batch.rb

@@ -20,7 +20,8 @@ module Cequel
       #
       def initialize(keyspace, options = {})
         @keyspace = keyspace
-        @auto_apply = options[:auto_apply]
+        @auto_apply = options.fetch(:auto_apply, false)
+        @unlogged = options.fetch(:unlogged, false)
         reset
       end
 
@@ -44,12 +45,20 @@ module Cequel
       def apply
         return if @statement_count.zero?
         if @statement_count > 1
-          @statement.prepend("BEGIN BATCH\n")
+          @statement.prepend(begin_statement)
           @statement.append("APPLY BATCH\n")
         end
         @keyspace.execute(*@statement.args)
       end
 
+      def unlogged?
+        @unlogged
+      end
+
+      def logged?
+        !unlogged?
+      end
+
       private
 
       def reset
@@ -57,6 +66,10 @@ module Cequel
         @statement_count = 0
       end
 
+      def begin_statement
+        "BEGIN #{"UNLOGGED " if unlogged?}BATCH\n"
+      end
+
     end
 
   end

data/lib/cequel/metal/keyspace.rb

@@ -6,6 +6,7 @@ module Cequel
     # Handle to a Cassandra keyspace.
     #
     class Keyspace
+      attr_reader :configuration
 
       #
       # @api private
@@ -25,7 +26,7 @@ module Cequel
 
       def configure(configuration = {})
         @configuration = configuration
-        @hosts = configuration[:host] || configuration[:hosts]
+        @hosts = configuration.fetch(:host, configuration.fetch(:hosts, '127.0.0.1:9160'))
         @thrift_options = configuration[:thrift].try(:symbolize_keys) || {}
         @keyspace = configuration[:keyspace]
         # reset the connections
@@ -144,9 +145,20 @@ module Cequel
       #   end
       #
       def batch(options = {})
-        return yield if get_batch
+        new_batch = Batch.new(self, options)
+
+        if get_batch
+          if get_batch.unlogged? && new_batch.logged?
+            raise ArgumentError,
+              "Already in a logged batch; can't start an unlogged batch."
+          elsif get_batch.logged? && new_batch.unlogged?
+            raise ArgumentError,
+              "Already in an unlogged batch; can't start a logged batch."
+          end
+          return yield
+        end
+
         begin
-          new_batch = Batch.new(self, options)
           set_batch(new_batch)
           yield.tap { new_batch.apply }
         ensure

data/lib/cequel/record.rb

@@ -6,6 +6,7 @@ require 'cequel/record/schema'
 require 'cequel/record/properties'
 require 'cequel/record/collection'
 require 'cequel/record/persistence'
+require 'cequel/record/bulk_writes'
 require 'cequel/record/record_set'
 require 'cequel/record/bound'
 require 'cequel/record/lazy_record_collection'

data/lib/cequel/record/bulk_writes.rb

@@ -0,0 +1,27 @@
+module Cequel
+  module Record
+    module BulkWrites
+      def update_all(attributes)
+        each_data_set { |data_set| data_set.update(attributes) }
+      end
+
+      def delete_all
+        each_data_set { |data_set| data_set.delete }
+      end
+
+      def destroy_all
+        each { |record| record.destroy }
+      end
+
+      private
+
+      def each_data_set
+        key_attributes_for_each_row.each_slice(100) do |batch|
+          connection.batch(:unlogged => true) do
+            batch.each { |key_attributes| yield table.where(key_attributes) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cequel/record/configuration_generator.rb

@@ -0,0 +1,12 @@
+module Cequel
+  module Record
+    class ConfigurationGenerator < Rails::Generators::Base
+      namespace 'cequel:configuration'
+      source_root File.expand_path('../../../../templates/', __FILE__)
+
+      def create_configuration
+        template "config/cequel.yml"
+      end
+    end
+  end
+end

data/lib/cequel/record/lazy_record_collection.rb

@@ -4,6 +4,11 @@ module Cequel
 
     class LazyRecordCollection < DelegateClass(Array)
 
+      extend Forwardable
+      include BulkWrites
+
+      def_delegators :record_set, :table, :connection
+
       def initialize(record_set)
         raise ArgumentError if record_set.nil?
 
@@ -37,6 +42,10 @@ module Cequel
       private
       attr_reader :record_set
 
+      def key_attributes_for_each_row
+        map { |record| record.key_attributes }
+      end
+
     end
 
   end

data/lib/cequel/record/persistence.rb

@@ -16,13 +16,17 @@ module Cequel
           new(attributes, &block).tap { |record| record.save }
         end
 
+        def table
+          connection[table_name]
+        end
+
         def hydrate(row)
           new_empty(row).__send__(:hydrated!)
         end
 
       end
 
-      def_delegator 'self.class', :connection
+      def_delegators 'self.class', :connection, :table
 
       def key_attributes
         @attributes.slice(*self.class.key_column_names)
@@ -182,7 +186,7 @@ module Cequel
       end
 
       def metal_scope
-        connection[table_name].where(key_attributes)
+        table.where(key_attributes)
       end
 
       def attributes_for_create

data/lib/cequel/record/railtie.rb

@@ -1,13 +1,13 @@
 module Cequel
-
   module Record
-
     class Railtie < Rails::Railtie
-
       config.cequel = Record
 
+      def self.app_name
+        Rails.application.railtie_name.sub(/_application$/, '')
+      end
+
       initializer "cequel.configure_rails" do
-        app_name = Rails.application.railtie_name.sub(/_application$/, '')
         config_path = Rails.root.join('config/cequel.yml').to_s
 
         if File.exist?(config_path)
@@ -16,25 +16,20 @@ module Cequel
         else
           config = {host: '127.0.0.1:9160'}
         end
-        config.reverse_merge!(keyspace: "#{app_name}_#{Rails.env}")
+        config.reverse_merge!(keyspace: "#{Railtie.app_name}_#{Rails.env}")
         connection = Cequel.connect(config)
 
-        begin
-          connection = Cequel.connect(config)
-        rescue CassandraCQL::Error::InvalidRequestException
-          connection = Cequel.connect(config.except(:keyspace))
-          #XXX This should be read from the configuration
-          connection.execute(<<-CQL)
-            CREATE KEYSPACE #{keyspace}
-            WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}
-          CQL
-          retry
-        end
         connection.logger = Rails.logger
         Record.connection = connection
       end
-    end
 
-  end
+      rake_tasks do
+        require "cequel/record/tasks"
+      end
 
+      generators do
+        require 'cequel/record/configuration_generator.rb'
+      end
+    end
+  end
 end

data/lib/cequel/record/record_set.rb

@@ -7,6 +7,7 @@ module Cequel
       extend Forwardable
       extend Cequel::Util::HashAccessors
       include Enumerable
+      include BulkWrites
 
       def self.default_attributes
         {:scoped_key_values => [], :select_columns => []}
@@ -134,9 +135,16 @@ module Cequel
         find_each_row(options) { |row| yield target_class.hydrate(row) }
       end
 
+      def find_in_batches(options = {})
+        return enum_for(:find_in_batches, options) unless block_given?
+        find_rows_in_batches(options) do |rows|
+          yield rows.map { |row| target_class.hydrate(row) }
+        end
+      end
+
       def find_each_row(options = {}, &block)
         return enum_for(:find_each_row, options) unless block
-        find_rows_in_batches(options) { |row| row.each(&block) }
+        find_rows_in_batches(options) { |rows| rows.each(&block) }
       end
 
       def find_rows_in_batches(options = {}, &block)
@@ -333,6 +341,13 @@ module Cequel
         RecordSet.new(target_class, attributes_copy)
       end
 
+      def key_attributes_for_each_row
+        return enum_for(:key_attributes_for_each_row) unless block_given?
+        select(*key_column_names).find_each do |record|
+          yield record.key_attributes
+        end
+      end
+
     end
 
   end

data/lib/cequel/record/scoped.rb

@@ -11,7 +11,9 @@ module Cequel
         extend Forwardable
 
         def_delegators :current_scope,
-          *(RecordSet.public_instance_methods(false) - Object.instance_methods)
+          *(RecordSet.public_instance_methods(false) +
+            BulkWrites.public_instance_methods -
+            Object.instance_methods)
 
         def current_scope
           delegating_scope || RecordSet.new(self)

data/lib/cequel/record/tasks.rb

@@ -0,0 +1,37 @@
+namespace :cequel do
+  namespace :keyspace do
+    desc 'Initialize Cassandra keyspace'
+    task :create => :environment do
+      Cequel::Record.connection.schema.create!
+      puts "Created keyspace #{Cequel::Record.connection.name}"
+    end
+
+    desc 'Drop Cassandra keyspace'
+    task :drop => :environment do
+      Cequel::Record.connection.schema.drop!
+      puts "Dropped keyspace #{Cequel::Record.connection.name}"
+    end
+  end
+
+  desc "Synchronize all models defined in `app/models' with Cassandra database schema"
+  task :migrate => :environment do
+    watch_stack = ActiveSupport::Dependencies::WatchStack.new
+
+    Dir.glob(Rails.root.join('app', 'models', '**', '*.rb')).each do |file|
+      watch_stack.watch_namespaces([Object])
+
+      require_dependency(file)
+
+      watch_stack.new_constants.each do |class_name|
+        clazz = class_name.constantize
+        if clazz.ancestors.include?(Cequel::Record)
+          clazz.synchronize_schema
+          puts "Synchronized schema for #{class_name}"
+        end
+      end
+    end
+  end
+
+  desc "Create keyspace and tables for all defined models"
+  task :init => %w(keyspace:create migrate)
+end

data/lib/cequel/schema/keyspace.rb

@@ -8,6 +8,27 @@ module Cequel
         @keyspace = keyspace
       end
 
+      def create!(options = {})
+        bare_connection =
+          Metal::Keyspace.new(keyspace.configuration.except(:keyspace))
+
+        options = options.symbolize_keys
+        options[:class] ||= 'SimpleStrategy'
+        options[:replication_factor] ||= 1 if options[:class] == 'SimpleStrategy'
+        options_strs = options.map do |name, value|
+          "'#{name}': #{CassandraCQL::Statement.quote(value)}"
+        end
+
+        bare_connection.execute(<<-CQL)
+          CREATE KEYSPACE #{keyspace.name}
+          WITH REPLICATION = {#{options_strs.join(', ')}}
+        CQL
+      end
+
+      def drop!
+        keyspace.execute("DROP KEYSPACE #{keyspace.name}")
+      end
+
       def read_table(name)
         TableReader.read(keyspace, name)
       end

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '1.0.0.pre.6'
+  VERSION = '1.0.0.rc1'
 end

data/spec/examples/record/record_set_spec.rb

@@ -102,7 +102,7 @@ describe Cequel::Record::RecordSet do
     end
   end
 
-  let(:posts) { [cassandra_posts, postgres_posts] }
+  let(:posts) { [*cassandra_posts, *postgres_posts] }
 
   let(:comments) do
     5.times.map do |i|
@@ -592,4 +592,70 @@ describe Cequel::Record::RecordSet do
     end
   end
 
+  describe '#update_all' do
+    let(:records) { posts }
+
+    it 'should be able to update with no scoping' do
+      Post.update_all(title: 'Same Title')
+      Post.all.map(&:title).should == Array.new(posts.length) { 'Same Title' }
+    end
+
+    it 'should update posts with scoping' do
+      Post['cassandra'].update_all(title: 'Same Title')
+      Post['cassandra'].map(&:title).
+        should == Array.new(cassandra_posts.length) { 'Same Title' }
+      Post['postgres'].map(&:title).should == postgres_posts.map(&:title)
+    end
+
+    it 'should update fully specified collection' do
+      Post['cassandra']['cequel0', 'cequel1', 'cequel2'].
+        update_all(title: 'Same Title')
+      Post['cassandra']['cequel0', 'cequel1', 'cequel2'].map(&:title).
+        should == Array.new(3) { 'Same Title' }
+      Post['cassandra']['cequel3', 'cequel4'].map(&:title).
+        should == cassandra_posts.drop(3).map(&:title)
+    end
+  end
+
+  describe '#delete_all' do
+    let(:records) { posts }
+
+    it 'should be able to delete with no scoping' do
+      Post.delete_all
+      Post.count.should be_zero
+    end
+
+    it 'should be able to delete with scoping' do
+      Post['postgres'].delete_all
+      Post['postgres'].count.should be_zero
+      Post['cassandra'].count.should == cassandra_posts.length
+    end
+
+    it 'should be able to delete fully specified collection' do
+      Post['postgres']['sequel0', 'sequel1'].delete_all
+      Post['postgres'].map(&:permalink).
+        should == postgres_posts.drop(2).map(&:permalink)
+    end
+  end
+
+  describe '#destroy_all' do
+    let(:records) { posts }
+
+    it 'should be able to delete with no scoping' do
+      Post.destroy_all
+      Post.count.should be_zero
+    end
+
+    it 'should be able to delete with scoping' do
+      Post['postgres'].destroy_all
+      Post['postgres'].count.should be_zero
+      Post['cassandra'].count.should == cassandra_posts.length
+    end
+
+    it 'should be able to delete fully specified collection' do
+      Post['postgres']['sequel0', 'sequel1'].destroy_all
+      Post['postgres'].map(&:permalink).
+        should == postgres_posts.drop(2).map(&:permalink)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.6
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Mat Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,8 +155,10 @@ files:
 - lib/cequel/record/associations.rb
 - lib/cequel/record/belongs_to_association.rb
 - lib/cequel/record/bound.rb
+- lib/cequel/record/bulk_writes.rb
 - lib/cequel/record/callbacks.rb
 - lib/cequel/record/collection.rb
+- lib/cequel/record/configuration_generator.rb
 - lib/cequel/record/dirty.rb
 - lib/cequel/record/errors.rb
 - lib/cequel/record/has_many_association.rb
@@ -169,6 +171,7 @@ files:
 - lib/cequel/record/schema.rb
 - lib/cequel/record/scoped.rb
 - lib/cequel/record/secondary_indexes.rb
+- lib/cequel/record/tasks.rb
 - lib/cequel/record/validations.rb
 - lib/cequel/record.rb
 - lib/cequel/schema/column.rb
@@ -235,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Cassandra 1.0+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3