hanami-assets 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656523e5106429d46d4ef06f9e49a9d8b0c7c6e9a5887034137ee94959833827
-  data.tar.gz: a9a823309ae222cf1fdaf789fd0619c51649abddd8cd11d8235516cd2a725edf
+  metadata.gz: f3eca9645ece86fd7d459f856d4bd5927218a0bf2793800d79893f182802b3e8
+  data.tar.gz: ce397508bfee8960426520195c3a9916f782e816add006c936d53a36fccb6c56
 SHA512:
-  metadata.gz: ea5984af832c0541ad530607e548b77c35a265fcf30bb38f439424b17834766ec2ee14d1e04964f58a86332e42ee90a1e5a19f8be158e5f7cad81a831ca61e30
-  data.tar.gz: 58d11b450a70857fe77fb6eb157eca3109fcd34ebda8bfa515bbe728248aa2a22935f0055c1df96345bd40f8c0b74f554957495b30af50be1e4d612f04aad779
+  metadata.gz: 8e0993d7081bdb900809b102654b2cd808a020e8e210c4e54b475b1d89f13c500f0ae636622972f737c342671715a0e4067f9c508f92e9fbf1e953b045d18852
+  data.tar.gz: ad68fce253795abe8b209d694205db4c239ede2cc9c6553126e2a214093ed0f76dd20dd480a114ebfdaa77a0fc4e76dbed445ee78bba748ff85a25875df7cbed

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v1.3.1 - 2019-01-18
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.6
+- [Luca Guidi] Support `bundler` 2.0+
+
+### Fixed
+- [Luca Guidi] Make optional nested assets feature to maintain backward compatibility with `1.2.x`
+
 ## v1.3.0 - 2018-10-24
 
 ## v1.3.0.beta1 - 2018-08-08

data/hanami-assets.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'hanami-helpers',  '~> 1.3'
   spec.add_runtime_dependency 'tilt',            '~> 2.0', '>= 2.0.2'
 
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler',          '>= 1.6', '< 3'
   spec.add_development_dependency 'rake',             '~> 12.0'
   spec.add_development_dependency 'rspec',            '~> 3.7'
 

data/lib/hanami/assets/bundler/manifest_entry.rb

@@ -38,7 +38,7 @@ module Hanami
         def values
           Hash[
             target: _convert_to_url(@asset.expanded_fingerprinted_target),
-            sri:    subresource_integrity_values
+            sri: subresource_integrity_values
           ]
         end
 

data/lib/hanami/assets/compiler.rb

@@ -177,11 +177,10 @@ module Hanami
         relative_destination_name(name: Pathname.new(result), add_prefix: false)
       end
 
-      # @since 0.1.0
+      # @since 1.3.0
       # @api private
       def destination_name
-        result = @name.relative? ? relative_destination_name : absolute_destination_name
-        result = result.to_s
+        result = destination_path
 
         if compile?
           result.scan(/\A[[[:alnum:]][\-\_]]*\.[[\w]]*/).first || result
@@ -190,6 +189,16 @@ module Hanami
         end
       end
 
+      # @since 1.3.1
+      # @api private
+      def destination_path
+        if @configuration.nested
+          @name.relative? ? relative_destination_name : absolute_destination_name
+        else
+          ::File.basename(@name)
+        end.to_s
+      end
+
       # @since 0.1.0
       # @api private
       def exist?

data/lib/hanami/assets/compilers/less.rb

@@ -8,7 +8,7 @@ module Hanami
       class Less < Compiler
         # @since 0.3.0
         # @api private
-        EXTENSIONS = /\.(less)\z/
+        EXTENSIONS = /\.(less)\z/.freeze
 
         # @since 0.3.0
         # @api private

data/lib/hanami/assets/compilers/sass.rb

@@ -8,7 +8,7 @@ module Hanami
       class Sass < Compiler
         # @since 0.3.0
         # @api private
-        EXTENSIONS = /\.(sass|scss)\z/
+        EXTENSIONS = /\.(sass|scss)\z/.freeze
 
         # @since 0.1.0
         # @api private

data/lib/hanami/assets/configuration.rb

@@ -129,6 +129,17 @@ module Hanami
         end
       end
 
+      # Support for nested path
+      #
+      # @since 1.3.1
+      def nested(value = nil)
+        if value.nil?
+          @nested
+        else
+          @nested = !!value # rubocop:disable Style/DoubleNegation
+        end
+      end
+
       # Subresource integrity mode
       #
       # Determine if the helpers should generate the integrity attribute for an
@@ -506,6 +517,7 @@ module Hanami
           c.subresource_integrity = subresource_integrity
           c.cdn                   = cdn
           c.compile               = compile
+          c.nested                = nested
           c.public_directory      = public_directory
           c.manifest              = manifest
           c.sources               = sources.dup
@@ -526,6 +538,7 @@ module Hanami
         @cdn                   = false
         @fingerprint           = false
         @compile               = false
+        @nested                = false
         @base_url              = nil
         @destination_directory = nil
         @public_manifest       = Config::NullManifest.new(self)
@@ -569,6 +582,10 @@ module Hanami
       # @api private
       attr_writer :compile
 
+      # @since 1.3.1
+      # @api private
+      attr_writer :nested
+
       # @since 0.1.0
       # @api private
       attr_writer :scheme

data/lib/hanami/assets/helpers.rb

@@ -65,7 +65,7 @@ module Hanami
 
       # @since 1.1.0
       # @api private
-      QUERY_STRING_MATCHER = /\?/
+      QUERY_STRING_MATCHER = /\?/.freeze
 
       include Hanami::Helpers::HtmlHelper
 
@@ -181,7 +181,7 @@ module Hanami
 
         _safe_tags(*sources) do |source|
           attributes = {
-            src:  _typed_asset_path(source, JAVASCRIPT_EXT, push: push, as: :script),
+            src: _typed_asset_path(source, JAVASCRIPT_EXT, push: push, as: :script),
             type: JAVASCRIPT_MIME_TYPE
           }
           attributes.merge!(options)
@@ -284,7 +284,7 @@ module Hanami
           attributes = {
             href: _typed_asset_path(source, STYLESHEET_EXT, push: push, as: :style),
             type: STYLESHEET_MIME_TYPE,
-            rel:  STYLESHEET_REL
+            rel: STYLESHEET_REL
           }
           attributes.merge!(options)
 
@@ -445,7 +445,7 @@ module Hanami
 
         attributes = {
           href: asset_path(source, push: options.delete(:push) || false, as: :image),
-          rel:  FAVICON_REL,
+          rel: FAVICON_REL,
           type: FAVICON_MIME_TYPE
         }
         attributes.merge!(options)
@@ -909,9 +909,7 @@ module Hanami
           options[:src] = asset_path(src, push: options.delete(:push) || false, as: as)
         end
 
-        if !options[:src] && !block_given?
-          raise ArgumentError.new('You should provide a source via `src` option or with a `source` HTML tag')
-        end
+        raise ArgumentError.new('You should provide a source via `src` option or with a `source` HTML tag') if !options[:src] && !block_given?
 
         options
       end

data/lib/hanami/assets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -64,14 +64,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -244,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Assets management