Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Don't let bundles get in the way of equality. #10

Closed
wants to merge 1 commit into from

2 participants

@sritchie

No description provided.

@magnars
Owner

Since assets are collapsed down to one after this equality check, we would lose differing :bundle definitions - precluding you from having the same asset in different bundles.

Instead I will ensure the list of assets is distinct on the juxt of :path and :bundle. Hopefully that is a decent solution to this issue.

@sritchie

Works for me. Closing.

@sritchie sritchie closed this
@sritchie sritchie deleted the sritchie:patch-1 branch
@magnars
Owner

0.13.2 released.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 28, 2013
  1. Don't let bundles get in the way of equality.

    Sam Ritchie authored
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/optimus/strategies.clj
View
4 src/optimus/strategies.clj
@@ -13,8 +13,8 @@
(app (assoc request :optimus-assets assets))))
(defn- collapse-equal-assets [asset-1 asset-2]
- (when-not (= (dissoc asset-1 :get-stream)
- (dissoc asset-2 :get-stream))
+ (when-not (= (dissoc asset-1 :get-stream :bundle)
+ (dissoc asset-2 :get-stream :bundle))
(throw (Exception. (str "Two assets have the same path \"" (:path asset-1) "\", but are not equal."))))
asset-1)
Something went wrong with that request. Please try again.