hanami-assets 1.1.0.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9111c91132c086c754c56207d3f9fb9063d58d5e
-  data.tar.gz: 29b94af5c82070f281687b57c78e33d618f3575c
+  metadata.gz: 9eb5dd67fc9b038fdc57c4901662ffc7e7e49b24
+  data.tar.gz: a31d3212cc379ffb81457b9921238eb534f7788a
 SHA512:
-  metadata.gz: cbe255b9c5929eaf3be2b8d96a77956992ecc628c592072a7db44cfb500c4d964b750bdccd9975b1b31fe2a67e3b01251c0ad10cd82bc47b5c535c059b20ba0a
-  data.tar.gz: 80d2145310f58232bfafeb02b517f1e36d96616e94060f1e30f374ae0d4a99bddf96fc9f6428bb6f24886119e1df485fdfa68c2f832a6cb73005945574cdaff2
+  metadata.gz: b7bf095b5753fc4b5127d250e6cc300e8629b505b1561cab2b0ebf1108ed3c2c4f71447cf2a3a69c1891079b7a0fa713e76065e1b7e4c933ed9bd2c2edf06e17
+  data.tar.gz: 80c5b8e66a51fdaf79bbcdc99e6e90f7fec27ef8c8a6831e4e2fed55b5701079997922c95398c3dcf15f519f01bc53688691b8dc050af590679346e42a9af657

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v1.1.0 - 2017-10-25
+### Fixed
+- [Luca Guidi] Don't let `#javascript` and `#stylesheet` helpers to append file extension if the URL contains a query string
+
 ## v1.1.0.rc1 - 2017-10-16
 
 ## v1.1.0.beta3 - 2017-10-04

data/hanami-assets.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'hanami-utils',    '1.1.0.rc1'
-  spec.add_runtime_dependency 'hanami-helpers',  '1.1.0.rc1'
+  spec.add_runtime_dependency 'hanami-utils',    '~> 1.1'
+  spec.add_runtime_dependency 'hanami-helpers',  '~> 1.1'
   spec.add_runtime_dependency 'tilt',            '~> 2.0', '>= 2.0.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake',             '~> 12.0'
-  spec.add_development_dependency 'rspec',            '~> 3.6'
+  spec.add_development_dependency 'rspec',            '~> 3.7'
 
   spec.add_development_dependency 'yui-compressor',   '~> 0.12'
   spec.add_development_dependency 'uglifier',         '~> 2.7'

data/lib/hanami/assets/helpers.rb

@@ -62,6 +62,10 @@ module Hanami
       # @api private
       ABSOLUTE_URL_MATCHER = URI::DEFAULT_PARSER.make_regexp
 
+      # @since 1.1.0
+      # @api private
+      QUERY_STRING_MATCHER = /\?/
+
       include Hanami::Helpers::HtmlHelper
 
       # Inject helpers into the given class
@@ -758,7 +762,7 @@ module Hanami
       # @since 0.1.0
       # @api private
       def _typed_asset_path(source, ext)
-        source = "#{source}#{ext}" unless source =~ /#{Regexp.escape(ext)}\z/
+        source = "#{source}#{ext}" if _append_extension?(source, ext)
         asset_path(source)
       end
 
@@ -819,6 +823,12 @@ module Hanami
 
         url
       end
+
+      # @since 1.1.0
+      # @api private
+      def _append_extension?(source, ext)
+        source !~ QUERY_STRING_MATCHER && source !~ /#{Regexp.escape(ext)}\z/
+      end
     end
   end
 end

data/lib/hanami/assets/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
@@ -240,9 +240,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13