cassandra-cql 1.1.4 → 1.1.5

data/README.md

@@ -1,4 +1,4 @@
-# Cassandra [![Build Status](https://secure.travis-ci.org/kreynolds/cassandra-cql.png)](http://travis-ci.org/kreynolds/cassandra-cql)
+# Cassandra [![Build Status](https://secure.travis-ci.org/kreynolds/cassandra-cql.png)](http://travis-ci.org/kreynolds/cassandra-cql) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/kreynolds/cassandra-cql)
 The Apache Cassandra Project (http://cassandra.apache.org) develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.
 
 # CQL

data/cassandra-cql.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">= 0.9.2"
   s.add_development_dependency "yard", ">= 0.7.2"
   s.add_dependency "simple_uuid", ">= 0.2.0"
-  s.add_dependency "thrift_client", ">= 0.7.1"
+  s.add_dependency "thrift_client", ">= 0.7.1", "< 0.9"
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {spec}/*`.split("\n")

data/lib/cassandra-cql/row.rb

@@ -22,12 +22,12 @@ module CassandraCQL
       @row, @schema = row, schema
       @value_cache = Hash.new { |h, key|
         # If it's a number and not one of our columns, assume it's an index
-        if key.kind_of?(Fixnum) and !column_names.include?(key)
+        if key.kind_of?(Fixnum) and !column_indices.key?(key)
           column_name = column_names[key]
           column_index = key
         else
           column_name = key
-          column_index = column_names.index(key)
+          column_index = column_indices[key]
         end
         
         if column_index.nil?
@@ -48,7 +48,11 @@ module CassandraCQL
         ColumnFamily.cast(column.name, @schema.names[column.name])
       end
     end
-  
+
+    def column_indices
+      @column_indices ||= Hash[column_names.each_with_index.to_a]
+    end
+
     def column_values
       column_names.map do |name|
         @value_cache[name]

data/lib/cassandra-cql/version.rb

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

data/spec/column_family_spec.rb

@@ -18,8 +18,12 @@ describe "ColumnFamily class" do
     it "should have some common attributes" do
       [@standard_column_family, @super_column_family].each do |column|
         column.name.should_not be_nil
-        column.id.should_not be_nil
         column.column_type.should_not be_nil
+
+        # Only true for cassandra < 1.2
+        if CassandraCQL.CASSANDRA_VERSION < "1.2"
+          column.id.should_not be_nil
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -4,12 +4,14 @@ if RUBY_VERSION >= "1.9"
 end
 
 require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+
 require 'yaml'
 require 'rspec'
 
 CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '1.1' unless defined?(CASSANDRA_VERSION)
 
-$LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 require "cassandra-cql/#{CASSANDRA_VERSION}"
 
 def yaml_fixture(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-cql
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,6 +126,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: CQL Interface to Cassandra
 email:
 - kelley.reynolds@rubyscale.com
@@ -209,6 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2401837343533382328
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: