right_support 2.9.3 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37afc64ef433ebff859d8ceee0fb88c158609480
-  data.tar.gz: cee57ea2de6dca374c35df0337af297192d01176
+  metadata.gz: f8cb5d377a3622ac5ba6240f5fb6e3554596f664
+  data.tar.gz: 4c77349b228d4a892a956d5afcd4284ff4865bd9
 SHA512:
-  metadata.gz: 27c7985c33dca1f7a28b811ea02849d93b1ecc53feecbb83e7e08594bb1008e1d31ca3a8d7f0910892235a4b01be62fd37342673ca2462e172f3dcb2321af6b0
-  data.tar.gz: 9a30f91c3411fa31619b67f24f6bd8611b7fc1e7fe28c2cb0f90e39bdbec6094624b6463ee519bd9e0e556775f6c32917449e58f9879beb76a11902660cdd4e5
+  metadata.gz: d32d8853b71c7579647a687237187925fe12e3e0942d51e827751b8adb24500e53107aa0ec5f7fc2fb28fbec6b2a91591ac0bacf5cd48d555edd179d3ddbf1d5
+  data.tar.gz: 917e614a451fa81bea1ae1203168650be8bd392cfe44082d28580bce1ed3eab6cdeeb4498bc9767b75466fda4413255766d385300941960260418b8127944b2b

data/VERSION

@@ -1 +1 @@
-2.9.3
+2.9.4

data/lib/right_support/db/cassandra_model.rb

@@ -220,13 +220,14 @@ module RightSupport::DB
       # As part of constructing the keyspace name, determine if we have a trailing namespace to 
       # append.  Applicable to rails_env test and integration, otherwise defaults to nil.
       def namespace(env)
-        case env
+        ( config[env] && config[env]['namespace'] ) || begin
+          case env
           when 'test'
-            nspace = 'testns'
+            'testns'
           when 'integration'
-            nspace = File.read('/etc/namespace').strip if File.file?('/etc/namespace')
+            File.read('/etc/namespace').strip if File.file?('/etc/namespace')
+          end
         end
-        nspace
       end
 
       # Return current keyspace names as Array of String (any keyspace that has been used this session).

data/right_support.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_support 2.9.3 ruby lib
+# stub: right_support 2.9.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.9.3"
+  s.version = "2.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2015-11-02"
+  s.date = "2016-03-16"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
@@ -149,7 +149,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/rightscale/right_support"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.3"
+  s.rubygems_version = "2.5.1"
   s.summary = "Reusable foundation code."
 
   if s.respond_to? :specification_version then

data/spec/db/cassandra_model_spec.rb

@@ -1,6 +1,22 @@
 require 'spec_helper'
 
 describe RightSupport::DB::CassandraModel do
+  let(:config) do
+    {
+      'test' => {'server' => 'connection'},
+      'developemnt' => {'server' => 'connection1'},
+      'integration' => {'server' => 'connection2', 'namespace' => 'bronze42' }
+    }
+  end
+
+  # Ensure we at try to put the class back the way it was beforehand.
+  # even if that prior state was invalid.
+  around do |example|
+    original = RightSupport::DB::CassandraModel.config rescue nil
+    RightSupport::DB::CassandraModel.config = config
+    example.call
+    RightSupport::DB::CassandraModel.config = original
+  end
 
   class Cassandra
     class OrderedHash < Hash
@@ -212,6 +228,21 @@ describe RightSupport::DB::CassandraModel do
         end
       end
 
+      context :namespace do
+        it 'returns testns for the test environment' do
+          RightSupport::DB::CassandraModel.namespace('test').should eq 'testns'
+        end
+        it 'uses the config-given namespace for the integration environment' do
+          RightSupport::DB::CassandraModel.config = config
+          RightSupport::DB::CassandraModel.namespace('integration').should eq 'bronze42'
+        end
+        it 'returns nil for any other environment' do
+          %w{production staging development frobnication}.each do |env|
+            RightSupport::DB::CassandraModel.namespace('production').should be(nil)
+            RightSupport::DB::CassandraModel.namespace('production').should be(nil)
+          end
+        end
+      end
       context :insert do
         it 'inserts a row by using the class method' do
           RightSupport::DB::CassandraModel.insert(@key, @attrs, @opt).should be_true
@@ -290,7 +321,7 @@ describe RightSupport::DB::CassandraModel do
         it 'returns row for the specified key' do
           rows = RightSupport::DB::CassandraModel.get_indexed(@index, @index_key)
           rows.should be_a_kind_of(Array)
-          rows.size.should == 1
+          rows.size.should eq 1
           rows.first.should be_a_kind_of(RightSupport::DB::CassandraModel)
         end
 
@@ -313,7 +344,7 @@ describe RightSupport::DB::CassandraModel do
             @conn.should_receive(:create_idx_clause).with([@expr], key2, 2).and_return(@clause).once
             @conn.should_receive(:get_indexed_slices).with(@column_family, @clause, nil, {}).and_return(rows2).once
             rows = RightSupport::DB::CassandraModel.get_indexed(@index, @index_key)
-            rows.size.should == 3
+            rows.size.should eq 3
             rows.inject({}) { |s, r| s[r.key] = r.attributes; s }.should == {key1 => cols, key2 => cols, key3 => cols}
           ensure
             RightSupport::DB::CassandraModel.instance_eval { remove_const :DEFAULT_COUNT }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.4
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Reusable foundation code.