cequel 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ce6a58ba37d6d660bab77d19bbb1a5058f2272
-  data.tar.gz: 5c48b614b57a353caff4330013398549ed7dde7c
+  metadata.gz: d14904f7678b99fb9228f1d0e255ece706ac607f
+  data.tar.gz: 9f63a0b4abf6d672c9712d7e5eebe34aae777212
 SHA512:
-  metadata.gz: 4eca1a7b499d4e75ce7cdd26af7fcc62b5cda4505e7c260abe1ca8518054f2f7d5a06ce79e43d75c3106b9ddcaa898d3d6c0824a3ab67a70d639a4d574725bd2
-  data.tar.gz: 14727e13ee05fca86ec0cd4297a8d7ef6601722cdea5b6601a5dc34fe52c9da17a63e7c18253a255d6618e7ee2d01f9a49be5c1d37125b96eae3f4bb057bde30
+  metadata.gz: bbad8d78bc4b5752cd0a708948c6f95fa0145679a3d8748ca16084e15b11b6c820817a244083d357799fc05c44c188dfe5703b22527ab1c3de5e36522418eb5c
+  data.tar.gz: c0eaaa9c567b14710dbd73bf58c6fe8ff27bec66b99545a362017206839c5f88c4de146500b50c97fc3c776041534fb1517107bed4e43d69472b7fb3d1ba82ac

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.7.0
+
+* Support Cassandra up to 2.2
+* Support JRuby 9
+* Drop support for Rails 3, Ruby 1.9
+* Update to `cassandra-driver` 2.0
+* Support SSL configuration
+* Add `RecordSet#first_or_initialize` and `RecordSet#first!`
+* Rake task to reset keyspace
+
 ## 1.6.1
 
 * Ruby 1.9 no longer supported (EOL)

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    cequel (1.6.1)
-      activemodel (>= 3.1, < 5.0)
-      cassandra-driver (~> 1.0)
+    cequel (1.7.0)
+      activemodel (~> 4.0)
+      cassandra-driver (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activesupport (4.2.1)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -30,9 +30,7 @@ GEM
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
-    cassandra-driver (1.2.0)
-      ione (~> 1.2)
-    cassandra-driver (1.2.0-java)
+    cassandra-driver (2.1.4)
       ione (~> 1.2)
     coderay (1.1.0)
     columnize (0.9.0)
@@ -61,7 +59,7 @@ GEM
       net-http-pipeline
     highline (1.6.21)
     i18n (0.7.0)
-    ione (1.2.0)
+    ione (1.2.1)
     json (1.8.2)
     json (1.8.2-java)
     launchy (2.4.3)
@@ -70,7 +68,7 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     method_source (0.8.2)
-    minitest (5.6.0)
+    minitest (5.8.0)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
@@ -321,7 +319,6 @@ GEM
       ffi
     thor (0.19.1)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     timecop (0.7.1)
     travis (1.7.5)
       addressable (~> 2.3)

data/README.md

@@ -337,7 +337,7 @@ Post.find_all_by_author_id(id) # returns an array of all posts with that author_
 You can also call the `where` method directly on record sets:
 
 ```ruby
-Post.where(:author_id, id)
+Post.where(author_id: id)
 ```
 
 ### Consistency tuning ###
@@ -516,21 +516,19 @@ the columns that are given.
 * 4.2
 * 4.1
 * 4.0
-* 3.2
 
 ### Ruby ###
 
 * Ruby 2.2, 2.1, 2.0
-* JRuby 1.7
+* JRuby 1.7, 9.0
 * Rubinius 2.5
 
 ### Cassandra ###
 
-* 1.2
-* 2.0
+* 2.x
 
-Though Cequel is tested against Cassandra 2.0, it does not at this time support
-any of the CQL3.1 features introduced in Cassandra 2.0. This will change in the
+Though Cequel is tested against Cassandra 2, it does not at this time support
+any of the CQL3.1 features introduced in Cassandra 2. This will change in the
 future.
 
 ## Support & Bugs ##

data/Rakefile

@@ -11,7 +11,6 @@ RUBY_VERSIONS = YAML.load_file(File.expand_path('../.travis.yml', __FILE__))['rv
 task :default => :release
 task :release => [
   :verify_changelog,
-  :rubocop,
   :"test:all",
   :build,
   :tag,

data/Vagrantfile

@@ -135,7 +135,7 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
   SH
 
   versions = File.read(File.expand_path('../.cassandra-versions', __FILE__)).each_line
-    .map(&:strip).grep(/^(1\.2\.|2\.)/)
+    .map(&:strip).grep(/^2\./)
   versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|

data/cequel.gemspec

@@ -26,9 +26,9 @@ DESC
   s.test_files = Dir['spec/examples/**/*.rb']
   s.has_rdoc = true
   s.extra_rdoc_files = 'README.md'
-  s.required_ruby_version = '>= 1.9'
-  s.add_runtime_dependency 'activemodel', '>= 3.1', '< 5.0'
-  s.add_runtime_dependency 'cassandra-driver', '~> 1.0'
+  s.required_ruby_version = '>= 2.0'
+  s.add_runtime_dependency 'activemodel', '~> 4.0'
+  s.add_runtime_dependency 'cassandra-driver', '~> 2.0'
   s.add_development_dependency 'appraisal', '~> 1.0'
   s.add_development_dependency 'wwtd', '~> 0.5'
   s.add_development_dependency 'rake', '~> 10.1'
@@ -38,5 +38,5 @@ DESC
   s.add_development_dependency 'timecop', '~> 0.7'
   s.add_development_dependency 'travis', '~> 1.7'
   s.add_development_dependency 'yard', '~> 0.6'
-  s.requirements << 'Cassandra >= 1.2.0'
+  s.requirements << 'Cassandra >= 2.0.0'
 end

data/lib/cequel/metal/keyspace.rb

@@ -30,6 +30,8 @@ module Cequel
       attr_writer :default_consistency
       # @return [Hash] credentials for connect to cassandra
       attr_reader :credentials
+      # @return [Hash] SSL Configuration options
+      attr_reader :ssl_config
 
       #
       # @!method write(statement, *bind_vars)
@@ -111,6 +113,15 @@ module Cequel
       # @option configuration [String] :password password to auth with (leave
       #   blank for no auth)
       # @option configuration [String] :keyspace name of keyspace to connect to
+      # @option configuration [Boolean] :ssl enable/disable ssl/tls support
+      # @option configuration [String] :server_cert path to ssl server
+      #   certificate
+      # @option configuration [String] :client_cert path to ssl client
+      #   certificate
+      # @option configuration [String] :private_key path to ssl client private
+      #   key
+      # @option configuartion [String] :passphrase the passphrase for client
+      #   private key
       # @return [void]
       #
       def configure(configuration = {})
@@ -124,6 +135,7 @@ module Cequel
         @credentials  = extract_credentials(configuration)
         @max_retries  = extract_max_retries(configuration)
         @retry_delay  = extract_retry_delay(configuration)
+        @ssl_config = extract_ssl_config(configuration)
 
         @name = configuration[:keyspace]
         @default_consistency = configuration[:default_consistency].try(:to_sym)
@@ -216,6 +228,7 @@ module Cequel
           remove_instance_variable(:@client_without_keyspace)
         end
         if defined? @cluster
+          @cluster.close
           remove_instance_variable(:@cluster)
         end
       end
@@ -266,6 +279,7 @@ module Cequel
       def client_options
         {hosts: hosts, port: port}.tap do |options|
           options.merge!(credentials) if credentials
+          options.merge!(ssl_config) if ssl_config
         end
       end
 
@@ -312,6 +326,17 @@ module Cequel
       def extract_retry_delay(configuration)
         configuration.fetch(:retry_delay, 0.5)
       end
+
+      def extract_ssl_config(configuration)
+        ssl_config = {}
+        ssl_config[:ssl] = configuration.fetch(:ssl, nil)
+        ssl_config[:server_cert] = configuration.fetch(:server_cert, nil)
+        ssl_config[:client_cert] = configuration.fetch(:client_cert, nil)
+        ssl_config[:private_key] = configuration.fetch(:private_key, nil)
+        ssl_config[:passphrase] = configuration.fetch(:passphrase, nil)
+        ssl_config.each { |key, value| ssl_config.delete(key) unless value }
+        ssl_config
+      end
     end
   end
 end

data/lib/cequel/record/record_set.rb

@@ -478,6 +478,24 @@ module Cequel
         count ? limit(count).entries : limit(1).each.first
       end
 
+      #
+      # @return [Record] the first record or a new instance
+      #
+      def first_or_initialize
+        first || new
+      end
+
+      #
+      # @return [Record] the first record
+      # @raise [RecordNotFound] if the record set is empty
+      #
+      def first!
+        first or fail(RecordNotFound,
+                      "Couldn't find record with keys: #{
+                      scoped_key_attributes.map { |k, v|
+                        "#{k}: #{v}" }.join(', ')}")
+      end
+
       #
       # @overload last
       #   @return [Record] the last record in this record set

data/lib/cequel/record/tasks.rb

@@ -6,20 +6,46 @@ namespace :cequel do
   namespace :keyspace do
     desc 'Initialize Cassandra keyspace'
     task :create => :environment do
-      Cequel::Record.connection.schema.create!
-      puts "Created keyspace #{Cequel::Record.connection.name}"
+      create!
     end
 
     desc 'Drop Cassandra keyspace'
     task :drop => :environment do
-      Cequel::Record.connection.schema.drop!
-      puts "Dropped keyspace #{Cequel::Record.connection.name}"
+      drop!
     end
   end
 
   desc "Synchronize all models defined in `app/models' with Cassandra " \
        "database schema"
   task :migrate => :environment do
+    migrate
+  end
+
+  desc "Create keyspace and tables for all defined models"
+  task :init => %w(keyspace:create migrate)
+
+
+  desc 'Drop keyspace if exists, then create and migrate'
+  task :reset => :environment do
+    if Cequel::Record.connection.schema.exists?
+      drop!
+    end
+    create!
+    migrate
+  end
+
+  def create!
+    Cequel::Record.connection.schema.create!
+    puts "Created keyspace #{Cequel::Record.connection.name}"
+  end
+
+
+  def drop!
+    Cequel::Record.connection.schema.drop!
+    puts "Dropped keyspace #{Cequel::Record.connection.name}"
+  end
+
+  def migrate
     watch_stack = ActiveSupport::Dependencies::WatchStack.new
 
     migration_table_names = Set[]
@@ -58,7 +84,4 @@ namespace :cequel do
       end
     end
   end
-
-  desc "Create keyspace and tables for all defined models"
-  task :init => %w(keyspace:create migrate)
 end

data/lib/cequel/schema/table_reader.rb

@@ -73,31 +73,35 @@ module Cequel
       # for now. It will be worth refactoring this code to take advantage of
       # 2.0's better interface in a future version of Cequel that targets 2.0+.
       def read_partition_keys
-        validator = table_data['key_validator']
-        types = parse_composite_types(validator) || [validator]
-        JSON.parse(table_data['key_aliases']).zip(types) do |key_alias, type|
-          name = key_alias.to_sym
-          table.add_partition_key(key_alias.to_sym, Type.lookup_internal(type))
+        validators = table_data['key_validator']
+        types = parse_composite_types(validators) || [validators]
+        columns = partition_columns.sort { |c| c['component_index'] }
+          .map { |c| c['column_name'] }
+
+        columns.zip(types) do |name, type|
+          table.add_partition_key(name.to_sym, Type.lookup_internal(type))
         end
       end
 
       # XXX See comment on {read_partition_keys}
       def read_clustering_columns
-        column_aliases = JSON.parse(table_data['column_aliases'])
+        columns = cluster_columns.sort { |l, r| l['component_index'] <=> r['component_index'] }
+          .map { |c| c['column_name'] }
         comparators = parse_composite_types(table_data['comparator'])
         unless comparators
           table.compact_storage = true
           return unless column_data.empty?
-          column_aliases << :column1 if column_aliases.empty?
+          columns << :column1 if cluster_columns.empty?
           comparators = [table_data['comparator']]
         end
-        column_aliases.zip(comparators) do |column_alias, type|
+
+        columns.zip(comparators) do |name, type|
           if REVERSED_TYPE_PATTERN =~ type
             type = $1
             clustering_order = :desc
           end
           table.add_clustering_column(
-            column_alias.to_sym,
+            name.to_sym,
             Type.lookup_internal(type),
             clustering_order
           )
@@ -107,7 +111,7 @@ module Cequel
       def read_data_columns
         if column_data.empty?
           table.add_data_column(
-            (table_data['value_alias'] || :value).to_sym,
+            (compact_value['column_name'] || :value).to_sym,
             Type.lookup_internal(table_data['default_validator']),
             false
           )
@@ -163,18 +167,40 @@ module Cequel
         @table_data = table_query.first.try(:to_hash)
       end
 
-      def column_data
-        @column_data ||=
+      def all_columns
+        @all_columns ||=
           if table_data
             column_query = keyspace.execute(<<-CQL, keyspace.name, table_name)
               SELECT * FROM system.schema_columns
               WHERE keyspace_name = ? AND columnfamily_name = ?
             CQL
-            column_query.map(&:to_hash).select do |column|
-              !column.key?('type') || column['type'] == 'regular'
-            end
+            column_query.map(&:to_hash)
           end
       end
+
+      def compact_value
+        @compact_value ||= all_columns.find do |column|
+          column['type'] == 'compact_value'
+        end || {}
+      end
+
+      def column_data
+        @column_data ||= all_columns.select do |column|
+          !column.key?('type') || column['type'] == 'regular'
+        end
+      end
+
+      def partition_columns
+        @partition_columns ||= all_columns.select do |column|
+          column['type'] == 'partition_key'
+        end
+      end
+
+      def cluster_columns
+        @cluster_columns ||= all_columns.select do |column|
+          column['type'] == 'clustering_key'
+        end
+      end
     end
   end
 end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.6.1'
+  VERSION = '1.7.0'
 end

data/spec/examples/metal/data_set_spec.rb

@@ -506,7 +506,7 @@ describe Cequel::Metal::DataSet do
       expect(cequel[:posts].where(
         :blog_subdomain => %w(cassandra big-data-weekly),
         :permalink => 'big-data'
-      ).map { |row| row[:title] }).to eq(['Big Data', 'Cassandra'])
+      ).map { |row| row[:title] }).to match_array(['Big Data', 'Cassandra'])
     end
 
     it 'should use = if provided one-element array' do

data/spec/examples/metal/keyspace_spec.rb

@@ -86,6 +86,24 @@ describe Cequel::Metal::Keyspace do
     end
   end
 
+  describe "#ssl_config" do
+    it "ssl configuration settings get extracted correctly for sending to cluster" do
+      connect = Cequel.connect host: Cequel::SpecSupport::Helpers.host,
+                           port: Cequel::SpecSupport::Helpers.port,
+                           ssl: true,
+                           server_cert: 'path/to/server_cert',
+                           client_cert: 'path/to/client_cert',
+                           private_key: 'private_key',
+                           passphrase: 'passphrase'
+
+      expect(connect.ssl_config[:ssl]).to be true
+      expect(connect.ssl_config[:server_cert]).to eq('path/to/server_cert')
+      expect(connect.ssl_config[:client_cert]).to eq('path/to/client_cert')
+      expect(connect.ssl_config[:private_key]).to eq('private_key')
+      expect(connect.ssl_config[:passphrase]).to eq('passphrase')
+    end
+  end
+
   describe "#execute" do
     let(:statement) { "SELECT id FROM posts" }
 

data/spec/examples/record/record_set_spec.rb

@@ -628,6 +628,48 @@ describe Cequel::Record::RecordSet do
     end
   end
 
+  describe '#first_or_initialize' do
+    context 'when there are posts' do
+      let(:post) { posts.first }
+
+      before { post }
+
+      it 'returns the first post' do
+        expect_any_instance_of(described_class).to receive(:first).and_return(post)
+        expect(Post.first_or_initialize).to eq post
+      end
+    end
+
+    context 'when there are no posts' do
+      it 'returns a new post instance' do
+        expect_any_instance_of(described_class).to receive(:first).and_return(nil)
+        expect_any_instance_of(described_class).to receive(:new).and_call_original
+        expect(Post.first_or_initialize).to be_new_record
+      end
+    end
+  end
+
+  describe '#first!' do
+    context 'when there are posts' do
+      let(:post) { posts.first }
+
+      before { post }
+
+      it 'returns the first post' do
+        expect_any_instance_of(described_class).to receive(:first).and_return(post)
+        expect(Post.first!).to eq post
+      end
+    end
+
+    context 'when there are no posts' do
+      it 'raises a RecordNotFound exception with a meaningful message' do
+        expect_any_instance_of(described_class).to receive(:first).and_return(nil)
+        expect { Post['1'].first! }.to raise_error Cequel::Record::RecordNotFound,
+          "Couldn't find record with keys: blog_subdomain: 1"
+      end
+    end
+  end
+
   describe '#limit' do
     let(:records) { blogs }
 
@@ -661,11 +703,6 @@ describe Cequel::Record::RecordSet do
     context 'simple primary key' do
       let(:records) { blogs }
 
-      it 'should correctly query for simple primary key with two arguments' do
-        expect(Blog.where(:subdomain, 'blog-0'))
-          .to eq(blogs.first(1))
-      end
-
       it 'should correctly query for simple primary key with hash argument' do
         expect(Blog.where(subdomain: 'blog-0'))
           .to eq(blogs.first(1))
@@ -708,7 +745,7 @@ describe Cequel::Record::RecordSet do
 
     context 'secondary indexed column' do
       it 'should query for secondary indexed columns with two arguments' do
-        expect(Post.where(:author_id, uuids.first).map(&:permalink)).
+        expect(Post.where(author_id: uuids.first).map(&:permalink)).
           to eq(%w(cequel0 cequel2 cequel4))
       end
 
@@ -723,13 +760,13 @@ describe Cequel::Record::RecordSet do
       end
 
       it 'should not allow chaining of multiple columns' do
-        expect { Post.where(:author_id, uuids.first).
-          where(:author_name, 'Mat Brown') }.
+        expect { Post.where(author_id: uuids.first).
+          where(author_name: 'Mat Brown') }.
           to raise_error(Cequel::Record::IllegalQuery)
       end
 
       it 'should cast argument for column' do
-        expect(Post.where(:author_id, uuids.first.to_s).map(&:permalink)).
+        expect(Post.where(author_id: uuids.first.to_s).map(&:permalink)).
           to eq(%w(cequel0 cequel2 cequel4))
       end
     end
@@ -753,14 +790,14 @@ describe Cequel::Record::RecordSet do
 
     context 'nonexistent column' do
       it 'should raise ArgumentError if column is not recognized' do
-        expect { Post.where(:bogus, 'Business') }.
+        expect { Post.where(bogus: 'Business') }.
           to raise_error(ArgumentError)
       end
     end
 
     context 'non-indexed column' do
       it 'should raise ArgumentError if column is not indexed' do
-        expect { Post.where(:title, 'Cequel 0') }.
+        expect { Post.where(title: 'Cequel 0') }.
           to raise_error(ArgumentError)
       end
     end

data/spec/examples/schema/keyspace_spec.rb

@@ -73,10 +73,10 @@ describe Cequel::Schema::Keyspace do
         })
       end
 
-      it "raises an error if a class other than SimpleStrategy is given" do
+      it "raises an error if a class other than SimpleStrategy is given"  do
         expect {
           keyspace.create! class: "NetworkTopologyStrategy", replication_factor: 2
-        }.to raise_error
+        }.to raise_error(RuntimeError)
       end
     end
 

data/spec/examples/spec_helper.rb

@@ -39,6 +39,7 @@ RSpec.configure do |config|
 
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
+  config.order = "random"
 end
 
 if defined? byebug

data/spec/examples/spec_support/preparation_spec.rb

@@ -18,7 +18,6 @@ describe Cequel::SpecSupport::Preparation do
     expect(prep.sync_schema).to eq prep
   end
 
-
   context "existing keyspace" do
     it "can be deleted" do
       prep.drop_keyspace
@@ -46,8 +45,8 @@ describe Cequel::SpecSupport::Preparation do
   end
 
   context "keyspace doesn't exist" do
-    before do
-       Cequel::Record.connection.schema.drop!
+    before(:each) do
+      Cequel::Record.connection.schema.drop!
     end
 
     it "doesn't cause failure upon drop requests" do
@@ -60,13 +59,19 @@ describe Cequel::SpecSupport::Preparation do
     end
 
     it "causes #sync_schema to fail" do
-      expect{ prep.sync_schema }.to raise_error
+      expect{ prep.sync_schema }.to raise_error(Cassandra::Errors::InvalidError)
     end
   end
 
   # background
 
-  after { Cequel::Record.connection.schema.create! rescue nil }
+  after(:each) do
+    begin
+      Cequel::Record.connection.schema.create!
+    rescue
+      nil
+    end
+  end
 
   matcher :contain_table do |table_name|
     match do |keyspace|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Mat Brown
@@ -29,42 +29,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -325,14 +319,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Cassandra >= 1.2.0
+- Cassandra >= 2.0.0
 rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: