Merge pull request #17 from zencoder/remove-trailing-dot-for-resources-without-a-file-extension

Handle empty-string value for file-extension when building full path

Author: philcluff

s3_config.go

@@ -34,7 +34,7 @@ func (c S3Config) GetFullBucketName() string {
 
 func (c S3Config) GetFullPath(basePath string) string {
 	// i.e. basepath.json
-	if c.FileExt == nil {
+	if c.FileExt == nil || *c.FileExt == "" {
 		return fmt.Sprintf("%s", basePath)
 	}
 	return fmt.Sprintf("%s.%s", basePath, *c.FileExt)

s3_config_test.go

@@ -227,6 +227,35 @@ func (s *S3ConfigSuite) TestGetFullPath() {
 	assert.Equal(s.T(), VALID_S3_CONFIG_FULL_PATH, fullPath)
 }
 
+func (s *S3ConfigSuite) TestGetFullPathWithEmptyFileExt() {
+	baseBucket := VALID_S3_CONFIG_BASE_BUCKET
+	region := VALID_S3_CONFIG_REGION
+	fileExt := ""
+
+	c := &S3Config{
+		BaseBucket: &baseBucket,
+		Region:     &region,
+		FileExt:    &fileExt,
+	}
+
+	fullPath := c.GetFullPath(VALID_S3_CONFIG_TEST_PATH)
+	assert.Equal(s.T(), VALID_S3_CONFIG_TEST_PATH, fullPath)
+}
+
+func (s *S3ConfigSuite) TestGetFullPathWithNilFileExt() {
+	baseBucket := VALID_S3_CONFIG_BASE_BUCKET
+	region := VALID_S3_CONFIG_REGION
+
+	c := &S3Config{
+		BaseBucket: &baseBucket,
+		Region:     &region,
+		FileExt:    nil,
+	}
+
+	fullPath := c.GetFullPath(VALID_S3_CONFIG_TEST_PATH)
+	assert.Equal(s.T(), VALID_S3_CONFIG_TEST_PATH, fullPath)
+}
+
 func (s *S3ConfigSuite) TestGetRegion() {
 	baseBucket := VALID_S3_CONFIG_BASE_BUCKET
 	region := VALID_S3_CONFIG_REGION