cassandra-cql 1.1.2 → 1.1.3

data/lib/cassandra-cql/row.rb

@@ -50,9 +50,9 @@ module CassandraCQL
     end
   
     def column_values
-      @row.columns.map { |column|
-        @value_cache[column.name]
-      }
+      column_names.map do |name|
+        @value_cache[name]
+      end
     end
   
     def columns
@@ -68,4 +68,4 @@ module CassandraCQL
       Hash[([column_names, column_values]).transpose]
     end
   end
-end
+end

data/lib/cassandra-cql/version.rb

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

data/spec/row_spec.rb

@@ -3,47 +3,74 @@ include CassandraCQL
 
 
 describe "basic methods" do
-  before(:each) do
-    @connection = setup_cassandra_connection
-    if @connection.schema.column_family_names.include?('basic_methods')
-      @connection.execute("DROP COLUMNFAMILY basic_methods")
-    end
-    @connection.execute("CREATE COLUMNFAMILY basic_methods (id varchar PRIMARY KEY, created_at uuid, default_column varchar, name varchar, serial int)")
+  context 'with basic column family' do
+    before(:each) do
+      @connection = setup_cassandra_connection
+      if @connection.schema.column_family_names.include?('basic_methods')
+        @connection.execute("DROP COLUMNFAMILY basic_methods")
+      end
+      @connection.execute("CREATE COLUMNFAMILY basic_methods (id varchar PRIMARY KEY, created_at uuid, default_column varchar, name varchar, serial int)")
 
-    @connection.execute("INSERT INTO basic_methods (id, created_at, name, serial, default_column) VALUES (?, ?, ?, ?, ?)", 'test', Time.new, 'name', 12345, 'snork')
-    @row = @connection.execute("SELECT * FROM basic_methods WHERE id=?", "test").fetch
-  end
+      @connection.execute("INSERT INTO basic_methods (id, created_at, name, serial, default_column) VALUES (?, ?, ?, ?, ?)", 'test', Time.new, 'name', 12345, 'snork')
+      @row = @connection.execute("SELECT * FROM basic_methods WHERE id=?", "test").fetch
+    end
 
-  context "column_names" do
-    it "should return a list of column names" do
-      @row.column_names.sort.should eq(["created_at", "default_column", "id", "name", "serial"].sort)
+    context "column_names" do
+      it "should return a list of column names" do
+        @row.column_names.sort.should eq(["created_at", "default_column", "id", "name", "serial"].sort)
+      end
     end
-  end
 
-  context "column_values" do
-    it "should return a list of column values as Ruby objects" do
-      @row.column_values.should be_kind_of(Array)
-      @row.column_values.size.should eq(@row.column_names.size)
+    context "column_values" do
+      it "should return a list of column values as Ruby objects" do
+        @row.column_values.should be_kind_of(Array)
+        @row.column_values.size.should eq(@row.column_names.size)
+      end
+    end
+      
+    context "columns" do
+      it "should equal the number of columns" do
+        @row.column_names.size.should eq(@row.column_values.size)
+        @row.columns.should eq(@row.column_names.size)
+      end
     end
-  end
     
-  context "columns" do
-    it "should equal the number of columns" do
-      @row.column_names.size.should eq(@row.column_values.size)
-      @row.columns.should eq(@row.column_names.size)
+    context "checking casting" do
+      it "should return column_values for to_a" do
+        @row.to_a.should eq(@row.column_values)
+      end
+
+      it "should return a hash for to_hash" do
+        h = @row.to_hash
+        h.should be_kind_of(Hash)
+        h.keys.sort.should eq(@row.column_names.sort)
+      end
     end
   end
-  
-  context "checking casting" do
-    it "should return column_values for to_a" do
-      @row.to_a.should eq(@row.column_values)
+
+  context 'with a column family with int comparators' do
+    before(:each) do
+      @connection = setup_cassandra_connection
+      if @connection.schema.column_family_names.include?('int_comparator')
+        @connection.execute("DROP COLUMNFAMILY int_comparator")
+      end
+      @connection.execute("CREATE COLUMNFAMILY int_comparator (key text PRIMARY KEY) WITH comparator=int AND default_validation=text")
+
+      @connection.execute("INSERT INTO int_comparator (key, 1, 2) VALUES (?, ?, ?)", 'test', 'value1', 'value2')
+      @row = @connection.execute("SELECT * FROM int_comparator WHERE key=?", "test").fetch
+    end
+
+    context "column_names" do
+      it "should return a list of column names" do
+        @row.column_names.should =~ ['KEY', 1, 2]
+      end
     end
 
-    it "should return a hash for to_hash" do
-      h = @row.to_hash
-      h.should be_kind_of(Hash)
-      h.keys.sort.should eq(@row.column_names.sort)
+    context "column_values" do
+      it "should return a list of column values as Ruby objects" do
+        @row.column_values.should be_kind_of(Array)
+        @row.column_values.should =~ ['test', 'value1', 'value2']
+      end
     end
   end
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-cql
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3942152054633015494
+      hash: -2241138987958010983
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: