httpimagestore 1.2.0 → 1.3.0

data/spec/support/full.cfg

@@ -2,10 +2,10 @@ s3 key="AKIAJMUYVYOSACNXLPTQ" secret="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"
 
 path {
 	"uri"			"#{path}"
-	"hash"			"#{digest}.#{mimeextension}"
-	"hash-name"		"#{digest}/#{imagename}.#{mimeextension}"
-	"structured"		"#{dirname}/#{digest}/#{basename}.#{mimeextension}"
-	"structured-name"	"#{dirname}/#{digest}/#{basename}-#{imagename}.#{mimeextension}"
+	"hash"			"#{input_digest}.#{image_mime_extension}"
+	"hash-name"		"#{input_digest}/#{image_name}.#{image_mime_extension}"
+	"structured"		"#{dirname}/#{input_digest}/#{basename}.#{image_mime_extension}"
+	"structured-name"	"#{dirname}/#{input_digest}/#{basename}-#{image_name}.#{image_mime_extension}"
 }
 
 put "thumbnail" ":name_list" {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpimagestore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicorn-cuba-base
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: httpthumbnailer-client
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -241,20 +241,23 @@ files:
 - features/cache-control.feature
 - features/compatibility.feature
 - features/error-reporting.feature
-- features/facebook.feature
+- features/flexi.feature
 - features/health-check.feature
 - features/s3-store-and-thumbnail.feature
 - features/step_definitions/httpimagestore_steps.rb
+- features/storage.feature
 - features/support/env.rb
 - features/support/test-large.jpg
 - features/support/test.empty
 - features/support/test.jpg
+- features/support/test.png
 - features/support/test.txt
 - httpimagestore.gemspec
 - lib/httpimagestore/aws_sdk_regions_hack.rb
 - lib/httpimagestore/configuration.rb
 - lib/httpimagestore/configuration/file.rb
 - lib/httpimagestore/configuration/handler.rb
+- lib/httpimagestore/configuration/identify.rb
 - lib/httpimagestore/configuration/output.rb
 - lib/httpimagestore/configuration/path.rb
 - lib/httpimagestore/configuration/s3.rb
@@ -267,6 +270,7 @@ files:
 - load_test/thumbnail_specs.csv
 - spec/configuration_file_spec.rb
 - spec/configuration_handler_spec.rb
+- spec/configuration_identify_spec.rb
 - spec/configuration_output_spec.rb
 - spec/configuration_path_spec.rb
 - spec/configuration_s3_spec.rb
@@ -292,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1673888350520322204
+      hash: 1883353100319806536
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/features/facebook.feature

@@ -1,149 +0,0 @@
-Feature: Store limited original image in S3 and thumbnail on facebook API
-	Similar API to described in https://developers.facebook.com/docs/reference/api/using-pictures/#sizes
-
-	Background:
-		Given S3 settings in AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY and AWS_S3_TEST_BUCKET environment variables
-		Given httpthumbnailer server is running at http://localhost:3100/health_check
-		Given httpimagestore server is running at http://localhost:3000/health_check with the following configuration
-		"""
-		s3 key="@AWS_ACCESS_KEY_ID@" secret="@AWS_SECRET_ACCESS_KEY@" ssl=false
-
-		path "original-hash"	"#{digest}"
-		path "path"		"#{path}"
-
-		put "original" {
-			thumbnail "input" "original" operation="limit" width=100 height=100 format="jpeg" quality=95
-
-			store_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="original-hash"
-
-			output_store_path "original"
-		}
-
-		get "&type=square" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get "&type=small" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="fit" width="50" height="2000" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get "&type=normall" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="fit" width="100" height="2000" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get "&type=large" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="fit" width="200" height="2000" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get "&:width" "&:height" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="crop" width="#{width}" height="#{height}" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get "&:width" "&:height?1080" {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="fit" width="#{width}" height="#{height}" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-
-		get {
-			source_s3 "original" bucket="@AWS_S3_TEST_BUCKET@" path="path"
-
-			thumbnail "original" "thumbnail" operation="crop" width="50" height="50" format="input"
-
-			output_image "thumbnail" cache-control="public, max-age=31557600, s-maxage=0"
-		}
-		"""
-
-	@facebook @type
-	Scenario: Putting original to S3 bucket
-		Given there is no 4006450256177f4a file in S3 bucket
-		Given test.jpg file content as request body
-		When I do PUT request http://localhost:3000/original
-		Then response status will be 200
-		And response content type will be text/plain
-		And response body will be CRLF ended lines
-		"""
-		4006450256177f4a
-		"""
-		Then S3 object 4006450256177f4a will contain JPEG image of size 71x100
-		When I do GET request http://@AWS_S3_TEST_BUCKET@.s3.amazonaws.com/4006450256177f4a
-		Then response status will be 403
-
-	@facebook @type
-	Scenario: Getting square type tumbnail
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?type=square
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 50x50
-
-	@facebook @type
-	Scenario: Getting small type tumbnail
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?type=small
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 50x71
-
-	@facebook @type
-	Scenario: Getting normall type tumbnail
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?type=normall
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 100x141
-
-	@facebook @type
-	Scenario: Getting large type tumbnail
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?type=large
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 200x283
-
-	@facebook @type
-	Scenario: Getting square type tumbnail when no type is specified
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 50x50
-
-	@facebook @size
-	Scenario: Getting custom size tumbnail
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?width=123&height=321
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 123x321
-
-	@facebook @size
-	Scenario: Getting custom size tumbnail without height
-		Given test.jpg file content is stored in S3 under 4006450256177f4a
-		When I do GET request http://localhost:3000/4006450256177f4a?width=123
-		Then response status will be 200
-		And response content type will be image/jpeg
-		Then response body will contain JPEG image of size 123x174
-