cassanity 0.2.1 → 0.2.2

data/Changelog.md

@@ -2,10 +2,12 @@
 
 Not all changes will be here, but the important ones will be for sure.
 
-## 0.2.1
+## 0.2.2
 
-* Added [using, order and limit clauses](https://github.com/jnunemaker/cassanity/compare/414d780...3aeb254) to column family select
+* Added [Keyspace#column_families](https://github.com/jnunemaker/cassanity/commit/8101835)
+* Added [ColumnFamily#recreate and exists?](https://github.com/jnunemaker/cassanity/commit/11a5739)
+* Added [Keyspace#exist? and ColumnFamily#exist?](https://github.com/jnunemaker/cassanity/commit/9fe88ab)
 
-## 0.2.0
+## 0.2.1
 
-*
+* Added [using, order and limit clauses](https://github.com/jnunemaker/cassanity/compare/414d780...3aeb254) to column family select

data/examples/batch.rb

@@ -6,8 +6,7 @@ executor = Cassanity::Executors::CassandraCql.new(client: client)
 
 connection = Cassanity::Connection.new(executor: executor)
 keyspace = connection['cassanity_examples']
-keyspace.drop if connection.keyspace?('cassanity_examples')
-keyspace.create
+keyspace.recreate
 
 # setting up the apps column family
 apps_schema = Cassanity::Schema.new({

data/examples/column_families.rb

@@ -6,8 +6,7 @@ executor = Cassanity::Executors::CassandraCql.new(client: client)
 
 connection = Cassanity::Connection.new(executor: executor)
 keyspace = connection['cassanity_examples']
-keyspace.drop if connection.keyspace?('cassanity_examples')
-keyspace.create
+keyspace.recreate
 
 apps_schema = Cassanity::Schema.new({
   primary_key: :id,

data/examples/keyspaces.rb

@@ -23,7 +23,7 @@ keyspace = connection.keyspace('cassanity_examples', {
 })
 
 # drop keyspace if it exists
-keyspace.drop if connection.keyspace?('cassanity_examples')
+keyspace.drop if keyspace.exists?
 
 # create the keyspace, uses options from above
 keyspace.create

data/lib/cassanity/argument_generators/column_families.rb

@@ -0,0 +1,19 @@
+module Cassanity
+  module ArgumentGenerators
+    class ColumnFamilies
+
+      # Internal
+      def call(args = {})
+        variables = []
+        cql = 'SELECT * FROM system.schema_columnfamilies'
+
+        if (keyspace_name = args[:keyspace_name])
+          cql << ' WHERE "keyspace" = ?'
+          variables << keyspace_name
+        end
+
+        [cql, *variables]
+      end
+    end
+  end
+end

data/lib/cassanity/column_family.rb

@@ -30,6 +30,29 @@ module Cassanity
       @schema = args[:schema]
     end
 
+    # Public: Returns true or false depending on if column family exists in
+    # the keyspace.
+    #
+    # Returns true if column family exists, false if it does not.
+    def exists?
+      @executor.call({
+        command: :column_families,
+        arguments: {
+          keyspace_name: @keyspace.name,
+        }
+      }).any? { |row| row['columnfamily'].to_s == @name.to_s }
+    end
+
+    alias_method :exist?, :exists?
+
+    # Public: Drops column family if it exists and then calls create.
+    #
+    # Returns nothing.
+    def recreate
+      drop if exists?
+      create
+    end
+
     # Public: Creates the column family in the keyspace based on the schema.
     #
     # args - The Hash of arguments to pass to the executor. Always passes

data/lib/cassanity/executors/cassandra_cql.rb

@@ -4,6 +4,7 @@ require 'cassanity/argument_generators/keyspaces'
 require 'cassanity/argument_generators/keyspace_create'
 require 'cassanity/argument_generators/keyspace_drop'
 require 'cassanity/argument_generators/keyspace_use'
+require 'cassanity/argument_generators/column_families'
 require 'cassanity/argument_generators/column_family_create'
 require 'cassanity/argument_generators/column_family_drop'
 require 'cassanity/argument_generators/column_family_truncate'
@@ -28,6 +29,7 @@ module Cassanity
         keyspace_create: Cassanity::ArgumentGenerators::KeyspaceCreate.new,
         keyspace_drop: Cassanity::ArgumentGenerators::KeyspaceDrop.new,
         keyspace_use: Cassanity::ArgumentGenerators::KeyspaceUse.new,
+        column_families: Cassanity::ArgumentGenerators::ColumnFamilies.new,
         column_family_create: Cassanity::ArgumentGenerators::ColumnFamilyCreate.new,
         column_family_drop: Cassanity::ArgumentGenerators::ColumnFamilyDrop.new,
         column_family_truncate: Cassanity::ArgumentGenerators::ColumnFamilyTruncate.new,
@@ -43,8 +45,9 @@ module Cassanity
 
       # Private: Hash of commands to related result transformers.
       ResultTransformers = {
-        column_family_select: Cassanity::ResultTransformers::ResultToArray.new,
         keyspaces: Cassanity::ResultTransformers::ResultToArray.new,
+        column_families: Cassanity::ResultTransformers::ResultToArray.new,
+        column_family_select: Cassanity::ResultTransformers::ResultToArray.new,
       }
 
       # Private: Default result transformer for commands that do not have one.

data/lib/cassanity/keyspace.rb

@@ -40,6 +40,8 @@ module Cassanity
       rows.any? { |row| row['name'].to_s == name.to_s }
     end
 
+    alias_method :exist?, :exists?
+
     # Public: Creates the keyspace
     #
     # args - The Hash of arguments to pass to the argument generator
@@ -68,7 +70,10 @@ module Cassanity
       })
     end
 
-    def recreate(args = {})
+    # Public: Drops keyspace if it exists and then calls create.
+    #
+    # Returns nothing.
+    def recreate
       drop if exists?
       create
     end
@@ -111,6 +116,23 @@ module Cassanity
       })
     end
 
+    # Public: Get all column families for keyspace.
+    #
+    # Returns Array of Cassanity::ColumnFamily instances.
+    def column_families
+      @executor.call({
+        command: :column_families,
+        arguments: {
+          keyspace_name: @name,
+        },
+      }).map { |row|
+        ColumnFamily.new({
+          name: row['columnfamily'],
+          keyspace: self,
+        })
+      }
+    end
+
     # Public: Get a column family instance
     #
     # name_or_args - The String name of the column family or a Hash which has

data/lib/cassanity/version.rb

@@ -1,3 +1,3 @@
 module Cassanity
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/integration/cassanity/column_family_spec.rb

@@ -62,6 +62,25 @@ describe Cassanity::ColumnFamily do
     client_drop_keyspace(client, keyspace_name)
   end
 
+  it "knows if it exists" do
+    subject.exists?.should be_true
+    client_drop_column_family(client, column_family_name)
+    subject.exists?.should be_false
+  end
+
+  it "can recreate when not created" do
+    client_drop_column_family(client, column_family_name)
+    client_column_family?(client, column_family_name).should be_false
+    subject.recreate
+    client_column_family?(client, column_family_name).should be_true
+  end
+
+  it "can recreate when already created" do
+    client_column_family?(client, column_family_name).should be_true
+    subject.recreate
+    client_column_family?(client, column_family_name).should be_true
+  end
+
   it "can create itself" do
     column_family = described_class.new(arguments.merge(name: 'people'))
     column_family.create

data/spec/integration/cassanity/keyspace_spec.rb

@@ -80,4 +80,22 @@ describe Cassanity::Keyspace do
     subject.drop
     client_keyspace?(client, keyspace_name).should be_false
   end
+
+  it "knows column families" do
+    client_create_column_family(client, 'something1')
+    client_create_column_family(client, 'something2')
+
+    result = subject.column_families
+    result.each do |column_family|
+      column_family.should be_instance_of(Cassanity::ColumnFamily)
+      column_family.keyspace.should eq(subject)
+    end
+
+    names = result.map(&:name)
+    names.should include('something1')
+    names.should include('something2')
+
+    client_drop_column_family(client, 'something1')
+    client_drop_column_family(client, 'something2')
+  end
 end

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

@@ -0,0 +1,23 @@
+require 'helper'
+require 'cassanity/argument_generators/column_families'
+
+describe Cassanity::ArgumentGenerators::ColumnFamilies do
+  describe "#call" do
+    context "without keyspace" do
+      it "returns array of arguments for selecting all column families" do
+        cql = 'SELECT * FROM system.schema_columnfamilies'
+        expected = [cql]
+        subject.call.should eq(expected)
+      end
+    end
+
+    context "with :keyspace_name" do
+      it "returns array of arguments for selecting all column families for keyspace" do
+        cql = 'SELECT * FROM system.schema_columnfamilies WHERE "keyspace" = ?'
+        variables = ['foo']
+        expected = [cql, 'foo']
+        subject.call(keyspace_name: 'foo').should eq(expected)
+      end
+    end
+  end
+end

data/spec/unit/cassanity/column_family_spec.rb

@@ -80,6 +80,38 @@ describe Cassanity::ColumnFamily do
     end
   end
 
+  shared_examples_for "column family existence" do |method_name|
+    it "returns true if column family name included in column families" do
+      executor.should_receive(:call).with({
+        command: :column_families,
+        arguments: {keyspace_name: keyspace.name},
+      }).and_return([
+        {'columnfamily' => column_family_name},
+      ])
+
+      subject.send(method_name).should be_true
+    end
+
+    it "returns false if column family name not included in column families" do
+      executor.should_receive(:call).with({
+        command: :column_families,
+        arguments: {keyspace_name: keyspace.name},
+      }).and_return([
+        {'columnfamily' => 'boo'},
+      ])
+
+      subject.send(method_name).should be_false
+    end
+  end
+
+  describe "#exists?" do
+    include_examples "column family existence", :exists?
+  end
+
+  describe "#exist?" do
+    include_examples "column family existence", :exist?
+  end
+
   describe "#create" do
     context "with schema set during initialization" do
       subject {

data/spec/unit/cassanity/executors/cassandra_cql_spec.rb

@@ -66,6 +66,7 @@ describe Cassanity::Executors::CassandraCql do
     :keyspace_create,
     :keyspace_drop,
     :keyspace_use,
+    :column_families,
     :column_family_create,
     :column_family_drop,
     :column_family_truncate,

data/spec/unit/cassanity/keyspace_spec.rb

@@ -178,27 +178,35 @@ describe Cassanity::Keyspace do
     end
   end
 
-  describe "#exists?" do
+  shared_examples_for "keyspace existence" do |method_name|
     it "returns true if name in existing keyspace names" do
       executor.should_receive(:call).with(command: :keyspaces).and_return([
         {'name' => keyspace_name.to_s},
       ])
-      subject.exists?.should be_true
+      subject.send(method_name).should be_true
     end
 
     it "returns false if name not in existing keyspace names" do
       executor.should_receive(:call).with(command: :keyspaces).and_return([
         {'name' => 'batman'},
       ])
-      subject.exists?.should be_false
+      subject.send(method_name).should be_false
     end
 
     it "returns false if no keyspaces" do
       executor.should_receive(:call).with(command: :keyspaces).and_return([])
-      subject.exists?.should be_false
+      subject.send(method_name).should be_false
     end
   end
 
+  describe "#exists?" do
+    include_examples "keyspace existence", :exists?
+  end
+
+  describe "#exist?" do
+    include_examples "keyspace existence", :exist?
+  end
+
   describe "#create" do
     it "sends command and arguments, including :name, to executor" do
       args = {something: 'else'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
@@ -51,6 +51,7 @@ files:
 - examples/keyspaces.rb
 - lib/cassanity.rb
 - lib/cassanity/argument_generators/batch.rb
+- lib/cassanity/argument_generators/column_families.rb
 - lib/cassanity/argument_generators/column_family_alter.rb
 - lib/cassanity/argument_generators/column_family_create.rb
 - lib/cassanity/argument_generators/column_family_delete.rb
@@ -86,6 +87,7 @@ files:
 - spec/integration/cassanity/keyspace_spec.rb
 - spec/support/cassanity_helpers.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
 - spec/unit/cassanity/argument_generators/column_family_create_spec.rb
 - spec/unit/cassanity/argument_generators/column_family_delete_spec.rb
@@ -129,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3816618086957989783
+      hash: 878477492175471212
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3816618086957989783
+      hash: 878477492175471212
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -153,6 +155,7 @@ test_files:
 - spec/integration/cassanity/keyspace_spec.rb
 - spec/support/cassanity_helpers.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
 - spec/unit/cassanity/argument_generators/column_family_create_spec.rb
 - spec/unit/cassanity/argument_generators/column_family_delete_spec.rb