vault-tools 0.4.6 → 0.4.7

data/lib/vault-tools/app.rb

@@ -2,6 +2,7 @@ require 'uuidtools'
 
 module Vault
   module App
+    ID_CAPTURE = /^app(\d+)\@[\w\.]+com$/
     # Convert a core app ID into a Heroku app ID.
     #
     # @param app_id [Fixnum] A core app ID.
@@ -25,7 +26,7 @@ module Vault
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
     # @return [Fixnum] The core app ID that uniquely represents the app.
     def self.hid_to_id(heroku_id)
-      if app_id = heroku_id.slice(/^app(\d+)\@heroku\.com$/, 1)
+      if app_id = heroku_id.slice(ID_CAPTURE, 1)
         app_id.to_i
       else
         raise ArgumentError,"#{heroku_id} is not a valid Heroku app ID."
@@ -38,7 +39,7 @@ module Vault
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
     # @return [String] A v5 UUID that uniquely represents the app.
     def self.hid_to_uuid(heroku_id)
-      if app_id = heroku_id.slice(/^app(\d+)\@heroku\.com$/, 1)
+      if app_id = heroku_id.slice(ID_CAPTURE, 1)
         id_to_uuid(app_id)
       else
         raise ArgumentError, "#{heroku_id} is not a valid Heroku app ID."

data/lib/vault-tools/user.rb

@@ -2,6 +2,7 @@ require 'uuidtools'
 
 module Vault
   module User
+    ID_CAPTURE = /^user(\d+)\@[\w\.]+com$/
     # Convert a user ID into a Heroku user ID.
     #
     # @param user_id [Fixnum] A user ID.
@@ -26,7 +27,7 @@ module Vault
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
     # @return [Fixnum] The core user ID that uniquely represents the user.
     def self.hid_to_id(heroku_id)
-      if user_id = heroku_id.slice(/^user(\d+)\@heroku\.com$/, 1)
+      if user_id = heroku_id.slice(ID_CAPTURE, 1)
         user_id.to_i
       else
         raise ArgumentError,"#{heroku_id} is not a valid Heroku user ID."
@@ -40,7 +41,7 @@ module Vault
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
     # @return [String] A v5 UUID that uniquely represents the user.
     def self.hid_to_uuid(heroku_id)
-      if user_id = heroku_id.slice(/^user(\d+)\@heroku\.com$/, 1)
+      if user_id = heroku_id.slice(ID_CAPTURE, 1)
         id_to_uuid(user_id)
       else
         raise ArgumentError,"#{heroku_id} is not a valid Heroku user ID."

data/lib/vault-tools/version.rb

@@ -1,5 +1,5 @@
 module Vault
   module Tools
-    VERSION = '0.4.6'
+    VERSION = '0.4.7'
   end
 end

data/test/app_test.rb

@@ -19,6 +19,11 @@ class AppTest < Vault::TestCase
     assert_equal(1234, Vault::App.hid_to_id('app1234@heroku.com'))
   end
 
+  # App.hid_to_id converts a staging Heroku app ID into a core integer app ID.
+  def test_staging_hid_to_id
+    assert_equal(1234, Vault::App.hid_to_id('app1234@staging.herokudev.com'))
+  end
+
   # App.hid_to_id raises an ArgumentError if the specified ID doesn't match
   # the expected format.
   def test_hid_to_id_with_invalid_heroku_id

data/test/user_test.rb

@@ -19,6 +19,11 @@ class UserTest < Vault::TestCase
     assert_equal(1234, Vault::User.hid_to_id('user1234@heroku.com'))
   end
 
+  # User.hid_to_id converts a staging Heroku user ID into a core integer user ID.
+  def test_staging_hid_to_id
+    assert_equal(1234, Vault::User.hid_to_id('user1234@staging.herokudev.com'))
+  end
+
   # User.hid_to_id raises an ArgumentError if the specified ID doesn't match
   # the expected format.
   def test_hid_to_id_with_invalid_heroku_id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4115367332515730407
+      hash: -1924830184331930765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4115367332515730407
+      hash: -1924830184331930765
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23