asset_cloud 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d836e4ffccd7ef2587c6d9059f2d3cbf27945e8
-  data.tar.gz: b3a39486d765695ba72331d9094ca5c8e6fc27c0
+  metadata.gz: c234877222854a009ce8f3cd01cc47e3827ce575
+  data.tar.gz: d0cfa40ee942e449c59b9bb6f2b362a7565e9ed1
 SHA512:
-  metadata.gz: bfc48a05fd7bdc09cef91ff32882d667cd6774ef72e550a0dd772f7c5bf320955f4040d9bd52142c3941b094751bca6a8bc6d6e3a4c2f7714a1b4340e92b2689
-  data.tar.gz: 2fd7ff5b0d9e0036de07b8feb7953845a4d4063185bc9f460bfab7bf5f64ac39aeabd499a565251b11bbf656b277ecac937b15180bc837a0c63926f1c49d703a
+  metadata.gz: 71784bf57b3a79dd4cbe76a6d5921617ae368a62871e3289f9a50bef1273901d985c0553fa8868f742a1959f39c578f1b8e33f64c6625fae686e1ceb629fac1b
+  data.tar.gz: b520683f21e5fafacac076b20fee73d08744589b9631e5176d1e48edf9744d24b0e3bd6f5693f850b99e68a9abd0bf2ce256ed50c6831a3287ce99c22a5498ea

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
   - '1.9.3'
   - '2.0'

data/History.md

@@ -1,5 +1,9 @@
 # Asset Cloud Version History
 
+## Version 2.2.2, 2016-02-11
+
+* Allow asset_class to be a proc which determines the class to use within a bucket (https://github.com/Shopify/asset_cloud/pull/15)
+
 ## 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)

data/asset_cloud.gemspec

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

data/lib/asset_cloud/base.rb

@@ -60,7 +60,10 @@ module AssetCloud
         self.asset_classes[bucket_name.to_sym]  = asset_class if asset_class
       else
         self.root_bucket_class = bucket_class
-        self.root_asset_class  = asset_class if asset_class
+        if asset_class
+          raise ArgumentError, 'asset_class on the root bucket cannot be a proc' if asset_class.is_a?(Proc)
+          self.root_asset_class  = asset_class
+        end
       end
     end
 
@@ -216,7 +219,10 @@ module AssetCloud
     end
 
     def asset_class_for(key)
-      klass = self.class.asset_classes[bucket_symbol_for_key(key)] || self.class.root_asset_class
+      klass = self.class.asset_classes[bucket_symbol_for_key(key)]
+      klass = klass.call(key) if klass.is_a?(Proc)
+      klass ||= self.class.root_asset_class
+
       constantize_if_necessary(klass)
     end
 

data/spec/base_spec.rb

@@ -3,10 +3,15 @@ require 'spec_helper'
 class SpecialAsset < AssetCloud::Asset
 end
 
-class BasicCloud < AssetCloud::Base
-  bucket :special, AssetCloud::MemoryBucket, :asset_class => SpecialAsset
+class LiquidAsset < AssetCloud::Asset
 end
 
+class BasicCloud < AssetCloud::Base
+  bucket :special, AssetCloud::MemoryBucket, asset_class: SpecialAsset
+  bucket :conditional, AssetCloud::MemoryBucket, asset_class: Proc.new {|key|
+    LiquidAsset if key.ends_with?('.liquid')
+  }
+end
 
 describe BasicCloud do
   directory = File.dirname(__FILE__) + '/files'
@@ -177,6 +182,15 @@ describe BasicCloud do
       @fs.build('assets/foo').should be_instance_of(AssetCloud::Asset)
       @fs.build('special/foo').should be_instance_of(SpecialAsset)
     end
+
+    it "should allow specifying a proc that determines the class to use, using the default bucket when returning nil" do
+      @fs.build('conditional/default.js').should be_instance_of(AssetCloud::Asset)
+      @fs.build('conditional/better.liquid').should be_instance_of(LiquidAsset)
+    end
+
+    it "should raise " do
+      expect { BasicCloud.bucket(AssetCloud::MemoryBucket, asset_class: Proc.new {}) }.to(raise_error(ArgumentError))
+    end
   end
 
   describe "MATCH_BUCKET" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset_cloud
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport