cassanity 0.2.2 → 0.3.0

data/spec/integration/cassanity/column_family_spec.rb

@@ -181,6 +181,51 @@ describe Cassanity::ColumnFamily do
     ])
   end
 
+  context "selecting a range of data" do
+    let(:name) { 'rollups_minute' }
+
+    subject {
+      described_class.new({
+        keyspace: keyspace,
+        name: name,
+      })
+    }
+
+    before do
+      client.execute("CREATE COLUMNFAMILY #{name} (id text, ts int, value counter, PRIMARY KEY(id, ts))")
+      @id = 'foo'
+      client.execute("UPDATE #{name} SET value = value + 1 WHERE id = ? AND ts = ?", @id, 1)
+      client.execute("UPDATE #{name} SET value = value + 1 WHERE id = ? AND ts = ?", @id, 2)
+      client.execute("UPDATE #{name} SET value = value + 1 WHERE id = ? AND ts = ?", @id, 3)
+      client.execute("UPDATE #{name} SET value = value + 1 WHERE id = ? AND ts = ?", @id, 4)
+    end
+
+    it "works including end" do
+      subject.select({
+        where: {
+          id: @id,
+          ts: Range.new(1, 3),
+        }
+      }).should eq([
+        {'id' => 'foo', 'ts' => 1, 'value' => 1},
+        {'id' => 'foo', 'ts' => 2, 'value' => 1},
+        {'id' => 'foo', 'ts' => 3, 'value' => 1},
+      ])
+    end
+
+    it "works excluding end" do
+      subject.select({
+        where: {
+          id: @id,
+          ts: Range.new(1, 3, true),
+        }
+      }).should eq([
+        {'id' => 'foo', 'ts' => 1, 'value' => 1},
+        {'id' => 'foo', 'ts' => 2, 'value' => 1},
+      ])
+    end
+  end
+
   it "can insert data" do
     subject.insert({
       data: {
@@ -219,7 +264,7 @@ describe Cassanity::ColumnFamily do
     row['name'].should eq('gist')
   end
 
-  describe "updating a counter column" do
+  describe "incrementing a counter column" do
     subject {
       described_class.new({
         keyspace: keyspace,
@@ -229,7 +274,7 @@ describe Cassanity::ColumnFamily do
 
     it "works" do
       subject.update({
-        set: {views: 'views + 2'},
+        set: {views: Cassanity::Increment.new(2)},
         where: {id: '1'},
       })
 
@@ -241,6 +286,28 @@ describe Cassanity::ColumnFamily do
     end
   end
 
+  describe "decrementing a counter column" do
+    subject {
+      described_class.new({
+        keyspace: keyspace,
+        name: counters_column_family_name,
+      })
+    }
+
+    it "works" do
+      subject.update({
+        set: {views: Cassanity::Decrement.new(2)},
+        where: {id: '1'},
+      })
+
+      result = client.execute("SELECT * FROM #{counters_column_family_name} WHERE id = '1'")
+      result.rows.should eq(1)
+      row = result.fetch_hash
+      row['id'].should eq('1')
+      row['views'].should be(-2)
+    end
+  end
+
   it "can delete data" do
     client.execute("INSERT INTO #{column_family_name} (id, name) VALUES (?, ?)", '1', 'github')
     client.execute("INSERT INTO #{column_family_name} (id, name) VALUES (?, ?)", '2', 'gist')

data/spec/unit/cassanity/argument_generators/set_clause_spec.rb

@@ -31,54 +31,17 @@ describe Cassanity::ArgumentGenerators::SetClause do
       end
     end
 
-    context "with counter update" do
-      it "returns array of arguments where counter SET is correct" do
-        subject.call(set: {views: 'views + 5'}).
-          should eq([" SET views = views + 5"])
-      end
-
-      it "works with no spaces" do
-        subject.call(set: {views: 'views+5'}).
-          should eq([" SET views = views+5"])
-      end
-
-      it "works with one or more spaces before the operator" do
-        subject.call(set: {views: 'views +5'}).
-          should eq([" SET views = views +5"])
-
-        subject.call(set: {views: 'views  +5'}).
-          should eq([" SET views = views  +5"])
-      end
-
-      it "works with one or more spaces after the operator" do
-        subject.call(set: {views: 'views+ 5'}).
-          should eq([" SET views = views+ 5"])
-
-        subject.call(set: {views: 'views+  5'}).
-          should eq([" SET views = views+  5"])
-      end
-
-      it "works with spaces after before the key" do
-        subject.call(set: {views: ' views + 5'}).
-          should eq([" SET views =  views + 5"])
-      end
-
-      it "works with spaces after the number" do
-        subject.call(set: {views: 'views + 5 '}).
-          should eq([" SET views = views + 5 "])
-
-        subject.call(set: {views: 'views + 5  '}).
-          should eq([" SET views = views + 5  "])
-      end
-
-      it "works with negative operator" do
-        subject.call(set: {views: 'views - 5'}).
-          should eq([" SET views = views - 5"])
+    context "with increment" do
+      it "returns array of arguments with SET including counter increment" do
+        subject.call(set: {views: Cassanity::Increment.new(5)}).
+          should eq([" SET views = views + ?", 5])
       end
+    end
 
-      it "works with multiple digit numbers" do
-        subject.call(set: {views: 'views - 52737237'}).
-          should eq([" SET views = views - 52737237"])
+    context "with decrement" do
+      it "returns array of arguments with SET including counter decrement" do
+        subject.call(set: {views: Cassanity::Decrement.new(3)}).
+          should eq([" SET views = views - ?", 3])
       end
     end
   end

data/spec/unit/cassanity/argument_generators/where_clause_spec.rb

@@ -26,6 +26,21 @@ describe Cassanity::ArgumentGenerators::WhereClause do
       end
     end
 
+    context "with multiple where values" do
+      it "returns array of arguments with AND separating where keys" do
+        subject.call({
+          where: {
+            bucket: '2012',
+            id: '1',
+          }
+        }).should eq([
+          " WHERE bucket = ? AND id = ?",
+          '2012',
+          '1',
+        ])
+      end
+    end
+
     context "with array value for a where" do
       it "returns array of arguments using IN for key with array value" do
         subject.call({
@@ -39,19 +54,83 @@ describe Cassanity::ArgumentGenerators::WhereClause do
       end
     end
 
-    context "with multiple where values" do
-      it "returns array of arguments with AND separating where keys" do
+    context "with inclusive range value for a where" do
+      it "returns range comparison including end of range" do
         subject.call({
           where: {
-            bucket: '2012',
-            id: '1',
-          }
+            timestamp: Range.new(1, 3)
+          },
         }).should eq([
-          " WHERE bucket = ? AND id = ?",
-          '2012',
-          '1',
+          " WHERE timestamp >= ? AND timestamp <= ?",
+          1, 3
         ])
       end
     end
+
+    context "with exclusive range value for a where" do
+      it "returns range comparison including end of range" do
+        subject.call({
+          where: {
+            timestamp: Range.new(1, 3, true)
+          },
+        }).should eq([
+          " WHERE timestamp >= ? AND timestamp < ?",
+          1, 3
+        ])
+      end
+    end
+
+    context "with a cassanity operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {
+            timestamp: Cassanity::Operator.new('<', 10)
+          },
+        }).should eq([
+          " WHERE timestamp < ?",
+          10
+        ])
+      end
+    end
+
+    context "with a cassanity less than operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {timestamp: Cassanity::Operators::Lt.new(10)},
+        }).should eq([" WHERE timestamp < ?", 10])
+      end
+    end
+
+    context "with a cassanity less than or equal to operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {timestamp: Cassanity::Operators::Lte.new(10)},
+        }).should eq([" WHERE timestamp <= ?", 10])
+      end
+    end
+
+    context "with a cassanity greater than operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {timestamp: Cassanity::Operators::Gt.new(10)},
+        }).should eq([" WHERE timestamp > ?", 10])
+      end
+    end
+
+    context "with a cassanity greater than or equal to operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {timestamp: Cassanity::Operators::Gte.new(10)},
+        }).should eq([" WHERE timestamp >= ?", 10])
+      end
+    end
+
+    context "with a cassanity equal to operator value" do
+      it "returns correct cql" do
+        subject.call({
+          where: {timestamp: Cassanity::Operators::Eq.new(10)},
+        }).should eq([" WHERE timestamp = ?", 10])
+      end
+    end
   end
 end

data/spec/unit/cassanity/decrement_spec.rb

@@ -0,0 +1,68 @@
+require 'helper'
+require 'cassanity/decrement'
+
+describe Cassanity::Decrement do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Decrement(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    context "with value" do
+      before do
+        @instance = described_class.new(5)
+      end
+
+      it "sets value" do
+        @instance.value.should be(5)
+      end
+
+      it "sets symbol" do
+        @instance.symbol.should be(:-)
+      end
+    end
+
+    context "without value" do
+      it "defaults value to 1" do
+        subject.value.should be(1)
+      end
+    end
+
+    context "with nil" do
+      it "raises error" do
+        expect {
+          described_class.new(nil)
+        }.to raise_error(ArgumentError, "value cannot be nil")
+      end
+    end
+  end
+
+  shared_examples_for "decrement equality" do |method_name|
+    it "returns true for same class and value" do
+      instance = described_class.new(5)
+      other = described_class.new(5)
+      instance.send(method_name, other).should be_true
+    end
+
+    it "returns false for same class and different value" do
+      instance = described_class.new(5)
+      other = described_class.new(7)
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for different class" do
+      instance = described_class.new(5)
+      other = Object.new
+      instance.send(method_name, other).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples "decrement equality", :eql?
+  end
+
+  describe "#==" do
+    include_examples "decrement equality", :==
+  end
+end

data/spec/unit/cassanity/increment_spec.rb

@@ -0,0 +1,68 @@
+require 'helper'
+require 'cassanity/increment'
+
+describe Cassanity::Increment do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Increment(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    context "with value" do
+      before do
+        @instance = described_class.new(5)
+      end
+
+      it "sets value" do
+        @instance.value.should be(5)
+      end
+
+      it "sets symbol" do
+        @instance.symbol.should be(:+)
+      end
+    end
+
+    context "without value" do
+      it "defaults value to 1" do
+        subject.value.should be(1)
+      end
+    end
+
+    context "with nil" do
+      it "raises error" do
+        expect {
+          described_class.new(nil)
+        }.to raise_error(ArgumentError, "value cannot be nil")
+      end
+    end
+  end
+
+  shared_examples_for "increment equality" do |method_name|
+    it "returns true for same class and value" do
+      instance = described_class.new(5)
+      other = described_class.new(5)
+      instance.send(method_name, other).should be_true
+    end
+
+    it "returns false for same class and different value" do
+      instance = described_class.new(5)
+      other = described_class.new(7)
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for different class" do
+      instance = described_class.new(5)
+      other = Object.new
+      instance.send(method_name, other).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples "increment equality", :eql?
+  end
+
+  describe "#==" do
+    include_examples "increment equality", :==
+  end
+end

data/spec/unit/cassanity/operator_spec.rb

@@ -0,0 +1,58 @@
+require 'helper'
+require 'cassanity/operator'
+
+describe Cassanity::Operator do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operator(:<, 5).should eq(described_class.new(:<, 5))
+    end
+  end
+
+  describe "#initialize" do
+    before do
+      @instance = described_class.new('<', 5)
+    end
+
+    it "sets symbol" do
+      @instance.symbol.should eq('<')
+    end
+
+    it "sets value" do
+      @instance.value.should be(5)
+    end
+  end
+
+  shared_examples_for "operator equality" do |method_name|
+    it "returns true for same class, symbol and value" do
+      instance = described_class.new(:<, 5)
+      other = described_class.new(:<, 5)
+      instance.send(method_name, other).should be_true
+    end
+
+    it "returns false for same class/value and different symbol" do
+      instance = described_class.new(:<, 5)
+      other = described_class.new(:>, 5)
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for same class/symbol and different value" do
+      instance = described_class.new(:<, 5)
+      other = described_class.new(:>, 7)
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for different class" do
+      instance = described_class.new(:<, 5)
+      other = Object.new
+      instance.send(method_name, other).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples "operator equality", :eql?
+  end
+
+  describe "#==" do
+    include_examples "operator equality", :==
+  end
+end

data/spec/unit/cassanity/operators/eq_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'cassanity/operators/eq'
+
+describe Cassanity::Operators::Eq do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operators::Eq(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    subject {
+      described_class.new('John')
+    }
+
+    it "sets symbol" do
+      subject.symbol.should be(:"=")
+    end
+
+    it "sets value" do
+      subject.value.should eq('John')
+    end
+  end
+end

data/spec/unit/cassanity/operators/gt_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'cassanity/operators/gt'
+
+describe Cassanity::Operators::Gt do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operators::Gt(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    subject {
+      described_class.new(5)
+    }
+
+    it "sets symbol" do
+      subject.symbol.should be(:>)
+    end
+
+    it "sets value" do
+      subject.value.should eq(5)
+    end
+  end
+end

data/spec/unit/cassanity/operators/gte_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'cassanity/operators/gte'
+
+describe Cassanity::Operators::Gte do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operators::Gte(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    subject {
+      described_class.new(5)
+    }
+
+    it "sets symbol" do
+      subject.symbol.should be(:>=)
+    end
+
+    it "sets value" do
+      subject.value.should eq(5)
+    end
+  end
+end

data/spec/unit/cassanity/operators/lt_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'cassanity/operators/lt'
+
+describe Cassanity::Operators::Lt do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operators::Lt(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    subject {
+      described_class.new(5)
+    }
+
+    it "sets symbol" do
+      subject.symbol.should be(:<)
+    end
+
+    it "sets value" do
+      subject.value.should eq(5)
+    end
+  end
+end

data/spec/unit/cassanity/operators/lte_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'cassanity/operators/lte'
+
+describe Cassanity::Operators::Lte do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::Operators::Lte(5).should eq(described_class.new(5))
+    end
+  end
+
+  describe "#initialize" do
+    subject {
+      described_class.new(5)
+    }
+
+    it "sets symbol" do
+      subject.symbol.should be(:<=)
+    end
+
+    it "sets value" do
+      subject.value.should eq(5)
+    end
+  end
+end