cequel 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 533e3980f9450dfeafb79127893006ba81fb3b64
-  data.tar.gz: 534f0031b6098578ae6fa1a12668dcf537cca564
+  metadata.gz: 769586127721ed091afdca815dd777b0c2f1c45b
+  data.tar.gz: 32ae7dab6f20e1e545e5d1c9ca82ec6a8f49a619
 SHA512:
-  metadata.gz: bba81999115ee78bd0980340d331f20794aa7aece07cedce42bcd235c6d0a6cfd2e58a67c7a37ccc157972a59de12a1a03918556871740deaa3f452e05728198
-  data.tar.gz: 697022e12729db4a4bbeca38f9569d4452d196b003feb59db93d843f80bebbd672ddc2ffc262dfe263238b3f78776e7d59a1ac7ec4e27531aab38ef6f4a53185
+  metadata.gz: b83ace65af35841571cb4420e52c2664680d40f64d04e411ab93aca11b9de7ffc0305d921d4c2e6036c09d4958349090e5ced9ff402ffebf6cf5afc2b4130286
+  data.tar.gz: fecc7319b72e30ded2ddf98d5760e5da6bb3c289381a682c0f3a7cb1ef7e60f36640acb621d95b1992ae16e53a170e2045dd7180b60550cbdc1d9336d477b0be

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.9.0
+
+* NewRelic instrumentation
+* fix querying tables whose first partition key is a timestamp
+
+
 ## 1.8.0
 
 * remove false claims of Rubinius support from readme (we would gratefully accept a PR to fix compatibility)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.8.0)
+    cequel (1.9.0)
       activemodel (~> 4.0)
       cassandra-driver (~> 2.0)
 

data/lib/cequel/metal/new_relic_instrumentation.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 begin
-  require 'new_relic/agent/method_tracer'
+  require 'new_relic/agent/datastores'
 rescue LoadError => e
   fail LoadError, "Can't use NewRelic instrumentation without NewRelic gem"
 end
@@ -13,12 +13,32 @@ module Cequel
     module NewRelicInstrumentation
       extend ActiveSupport::Concern
 
-      included do
-        include NewRelic::Agent::MethodTracer
+      define_method :execute_with_consistency_with_newrelic do |statement, bind_vars, consistency|
+        callback = Proc.new do |result, scoped_metric, elapsed|
+          NewRelic::Agent::Datastores.notice_statement(statement, elapsed)
+        end
+
+        statement_words = statement.split
+        operation = statement_words.first.downcase
+        table = nil
+        case operation
+        when "begin"
+          operation = "batch"
+        when "select"
+          table = statement_words.at(statement_words.index("FROM") + 1)
+        when "insert"
+          table = statement_words[2]
+        when "update"
+          table = statement_words[1]
+        end
 
-        add_method_tracer :execute_with_consistency,
-                          'Database/Cassandra/#{args[0][/^[A-Z ]*[A-Z]/]' \
-                          '.sub(/ FROM$/, \'\')}'
+        NewRelic::Agent::Datastores.wrap("Cassandra", operation, table, callback) do
+          execute_with_consistency_without_newrelic(statement, bind_vars, consistency)
+        end
+      end
+
+      included do
+        alias_method_chain :execute_with_consistency, :newrelic
       end
     end
   end

data/lib/cequel/record/lazy_record_collection.rb

@@ -32,7 +32,7 @@ module Cequel
 
         exploded_key_attributes = [{}].tap do |all_key_attributes|
           key_columns.zip(scoped_key_values) do |column, values|
-            all_key_attributes.replace(Array(values).flat_map do |value|
+            all_key_attributes.replace([values].flatten.compact.flat_map do |value|
               all_key_attributes.map do |key_attributes|
                 key_attributes.merge(column.name => value)
               end

data/lib/cequel/record/railtie.rb

@@ -22,9 +22,9 @@ module Cequel
       end
 
       initializer "cequel.add_new_relic" do
-        if configuration.fetch(:newrelic_enabled, true)
+        if configuration.fetch(:newrelic, true)
           begin
-            require 'new_relic/agent/method_tracer'
+            require 'new_relic/agent/datastores'
           rescue LoadError => e
             Rails.logger.debug(
               "New Relic not installed; skipping New Relic integration")

data/lib/cequel/version.rb

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

data/spec/examples/record/lazy_record_collection_spec.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Cequel::Record::LazyRecordCollection do
+  context 'handle timestamp attribute correctly (do not split it to array)' do
+    model :Event do
+      key :timestamp, :timestamp
+      column :value, :text
+    end
+
+    let(:now) { Time.now }
+    let(:event) { Event[now] }
+
+    it { expect(event.attributes).to include(timestamp: now) }
+  end
+end

data/spec/examples/spec_support/preparation_spec.rb

@@ -75,6 +75,7 @@ describe Cequel::SpecSupport::Preparation do
 
   after(:each) do
     begin
+      Cequel::Record.connection.clear_active_connections!
       Cequel::Record.connection.schema.create!
     rescue
       nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -277,6 +277,7 @@ files:
 - spec/examples/record/callbacks_spec.rb
 - spec/examples/record/dirty_spec.rb
 - spec/examples/record/finders_spec.rb
+- spec/examples/record/lazy_record_collection_spec.rb
 - spec/examples/record/list_spec.rb
 - spec/examples/record/map_spec.rb
 - spec/examples/record/mass_assignment_spec.rb
@@ -336,6 +337,7 @@ test_files:
 - spec/examples/record/callbacks_spec.rb
 - spec/examples/record/dirty_spec.rb
 - spec/examples/record/finders_spec.rb
+- spec/examples/record/lazy_record_collection_spec.rb
 - spec/examples/record/list_spec.rb
 - spec/examples/record/map_spec.rb
 - spec/examples/record/mass_assignment_spec.rb