cequel 0.5.0 → 0.5.1

data/lib/cequel/model/readable_dictionary.rb

@@ -58,11 +58,8 @@ module Cequel
         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).
+          column_family.
             where(key_alias.to_s => keys).
             map { |row| new(row.delete(key_alias.to_s), row) }
         end
@@ -100,6 +97,21 @@ module Cequel
         end
       end
 
+      def first
+        @loaded ?  @row.first : slice(:first => 1).first
+      end
+
+      def last
+        if @loaded
+          unless @row.empty?
+            key = @row.keys.last
+            [key, @row[key]]
+          end
+        else
+          slice(:last => 1).first
+        end
+      end
+
       def key?(column)
         @row.key?(column) || load_raw_slice([column])[column].present?
       end

data/lib/cequel/version.rb

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

data/spec/shared/readable_dictionary.rb

@@ -77,6 +77,24 @@ shared_examples 'readable dictionary' do
       end
     end
 
+    describe '#first' do
+      it 'should load value from data store' do
+        connection.should_receive(:execute).
+          with("SELECT FIRST 1 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
+          and_return result_stub('blog_id' => 1, uuid1 => 1)
+        dictionary.first.should == [uuid1, 1]
+      end
+    end
+
+    describe '#last' do
+      it 'should load value from data store' do
+        connection.should_receive(:execute).
+          with("SELECT FIRST 1 REVERSED * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
+          and_return result_stub('blog_id' => 1, uuid3 => 3)
+        dictionary.last.should == [uuid3, 3]
+      end
+    end
+
   end
 
   context 'with data loaded in memory' do
@@ -116,6 +134,18 @@ shared_examples 'readable dictionary' do
       end
     end
 
+    describe '#first' do
+      it 'should return first element in memory' do
+        dictionary.first.should == [uuid1, 1]
+      end
+    end
+
+    describe '#last' do
+      it 'should return first element in memory' do
+        dictionary.last.should == [uuid3, 3]
+      end
+    end
+
     describe '#keys' do
       it 'should return keys from memory' do
         dictionary.keys.should == [uuid1, uuid2, uuid3]
@@ -140,7 +170,7 @@ shared_examples 'readable dictionary' do
     it 'should load all rows in one query' do
       connection.stub(:execute).
         with(
-          'SELECT FIRST 1000 * FROM post_comments WHERE ? IN (?)',
+          'SELECT * FROM post_comments WHERE ? IN (?)',
           'post_id', [1, 2]
         ).and_return result_stub(
           *comments.each_with_index.
@@ -150,19 +180,6 @@ shared_examples 'readable dictionary' do
       rows.map { |row| row.post_id }.should == [1, 2]
       rows.map { |row| row.values.first }.should == comments
     end
-
-    it 'should respect columns option' do
-      connection.stub(:execute).
-        with(
-          'SELECT FIRST 20 * FROM post_comments WHERE ? IN (?)',
-          'post_id', [1, 2]
-        ).and_return result_stub(
-          *comments.each_with_index.
-            map { |comment, i| {'post_id' => i+1, i+4 => comment.to_json} }
-          )
-      rows = PostComments.load(1, 2, :columns => 20)
-      rows.map { |row| row.post_id }.should == [1, 2]
-    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport