cassandra-cql 1.1.3 → 1.1.4

data/lib/cassandra-cql/result.rb

@@ -35,8 +35,10 @@ module CassandraCQL
       }
     end
   end
-  
+
   class Result
+    include Enumerable
+
     attr_reader :result, :schema, :cursor
 
     def initialize(result)
@@ -44,11 +46,11 @@ module CassandraCQL
       @schema = ResultSchema.new(result.schema) if rows?
       @cursor = 0
     end
-  
+
     def void?
       @result.type == CassandraCQL::Thrift::CqlResultType::VOID
     end
-    
+
     def int?
       @result.type == CassandraCQL::Thrift::CqlResultType::INT
     end
@@ -61,12 +63,20 @@ module CassandraCQL
       @result.rows.size
     end
 
+    alias_method :size, :rows
+    alias_method :count, :rows
+    alias_method :length, :rows
+
     def cursor=(cursor)
       @cursor = cursor.to_i
     rescue Exception => e
       raise Error::InvalidCursor, e.to_s
     end
-    
+
+    def each
+      fetch { |row| yield row }
+    end
+
     def fetch_row
       case @result.type
       when CassandraCQL::Thrift::CqlResultType::ROWS
@@ -113,7 +123,7 @@ module CassandraCQL
         end
       end
     end
-  
+
     def fetch_array
       if block_given?
         while row = fetch_row

data/lib/cassandra-cql/statement.rb

@@ -90,7 +90,7 @@ module CassandraCQL
         obj.strftime('%Y-%m-%d')
       elsif obj.kind_of?(Time)
         (obj.to_f * 1000).to_i
-      elsif obj.kind_of?(UUID)
+      elsif obj.kind_of?(SimpleUUID::UUID)
         obj.to_guid
       # There are corner cases where this is an invalid assumption but they are extremely rare.
       # The alternative is to make the user pack the data on their own .. let's not do that until we have to

data/lib/cassandra-cql/version.rb

@@ -15,5 +15,5 @@ limitations under the License.
 =end
 
 module CassandraCQL
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/result_spec.rb

@@ -57,30 +57,42 @@ describe "row results" do
   it "should have two rows" do
     @result.rows.should eq(2)
   end
-  
+
+  it "should know size of rows" do
+    @result.size.should eq(2)
+  end
+
+  it "should know count of rows" do
+    @result.count.should eq(2)
+  end
+
+  it "should know length of rows" do
+    @result.length.should eq(2)
+  end
+
   context "initialize" do
     it "should have a cursor set to 0" do
       @result.instance_variable_get(:@cursor).should eq(0)
     end
-  
+
     it "should have a result" do
       @result.instance_variable_get(:@result).should be_kind_of(CassandraCQL::Thrift::CqlResult)
     end
   end
-  
+
   context "setting the cursor" do
     it "should set the cursor" do
       expect {
         @result.cursor = 15
       }.to_not raise_error
       @result.instance_variable_get(:@cursor).should eq(15)
-    end 
+    end
 
     it "should not set the cursor" do
       expect {
         @result.cursor = Object
       }.to raise_error(CassandraCQL::Error::InvalidCursor)
-    end 
+    end
   end
 
   context "fetching a single row" do
@@ -90,12 +102,12 @@ describe "row results" do
 
       @result.fetch_row.should be_kind_of(Row)
       @result.instance_variable_get(:@cursor).should eq(2)
-      
+
       @result.fetch_row.should be_nil
       @result.instance_variable_get(:@cursor).should eq(2)
     end
   end
-  
+
   context "resetting cursor should fetch the same row" do
     it "should return the same row" do
       @result.instance_variable_get(:@cursor).should eq(0)
@@ -104,7 +116,7 @@ describe "row results" do
       arr.should eq(@result.fetch_array)
     end
   end
-  
+
   context "fetch without a block" do
     it "should return a row twice then nil" do
       @result.fetch.should be_kind_of(Row)
@@ -112,12 +124,12 @@ describe "row results" do
 
       @result.fetch.should be_kind_of(Row)
       @result.instance_variable_get(:@cursor).should eq(2)
-      
+
       @result.fetch.should be_nil
       @result.instance_variable_get(:@cursor).should eq(2)
     end
   end
-  
+
   context "fetch with a block" do
     it "fetched count should equal the number of rows" do
       counter = 0
@@ -138,7 +150,7 @@ describe "row results" do
       arr.should eq(row.column_values)
     end
   end
-  
+
   context "fetch_array_with a block" do
     it "fetched count should equal the number of rows" do
       counter = 0
@@ -164,7 +176,7 @@ describe "row results" do
       @result.fetch_hash.should be_nil
     end
   end
-  
+
   context "fetch_hash_with a block" do
     it "should iterate rows() times and return hashes" do
       counter = 0
@@ -175,4 +187,20 @@ describe "row results" do
       counter.should eq(@result.rows)
     end
   end
+
+  describe "#each" do
+    it "yields each row as a hash" do
+      rows = []
+      @result.each { |row| rows << row }
+      rows.each do |row|
+        row.should be_instance_of(CassandraCQL::Row)
+        row.column_names.should eq(['col1', 'col2', 'col3', 'col4'])
+      end
+    end
+  end
+
+  it "is enumerable" do
+    @result.class.ancestors.should include(Enumerable)
+    @result.map { |row| row['col1'] }.should eq(['val1', nil])
+  end
 end

data/spec/statement_spec.rb

@@ -130,6 +130,14 @@ describe "cast_to_cql" do
     end
   end
 
+  context "with a SimpleUUID::UUID object" do
+    it "should return the guid" do
+      uuid = SimpleUUID::UUID.new
+      guid = Statement.cast_to_cql(uuid)
+      guid.should eq(uuid.to_guid)
+    end
+  end
+
   context "with a String without quotes" do
     it "should return a copy of itself" do
       str = "This is a string"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-cql
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -209,9 +209,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2241138987958010983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: