cequel 1.0.4 → 1.1.0

data/spec/examples/record/schema_spec.rb

@@ -93,7 +93,7 @@ describe Cequel::Record::Schema do
       its(:data_columns) { should == [Cequel::Schema::Column.new(:data, :text)] }
     end
 
-    context 'existing model' do
+    context 'existing model', thrift: true do
       before do
         legacy_connection.execute(<<-CQL2)
           CREATE COLUMNFAMILY legacy_posts (blog_subdomain text PRIMARY KEY)

data/spec/examples/record/secondary_index_spec.rb

@@ -9,7 +9,7 @@ describe Cequel::Record::SecondaryIndexes do
     column :author_id, :uuid, :index => true
   end
 
-  let(:uuids) { Array.new(2) { CassandraCQL::UUID.new }}
+  let(:uuids) { Array.new(2) { Cequel.uuid }}
 
   let!(:posts) do
     3.times.map do |i|

data/spec/examples/schema/table_reader_spec.rb

@@ -352,7 +352,7 @@ describe Cequel::Schema::TableReader do
       [Cequel::Schema::DataColumn.new(:data, :text)] }
   end
 
-  describe 'skinny-row legacy table' do
+  describe 'skinny-row legacy table', thrift: true do
     before do
       legacy_connection.execute <<-CQL
         CREATE TABLE posts (permalink text PRIMARY KEY, title text, body text)
@@ -369,7 +369,7 @@ describe Cequel::Schema::TableReader do
         Cequel::Schema::DataColumn.new(:body, :text)] }
   end
 
-  describe 'wide-row legacy table' do
+  describe 'wide-row legacy table', thrift: true do
     before do
       legacy_connection.execute(<<-CQL2)
         CREATE COLUMNFAMILY posts (blog_subdomain text PRIMARY KEY)
@@ -386,5 +386,4 @@ describe Cequel::Schema::TableReader do
     its(:data_columns) { should ==
       [Cequel::Schema::DataColumn.new(:value, :text)] }
   end
-
 end

data/spec/examples/spec_helper.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path('../../environment', __FILE__)
 require 'cequel'
+require 'tzinfo'
 
 Dir.glob(File.expand_path('../../support/**/*.rb', __FILE__)).each do |file|
   require file
@@ -18,9 +19,16 @@ RSpec.configure do |config|
       satisfied_by?(Gem::Version.new(ActiveSupport::VERSION::STRING))
   }
 
+  unless defined? CassandraCQL
+    config.filter_run_excluding thrift: true
+  end
+
   config.before(:all) do
     cequel.schema.create!
     Cequel::Record.connection = cequel
+    Time.zone = 'UTC'
+    I18n.enforce_available_locales = false
+    SafeYAML::OPTIONS[:default_mode] = :safe if defined? SafeYAML
   end
 
   config.after(:all) do

data/spec/examples/type_spec.rb

@@ -178,12 +178,14 @@ describe Cequel::Type do
       should == 'org.apache.cassandra.db.marshal.UUIDType' }
 
     describe '#cast' do
-      let(:uuid) { CassandraCQL::UUID.new }
+      let(:uuid) { Cequel.uuid }
       specify { subject.cast(uuid).should == uuid }
-      specify { subject.cast(SimpleUUID::UUID.new(uuid)).
-        should be_a(CassandraCQL::UUID) }
-      specify { subject.cast(uuid.to_guid).should == uuid }
-      specify { subject.cast(uuid.to_i).should == uuid }
+      specify { subject.cast(uuid.to_s).should == uuid }
+      specify { subject.cast(uuid.value).should == uuid }
+      if defined? SimpleUUID::UUID
+        specify { subject.cast(SimpleUUID::UUID.new(uuid.value))
+                    .should == uuid }
+      end
     end
   end
 

data/spec/examples/uuids_spec.rb

@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+require_relative 'spec_helper'
+
+describe Cequel::Uuids do
+  describe '#uuid' do
+    specify { Cequel.uuid.is_a?(Cql::TimeUuid) }
+    specify { Cequel.uuid != Cequel.uuid }
+    specify { time = Time.now; Cequel.uuid(time).to_time == time }
+    specify { time = DateTime.now; Cequel.uuid(time).to_time == time.to_time }
+    specify { time = Time.zone.now; Cequel.uuid(time).to_time == time.to_time }
+    specify { val = Cequel.uuid.value; Cequel.uuid(val).value == val }
+    specify { str = Cequel.uuid.to_s; Cequel.uuid(str).to_s == str }
+  end
+
+  describe '#uuid?' do
+    specify { Cequel.uuid?(Cequel.uuid) }
+    specify { !Cequel.uuid?(Cequel.uuid.to_s) }
+    if defined? SimpleUUID::UUID
+      specify { !Cequel.uuid?(SimpleUUID::UUID.new) }
+    end
+  end
+end

data/spec/support/helpers.rb

@@ -45,7 +45,7 @@ module Cequel
       end
 
       def uuid(name)
-        let(name) { CassandraCQL::UUID.new }
+        let(name) { Cequel.uuid }
       end
     end
 
@@ -54,15 +54,22 @@ module Cequel
       def self.cequel
         @cequel ||= Cequel.connect(
           host: host,
-          keyspace: keyspace_name,
-          thrift: {retries: 5, cached_connections: true}
+          keyspace: keyspace_name
         ).tap do |cequel|
-          cequel.logger = Logger.new(STDOUT) if ENV['CEQUEL_LOG_QUERIES']
+          if ENV['CEQUEL_LOG_QUERIES']
+            cequel.logger = Logger.new(STDOUT)
+          else
+            cequel.logger = Logger.new(File.open('/dev/null', 'a'))
+          end
         end
       end
 
       def self.host
-        ENV['CEQUEL_TEST_HOST'] || '127.0.0.1:9160'
+        ENV['CEQUEL_TEST_HOST'] || '127.0.0.1:9042'
+      end
+
+      def self.legacy_host
+        ENV['CEQUEL_TEST_LEGACY_HOST'] || '127.0.0.1:9160'
       end
 
       def self.keyspace_name
@@ -70,29 +77,21 @@ module Cequel
       end
 
       def self.legacy_connection
+        require 'cassandra-cql'
         @legacy_connection ||= CassandraCQL::Database.new(
-          Cequel::SpecSupport::Helpers.host,
-          :keyspace => Cequel::SpecSupport::Helpers.keyspace_name,
+          legacy_host,
+          :keyspace => keyspace_name,
           :cql_version => '2.0.0'
         )
       end
 
       def min_uuid(time = Time.now)
-        CassandraCQL::UUID.new(time, :randomize => false)
+        Cql::TimeUuid::Generator.new(0, 0).from_time(time, 0)
       end
 
       def max_uuid(time = Time.now)
-        time = time.stamp * 10 + SimpleUUID::UUID::GREGORIAN_EPOCH_OFFSET
-        # See http://github.com/spectra/ruby-uuid/
-        byte_array = [
-          time & 0xFFFF_FFFF,
-          time >> 32,
-          ((time >> 48) & 0x0FFF) | 0x1000,
-          (2**13 - 1) | SimpleUUID::UUID::VARIANT,
-          2**16 - 1,
-          2**32 - 1
-        ]
-        CassandraCQL::UUID.new(byte_array.pack("NnnnnN"))
+        Cql::TimeUuid::Generator.new(0x3fff, 0xffffffffffff).
+          from_time(time, 999)
       end
 
       def cequel
@@ -110,6 +109,13 @@ module Cequel
       def disallow_queries!
         cequel.should_not_receive(:execute)
       end
+
+      def expect_query_with_consistency(matcher, consistency)
+        expect(cequel.client).to receive(:execute).with(matcher, consistency)
+          .and_call_original
+        yield
+        RSpec::Mocks.proxy_for(cequel.client).reset
+      end
     end
   end
 end

data/templates/config/cequel.yml

@@ -1,17 +1,17 @@
 <% app_name = Cequel::Record::Railtie.app_name -%>
 development:
-  host: '127.0.0.1:9160'
+  host: '127.0.0.1:9042'
   keyspace: <%= app_name %>_development
 
 test:
-  host: '127.0.0.1:9160'
+  host: '127.0.0.1:9042'
   keyspace: <%= app_name %>_test
 
 production:
   hosts:
-    - 'cass1.<%= app_name %>.biz:9160'
-    - 'cass2.<%= app_name %>.biz:9160'
-    - 'cass3.<%= app_name %>.biz:9160'
+    - 'cass1.<%= app_name %>.biz:9042'
+    - 'cass2.<%= app_name %>.biz:9042'
+    - 'cass3.<%= app_name %>.biz:9042'
   keyspace: <%= app_name %>_production
   thrift:
     retries: 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Mat Brown
@@ -11,13 +11,14 @@ authors:
 - Louis Simoneau
 - Peter Williams
 - Kenneth Hoffman
+- Antti Tapio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: cql-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,49 +46,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cassandra-cql
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '0.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '0.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,35 +102,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +144,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,7 +165,8 @@ description: |
 email: mat.a.brown@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
 - Appraisals
 - CHANGELOG.md
@@ -234,9 +236,11 @@ files:
 - lib/cequel/schema/update_table_dsl.rb
 - lib/cequel/type.rb
 - lib/cequel/util.rb
+- lib/cequel/uuids.rb
 - lib/cequel/version.rb
 - spec/environment.rb
 - spec/examples/metal/data_set_spec.rb
+- spec/examples/metal/keyspace_spec.rb
 - spec/examples/record/associations_spec.rb
 - spec/examples/record/callbacks_spec.rb
 - spec/examples/record/dirty_spec.rb
@@ -260,6 +264,7 @@ files:
 - spec/examples/schema/table_writer_spec.rb
 - spec/examples/spec_helper.rb
 - spec/examples/type_spec.rb
+- spec/examples/uuids_spec.rb
 - spec/shared/readable_dictionary.rb
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
@@ -292,6 +297,7 @@ specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3
 test_files:
 - spec/examples/metal/data_set_spec.rb
+- spec/examples/metal/keyspace_spec.rb
 - spec/examples/record/associations_spec.rb
 - spec/examples/record/callbacks_spec.rb
 - spec/examples/record/dirty_spec.rb
@@ -315,4 +321,5 @@ test_files:
 - spec/examples/schema/table_writer_spec.rb
 - spec/examples/spec_helper.rb
 - spec/examples/type_spec.rb
-has_rdoc: false
+- spec/examples/uuids_spec.rb
+has_rdoc: true