cassanity 0.5.1 → 0.6.0.beta1

data/spec/unit/cassanity/client_spec.rb

@@ -6,83 +6,45 @@ describe Cassanity::Client do
 
   before do
     # Ensure that we never hit cassandra for real here.
-    CassandraCQL::Database.stub(:new => driver)
+    Cql::Client.stub(:connect => driver)
   end
 
   describe "#initialize" do
     it "passes arguments to cassandra cql database instance" do
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          'localhost:1234',
-          hash_including(some: 'option'),
-          instance_of(Hash)
-        )
-
-      described_class.new('localhost:1234', some: 'option')
+      Cql::Client.should_receive(:connect).
+        with(hash_including(hosts: ['localhost'], port: 1234, some: 'option'))
+
+      described_class.new(['localhost'], 1234, some: 'option')
     end
 
     it "defaults servers if not present" do
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          '127.0.0.1:9160',
-          instance_of(Hash),
-          instance_of(Hash)
-        )
+      Cql::Client.should_receive(:connect).
+        with(hash_including(hosts: ['127.0.0.1'], port: 9042))
 
       described_class.new
     end
 
     it "defaults servers if nil" do
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          '127.0.0.1:9160',
-          instance_of(Hash),
-          instance_of(Hash)
-        )
+      Cql::Client.should_receive(:connect).
+        with(hash_including(hosts: ['127.0.0.1'], port: 9042))
 
       described_class.new(nil)
     end
 
-    it "defaults cql version in options to 3" do
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          anything,
-          hash_including(cql_version: '3.0.0'),
-          instance_of(Hash)
-        )
-
-      described_class.new
-    end
-
-    it "does not override cql version option if other options are provided" do
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          anything,
-          hash_including(cql_version: '3.0.0', some: 'thing'),
-          instance_of(Hash)
-        )
-
-      described_class.new('localhost:1234', some: 'thing')
-    end
-
     it "allows passing instrumenter to executor, but does not pass it to driver instance" do
       instrumenter = double('Instrumenter')
       driver = double('Driver')
       executor = double('Executor')
 
-      CassandraCQL::Database.should_receive(:new).
-        with(
-          anything,
-          hash_not_including(instrumenter: instrumenter),
-          instance_of(Hash)
-        ).
+      Cql::Client.should_receive(:connect).
+        with(hash_not_including(instrumenter: instrumenter)).
         and_return(driver)
 
-      Cassanity::Executors::CassandraCql.should_receive(:new).
+      Cassanity::Executors::CqlRb.should_receive(:new).
         with(hash_including(driver: driver, instrumenter: instrumenter)).
         and_return(executor)
 
-      described_class.new('localhost:1234', instrumenter: instrumenter)
+      described_class.new(['localhost'], 1234, instrumenter: instrumenter)
     end
 
     it "sets cassandra cql database instance as driver" do
@@ -95,9 +57,9 @@ describe Cassanity::Client do
       executor = double('Executor')
       connection = double('Connection')
 
-      CassandraCQL::Database.should_receive(:new).and_return(driver)
+      Cql::Client.should_receive(:connect).and_return(driver)
 
-      Cassanity::Executors::CassandraCql.should_receive(:new).
+      Cassanity::Executors::CqlRb.should_receive(:new).
         with(hash_including(driver: driver)).
         and_return(executor)
 

data/spec/unit/cassanity/connection_spec.rb

@@ -55,7 +55,7 @@ describe Cassanity::Connection do
     context "with name and args" do
       before do
         @return_value = subject.keyspace(keyspace_name, {
-          strategy_class: 'NetworkTopologyStrategy',
+          replication: {class: 'NetworkTopologyStrategy'},
         })
       end
 
@@ -64,7 +64,7 @@ describe Cassanity::Connection do
       end
 
       it "passes args to initialization" do
-        @return_value.strategy_class.should eq('NetworkTopologyStrategy')
+        @return_value.replication.should eq(class: 'NetworkTopologyStrategy')
       end
 
       it "returns instance of keyspace" do
@@ -76,7 +76,7 @@ describe Cassanity::Connection do
       before do
         @return_value = subject.keyspace({
           name: keyspace_name,
-          strategy_class: 'NetworkTopologyStrategy',
+          replication: {class: 'NetworkTopologyStrategy'},
         })
       end
 
@@ -89,7 +89,7 @@ describe Cassanity::Connection do
       end
 
       it "passes args to initialization" do
-        @return_value.strategy_class.should eq('NetworkTopologyStrategy')
+        @return_value.replication.should eq(class: 'NetworkTopologyStrategy')
       end
     end
 
@@ -98,7 +98,7 @@ describe Cassanity::Connection do
         @return_value = subject.keyspace({
           name: keyspace_name,
         }, {
-          strategy_class: 'NetworkTopologyStrategy',
+          replication: {class: 'NetworkTopologyStrategy'},
         })
       end
 
@@ -111,7 +111,7 @@ describe Cassanity::Connection do
       end
 
       it "passes args to initialization" do
-        @return_value.strategy_class.should eq('NetworkTopologyStrategy')
+        @return_value.replication.should eq(class: 'NetworkTopologyStrategy')
       end
     end
   end

data/spec/unit/cassanity/keyspace_spec.rb

@@ -36,23 +36,23 @@ describe Cassanity::Keyspace do
       end
     end
 
-    it "sets strategy_class if provided" do
+    it "sets class if provided" do
       instance = described_class.new(required_arguments.merge({
-        strategy_class: 'NetworkTopologyStrategy',
+        replication: {class: 'NetworkTopologyStrategy'},
       }))
 
-      instance.strategy_class.should eq('NetworkTopologyStrategy')
+      instance.replication.should eq(class: 'NetworkTopologyStrategy')
     end
 
-    it "sets strategy_options if provided" do
+    it "sets strategy options if provided" do
       instance = described_class.new(required_arguments.merge({
-        strategy_options: {
+        replication: {
           dc1: 3,
           dc2: 5,
         },
       }))
 
-      instance.strategy_options.should eq({
+      instance.replication.should eq({
         dc1: 3,
         dc2: 5,
       })
@@ -236,7 +236,7 @@ describe Cassanity::Keyspace do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :keyspace_create,
-        arguments: args.merge(keyspace_name: keyspace_name),
+        arguments: args.merge(keyspace_name: keyspace_name, replication: {}),
       })
       subject.create(args)
     end
@@ -248,32 +248,30 @@ describe Cassanity::Keyspace do
         command: :keyspace_create,
         arguments: args.merge({
           keyspace_name: keyspace_name,
-          strategy_class: 'NetworkTopologyStrategy',
-          strategy_options: {replication_factory: 3},
+          replication: {class: 'NetworkTopologyStrategy', replication_factory: 3},
         }),
       })
 
       instance = described_class.new(required_arguments.merge({
-        strategy_class: 'NetworkTopologyStrategy',
-        strategy_options: {replication_factory: 3},
+        replication: {class: 'NetworkTopologyStrategy', replication_factory: 3},
       }))
 
       instance.create(args)
     end
 
     it "merges strategy options in args with initialized strategy options" do
-      args = {strategy_options: {dc1: 1}}
+      args = {replication: {dc1: 1}}
 
       executor.should_receive(:call).with({
         command: :keyspace_create,
         arguments: {
           keyspace_name: keyspace_name,
-          strategy_options: {dc1: 1, dc2: 2},
+          replication: {dc1: 1, dc2: 2},
         },
       })
 
       instance = described_class.new(required_arguments.merge({
-        strategy_options: {dc2: 2},
+        replication: {dc2: 2},
       }))
 
       instance.create(args)

data/spec/unit/cassanity/result_transformers/result_to_array_spec.rb

@@ -6,23 +6,10 @@ describe Cassanity::ResultTransformers::ResultToArray do
     [{one: 1}, {two: 2}, {three: 3}]
   }
 
-  let(:result) {
-    Class.new do
-      def initialize(array)
-        @array = array
-      end
-
-      def fetch_hash
-        @array.each do |row|
-          yield row
-        end
-      end
-    end.new(result_array)
-  }
-
   describe "#call" do
-    it "it iterates fetch_hash and returns array" do
-      subject.call(result).should eq(result_array)
+    it "returns a copy of the array" do
+      subject.call(result_array).should eq(result_array)
+      subject.call(result_array).should_not equal(result_array)
     end
   end
 end

data/spec/unit/cassanity/statement_spec.rb

@@ -0,0 +1,100 @@
+# encoding: utf-8
+require 'helper'
+require 'ostruct'
+require 'cassanity/statement'
+
+describe Cassanity::Statement do
+  describe 'variable interpolation' do
+    it 'interpolates strings' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate(["str"])).to eq(
+        "INSERT INTO foo VALUES ('str')"
+      )
+    end
+
+    it 'interpolates strings, escaping single quotes' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate(["testing'123"])).to eq(
+        "INSERT INTO foo VALUES ('testing''123')"
+      )
+    end
+
+    it 'interpolates strings containing binary data'
+
+    it 'interpolates numerics' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?,?)')
+      expect(stmt.interpolate([123, 456.78])).to eq(
+        "INSERT INTO foo VALUES (123,456.78)"
+      )
+    end
+
+    it 'interpolates big decimals' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate([BigDecimal.new("1234.56")])).to eq(
+        "INSERT INTO foo VALUES (0.123456E4)"
+      )
+    end
+
+    it 'interpolates booleans' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?,?)')
+      expect(stmt.interpolate([true, false])).to eq(
+        "INSERT INTO foo VALUES (true,false)"
+      )
+    end
+
+    it 'interpolates dates and times' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?,?)')
+      expect(stmt.interpolate([Date.new(2013, 5, 1), Time.utc(2013, 5, 1)])).to eq(
+        "INSERT INTO foo VALUES ('2013-05-01',1367366400000)"
+      )
+    end
+
+    it 'interpolates guids' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate([OpenStruct.new(to_guid: 'abc-123-def')])).to eq(
+        "INSERT INTO foo VALUES (abc-123-def)"
+      )
+    end
+
+    it 'interpolates arrays, recursively escaping each value' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate([["str", 123]])).to eq(
+        "INSERT INTO foo VALUES ('str',123)"
+      )
+    end
+
+    it 'interpolates hashes, recursively escaping each key/value' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate([{"foo" => 123}])).to eq(
+        "INSERT INTO foo VALUES ({'foo':123})"
+      )
+    end
+
+    it 'interpolates other items that can be converted to strings' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+
+      o = Object.new
+      def o.to_s; "string value"; end
+
+      expect(stmt.interpolate([o])).to eq(
+        "INSERT INTO foo VALUES ('string value')"
+      )
+    end
+
+    context 'cql version 2' do
+      it 'quotes big decimals values' do
+        stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)', cql_version: '2.0.0')
+        expect(stmt.interpolate([BigDecimal.new("1234.56")])).to eq(
+          "INSERT INTO foo VALUES ('0.123456E4')"
+        )
+      end
+
+      it 'quotes boolean values' do
+        stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?,?)', cql_version: '2.0.0')
+        expect(stmt.interpolate([true, false])).to eq(
+          "INSERT INTO foo VALUES ('true','false')"
+        )
+      end
+    end
+  end
+end

metadata

@@ -1,32 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cassandra-cql
+  name: cql-rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: simple_uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Layer of goodness on top of cassandra-cql so you do not have to write
   CQL strings all over the place.
 email:
@@ -83,7 +100,7 @@ files:
 - lib/cassanity/connection.rb
 - lib/cassanity/decrement.rb
 - lib/cassanity/error.rb
-- lib/cassanity/executors/cassandra_cql.rb
+- lib/cassanity/executors/cql_rb.rb
 - lib/cassanity/increment.rb
 - lib/cassanity/instrumentation/log_subscriber.rb
 - lib/cassanity/instrumentation/metriks.rb
@@ -113,6 +130,7 @@ files:
 - lib/cassanity/retry_strategies/retry_n_times.rb
 - lib/cassanity/retry_strategies/retry_strategy.rb
 - lib/cassanity/schema.rb
+- lib/cassanity/statement.rb
 - lib/cassanity/version.rb
 - spec/helper.rb
 - spec/integration/cassanity/column_family_spec.rb
@@ -157,7 +175,6 @@ files:
 - spec/unit/cassanity/connection_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
-- spec/unit/cassanity/executors/cassandra_cql_spec.rb
 - spec/unit/cassanity/increment_spec.rb
 - spec/unit/cassanity/instrumentors/memory_spec.rb
 - spec/unit/cassanity/instrumentors/noop_spec.rb
@@ -177,36 +194,30 @@ files:
 - spec/unit/cassanity/retry_strategies/retry_n_times_spec.rb
 - spec/unit/cassanity/retry_strategies/retry_strategy_spec.rb
 - spec/unit/cassanity/schema_spec.rb
+- spec/unit/cassanity/statement_spec.rb
 - spec/unit/cassanity_spec.rb
 homepage: http://johnnunemaker.com/cassanity/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -90461320440382772
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -90461320440382772
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Layer of goodness on top of cassandra-cql so you do not have to write CQL
   strings all over the place.
 test_files:
@@ -253,7 +264,6 @@ test_files:
 - spec/unit/cassanity/connection_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
-- spec/unit/cassanity/executors/cassandra_cql_spec.rb
 - spec/unit/cassanity/increment_spec.rb
 - spec/unit/cassanity/instrumentors/memory_spec.rb
 - spec/unit/cassanity/instrumentors/noop_spec.rb
@@ -273,4 +283,5 @@ test_files:
 - spec/unit/cassanity/retry_strategies/retry_n_times_spec.rb
 - spec/unit/cassanity/retry_strategies/retry_strategy_spec.rb
 - spec/unit/cassanity/schema_spec.rb
+- spec/unit/cassanity/statement_spec.rb
 - spec/unit/cassanity_spec.rb