asset_cloud 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3f0421040a068165fb6219c055d4d490c0d1b56
-  data.tar.gz: 539fc589e72c4b3be9eb61e45fb895d75f96f0ae
+  metadata.gz: cf0be61cd6058f4e4ab5cd5c9c5bb19363f819e3
+  data.tar.gz: d8e8070dd5cb0e0bb6cc880f5c88088fe1b30f9b
 SHA512:
-  metadata.gz: 67092177460792fa3892e585bb939b97969b80b96e621d32a619fe24022caccc781db5426c6bc3b8921ed8b950886259ab57a910472cbee922ae27ff9e2f3a28
-  data.tar.gz: b532387d3a18ceceb4710f8a3bd006693e063171ec1792f040d0ee3d1c2534aa3d95f31edc26ad05a604bbfd916ed387571d08785fdb5829c403ce3a058908c6
+  metadata.gz: 08b3646611ed0077c34764aa11d6a230d376623e5d545521a4ed757a4b906dacc853b30f0f5767f7643be77922d9d2c485d262cad61a5842f5eda51f22f57184
+  data.tar.gz: 9a73762440be2c3560a5cece29e4819aeeb84cbbafe2086b637d7769cd8b538ef471c63bdca55d1944a8dca4c8f67c39afe263c666b1cc0ca18f56ca807e6d0c

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Tobias Lütke & Shopify, Inc.
+Copyright (c) 2008-2014 Tobias Lütke & Shopify, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://travis-ci.org/Shopify/asset_cloud.png?branch=master" alt="Build Status" />}[https://travis-ci.org/Shopify/asset_cloud]
+
 = AssetCloud
 
 An abstraction layer around arbitrary and diverse asset stores.
@@ -10,4 +12,4 @@ An abstraction layer around arbitrary and diverse asset stores.
 
 == Copyright
 
-Copyright (c) 2008-2013 Tobias Lütke & Shopify, Inc. Released under the MIT license (see LICENSE for details).
+Copyright (c) 2008-2014 Tobias Lütke & Shopify, Inc. Released under the MIT license (see LICENSE for details).

data/asset_cloud.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{asset_cloud}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.authors = %w(Shopify)
   s.date = %q{2009-08-04}

data/lib/asset_cloud/free_key_locator.rb

@@ -8,10 +8,9 @@ module AssetCloud
       # Check weather the suggested key name is free. If so we
       # simply return it.
 
-      if not exist?(key)
+      if !exist?(key) && !options[:force_uuid]
         key
       else
-
         ext         = File.extname(key)
         dirname     = File.dirname(key)
         base        = dirname == '.' ? File.basename(key, ext) : File.join(File.dirname(key), File.basename(key, ext))

data/spec/find_free_key_spec.rb

@@ -14,7 +14,7 @@ describe "FreeFilenameLocator", 'when asked to return a free key such as the one
     FindFreeKey.find_free_key_like('free.txt').should == 'free.txt'
   end
 
-  it "should append a UUID to the key before the extension if key is taken " do
+  it "should append a UUID to the key before the extension if key is taken" do
     SecureRandom.stub(:uuid).and_return('moo')
     FindFreeKey.should_receive(:exist?).with('free.txt').and_return(true)
     FindFreeKey.should_receive(:exist?).with('free_moo.txt').and_return(false)
@@ -36,4 +36,11 @@ describe "FreeFilenameLocator", 'when asked to return a free key such as the one
     lambda { FindFreeKey.find_free_key_like('free.txt') }.should raise_error(StandardError)
   end
 
+  it "should append a UUID to the key before the extensions if the force_uuid option is passed" do
+    FindFreeKey.should_receive(:exist?).with('free.txt').and_return(false)
+    FindFreeKey.should_receive(:exist?).with('free_as-in-beer.txt').and_return(false)
+    SecureRandom.stub(:uuid).and_return('as-in-beer')
+
+    FindFreeKey.find_free_key_like('free.txt', :force_uuid => true).should == 'free_as-in-beer.txt'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Shopify
@@ -14,56 +14,56 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: class_inheritable_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An abstraction layer around arbitrary and diverse asset stores.
@@ -72,7 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -118,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: An abstraction layer around arbitrary and diverse asset stores.