cassanity 0.2.0 → 0.2.1

data/Changelog.md

@@ -0,0 +1,11 @@
+# Changelog
+
+Not all changes will be here, but the important ones will be for sure.
+
+## 0.2.1
+
+* Added [using, order and limit clauses](https://github.com/jnunemaker/cassanity/compare/414d780...3aeb254) to column family select
+
+## 0.2.0
+
+*

data/lib/cassanity/argument_generators/column_family_select.rb

@@ -1,4 +1,7 @@
+require 'cassanity/argument_generators/using_clause'
 require 'cassanity/argument_generators/where_clause'
+require 'cassanity/argument_generators/order_clause'
+require 'cassanity/argument_generators/limit_clause'
 
 module Cassanity
   module ArgumentGenerators
@@ -6,7 +9,10 @@ module Cassanity
 
       # Internal
       def initialize(args = {})
+        @using_clause = args.fetch(:using_clause) { UsingClause.new }
         @where_clause = args.fetch(:where_clause) { WhereClause.new }
+        @order_clause = args.fetch(:order_clause) { OrderClause.new }
+        @limit_clause = args.fetch(:limit_clause) { LimitClause.new }
       end
 
       # Internal
@@ -14,6 +20,9 @@ module Cassanity
         select = Array(args.fetch(:select, '*'))
         name   = args.fetch(:name)
         where  = args[:where]
+        using  = args[:using]
+        order  = args[:order]
+        limit  = args[:limit]
 
         variables = []
 
@@ -23,10 +32,22 @@ module Cassanity
 
         cql = "SELECT #{select.join(', ')} FROM #{name}"
 
+        using_cql, *using_variables = @using_clause.call(using: using)
+        cql << using_cql
+        variables.concat(using_variables)
+
         where_cql, *where_variables = @where_clause.call(where: where)
         cql << where_cql
         variables.concat(where_variables)
 
+        order_cql, *order_variables = @order_clause.call(order: order)
+        cql << order_cql
+        variables.concat(order_variables)
+
+        limit_cql, *limit_variables = @limit_clause.call(limit: limit)
+        cql << limit_cql
+        variables.concat(limit_variables)
+
         [cql, *variables]
       end
     end

data/lib/cassanity/argument_generators/limit_clause.rb

@@ -0,0 +1,17 @@
+module Cassanity
+  module ArgumentGenerators
+    class LimitClause
+
+      # Internal
+      def call(args = {})
+        limit = args[:limit]
+
+        if limit.nil?
+          ['']
+        else
+          [" LIMIT #{limit}"]
+        end
+      end
+    end
+  end
+end

data/lib/cassanity/argument_generators/order_clause.rb

@@ -0,0 +1,17 @@
+module Cassanity
+  module ArgumentGenerators
+    class OrderClause
+
+      # Internal
+      def call(args = {})
+        order = args[:order]
+
+        if order.nil? || order.empty?
+          ['']
+        else
+          [" ORDER BY #{order}"]
+        end
+      end
+    end
+  end
+end

data/lib/cassanity/version.rb

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

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

@@ -88,16 +88,30 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
       end
     end
 
+    context "with using option" do
+      let(:using_clause) {
+        lambda { |args| [" USING CONSISTENCY BATMAN"]}
+      }
+
+      subject { described_class.new(using_clause: using_clause) }
+
+      it "returns array of arguments with help from using clause" do
+        using = {consistency: :batman}
+        cql = "SELECT * FROM #{column_family_name} USING CONSISTENCY BATMAN"
+        expected = [cql]
+        subject.call({
+          name: column_family_name,
+          using: using,
+        }).should eq(expected)
+      end
+    end
+
     context "with where option" do
       let(:where_clause) {
         lambda { |args| [" WHERE foo = ?", args.fetch(:where).fetch(:foo)]}
       }
 
-      subject {
-        described_class.new({
-          where_clause: where_clause,
-        })
-      }
+      subject { described_class.new(where_clause: where_clause) }
 
       it "returns array of arguments with help from where clause" do
         where = {foo: 'bar'}
@@ -109,5 +123,39 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         }).should eq(expected)
       end
     end
+
+    context "with order option" do
+      let(:order_clause) {
+        lambda { |args| [" ORDER BY #{args.fetch(:order)}"]}
+      }
+
+      subject { described_class.new(order_clause: order_clause) }
+
+      it "returns array of arguments with help from order clause" do
+        cql = "SELECT * FROM #{column_family_name} ORDER BY name"
+        expected = [cql]
+        subject.call({
+          name: column_family_name,
+          order: :name,
+        }).should eq(expected)
+      end
+    end
+
+    context "with limit option" do
+      let(:limit_clause) {
+        lambda { |args| [" LIMIT #{args.fetch(:limit)}"]}
+      }
+
+      subject { described_class.new(limit_clause: limit_clause) }
+
+      it "returns array of arguments with help from limit clause" do
+        cql = "SELECT * FROM #{column_family_name} LIMIT 50"
+        expected = [cql]
+        subject.call({
+          name: column_family_name,
+          limit: 50,
+        }).should eq(expected)
+      end
+    end
   end
 end

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

@@ -0,0 +1,30 @@
+require 'helper'
+require 'cassanity/argument_generators/limit_clause'
+
+describe Cassanity::ArgumentGenerators::LimitClause do
+  describe "#call" do
+    context "with :limit integer value" do
+      it "returns array of arguments" do
+        subject.call(limit: 50).should eq([" LIMIT 50"])
+      end
+    end
+
+    context "with :limit string value" do
+      it "returns array of arguments" do
+        subject.call(limit: '50').should eq([" LIMIT 50"])
+      end
+    end
+
+    context "with no arguments" do
+      it "returns array of arguments where only item is empty string" do
+        subject.call.should eq([""])
+      end
+    end
+
+    context "with empty arguments" do
+      it "returns array of arguments where only item is empty string" do
+        subject.call({}).should eq([""])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'helper'
+require 'cassanity/argument_generators/order_clause'
+
+describe Cassanity::ArgumentGenerators::OrderClause do
+  describe "#call" do
+    context "with single :order" do
+      it "returns array of arguments" do
+        subject.call(order: 'name').should eq([" ORDER BY name"])
+      end
+    end
+
+    context "with single :order ASC" do
+      it "returns array of arguments" do
+        subject.call(order: 'name ASC').should eq([" ORDER BY name ASC"])
+      end
+    end
+
+    context "with single :order DESC" do
+      it "returns array of arguments" do
+        subject.call(order: 'name DESC').should eq([" ORDER BY name DESC"])
+      end
+    end
+
+    context "with no arguments" do
+      it "returns array of arguments where only item is empty string" do
+        subject.call.should eq([""])
+      end
+    end
+
+    context "with empty arguments" do
+      it "returns array of arguments where only item is empty string" do
+        subject.call({}).should eq([""])
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
@@ -38,6 +38,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -64,6 +65,8 @@ files:
 - lib/cassanity/argument_generators/keyspace_drop.rb
 - lib/cassanity/argument_generators/keyspace_use.rb
 - lib/cassanity/argument_generators/keyspaces.rb
+- lib/cassanity/argument_generators/limit_clause.rb
+- lib/cassanity/argument_generators/order_clause.rb
 - lib/cassanity/argument_generators/set_clause.rb
 - lib/cassanity/argument_generators/using_clause.rb
 - lib/cassanity/argument_generators/where_clause.rb
@@ -97,6 +100,8 @@ files:
 - spec/unit/cassanity/argument_generators/keyspace_drop_spec.rb
 - spec/unit/cassanity/argument_generators/keyspace_use_spec.rb
 - spec/unit/cassanity/argument_generators/keyspaces_spec.rb
+- spec/unit/cassanity/argument_generators/limit_clause_spec.rb
+- spec/unit/cassanity/argument_generators/order_clause_spec.rb
 - spec/unit/cassanity/argument_generators/set_clause_spec.rb
 - spec/unit/cassanity/argument_generators/using_clause_spec.rb
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb
@@ -124,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3410109094406772154
+      hash: -3816618086957989783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3410109094406772154
+      hash: -3816618086957989783
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -162,6 +167,8 @@ test_files:
 - spec/unit/cassanity/argument_generators/keyspace_drop_spec.rb
 - spec/unit/cassanity/argument_generators/keyspace_use_spec.rb
 - spec/unit/cassanity/argument_generators/keyspaces_spec.rb
+- spec/unit/cassanity/argument_generators/limit_clause_spec.rb
+- spec/unit/cassanity/argument_generators/order_clause_spec.rb
 - spec/unit/cassanity/argument_generators/set_clause_spec.rb
 - spec/unit/cassanity/argument_generators/using_clause_spec.rb
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb