asset_cloud 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c73b8628c09c25c2e05eae7b097b38a55a40175a
-  data.tar.gz: b78f3c69d1bf5346d88bf6c3a2608e2c92cbf13a
+  metadata.gz: 2e9519f3cbd8f6ae164aafbbb96052e36eddf225
+  data.tar.gz: 887d20cd493e498d371e51e827118daa19a01f0e
 SHA512:
-  metadata.gz: eaa3b2f1e39aefa77383c50e9d3248d97d8df7f02fd7b229747c346f12b56b8f36a907e570c8b80cc7364f79fedd61527e0b0f092947898073dca045a108dabd
-  data.tar.gz: 24eab9467aaa4243b98c82350a504ae9fc1a3b14e4ea45dc9d7002228c9f585d0b4ae1a0c0ca3efb573547277ff193d41bb92b5862a94e528245859bdcc16bf5
+  metadata.gz: bdaa546e8d1bd72f68b16456aa490ab15acb166c0655c8f8d78748e4ba428029af55275e3bbbfdd689d21c5f12490e793d03d86c02a6d84fffcfb750ccf2f873
+  data.tar.gz: 48e53d85b4d4681524d98a6701b7a2420d316d25b925f42da7d29c6dfa52c2ad7725662e457a3c384bfb2bf28b84694d7340ed95d67f1285a7652f7f2d7a9402

data/History.md

@@ -1,5 +1,9 @@
 # Asset Cloud Version History
 
+## Version 2.2.0, 2015-03-17
+
+* Reduce the limitations on filenames so as not to catch valid filenames. (https://github.com/Shopify/asset_cloud/pull/12)
+
 ## Version 2.1.0, 2015-03-03
 
 * Add support for S3 assests https://github.com/Shopify/asset_cloud/pull/7

data/asset_cloud.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_cloud}
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.authors = %w(Shopify)
   s.summary = %q{An abstraction layer around arbitrary and diverse asset stores.}

data/lib/asset_cloud/base.rb

@@ -9,7 +9,25 @@ module AssetCloud
   class Base
     cattr_accessor :logger
 
-    VALID_PATHS = /\A[a-z0-9][a-z0-9_\-\/]+([a-z0-9][\w\-\ \.\@]*\.\w{2,6})?\z/i
+    VALID_PATHS = /\A
+      (
+        (\w)                #Filename can be a single letter or underscore
+        |                     #OR it is many and follows the below rules
+        (
+          (\.?[\w\[\]\(\)\-\@])       #It can start with a dot but it must have a following character
+          (
+            [\w\[\]\(\)\-\@]          #You can have a letter without any following conditions
+            |
+            [\ ][\w\[\]\(\)\-\@\.]      #If there is a space you need to have a normal letter afterward or a dot
+            |
+            [\/][\w\[\]\(\)\-\@]      #If there is a slash you need to have a normal letter afterward
+            |
+            [\/][\.][\w\[\]\(\)\-\@]  #Though a slash could be followed by a dot so long as there is a normal letter afterward
+            |
+            [\.]+[\w\[\]\(\)\-\@]+     #One or more dots must be followed by one (or more) normal letters
+          )*                  #Zero to many of these combinations.
+        )
+      )\z/x
     MATCH_BUCKET = /^(\w+)(\/|$)/
 
     attr_accessor :url, :root

data/spec/base_spec.rb

@@ -42,8 +42,78 @@ describe BasicCloud do
     lambda { @fs['./test']   }.should raise_error(AssetCloud::IllegalPath)
   end
 
+  it "should raise error when filename has trailing period" do
+    lambda { @fs['test.']             }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['/test/testfile.']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory/.']  }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['/test/testfile .']  }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory /.'] }.should raise_error(AssetCloud::IllegalPath)
+  end
+
+  it "should raise error when filename ends with space" do
+    lambda { @fs['test ']             }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['/test/testfile ']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory/ ']  }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test. ']            }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['/test/testfile. ']  }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory/. '] }.should raise_error(AssetCloud::IllegalPath)
+  end
+
+  it "should raise error when filename ends with slash" do
+    lambda { @fs['test/']             }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory/']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test /']            }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['/test/testfile /']  }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/directory//']  }.should raise_error(AssetCloud::IllegalPath)
+  end
+
+  it "should raise error when using with minus relative even after another directory" do
+    lambda { @fs['test/../test']      }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/../../test']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test/../../../test']}.should raise_error(AssetCloud::IllegalPath)
+  end
+
+  it "should raise an error when using names with combinations of '.' and ' '" do
+    lambda { @fs['test. . . .. ... .. . ']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test. .']   }.should raise_error(AssetCloud::IllegalPath)
+    lambda { @fs['test.   .test2']   }.should raise_error(AssetCloud::IllegalPath)
+  end
+
+  it "should allow filenames with repeating dots" do
+    @fs['test..jpg']
+    @fs['assets/T.T..jpg']
+    @fs['test/assets/1234123412341234_obj_description..14...58......v8...._2134123412341234.jpg']
+  end
+
+  it "should allow filenames with repeating underscores" do
+    @fs['test__jpg']
+    @fs['assets/T__T..jpg']
+    @fs['test/assets/1234123412341234_obj_description..14...58......v8...__2134123412341234.jpg']
+  end
+
+  it "should allow filenames with various bracket arragements" do
+    @fs['test[1].jpg']
+    @fs['test[1]']
+    @fs['[test].jpg']
+  end
+
+  it "should not raise an error when using directory names with spaces" do
+    @fs['files/ass ets/.DS_Store']
+  end
+
+  it "should not raise_error when using unusual but valid filenames" do
+    @fs['.DS_Store']
+    @fs['photograph.g']
+    @fs['_testfilename']
+    @fs['assets/.DS_Store']
+    @fs['assets/photograph.g']
+    @fs['a/_testfilename']
+    @fs['a']
+  end
+
   it "should allow sensible relative filenames" do
     @fs['assets/rails_logo.gif']
+    @fs['assets/rails_logo']
     @fs['assets/rails-2.gif']
     @fs['assets/223434.gif']
     @fs['files/1.JPG']

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ8wDQYDVQQDDAZhZG1p
+  bnMxFzAVBgoJkiaJk/IsZAEZFgdzaG9waWZ5MRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE0MDUxNTIwMzM0OFoXDTE1MDUxNTIwMzM0OFowPzEPMA0GA1UEAwwGYWRt
+  aW5zMRcwFQYKCZImiZPyLGQBGRYHc2hvcGlmeTETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0/81O3e1vh5smcwp2G
+  MpLQ6q0kejQLa65bPYPxdzWA1SYOKyGfw+yR9LdFzsuKpwWzKq6zX35lj1IckWS4
+  bNBEQzxmufUxU0XPM02haFB8fOfDJzdXsWte9Ge4IFwahwn68gpMqN+BvxL+KMYz
+  Iut9YmN44d4LZdsENEIO5vmybuG2vYDz7R56qB0PA+Q2P2CdhymsBad2DQs69FBo
+  uico9V6VMYYctL9lCYdzu9IXrOYNTt88suKIVzzAlHOKeN0Ng5qdztFoTR8sfxDr
+  Ydg3KHl5n47wlpgd8R0f/4b5gGxW+v9pyJCgQnLlRu7DedVSvv7+GMtj3g9r3nhJ
+  KqECAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFI/o
+  maf34HXbUOQsdoLHacEKQgunMB0GA1UdEQQWMBSBEmFkbWluc0BzaG9waWZ5LmNv
+  bTAdBgNVHRIEFjAUgRJhZG1pbnNAc2hvcGlmeS5jb20wDQYJKoZIhvcNAQEFBQAD
+  ggEBADkK9aj5T0HPExsov4EoMWFnO+G7RQ28C30VAfKxnL2UxG6i4XMHVs6Xi94h
+  qXFw1ec9Y2eDUqaolT3bviOk9BB197+A8Vz/k7MC6ci2NE+yDDB7HAC8zU6LAx8Y
+  Iqvw7B/PSZ/pz4bUVFlTATif4mi1vO3lidRkdHRtM7UePSn2rUpOi0gtXBP3bLu5
+  YjHJN7wx5cugMEyroKITG5gL0Nxtu21qtOlHX4Hc4KdE2JqzCPOsS4zsZGhgwhPs
+  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
+  TConQSX2BnZdhIEYW+cKzEC/bLc=
+  -----END CERTIFICATE-----
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport

metadata.gz.sig

@@ -0,0 +1,2 @@
+	\)I0J$n�����A}�\�2�?.Җ
�3,��%�����Ϫڎ�gZW��JK_7�$jz)����l�����=j5��8�W.x�P����#��ۘ�k~
+��I���x