right_support 2.8.0 → 2.8.1

data/VERSION

@@ -1 +1 @@
-2.8.0
+2.8.1

data/lib/right_support/db/cassandra_model.rb

@@ -164,6 +164,18 @@ module RightSupport::DB
         result
       end
 
+      def namespace(env)
+        if env == 'test'
+          nspace = "testns"
+        else
+          nspace = nil
+          if File.file?("/etc/namespace")
+            nspace = File.read("/etc/namespace").strip
+          end
+        end
+        nspace
+      end
+
       # Return current keyspace names as Array of String (any keyspace that has been used this session).
       #
       # === Return
@@ -186,7 +198,10 @@ module RightSupport::DB
       # keyspace(String):: Set the default keyspace
 
       def keyspace=(kyspc)
-        @@default_keyspace = (kyspc + "_" + (ENV['RACK_ENV'] || 'development'))
+        env = ENV['RACK_ENV'] || 'development'
+        nspace = namespace(env)
+        @@default_keyspace = "#{kyspc}_#{env}"
+        @@default_keyspace += "_#{nspace}" if nspace
       end
 
       # Temporarily change the working keyspace for this class for the duration of
@@ -200,8 +215,14 @@ module RightSupport::DB
       def with_keyspace(keyspace, append_env=true, &block)
         @@current_keyspace = keyspace
         env = ENV['RACK_ENV'] || 'development'
-        if append_env && @@current_keyspace !~ /_#{env}$/
-          @@current_keyspace = "#{@@current_keyspace}_#{env}"
+        nspace = namespace(env)
+        if append_env
+          if nspace
+            tail = "_#{env}_#{nspace}"
+          else
+            tail = "_#{env}"
+          end
+          @@current_keyspace += tail unless @@current_keyspace.end_with?(tail)
         end
         block.call
         ensure

data/lib/right_support/stats/activity.rb

@@ -247,7 +247,7 @@ module RightSupport::Stats
     #
     # @return [Fixnum, NilClass] Average rate or nil if no average rate data
     def self.avg_rate(stats, total)
-      sum = stats.inject(nil) { |sum, stat| sum = (sum || 0.0) + (stat["rate"] * stat["total"]) if stat["rate"]; sum }
+      sum = stats.inject(nil) { |sum, stat| sum = (sum || 0.0) + (stat["rate"] * stat["total"]) if stat && stat["rate"]; sum }
       sum / total if sum
     end
 

data/right_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{right_support}
-  s.version = "2.8.0"
+  s.version = "2.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]

data/spec/db/cassandra_model_part1_spec.rb

@@ -65,7 +65,7 @@ describe RightSupport::DB::CassandraModel do
         begin
           ENV['RACK_ENV'] = env
 
-          flexmock(Cassandra).should_receive(:new).with(default_keyspace + '_' + env, congig_test , {:timeout=>10}).and_return(default_keyspace_connection)
+          flexmock(Cassandra).should_receive(:new).with(/#{default_keyspace}_#{env}/, congig_test , {:timeout=>10}).and_return(default_keyspace_connection)
           default_keyspace_connection.should_receive(:disable_node_auto_discovery!).and_return(true)
         
 

data/spec/db/cassandra_model_spec.rb

@@ -43,8 +43,8 @@ describe RightSupport::DB::CassandraModel do
         default_keyspace_connection.should_receive(:disable_node_auto_discovery!).and_return(true)
         default_keyspace_connection.should_receive(:name).and_return('connection2')
 
-        flexmock(Cassandra).should_receive(:new).with(keyspace + '_' + (ENV['RACK_ENV'] || 'development'), "localhost:9160", {:timeout=>10}).and_return(current_keyspace_connection)
-        flexmock(Cassandra).should_receive(:new).with(default_keyspace + '_' + (ENV['RACK_ENV'] || 'development'), "localhost:9160", {:timeout=>10}).and_return(default_keyspace_connection)
+        flexmock(Cassandra).should_receive(:new).with(keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10}).and_return(current_keyspace_connection)
+        flexmock(Cassandra).should_receive(:new).with(default_keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10}).and_return(default_keyspace_connection)
       end
 
       it 'raises a meaningful exception when a config stanza is missing' do
@@ -141,14 +141,14 @@ describe RightSupport::DB::CassandraModel do
 
         it 'appends the environment to the keyspace provided' do
           RightSupport::DB::CassandraModel.keyspace = keyspace
-          RightSupport::DB::CassandraModel.send(:class_variable_get, :@@default_keyspace).should == (keyspace + "_" + (ENV['RACK_ENV'] || 'development'))
+          RightSupport::DB::CassandraModel.send(:class_variable_get, :@@default_keyspace).should == (keyspace + "_" + (ENV['RACK_ENV'] || 'development') + "_testns")
         end
       end
 
       # If a current keyspace is provided it takes precedence over the default keyspace.  If none is
       # provided, the default keyspace should be returned.
       context :keyspace do
-        let(:keyspace) { 'SatelliteService_' + ENV['RACK_ENV'] }
+        let(:keyspace) { 'SatelliteService_' + ENV['RACK_ENV'] + "_testns"}
 
         it 'returns the default keyspace if no current keyspace is set' do
           RightSupport::DB::CassandraModel.send(:class_variable_set, :@@current_keyspace, nil)
@@ -177,24 +177,24 @@ describe RightSupport::DB::CassandraModel do
 
         it 'sets the current keyspace to the keyspace provided for execution within the block' do
           RightSupport::DB::CassandraModel.with_keyspace(keyspace) do
-            RightSupport::DB::CassandraModel.keyspace.should == keyspace + "_" + 'test'
+            RightSupport::DB::CassandraModel.keyspace.should == keyspace + "_test_testns"
           end
         end
 
         it 'resets back to the default keyspace for execution outside of the block' do
           RightSupport::DB::CassandraModel.with_keyspace(keyspace) {}
-          RightSupport::DB::CassandraModel.keyspace.should == default_keyspace + "_" + 'test'
+          RightSupport::DB::CassandraModel.keyspace.should == default_keyspace + "_test_testns"
         end
         context 'append_env parameter' do
           it 'appends the environment by default' do
             RightSupport::DB::CassandraModel.with_keyspace('Monkey') do
-              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test'
+              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test_testns'
             end
           end
 
           it 'appends the environment when append_env == true' do
             RightSupport::DB::CassandraModel.with_keyspace('Monkey', true) do
-              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test'
+              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test_testns'
             end
           end
 
@@ -205,8 +205,8 @@ describe RightSupport::DB::CassandraModel do
           end
 
           it 'avoids double-appending the environment' do
-            RightSupport::DB::CassandraModel.with_keyspace('Monkey_test') do
-              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test'
+            RightSupport::DB::CassandraModel.with_keyspace('Monkey_test_testns') do
+              RightSupport::DB::CassandraModel.keyspace.should == 'Monkey_test_testns'
             end
           end
         end

data/spec/stats/activity_spec.rb

@@ -259,6 +259,14 @@ describe RightSupport::Stats::Activity do
             {"last" => {"elapsed" => 10, "type" => "foo"}, "total" => 5, "percent" => {"foo" => 20.0, "bar" => 80.0}, "rate" => 0.18}
       end
 
+      it "handles nil stat" do
+        stats = [{"last" => {"elapsed" => 10, "type" => "foo"}, "total" => 1, "percent" => {"foo" => 100.0}},
+                 nil,
+                 {"last" => {"elapsed" => 20, "type" => "bar"}, "total" => 4, "percent" => {"bar" => 100.0}}]
+        RightSupport::Stats::Activity.all(stats).should ==
+            {"last" => {"elapsed" => 10, "type" => "foo"}, "total" => 5, "percent" => {"foo" => 20.0, "bar" => 80.0}}
+      end
+
       it "returns nil if there are no stats" do
         RightSupport::Stats::Activity.all([]).should be_nil
       end
@@ -272,6 +280,15 @@ describe RightSupport::Stats::Activity do
         RightSupport::Stats::Activity.percentage(stats, 10).should == {"total" => 10, "percent" => {"foo" => 40.0, "bar" => 60.0}}
       end
 
+      it "handles nil stat" do
+        stats = [{"total" => 1, "percent" => {"foo" => 100.0}},
+                 nil,
+                 {"total" => 5, "percent" => {"bar" => 100.0}},
+                 nil,
+                 {"total" => 4, "percent" => {"foo" => 75.0, "bar" => 25.0}}]
+        RightSupport::Stats::Activity.percentage(stats, 10).should == {"total" => 10, "percent" => {"foo" => 40.0, "bar" => 60.0}}
+      end
+
       it "returns only total if there is no data" do
         RightSupport::Stats::Activity.percentage([], 0).should == {"total" => 0}
       end
@@ -285,6 +302,15 @@ describe RightSupport::Stats::Activity do
         RightSupport::Stats::Activity.avg_rate(stats, 10).should == 0.18
       end
 
+      it "handles nil stat" do
+        stats = [{"total" => 1, "rate" => 0.5},
+                 nil,
+                 {"total" => 5, "rate" => 0.1},
+                 nil,
+                 {"total" => 4, "rate" => 0.2}]
+        RightSupport::Stats::Activity.avg_rate(stats, 10).should == 0.18
+      end
+
       it "returns nil if there is no data" do
         RightSupport::Stats::Activity.avg_rate([], 0).should be_nil
       end
@@ -296,6 +322,12 @@ describe RightSupport::Stats::Activity do
                  {"last" => {"elapsed" => 0, "type" => "foo"}, "total" => 1, "percent" => {"foo" => 100.0}}]
       end
 
+      it "handles nil stat" do
+        stats = [{"last" => {"elapsed" => 0, "type" => "foo"}, "total" => 1, "percent" => {"foo" => 100.0}},
+                 nil,
+                 {"last" => {"elapsed" => 0, "type" => "foo"}, "total" => 1, "percent" => {"foo" => 100.0}}]
+      end
+
       it "returns nil if there is no data" do
         RightSupport::Stats::Activity.last([]).should be_nil
       end

data/spec/stats/exceptions_spec.rb

@@ -178,6 +178,7 @@ describe RightSupport::Stats::Exceptions do
                                               "when" => @now + 15, "where" => "there"},
                                              {"count" => 2, "type" => "ArgumentError", "message" => "badarg",
                                               "when" => @now + 30, "where" => "everywhere"}]}},
+                 nil,
                  {"testing" => {"total" => 1,
                                 "recent" => [{"count" => 1, "type" => "ArgumentError", "message" => "awfularg",
                                               "when" => @now + 10, "where" => "here"}]}},

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
+  hash: 45
+  prerelease: false
   segments: 
   - 2
   - 8
-  - 0
-  version: 2.8.0
+  - 1
+  version: 2.8.1
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,12 +20,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-28 00:00:00 -07:00
+date: 2013-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -35,12 +34,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  version_requirements: *id001
+  requirement: *id001
+  type: :development
   name: rake
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -51,12 +50,12 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
-  version_requirements: *id002
+  requirement: *id002
+  type: :development
   name: jeweler
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +65,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id003
+  requirement: *id003
+  type: :development
   name: right_develop
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +80,12 @@ dependencies:
         - 0
         - 10
         version: "0.10"
-  version_requirements: *id004
+  requirement: *id004
+  type: :development
   name: ruby-debug
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +96,12 @@ dependencies:
         - 11
         - 6
         version: 0.11.6
-  version_requirements: *id005
+  requirement: *id005
+  type: :development
   name: ruby-debug19
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,12 +112,12 @@ dependencies:
         - 4
         - 2
         version: 2.4.2
-  version_requirements: *id006
+  requirement: *id006
+  type: :development
   name: rdoc
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,12 +127,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id007
+  requirement: *id007
+  type: :development
   name: flexmock
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,12 +143,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
+  requirement: *id008
+  type: :development
   name: syntax
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,7 +158,8 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  version_requirements: *id009
+  requirement: *id009
+  type: :development
   name: nokogiri
   prerelease: false
 description: A toolkit of useful, reusable foundation code created by RightScale.
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Reusable foundation code.