cassanity 0.6.0.beta5 → 0.6.0

data/spec/unit/cassanity/schema_spec.rb

@@ -23,8 +23,21 @@ describe Cassanity::Schema do
     }
   }
 
+  let(:composite_partition_required_arguments) {
+    {
+      primary_key: [[:bucket, :version], :id],
+      columns: {
+        bucket: :text,
+        version: :text,
+        id: :text,
+        name: :text,
+      }
+    }
+  }
+
   let(:schema) { described_class.new(required_arguments) }
   let(:composite_schema) { described_class.new(composite_required_arguments) }
+  let(:composite_partition_schema) { described_class.new(composite_partition_required_arguments) }
 
   subject { schema }
 
@@ -48,6 +61,18 @@ describe Cassanity::Schema do
         described_class.new(args)
       }.to raise_error(ArgumentError, "Not all primary keys ([:foo, :bar]) were defined as columns ([:id])")
     end
+
+    it "works regardless colums definition order" do
+      args = composite_required_arguments.merge({
+        columns: {
+          id: :text,
+          bucket: :text,
+          name: :text,
+        }
+      })
+
+      described_class.new(args).should be_a described_class
+    end
   end
 
   describe "#column_names" do
@@ -78,6 +103,14 @@ describe Cassanity::Schema do
         subject.primary_keys.should eq([:bucket, :id])
       end
     end
+
+    context "with composite partition key" do
+      subject { composite_partition_schema }
+
+      it "returns array of primary keys with array of partition" do
+        subject.primary_keys.should eq([[:bucket, :version], :id])
+      end
+    end
   end
 
   describe "#primary_key" do
@@ -96,6 +129,14 @@ describe Cassanity::Schema do
         subject.primary_key.should eq([:bucket, :id])
       end
     end
+
+    context "with composite partition key" do
+      subject { composite_partition_schema }
+
+      it "returns array of primary keys with array of partition" do
+        subject.primary_keys.should eq([[:bucket, :version], :id])
+      end
+    end
   end
 
   describe "#composite_primary_key?" do
@@ -114,6 +155,14 @@ describe Cassanity::Schema do
         subject.composite_primary_key?.should be_true
       end
     end
+
+    context "with composite partition key" do
+      subject { composite_partition_schema }
+
+      it "returns true" do
+        subject.composite_primary_key?.should be_true
+      end
+    end
   end
 
   describe "#inspect" do

data/spec/unit/cassanity/set_addition_spec.rb

@@ -0,0 +1,80 @@
+require 'helper'
+require 'cassanity/set_addition'
+
+describe Cassanity::SetAddition do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::SetAddition('foo').should eq(described_class.new('foo'))
+    end
+  end
+
+  describe "#initialize" do
+    context "with value" do
+      before do
+        @instance = described_class.new('foo')
+      end
+
+      it "sets value" do
+        @instance.value.should eq(Set['foo'])
+      end
+
+      it "sets symbol" do
+        @instance.symbol.should be(:+)
+      end
+    end
+
+    context "with multiples values" do
+      before do
+        @instance = described_class.new('foo', 'bar')
+      end
+
+      it "sets values" do
+        @instance.value.should eq(Set['foo', 'bar'])
+      end
+    end
+
+    context "without value" do
+      it "raises error" do
+        expect {
+          subject.value
+        }.to raise_error(ArgumentError, "value cannot be nil")
+      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 "set_addition equality" do |method_name|
+    it "returns true for same class and value" do
+      instance = described_class.new('foo')
+      other = described_class.new('foo')
+      instance.send(method_name, other).should be_true
+    end
+
+    it "returns false for same class and different value" do
+      instance = described_class.new('foo')
+      other = described_class.new('bar')
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for different class" do
+      instance = described_class.new('foo')
+      other = Object.new
+      instance.send(method_name, other).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples "set_addition equality", :eql?
+  end
+
+  describe "#==" do
+    include_examples "set_addition equality", :==
+  end
+end

data/spec/unit/cassanity/set_removal_spec.rb

@@ -0,0 +1,80 @@
+require 'helper'
+require 'cassanity/set_removal'
+
+describe Cassanity::SetRemoval do
+  describe "self named helper method" do
+    it "returns instance" do
+      Cassanity::SetRemoval('foo').should eq(described_class.new('foo'))
+    end
+  end
+
+  describe "#initialize" do
+    context "with value" do
+      before do
+        @instance = described_class.new('foo')
+      end
+
+      it "sets value" do
+        @instance.value.should eq(Set['foo'])
+      end
+
+      it "sets symbol" do
+        @instance.symbol.should be(:-)
+      end
+    end
+
+    context "with multiples values" do
+      before do
+        @instance = described_class.new('foo', 'bar')
+      end
+
+      it "sets values" do
+        @instance.value.should eq(Set['foo', 'bar'])
+      end
+    end
+
+    context "without value" do
+      it "raises error" do
+        expect {
+          subject.value
+        }.to raise_error(ArgumentError, "value cannot be nil")
+      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 "set_removal equality" do |method_name|
+    it "returns true for same class and value" do
+      instance = described_class.new('foo')
+      other = described_class.new('foo')
+      instance.send(method_name, other).should be_true
+    end
+
+    it "returns false for same class and different value" do
+      instance = described_class.new('foo')
+      other = described_class.new('bar')
+      instance.send(method_name, other).should be_false
+    end
+
+    it "returns false for different class" do
+      instance = described_class.new('foo')
+      other = Object.new
+      instance.send(method_name, other).should be_false
+    end
+  end
+
+  describe "#eql?" do
+    include_examples "set_removal equality", :eql?
+  end
+
+  describe "#==" do
+    include_examples "set_removal equality", :==
+  end
+end

data/spec/unit/cassanity/statement_spec.rb

@@ -58,8 +58,15 @@ describe Cassanity::Statement do
 
     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)"
+      expect(stmt.interpolate([["abc", "def"]])).to eq(
+        "INSERT INTO foo VALUES (['abc','def'])"
+      )
+    end
+
+    it 'interpolates sets, recursively escaping each value' do
+      stmt = Cassanity::Statement.new('INSERT INTO foo VALUES (?)')
+      expect(stmt.interpolate([Set.new(["abc","def"])])).to eq(
+        "INSERT INTO foo VALUES ({'abc','def'})"
       )
     end
 

data/spec/unit/cassanity_spec.rb

@@ -126,4 +126,46 @@ describe Cassanity do
       Cassanity.range(1, 5).should eq(Cassanity::Range.new(1, 5))
     end
   end
+
+  describe ".add" do
+    it "returns addition instance" do
+      Cassanity.add("value").should eq(Cassanity::Addition.new("value"))
+    end
+  end
+
+  describe ".remove" do
+    it "returns removal instance" do
+      Cassanity.remove("value").should eq(Cassanity::Removal.new("value"))
+    end
+  end
+
+  describe ".set_add" do
+    it "returns set_addition instance" do
+      Cassanity.set_add("value").should eq(Cassanity::SetAddition.new("value"))
+    end
+  end
+
+  describe ".set_remove" do
+    it "returns set_removal instance" do
+      Cassanity.set_remove("value").should eq(Cassanity::SetRemoval.new("value"))
+    end
+  end
+
+  describe ".sadd" do
+    it "returns set_addition instance" do
+      Cassanity.sadd("value").should eq(Cassanity::SetAddition.new("value"))
+    end
+  end
+
+  describe ".sremove" do
+    it "returns set_removal instance" do
+      Cassanity.sremove("value").should eq(Cassanity::SetRemoval.new("value"))
+    end
+  end
+
+  describe ".item" do
+    it "returns collection item instance" do
+      Cassanity.item(1,"value").should eq(Cassanity::CollectionItem.new(1,"value"))
+    end
+  end
 end

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta5
+  version: 0.6.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
@@ -52,9 +52,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Guardfile
@@ -66,11 +66,13 @@ files:
 - doc/Migrations.md
 - examples/_shared.rb
 - examples/batch.rb
+- examples/collections.rb
 - examples/column_families.rb
 - examples/counters.rb
 - examples/keyspaces.rb
 - examples/select_range.rb
 - lib/cassanity.rb
+- lib/cassanity/addition.rb
 - lib/cassanity/argument_generators/batch.rb
 - lib/cassanity/argument_generators/column_families.rb
 - lib/cassanity/argument_generators/column_family_alter.rb
@@ -95,6 +97,7 @@ files:
 - lib/cassanity/argument_generators/where_clause.rb
 - lib/cassanity/argument_generators/with_clause.rb
 - lib/cassanity/client.rb
+- lib/cassanity/collection_item.rb
 - lib/cassanity/column.rb
 - lib/cassanity/column_family.rb
 - lib/cassanity/connection.rb
@@ -122,6 +125,7 @@ files:
 - lib/cassanity/operators/lt.rb
 - lib/cassanity/operators/lte.rb
 - lib/cassanity/range.rb
+- lib/cassanity/removal.rb
 - lib/cassanity/result_transformers/column_families.rb
 - lib/cassanity/result_transformers/columns.rb
 - lib/cassanity/result_transformers/keyspaces.rb
@@ -131,6 +135,8 @@ files:
 - lib/cassanity/retry_strategies/retry_n_times.rb
 - lib/cassanity/retry_strategies/retry_strategy.rb
 - lib/cassanity/schema.rb
+- lib/cassanity/set_addition.rb
+- lib/cassanity/set_removal.rb
 - lib/cassanity/statement.rb
 - lib/cassanity/version.rb
 - spec/helper.rb
@@ -147,6 +153,7 @@ files:
 - spec/integration/cassanity/migrator_spec.rb
 - spec/support/cassanity_helpers.rb
 - spec/support/fake_udp_socket.rb
+- spec/unit/cassanity/addition_spec.rb
 - spec/unit/cassanity/argument_generators/batch_spec.rb
 - spec/unit/cassanity/argument_generators/column_families_spec.rb
 - spec/unit/cassanity/argument_generators/column_family_alter_spec.rb
@@ -171,6 +178,7 @@ files:
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb
 - spec/unit/cassanity/argument_generators/with_clause_spec.rb
 - spec/unit/cassanity/client_spec.rb
+- spec/unit/cassanity/collection_item_spec.rb
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/column_spec.rb
 - spec/unit/cassanity/connection_spec.rb
@@ -190,12 +198,15 @@ files:
 - spec/unit/cassanity/operators/gte_spec.rb
 - spec/unit/cassanity/operators/lt_spec.rb
 - spec/unit/cassanity/operators/lte_spec.rb
+- spec/unit/cassanity/removal_spec.rb
 - spec/unit/cassanity/result_transformers/mirror_spec.rb
 - spec/unit/cassanity/result_transformers/result_to_array_spec.rb
 - spec/unit/cassanity/retry_strategies/exponential_backoff_spec.rb
 - 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/set_addition_spec.rb
+- spec/unit/cassanity/set_removal_spec.rb
 - spec/unit/cassanity/statement_spec.rb
 - spec/unit/cassanity_spec.rb
 homepage: http://johnnunemaker.com/cassanity/
@@ -207,17 +218,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Layer of goodness on top of cassandra-cql so you do not have to write CQL
@@ -237,6 +248,7 @@ test_files:
 - spec/integration/cassanity/migrator_spec.rb
 - spec/support/cassanity_helpers.rb
 - spec/support/fake_udp_socket.rb
+- spec/unit/cassanity/addition_spec.rb
 - spec/unit/cassanity/argument_generators/batch_spec.rb
 - spec/unit/cassanity/argument_generators/column_families_spec.rb
 - spec/unit/cassanity/argument_generators/column_family_alter_spec.rb
@@ -261,6 +273,7 @@ test_files:
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb
 - spec/unit/cassanity/argument_generators/with_clause_spec.rb
 - spec/unit/cassanity/client_spec.rb
+- spec/unit/cassanity/collection_item_spec.rb
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/column_spec.rb
 - spec/unit/cassanity/connection_spec.rb
@@ -280,11 +293,14 @@ test_files:
 - spec/unit/cassanity/operators/gte_spec.rb
 - spec/unit/cassanity/operators/lt_spec.rb
 - spec/unit/cassanity/operators/lte_spec.rb
+- spec/unit/cassanity/removal_spec.rb
 - spec/unit/cassanity/result_transformers/mirror_spec.rb
 - spec/unit/cassanity/result_transformers/result_to_array_spec.rb
 - spec/unit/cassanity/retry_strategies/exponential_backoff_spec.rb
 - 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/set_addition_spec.rb
+- spec/unit/cassanity/set_removal_spec.rb
 - spec/unit/cassanity/statement_spec.rb
 - spec/unit/cassanity_spec.rb