torba 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e11c81ece9ca358a44330fd7ef22317bba7d3c
-  data.tar.gz: 47cabbe91908c788a9b552459770e2faa3f52a4c
+  metadata.gz: 74c50af6fd600841ed420a3ffe0df1b6b471d97f
+  data.tar.gz: 976c74cdce2db8e851ae2e7c439bdc2ce7827b91
 SHA512:
-  metadata.gz: b2dddf5b66d3ea94ab020fa14be5d2c04f88df1c88c6bcade53ce9d7821661b3120d235acde322030aa7d59bd1c111969cc8c581578ed4b4ead1eb4476f25ea7
-  data.tar.gz: 08b7d6437572ac60111128b88ca5db4de13291eac917daf5d0361633024996dfe93209e48a8be143fd2519fad3f41f3e1db358426df9024e6e766a8f59ecf490
+  metadata.gz: a4c5a9cad8a21318f7dc823937bd046aec8cde1735831620580240b9b87d3c1dec258a009fe499e0bd639dfd43c89ccd1a1bf039c3550ed10dc19572617957a2
+  data.tar.gz: 73718d27fe6bf5ce7e204926397c76b40fa16487dc689554e93d2adb2838dce0fc4182f5b08fea2be211f9f0253dc6cc8a95691cc52257e507db996c9c01a5d6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+## Version 0.3.1
+
+### Bug fixes
+
+* Fix no asset found when a CSS url contains "?#iefix" or "#svg-fragment"
+
 ## Version 0.3.0
 
 ### Enhancements

data/README.md

@@ -21,24 +21,22 @@ Production ready.
 
 ## Why
 
-De facto approach, i.e. wrapping JS and CSS libraries in a gem, requires from a
-maintainer to constantly track changes in upstream repository. Even more, if the
-maintainer stops using this gem itself, it will eventually become abandoned.
-Many libraries still have no gem wrappers.
+De facto approach, i.e. wrapping JS and CSS libraries in a gem, requires a
+maintainer to constantly track changes in an upstream repository. Even more so, if a gem
+maintainer stops using that specific library, the gem will eventually become abandoned.
+Additionally, many libraries still have no gem wrappers.
 
-Among other alternatives:
+Other alternatives:
 
-* [rails-assets][rails-assets] project relies on Bower *and* it is quite complex,
-* [bower-rails][bower-rails] project relies on Bower.
+* [rails-assets][rails-assets] relies on Bower *and* it is quite complex,
+* [bower-rails][bower-rails] relies on Bower, see below for why this can be an issue.
 
 Problems with the Bower:
 
-* it is not a part of Ruby ecosystem,
-* frontend JS libraries are usually standalone (except for jQuery dependency), so there's
-  no need for complex Bundler-like solution with tree-dependency resolution,
-* often we can't use optimistic version constraints, because JS community still doesn't
-  fully grasp the idea of [Semver][semver]. By specifying strict versions we use Bower
-  as a complex facade for functionality that could be done by curl.
+* it is not a part of the Ruby ecosystem,
+* frontend JS libraries are usually standalone (except for a potential jQuery dependency), so there's
+  no need for a complex Bundler-like solution with tree-dependency resolution,
+* often we can't use optimistic version constraints, because the JavaScript community does not consistenly apply the principles of [Semver][semver]. By specifying strict versions we use Bower as a complex facade for functionality that could be accomplished with curl.
 
 ## External dependencies
 
@@ -49,9 +47,9 @@ Problems with the Bower:
 
 ## Design limitations
 
-* Torba doesn't do any version dependency resolution, it's up to you to specify correct version of
+* Torba doesn't do any version dependency resolution, it's up to you to specify the correct version of
   each asset package,
-* Torba doesn't do any builds, use remote sources with pre-built assets.
+* Torba doesn't do any builds, you should use remote sources with pre-built assets.
 
 ## Installation
 
@@ -183,16 +181,16 @@ When you run `torba pack` the following happens:
 
 1.  All remote sources are cached locally.
 
-2.  Archives are unpacked with top level directory removed. This is done for good cause it
-usually contains package version, e.g. "react-0.13.2", and you don't want to reference versions
+2.  Archives are unpacked with top level directory removed. This is done for good because it
+usually contains the package version in the name, e.g. "react-0.13.2", and you don't want to have to reference versions
 inside your application code (except Torbafile).
 
 3.  Remote source's content is copied as is to the `Torba.home_path` location with **package name used
 as a namespace**.
 
-    This is also done for good in order to avoid name collisions (since many JS projects can have
-assets with the same names and all packages are placed into shared Sprockets' virtual filesystem).
-The downside is that you have to use namespace in each require directive, which can lead to
+    This is also done for good reason in order to avoid name collisions (since many JS projects can have
+assets with the same names and all packages are placed into Sprockets' shared virtual filesystem).
+The downside is that you have to use namespaces in each require directive, which can lead to
 duplication:
 
     ```javascript
@@ -211,8 +209,8 @@ statements.
 
 ### :import option
 
-Copying whole remote source's content has one disadvantage of using remote source specific paths in your
-require/import directives. For example, if an archive contains file in "dist/css" directory, you'll have
+Copying whole remote source's content has the disadvantage of using remote source specific paths in your
+require/import directives. For example, if an archive contains files in the "dist/css" directory, you'll have
 to mention it:
 
 ```css
@@ -220,7 +218,7 @@ to mention it:
 @import 'lightslider/dist/css/lightslider';
 ```
 
-To mitigate this you can cherry-pick files from the source via "import" option, for example:
+To mitigate this you can cherry-pick files from the source via the "import" option, for example:
 
 ```
 gh_release "lightslider", source: "sachinchoolur/lightslider", tag: "1.1.2", import: %w[

data/lib/torba/css_url_to_erb_asset_path.rb

@@ -4,15 +4,22 @@ module Torba
   class CssUrlToErbAssetPath
     URL_RE =
       /
-        url\(     # url(
-        \s*       # optional space
-        (?!data)  # no data URIs
-        ['"]?     # optional quote
-        (?!\/)    # only relative location
-        ([^'"]+?) # location
-        ['"]?     # optional quote
-        \s*       # optional space
-        \)        # )
+        (                # $1
+          url\(          # url(
+          \s*            # optional space
+          (?!data)       # no data URIs
+          ['"]?          # optional quote
+          (?!\/)         # only relative location
+        )
+        (                # $2
+          [^'"?#]+?      # location
+        )
+        (                # $3
+          ([?#][^'"]+?)? # optional query or fragment
+          ['"]?          # optional quote
+          \s*            # optional space
+          \)             # )
+        )
       /xm
 
     # @return [String] CSS file content where image "url(...)" paths are replaced by ERB
@@ -42,9 +49,9 @@ module Torba
     #     }"
     def self.call(content, file_path)
       content.gsub(URL_RE) do
-        absolute_image_file_path = File.expand_path($1, File.dirname(file_path))
+        absolute_image_file_path = File.expand_path($2, File.dirname(file_path))
         sprockets_file_path = yield absolute_image_file_path
-        "url('<%= asset_path('#{sprockets_file_path}') %>')"
+        "#{$1}<%= asset_path('#{sprockets_file_path}') %>#{$3}"
       end
     end
   end

data/lib/torba.rb

@@ -86,8 +86,8 @@ module Torba
     ui.suggest "Make sure that the path has trailing '/' if its a directory."
     exit(false)
   rescue Errors::AssetNotFound => e
-    ui.error "Couldn't found an asset with path '#{e.message}'."
-    ui.suggest "Make sure that you've imported all image assets mentioned in a stylesheet(-s)."
+    ui.error "Couldn't find an asset with path '#{e.message}'."
+    ui.suggest "Make sure that you've imported all image/font assets mentioned in a stylesheet(-s)."
     exit(false)
   end
 end

data/test/acceptance_test.rb

@@ -55,8 +55,8 @@ module Torba
       assert_exists "trumbowyg/icons-2x.png"
 
       css = read_path "trumbowyg/trumbowyg.css.erb"
-      assert_includes css, "background: transparent url('<%= asset_path('trumbowyg/icons.png') %>') no-repeat;"
-      assert_includes css, "background-image: url('<%= asset_path('trumbowyg/icons-2x.png') %>')"
+      assert_includes css, %[background: transparent url("<%= asset_path('trumbowyg/icons.png') %>") no-repeat;]
+      assert_includes css, %[background-image: url("<%= asset_path('trumbowyg/icons-2x.png') %>")]
     end
 
     def test_targz
@@ -72,8 +72,8 @@ module Torba
       assert_exists "trumbowyg-from-tar/images/icons-2x.png"
 
       css = read_path "trumbowyg-from-tar/trumbowyg.css.erb"
-      assert_includes css, "background: transparent url('<%= asset_path('trumbowyg-from-tar/images/icons.png') %>') no-repeat;"
-      assert_includes css, "background-image: url('<%= asset_path('trumbowyg-from-tar/images/icons-2x.png') %>')"
+      assert_includes css, %[background: transparent url("<%= asset_path('trumbowyg-from-tar/images/icons.png') %>") no-repeat;]
+      assert_includes css, %[background-image: url("<%= asset_path('trumbowyg-from-tar/images/icons-2x.png') %>")]
     end
 
     def test_npm

data/test/css_url_to_erb_asset_path_test.rb

@@ -71,5 +71,53 @@ module Torba
       end
       assert_equal "background-image: url('<%= asset_path('ui/images/icons.png') %>');", new_content
     end
+
+    def test_url_with_iefix_query
+      current_file = "/home/dist/ui/stylesheet.css"
+      css = <<-CSS
+      @font-face {
+        font-family: "Material-Design-Icons";
+        src: url("../font/material-design-icons/Material-Design-Icons.eot?#iefix") format("embedded-opentype");
+        font-weight: normal;
+        font-style: normal; }
+      CSS
+
+      new_content = filter.call(css, current_file) do |image_full_url|
+        assert_equal "/home/dist/font/material-design-icons/Material-Design-Icons.eot", image_full_url
+        "material-design-icons/Material-Design-Icons.eot"
+      end
+
+      assert_equal <<-CSS, new_content
+      @font-face {
+        font-family: "Material-Design-Icons";
+        src: url("<%= asset_path('material-design-icons/Material-Design-Icons.eot') %>?#iefix") format("embedded-opentype");
+        font-weight: normal;
+        font-style: normal; }
+      CSS
+    end
+
+    def test_url_with_svg_fragment
+      current_file = "/home/dist/ui/stylesheet.css"
+      css = <<-CSS
+      @font-face {
+        font-family: "Material-Design-Icons";
+        src: url("../font/material-design-icons/Material-Design-Icons.svg#Material-Design-Icons") format("svg");
+        font-weight: normal;
+        font-style: normal; }
+      CSS
+
+      new_content = filter.call(css, current_file) do |image_full_url|
+        assert_equal "/home/dist/font/material-design-icons/Material-Design-Icons.svg", image_full_url
+        "material-design-icons/Material-Design-Icons.svg"
+      end
+
+      assert_equal <<-CSS, new_content
+      @font-face {
+        font-family: "Material-Design-Icons";
+        src: url("<%= asset_path('material-design-icons/Material-Design-Icons.svg') %>#Material-Design-Icons") format("svg");
+        font-weight: normal;
+        font-style: normal; }
+      CSS
+    end
   end
 end

data/torba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "torba"
-  spec.version       = "0.3.0"
+  spec.version       = "0.3.1"
   spec.authors       = ["Andrii Malyshko"]
   spec.email         = ["mail@nashbridges.me"]
   spec.description   = "Bundler for Sprockets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torba
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrii Malyshko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor