whi-cassie 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8392ef6b34920bdde8a689495610115ba637c300
-  data.tar.gz: ccf179a324199af0f1af5c81589634efc44f89a5
+  metadata.gz: f85b689086bd176a805cd0fcdd9ba9cab4980d75
+  data.tar.gz: e596bacb6ddd3393c5d1fd93d49da61d1898333b
 SHA512:
-  metadata.gz: 715926f6cead3063ea00a364c0b7f30f67c0cf81be18288a78dd16431d95d2496fa845d928afdfd3b206dea78efb6e9d45a41c943d332a138f47225066c4d5da
-  data.tar.gz: 2da40bc6fbc2c2c02594c76cc8c719c495db90a5b5983cf791e0b243bf47ce21e85d693c53398b051b4576479bb46c9467e25b60e5caac4d203266617c07ab18
+  metadata.gz: de080c2f8d0a523d754dbfa0aee4215cc64923e1f122c6ddce85a58c7becb97b02616540cdc880b1dd2c993aed89396f91123393cd374f4b90189da5fc571871
+  data.tar.gz: 2bc5d0e2ea0aa0e8ee43cbe86789b497ad8e421bda9365bcf4d5493e1ddeec647b22383e89ca35c8f254d9e5d5056389cd4fafd346de8ede7a9493792c546fae

data/HISTORY.txt

@@ -1,3 +1,7 @@
+1.0.6
+
+Wrap raw CQL in a Simple statement for code consistency in subscribers.
+
 1.0.5
 
 Add subscribers for instumenting code.

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/cassie.rb

@@ -270,8 +270,12 @@ class Cassie
     start_time = Time.now
     begin
       statement = nil
-      if cql.is_a?(String) && values.present?
-        statement = prepare(cql)
+      if cql.is_a?(String)
+        if values.present?
+          statement = prepare(cql)
+        else
+          statement = Cassandra::Statements::Simple.new(cql)
+        end
       else
         statement = cql
       end
@@ -292,7 +296,7 @@ class Cassie
       disconnect
       raise e
     ensure
-      unless subscribers.empty?
+      if statement.is_a?(Cassandra::Statement) && !subscribers.empty?
         payload = Message.new(statement, options, Time.now - start_time)
         subscribers.each{|subscriber| subscriber.call(payload)}
       end

data/spec/cassie_spec.rb

@@ -134,6 +134,13 @@ describe Cassie do
         message.options.should == {:arguments => [1]}
         message.elapsed_time.should be_a(Float)
 
+        instance.execute("SELECT owner, id, val FROM #{table} WHERE owner = 1")
+        messages.size.should == 1
+        message = messages.shift
+        message.statement.should be_a(Cassandra::Statement)
+        message.options.should == nil
+        message.elapsed_time.should be_a(Float)
+
         instance.batch do
           instance.insert(table, :owner => 1, :id => 2, :val => 'foo')
           instance.delete(table, :owner => 1)
@@ -153,19 +160,19 @@ describe Cassie do
     let(:session){ instance.send(:session) }
     
     it "should not specify query consistency by default" do
-      expect(session).to receive(:execute).with("SELECT * FROM dual", {})
+      expect(session).to receive(:execute).with(Cassandra::Statements::Simple.new("SELECT * FROM dual"), {})
       instance.execute("SELECT * FROM dual")
     end
     
     it "should allow specifying the consistency in a block" do
-      expect(session).to receive(:execute).with("SELECT * FROM dual", {:consistency => :one})
+      expect(session).to receive(:execute).with(Cassandra::Statements::Simple.new("SELECT * FROM dual"), {:consistency => :one})
       Cassie.consistency(:one) do
         instance.execute("SELECT * FROM dual")
       end
     end
     
     it "should use the consistency specified to execute if provided" do
-      expect(session).to receive(:execute).with("SELECT * FROM dual", {:consistency => :two})
+      expect(session).to receive(:execute).with(Cassandra::Statements::Simple.new("SELECT * FROM dual"), {:consistency => :two})
       Cassie.consistency(:one) do
         instance.execute("SELECT * FROM dual", nil, :consistency => :two)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver