cassandra-cql 1.0.1 → 1.0.2

data/README.rdoc

@@ -69,10 +69,3 @@ So adding a feature like counters just requires teaching the CQL parser to under
 
   # Delete the swarthy bastard Kevin
   db.execute("DELETE FROM users WHERE id=?", 'kway')
-  
-=TODO
-
-  1. Make bind_var usage friendlier
-  2. Determine if returning Time objects for TimeUUID is appropriate in all cases and if not, add an option
-  3. Add yardoc
-  4. Add spec for database

data/lib/cassandra-cql.rb

@@ -18,11 +18,13 @@ here = File.dirname(__FILE__)
 require "#{here}/../vendor/gen-rb/cassandra"
 
 require 'bigdecimal'
+require 'date'
 require 'thrift_client'
 require 'cassandra-cql/types/abstract_type'
 require 'cassandra-cql/types/ascii_type'
 require 'cassandra-cql/types/boolean_type'
 require 'cassandra-cql/types/bytes_type'
+require 'cassandra-cql/types/date_type'
 require 'cassandra-cql/types/decimal_type'
 require 'cassandra-cql/types/double_type'
 require 'cassandra-cql/types/float_type'

data/lib/cassandra-cql/statement.rb

@@ -83,8 +83,10 @@ module CassandraCQL
         obj.map { |member| cast_to_cql(member) }
       elsif obj.kind_of?(Fixnum) or obj.kind_of?(Float)
         obj
+      elsif obj.kind_of?(Date)
+        obj.strftime('%Y-%m-%d')
       elsif obj.kind_of?(Time)
-        UUID.new(obj).to_guid
+        (obj.to_f * 1000).to_i
       elsif obj.kind_of?(UUID)
         obj.to_guid
       # There are corner cases where this is an invalid assumption but they are extremely rare.

data/lib/cassandra-cql/types/date_type.rb

@@ -0,0 +1,9 @@
+module CassandraCQL
+  module Types
+    class DateType < AbstractType
+      def self.cast(value)
+        Time.at(bytes_to_long(value) / 1000.0)
+      end
+    end
+  end
+end

data/lib/cassandra-cql/version.rb

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

data/spec/comparator_spec.rb

@@ -78,6 +78,27 @@ describe "Comparator Roundtrip tests" do
     end
   end
 
+  context "with date comparator" do
+    let(:cf_name) { "comparator_cf_date" }
+    before(:each) { create_column_family(cf_name, 'DateType') }
+
+    it "should return a Time object" do
+      ts = Time.new
+      res = create_and_fetch_column(cf_name, ts)
+      res.to_f.should be_within(0.001).of(ts.to_f)
+      res.should be_kind_of(Time)
+    end
+    
+    it "should return a timestamp given a date" do
+      date = Date.today
+      res = create_and_fetch_column(cf_name, date)
+      [:year, :month, :day].each do |sym|
+        res.send(sym).should eq(date.send(sym))
+      end
+      res.class.should eq(Time)
+    end
+    
+  end
 
   context "with decimal comparator" do
     let(:cf_name) { "comparator_cf_decimal" }
@@ -88,13 +109,12 @@ describe "Comparator Roundtrip tests" do
       create_and_fetch_column(cf_name, value*-1).should eq(value*-1)
     end
   
-# These tests currently crash the node
-    it "should return a small decimal" #do
-#      test_for_value(15.333)
-#    end
-    it "should return a huge decimal" #do
-#      test_for_value(BigDecimal.new('129182739481237481341234123411.1029348102934810293481039'))
-#    end
+    it "should return a small decimal" do
+      test_for_value(15.333)
+    end
+    it "should return a huge decimal" do
+      test_for_value(BigDecimal.new('129182739481237481341234123411.1029348102934810293481039'))
+    end
   end
 
   context "with double comparator" do

data/spec/statement_spec.rb

@@ -100,17 +100,19 @@ end
 
 describe "cast_to_cql" do
   context "with a Time object" do
-    it "should return a guid of a UUID" do
+    it "should return a Time object with the number of microseconds since epoch" do
       ts = Time.new - 86400 # set it to yesterday just to be sure no defaulting to today misses an error
-      guid = Statement.cast_to_cql(ts)
-      guid.should be_kind_of(String)
-      expect {
-        ret = UUID.new(guid)
-        uuid_ts = Time.at(ret.seconds)
-        [:year, :month, :day, :hour, :min, :sec].each do |sym|
-          uuid_ts.send(sym).should eq(ts.send(sym))
-        end
-      }.to_not raise_error
+      long = Statement.cast_to_cql(ts)
+      long.should be_kind_of(Integer)
+      Time.at(long / 1000.0).to_f.should be_within(0.001).of(ts.to_f)
+    end
+  end
+  
+  context "with a Date object" do
+    it "should return a corresponding Time object" do
+      date = Date.today << 1
+      str = Statement.cast_to_cql(date)
+      str.should eq(date.strftime('%Y-%m-%d'))
     end
   end
   

data/spec/validation_spec.rb

@@ -9,7 +9,8 @@ describe "Validation Roundtrip tests" do
 
   def create_and_fetch_column(column_family, value)
     @connection.execute("insert into #{column_family} (id, test_column) values (?, ?)", 'test', value)
-    return @connection.execute("select test_column from #{column_family} where id = ?", 'test').fetch[0]
+    res = @connection.execute("select test_column from #{column_family} where id = ?", 'test')
+    return res.fetch[0]
   end
 
   def create_column_family(name, test_column_type, opts="")
@@ -197,8 +198,19 @@ describe "Validation Roundtrip tests" do
     before(:each) { create_column_family(cf_name, 'timestamp') }
 
     it "should return a timestamp" do
-      uuid = UUID.new
-      #create_and_fetch_column(cf_name, uuid).should eq(uuid)
+      ts = Time.new
+      res = create_and_fetch_column(cf_name, ts)
+      res.to_f.should be_within(0.001).of(ts.to_f)
+      res.class.should eq(Time)
+    end
+
+    it "should return a timestamp given a date" do
+      date = Date.today
+      res = create_and_fetch_column(cf_name, date)
+      [:year, :month, :day].each do |sym|
+        res.send(sym).should eq(date.send(sym))
+      end
+      res.class.should eq(Time)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-cql
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70106920848140 !ruby/object:Gem::Requirement
+  requirement: &70205356087480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70106920848140
+  version_requirements: *70205356087480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70106920847680 !ruby/object:Gem::Requirement
+  requirement: &70205356087020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *70106920847680
+  version_requirements: *70205356087020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106920847220 !ruby/object:Gem::Requirement
+  requirement: &70205356086560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70106920847220
+  version_requirements: *70205356086560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106920846760 !ruby/object:Gem::Requirement
+  requirement: &70205356086100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70106920846760
+  version_requirements: *70205356086100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70106920846300 !ruby/object:Gem::Requirement
+  requirement: &70205356085640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70106920846300
+  version_requirements: *70205356085640
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &70106920845840 !ruby/object:Gem::Requirement
+  requirement: &70205356085180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70106920845840
+  version_requirements: *70205356085180
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70106920845380 !ruby/object:Gem::Requirement
+  requirement: &70205356084720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70106920845380
+  version_requirements: *70205356084720
 description: CQL Interface to Cassandra
 email:
 - kelley@insidesystems.net
@@ -111,6 +111,7 @@ files:
 - lib/cassandra-cql/types/ascii_type.rb
 - lib/cassandra-cql/types/boolean_type.rb
 - lib/cassandra-cql/types/bytes_type.rb
+- lib/cassandra-cql/types/date_type.rb
 - lib/cassandra-cql/types/decimal_type.rb
 - lib/cassandra-cql/types/double_type.rb
 - lib/cassandra-cql/types/float_type.rb