cequel 0.4.2 → 0.5.0

data/lib/cequel/model/railtie.rb

@@ -10,7 +10,7 @@ module Cequel
         config_path = Rails.root.join('config/cequel.yml').to_s
 
         if File.exist?(config_path)
-          yaml = YAML.load_file(config_path)[Rails.env]
+          yaml = YAML::load(ERB.new(IO.read(config_path)).result)[Rails.env]
           Cequel::Model.configure(yaml.symbolize_keys) if yaml
         end
 

data/lib/cequel/model/readable_dictionary.rb

@@ -0,0 +1,169 @@
+module Cequel
+
+  module Model
+
+    class ReadableDictionary
+
+      class <<self
+
+        attr_writer :column_family, :default_batch_size
+
+        def key_alias
+          @key_alias ||= :KEY
+        end
+
+        def key_type
+          @key_type ||= :text
+        end
+
+        def comparator
+          @comparator ||= :text
+        end
+
+        def validation
+          :counter
+        end
+
+        def key(key_alias, type)
+          @key_alias, @key_type = key_alias, type
+
+          module_eval(<<-RUBY)
+          def #{key_alias.downcase}
+            @key
+          end
+          RUBY
+        end
+
+        def columns(comparator)
+          @comparator = comparator
+        end
+
+        def column_family
+          return @column_family if @column_family
+          self.column_family_name = name.underscore.to_sym
+          @column_family
+        end
+
+        def column_family_name=(column_family_name)
+          self.column_family = Cequel::Model.keyspace[column_family_name]
+        end
+
+        def default_batch_size
+          @default_batch_size || 1000
+        end
+
+        def [](key)
+          new(key)
+        end
+        private :new
+
+        def load(*keys)
+          options = keys.extract_options!
+          keys.flatten!
+          batch_size = options[:columns] || options[:batch_size] ||
+            default_batch_size
+          column_family.select(:first => batch_size).
+            where(key_alias.to_s => keys).
+            map { |row| new(row.delete(key_alias.to_s), row) }
+        end
+
+      end
+
+      include Enumerable
+
+      def initialize(key, row = nil)
+        @key = key
+        setup(row)
+      end
+
+      def [](column)
+        if @loaded
+          @row[column]
+        else
+          scope.select(column).first[column]
+        end
+      end
+
+      def keys
+        @loaded ? @row.keys : each_pair.map { |key, value| key }
+      end
+
+      def values
+        @loaded ? @row.values : each_pair.map { |key, value| value }
+      end
+
+      def slice(*columns)
+        if @loaded
+          @row.slice(*columns)
+        else
+          deserialize_row(load_raw_slice(columns))
+        end
+      end
+
+      def key?(column)
+        @row.key?(column) || load_raw_slice([column])[column].present?
+      end
+
+      def each_pair(options = {}, &block)
+        return Enumerator.new(self, :each_pair, options) unless block
+        return @row.each_pair(&block) if @loaded
+        batch_size = options[:batch_size] || self.class.default_batch_size
+        each_slice(batch_size) do |batch_results|
+          batch_results.each_pair(&block)
+        end
+      end
+
+      def each(&block)
+        each_pair(&block)
+      end
+
+      def each_slice(batch_size)
+        batch_scope = scope.select(:first => batch_size)
+        key_alias = self.class.key_alias
+        last_key = nil
+        begin
+          batch_results = batch_scope.first
+          batch_results.delete(key_alias)
+          result_length = batch_results.length
+          batch_results.delete(last_key) unless last_key.nil?
+          yield deserialize_row(batch_results)
+          last_key = batch_results.keys.last
+          batch_scope = batch_scope.select(:from => last_key)
+        end while result_length == batch_size
+      end
+
+      def load
+        @row = {}
+        each_pair { |column, value| @row[column] = value }
+        @loaded = true
+        self
+      end
+
+      def loaded?
+        !!@loaded
+      end
+
+      private
+
+      def setup(init_row = nil)
+        @row = deserialize_row(init_row || {})
+        @loaded = !!init_row
+      end
+
+      def scope
+        self.class.column_family.where(self.class.key_alias => @key)
+      end
+
+      def load_raw_slice(columns)
+        row = scope.select(*columns).first.except(self.class.key_alias)
+      end
+
+      def deserialize_row(row)
+        row
+      end
+
+    end
+
+  end
+
+end

data/lib/cequel/model/scoped.rb

@@ -16,7 +16,7 @@ module Cequel
         end
 
         def all
-          @_cequel.current_scope || @_cequel.default_scope || empty_scope
+          current_scope || @_cequel.default_scope || empty_scope
         end
 
         def select(*rows)
@@ -25,12 +25,12 @@ module Cequel
 
         def with_scope(scope)
           @_cequel.synchronize do
-            old_scope = @_cequel.current_scope
+            old_scope = current_scope
             begin
-              @_cequel.current_scope = scope
+              self.current_scope = scope
               yield
             ensure
-              @_cequel.current_scope = old_scope
+              self.current_scope = old_scope
             end
           end
         end
@@ -41,6 +41,18 @@ module Cequel
           Scope.new(self, [column_family])
         end
 
+        def current_scope
+          ::Thread.current[current_scope_key]
+        end
+
+        def current_scope=(scope)
+          ::Thread.current[current_scope_key] = scope
+        end
+
+        def current_scope_key
+          :"cequel-current_scope-#{object_id}"
+        end
+
       end
 
     end

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

data/spec/examples/data_set_spec.rb

@@ -93,6 +93,32 @@ describe Cequel::DataSet do
     end
   end
 
+  describe '#increment' do
+    it 'should increment counter columns' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ?, ? = ? + ? WHERE ? = ?',
+        'somepost', 'somepost', 1,
+        'anotherpost', 'anotherpost', 2,
+        'blog_id', 'myblog'
+      )
+      cequel[:comment_counts].where('blog_id' => 'myblog').
+        increment('somepost' => 1, 'anotherpost' => 2)
+    end
+  end
+
+  describe '#decrement' do
+    it 'should decrement counter columns' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ?, ? = ? - ? WHERE ? = ?',
+        'somepost', 'somepost', 1,
+        'anotherpost', 'anotherpost', 2,
+        'blog_id', 'myblog'
+      )
+      cequel[:comment_counts].where('blog_id' => 'myblog').
+        decrement('somepost' => 1, 'anotherpost' => 2)
+    end
+  end
+
   describe '#delete' do
     it 'should send basic delete statement' do
       connection.should_receive(:execute).

data/spec/examples/keyspace_spec.rb

@@ -48,7 +48,7 @@ CQL
   describe '::logger=' do
     let(:io) { StringIO.new }
     let(:logger) { Logger.new(io) }
-    
+
     before do
       logger.level = Logger::DEBUG
       cequel.logger = logger

data/spec/examples/model/counter_spec.rb

@@ -0,0 +1,94 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Cequel::Model::Counter do
+  let(:counter) { CommentCounts[1] }
+  let(:dictionary) { counter }
+  let(:uuid1) { CassandraCQL::UUID.new }
+  let(:uuid2) { CassandraCQL::UUID.new }
+
+  it_behaves_like 'readable dictionary'
+
+  describe '#increment' do
+    it 'should increment single column by default 1' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ? WHERE ? = ?',
+        uuid1, uuid1, 1, :blog_id, 1
+      )
+      dictionary.increment(uuid1)
+    end
+
+    it 'should increment single column by given value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ? WHERE ? = ?',
+        uuid1, uuid1, 4, :blog_id, 1
+      )
+      dictionary.increment(uuid1, 4)
+    end
+
+    it 'should increment multiple columns by default value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ?, ? = ? + ? WHERE ? = ?',
+        uuid1, uuid1, 1, uuid2, uuid2, 1, :blog_id, 1
+      )
+      dictionary.increment([uuid1, uuid2])
+    end
+
+    it 'should increment multiple columns by given value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ?, ? = ? + ? WHERE ? = ?',
+        uuid1, uuid1, 4, uuid2, uuid2, 4, :blog_id, 1
+      )
+      dictionary.increment([uuid1, uuid2], 4)
+    end
+
+    it 'should increment multiple columns by given deltas' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? + ?, ? = ? + ? WHERE ? = ?',
+        uuid1, uuid1, 4, uuid2, uuid2, 2, :blog_id, 1
+      )
+      dictionary.increment(uuid1 => 4, uuid2 => 2)
+    end
+  end
+
+  describe '#decrement' do
+    it 'should increment single column by default 1' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ? WHERE ? = ?',
+        uuid1, uuid1, 1, :blog_id, 1
+      )
+      dictionary.decrement(uuid1)
+    end
+
+    it 'should increment single column by given value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ? WHERE ? = ?',
+        uuid1, uuid1, 4, :blog_id, 1
+      )
+      dictionary.decrement(uuid1, 4)
+    end
+
+    it 'should increment multiple columns by default value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ?, ? = ? - ? WHERE ? = ?',
+        uuid1, uuid1, 1, uuid2, uuid2, 1, :blog_id, 1
+      )
+      dictionary.decrement([uuid1, uuid2])
+    end
+
+    it 'should increment multiple columns by given value' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ?, ? = ? - ? WHERE ? = ?',
+        uuid1, uuid1, 4, uuid2, uuid2, 4, :blog_id, 1
+      )
+      dictionary.decrement([uuid1, uuid2], 4)
+    end
+
+    it 'should increment multiple columns by given deltas' do
+      connection.should_receive(:execute).with(
+        'UPDATE comment_counts SET ? = ? - ?, ? = ? - ? WHERE ? = ?',
+        uuid1, uuid1, 4, uuid2, uuid2, 2, :blog_id, 1
+      )
+      dictionary.decrement(uuid1 => 4, uuid2 => 2)
+    end
+  end
+end

data/spec/examples/model/dictionary_spec.rb

@@ -6,6 +6,8 @@ describe Cequel::Model::Dictionary do
   let(:uuid3) { uuid }
   let(:dictionary) { BlogPosts[1] }
 
+  it_behaves_like 'readable dictionary'
+
   describe '#save' do
     before do
       connection.stub(:execute).
@@ -125,131 +127,6 @@ describe Cequel::Model::Dictionary do
     end
   end
 
-  context 'without row in memory' do
-
-    describe '#each_pair' do
-
-      it 'should load columns in batches and yield them' do
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 * FROM blog_posts WHERE ? = ? LIMIT 1', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        hash = {}
-        dictionary.each_pair do |key, value|
-          hash[key] = value
-        end
-        hash.should == {uuid1 => 1, uuid2 => 2, uuid3 => 3}
-      end
-
-    end
-
-    describe '#[]' do
-
-      it 'should load column from cassandra' do
-        connection.stub(:execute).
-          with('SELECT ? FROM blog_posts WHERE ? = ? LIMIT 1', [uuid1], :blog_id, 1).
-          and_return result_stub(uuid1 => 1)
-        dictionary[uuid1].should == 1
-      end
-
-    end
-
-    describe '#slice' do
-      it 'should load columns from data store' do
-        connection.stub(:execute).
-          with('SELECT ? FROM blog_posts WHERE ? = ? LIMIT 1', [uuid1,uuid2], :blog_id, 1).
-          and_return result_stub(uuid1 => 1, uuid2 => 2)
-        dictionary.slice(uuid1, uuid2).should == {uuid1 => 1, uuid2 => 2}
-      end
-    end
-
-    describe '#keys' do
-      it 'should load keys from data store' do
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 * FROM blog_posts WHERE ? = ? LIMIT 1', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        dictionary.keys.should == [uuid1, uuid2, uuid3]
-      end
-    end
-
-    describe '#values' do
-      it 'should load values from data store' do
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 * FROM blog_posts WHERE ? = ? LIMIT 1', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        dictionary.values.should == [1, 2, 3]
-      end
-    end
-
-  end
-
-  context 'with data loaded in memory' do
-    before do
-      connection.stub(:execute).
-        with('SELECT FIRST 2 * FROM blog_posts WHERE ? = ? LIMIT 1', :blog_id, 1).
-        and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-      connection.stub(:execute).
-        with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid2, '', :blog_id, 1).
-        and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-      connection.stub(:execute).
-        with('SELECT FIRST 2 ?..? FROM blog_posts WHERE ? = ? LIMIT 1', uuid3, '', :blog_id, 1).
-        and_return result_stub({'blog_id' => 1})
-      dictionary.load
-      connection.should_not_receive(:execute)
-    end
-
-    describe '#each_pair' do
-      it 'should yield data from memory' do
-        hash = {}
-        dictionary.each_pair do |key, value|
-          hash[key] = value
-        end
-        hash.should == {uuid1 => 1, uuid2 => 2, uuid3 => 3}
-      end
-    end
-
-    describe '#[]' do
-      it 'should return value from memory' do
-        dictionary[uuid1].should == 1
-      end
-    end
-
-    describe '#slice' do
-      it 'should return slice of data in memory' do
-        dictionary.slice(uuid1, uuid2).should == {uuid1 => 1, uuid2 => 2}
-      end
-    end
-
-    describe '#keys' do
-      it 'should return keys from memory' do
-        dictionary.keys.should == [uuid1, uuid2, uuid3]
-      end
-    end
-
-    describe '#values' do
-      it 'should return values from memory' do
-        dictionary.values.should == [1, 2, 3]
-      end
-    end
-  end
-
   context 'with data modified but not loaded in memory' do
     let(:uuid4) { uuid }