hanami-assets 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a443db3ecee31792abeda3bc3c777df04b3ed8e7
-  data.tar.gz: e8cabf2dc50f5a1a9d6c2e44403a251bddbf9873
+  metadata.gz: 15727c44014a8955a11e3ca6fee4f113768447b9
+  data.tar.gz: e9bbfc0c852365081730a441afa657ba8ef6aa45
 SHA512:
-  metadata.gz: c837a69fa374ed5ccefedc39c202769135e8d15021a6eb11859d3d8737e0152c5add82a756a58a138ece98d258a1acb08fc0557258c225fc679ece71a5787d1c
-  data.tar.gz: d54301922da41e242a1b5bb3e6bbf952a61007f3e3ece7c17462853dd105f42e11c0e465b46e58883d9d1a44e62b5efa8ea5b2c0ec4436c93b815957d6aa7c81
+  metadata.gz: dcae9c85fa64d98e67da40d615c7e1c50df244ed7317a4968e4b35fa0e97f5709700e9ecf9e70c16db4c7966a4cd4852b6a6df48d30b0cc9efdd712ef5af9b8b
+  data.tar.gz: bbd26c301fe64b96173607b0311abc479e594b9b8e51c1745bc10c9d65b04d517d6d73ac22c22174885ca0b12b4a1695e14094b63e3091445c53f773d3e22cde

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v0.2.1 - 2016-02-05
+### Changed
+- [Derk-Jan Karrenbeld] Don't precompile `.map` files
+
+### Fixed
+- [Luca Guidi] Fix recursive Sass imports
+- [Luca Guidi] Ensure to truncate assets in public before to precompile/copy them
+
 ## v0.2.0 - 2016-01-22
 ### Changed
 - [Luca Guidi] Renamed the project

data/README.md

@@ -335,7 +335,7 @@ To do so we need to specify which gem we want to use and add it to our `Gemfile`
 Hanami can use the following compressors (aka minifiers) for JavaScript.
 
   * `:builtin` - Ruby based implementation of jsmin. It doesn't require any external gem.
-  * `:yui` - [YUI Compressor](http://yui.github.io/yuicompressor), it depends on [`yui-compressor`](https://rubygems.org/gems/yui-compressor) gem and iπt requires Java 1.4+
+  * `:yui` - [YUI Compressor](http://yui.github.io/yuicompressor), it depends on [`yui-compressor`](https://rubygems.org/gems/yui-compressor) gem and it requires Java 1.4+
   * `:uglifier` - [UglifyJS](http://lisperator.net/uglifyjs), it depends on [`uglifier`](https://rubygems.org/gems/uglifier) gem and it requires Node.js
   * `:closure` - [Google Closure Compiler](https://developers.google.com/closure/compiler), it depends on [`closure-compiler`](https://rubygems.org/gems/closure-compiler) gem and it requires Java
 
@@ -350,7 +350,7 @@ end
 Hanami can use the following compressors (aka minifiers) for Stylesheet.
 
   * `:builtin` - Ruby based compressor. It doesn't require any external gem. It's fast, but not an efficient compressor.
-  * `:yui` - [YUI Compressor](http://yui.github.io/yuicompressor), it depends on [`yui-compressor`](https://rubygems.org/gems/yui-compressor) gem and iπt requires Java 1.4+
+  * `:yui` - [YUI Compressor](http://yui.github.io/yuicompressor), it depends on [`yui-compressor`](https://rubygems.org/gems/yui-compressor) gem and it requires Java 1.4+
   * `:sass` - [Sass](http://sass-lang.com/), it depends on [`sass`](https://rubygems.org/gems/sass) gem
 
 ```ruby

data/lib/hanami/assets/cache.rb

@@ -4,7 +4,7 @@ module Hanami
   module Assets
     # Store assets references when compile mode is on.
     #
-    # This is expecially useful in development mode, where we want to compile
+    # This is especially useful in development mode, where we want to compile
     # only the assets that were changed from last browser refresh.
     #
     # @since 0.1.0

data/lib/hanami/assets/compiler.rb

@@ -1,3 +1,5 @@
+require 'find'
+
 module Hanami
   module Assets
     class MissingAsset < Error
@@ -33,7 +35,7 @@ module Hanami
 
       # @since 0.1.0
       # @api private
-      EXTENSIONS = {'.js' => true, '.css' => true}.freeze
+      EXTENSIONS = {'.js' => true, '.css' => true, '.map' => true}.freeze
 
       # @since 0.1.0
       # @api private
@@ -170,7 +172,7 @@ module Hanami
         #
         # This is needed to don't create a `.sass-cache' directory at the root of the project,
         # but to have it under `tmp/sass-cache'.
-        write { Tilt.new(source, nil, load_paths: @configuration.sources.to_a, cache_location: sass_cache_location).render }
+        write { Tilt.new(source, nil, load_paths: sass_load_paths, cache_location: sass_cache_location).render }
       rescue RuntimeError
         raise UnknownAssetEngine.new(source)
       end
@@ -191,7 +193,7 @@ module Hanami
       # @api private
       def write
         destination.dirname.mkpath
-        destination.open(File::WRONLY|File::CREAT, DEFAULT_PERMISSIONS) do |file|
+        destination.open(File::WRONLY|File::TRUNC|File::CREAT, DEFAULT_PERMISSIONS) do |file|
           file.write(yield)
         end
       end
@@ -202,6 +204,20 @@ module Hanami
         self.class.cache
       end
 
+      # @since x.x.x
+      # @api private
+      def sass_load_paths
+        result = []
+
+        @configuration.sources.each do |source|
+          Find.find(source) do |path|
+            result << path if File.directory?(path)
+          end
+        end
+
+        result
+      end
+
       # @since 0.1.0
       # @api private
       def sass_cache_location

data/lib/hanami/assets/config/sources.rb

@@ -59,12 +59,6 @@ module Hanami
           result
         end
 
-        # @since 0.1.0
-        # @api private
-        def to_a
-          map {|s| s }
-        end
-
         private
         # @since 0.1.0
         # @api private

data/lib/hanami/assets/precompiler.rb

@@ -39,7 +39,7 @@ module Hanami
       # @since 0.1.0
       # @api private
       def clear_public_directory
-        public_directory = Hanami::Assets.configuration.public_directory
+        public_directory = @configuration.public_directory
         public_directory.rmtree if public_directory.exist?
       end
 
@@ -47,7 +47,12 @@ module Hanami
       # @api private
       def precompile
         applications.each do |duplicate|
-          config = duplicate.configuration
+          config = if duplicate.respond_to?(:configuration)
+                     duplicate.configuration
+                   else
+                     duplicate
+                   end
+
           config.compile true
 
           config.files.each do |file|
@@ -60,7 +65,7 @@ module Hanami
       # @api private
       def applications
         @duplicates.empty? ?
-          [Hanami::Assets] : @duplicates
+          [@configuration] : @duplicates
       end
     end
   end

data/lib/hanami/assets/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils