cequel 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6eac18c5d802d417f619e19c31970ba843cd6ca
-  data.tar.gz: 904a86db08bb93edb3484ecc34edefa4e86c245b
+  metadata.gz: f9085a953689716b573953d289758730b72c6952
+  data.tar.gz: 5c96c40d2b735f0075c6685ad5e52e45ba6a7054
 SHA512:
-  metadata.gz: 2eb1fe18077241a6002f25e4853cde91f5b0937e0c7c42f5625052473006edfa722c461c046fc4713fd1010aa71bfe23a811e335761085f1963c21e9dc79121f
-  data.tar.gz: b20744caf7e47b951eae94437daa5a2fb7df8a835d0532b4d550bd78f9745f5d57def94c98001e510baba8d61de5823c7a55e8b2fdb78528ef76cf8b348740b6
+  metadata.gz: 213f188002f5b59514955bc2474a22a7427b748dc3e34c8eee7b9e23f1ed539e58e216ff6c9cf425971d57f342365deed664bdd8af42ec381496eb8cb6bdeb01
+  data.tar.gz: b15c63da92f2231b0ec30b9a6851a0a1bd5ffaa256c24ce4d09b96029ef0dccc00c53670d3bd349c0a52d8448a11cee060e8c7c2e42f54f1420d49e810a9260c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1
+
+* Specify NewRelicInstrumentation with full namespace
+* Update config generator template for native protocol
+
 ## 1.1.0
 
 * Switch to `cql-rb` (CQL native protocol) from `cassandra-cql` (Thrift

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.1.0)
+    cequel (1.1.1)
       activemodel (>= 3.1)
       cql-rb
 

data/Vagrantfile

@@ -136,8 +136,8 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
     service cassandra start
   SH
 
-  %w(2.0.4 2.0.3 2.0.2 2.0.1 2.0.0 1.2.13 1.2.12 1.2.11 1.2.10 1.2.9 1.2.8
-     1.2.7 1.2.6 1.2.5 1.2.4 1.2.3 1.2.2 1.2.1 1.2.0).each do |version|
+  versions = (0..6).map { |p| "2.0.#{p}" } + (0..15).map { |p| "1.2.#{p}" }
+  versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|
       machine.vm.provision :shell, inline: provision,

data/lib/cequel/metal/new_relic_instrumentation.rb

@@ -24,4 +24,6 @@ module Cequel
   end
 end
 
-Cequel::Metal::Keyspace.module_eval { include NewRelicInstrumentation }
+Cequel::Metal::Keyspace.module_eval do
+  include Cequel::Metal::NewRelicInstrumentation
+end

data/lib/cequel/version.rb

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

data/spec/support/helpers.rb

@@ -54,6 +54,7 @@ module Cequel
       def self.cequel
         @cequel ||= Cequel.connect(
           host: host,
+          port: port,
           keyspace: keyspace_name
         ).tap do |cequel|
           if ENV['CEQUEL_LOG_QUERIES']
@@ -65,7 +66,11 @@ module Cequel
       end
 
       def self.host
-        ENV['CEQUEL_TEST_HOST'] || '127.0.0.1:9042'
+        '127.0.0.1'
+      end
+
+      def self.port
+        ENV['CEQUEL_TEST_PORT'] || '9042'
       end
 
       def self.legacy_host

data/templates/config/cequel.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mat Brown
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel