hanami-assets 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e0c704c7030f9ee7a4353499cd4da8d9c855c1a4441bb0c4280c58ded93ddc
-  data.tar.gz: dce013f39503e64f36a0072698c005d12415fd8182466f3b0df04c20bf503081
+  metadata.gz: '04581104608ddd3d41551cd5ae26efff9e735a41ddeef42b656f65d839e8b9ef'
+  data.tar.gz: 986c4559a71b18de44b17aed0a0958969c73c3b1a3a21eb8cb474f3ebdcd20e3
 SHA512:
-  metadata.gz: 9a5909e52c9d0f529e410d97e94b581aa4fb77e645c0e3942b313fcc665d36e804e90ca1dbe89591a9454bd4de234a637ae6dc3e714265b00573ff824dfa8209
-  data.tar.gz: 7e2392ac5f2249d8b908b787276c9aa81fdcb5b50f5af42aaeaf2e076984ed01db4e9be219fe46c37170da7407bb0a277d928a2509dd6f90a46159a83534d8c7
+  metadata.gz: e285ddacc5fa3755405c16b0872274412622503e2046280f8c87185c810c023df315499606dc7b381c1902c2a0a702c8ef36e08295fee9561cb5907997cd797e
+  data.tar.gz: c1ede8b4430fb8133ee91b33a8e2abbf3cfeb1d444a28b5b4f5c1ad3633fd2b8d38f6539dd1350ee98a51cb7c8d24f24d84f6f2973d2e15000fdf7b8140e42c3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v1.3.0.beta1 - 2018-08-08
+### Added
+- [Paweł Świątkowski] Preserve directory structure of assets at the precompile time.
+- [Luca Guidi] Official support for JRuby 9.2.0.0
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/README.md

@@ -4,11 +4,11 @@ Assets management for Ruby web projects
 
 ## Status
 
-[![Gem Version](http://img.shields.io/gem/v/hanami-assets.svg)](https://badge.fury.io/rb/hanami-assets)
-[![Build Status](http://img.shields.io/travis/hanami/assets/master.svg)](https://travis-ci.org/hanami/assets?branch=master)
-[![Coverage](http://img.shields.io/coveralls/hanami/assets/master.svg)](https://coveralls.io/r/hanami/assets)
-[![Code Climate](http://img.shields.io/codeclimate/github/hanami/assets.svg)](https://codeclimate.com/github/hanami/assets)
-[![Dependencies](http://img.shields.io/gemnasium/hanami/assets.svg)](https://gemnasium.com/hanami/assets)
+[![Gem Version](https://badge.fury.io/rb/hanami-assets.svg)](https://badge.fury.io/rb/hanami-assets)
+[![TravisCI](https://travis-ci.org/hanami/assets.svg?branch=master)](https://travis-ci.org/hanami/assets)
+[![CircleCI](https://circleci.com/gh/hanami/assets/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/assets/tree/master)
+[![Test Coverage](https://codecov.io/gh/hanami/assets/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/assets)
+[![Depfu](https://badges.depfu.com/badges/4b37347bd74042ff96477495cc16531d/overview.svg)](https://depfu.com/github/hanami/assets?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/assets.svg)](http://inch-ci.org/github/hanami/assets)
 
 ## Contact

data/hanami-assets.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'hanami-utils',    '~> 1.2'
-  spec.add_runtime_dependency 'hanami-helpers',  '~> 1.2'
+  spec.add_runtime_dependency 'hanami-utils',    '~> 1.3.beta'
+  spec.add_runtime_dependency 'hanami-helpers',  '~> 1.3.beta'
   spec.add_runtime_dependency 'tilt',            '~> 2.0', '>= 2.0.2'
 
   spec.add_development_dependency 'bundler'

data/lib/hanami/assets/compiler.rb

@@ -148,13 +148,40 @@ module Hanami
       # @since 0.1.0
       # @api private
       def destination
-        @destination ||= @configuration.destination_directory.join(basename)
+        @destination ||= @configuration.destination_directory.join(destination_name)
       end
 
-      # @since 0.1.0
+      # @since 1.3.0
       # @api private
-      def basename
+      def relative_destination_name(name: @name, add_prefix: true)
+        result = name.to_s
+        base_dir = @configuration.base_directories.detect { |dir| result.start_with?(dir) }
+        if base_dir
+          prefix = @configuration.prefix
+          base_dir = prefix.join(base_dir) if add_prefix
+          result = name.relative_path_from(Pathname.new(base_dir))
+        end
+        result
+      end
+
+      # @since 1.3.0
+      # @api private
+      def absolute_destination_name
         result = ::File.basename(@name)
+        @configuration.sources.each do |source|
+          if @name.to_s.start_with?(source.to_s)
+            result = @name.relative_path_from(source)
+            break
+          end
+        end
+        relative_destination_name(name: Pathname.new(result), add_prefix: false)
+      end
+
+      # @since 0.1.0
+      # @api private
+      def destination_name
+        result = @name.relative? ? relative_destination_name : absolute_destination_name
+        result = result.to_s
 
         if compile?
           result.scan(/\A[[[:alnum:]][\-\_]]*\.[[\w]]*/).first || result

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

@@ -61,7 +61,7 @@ module Hanami
         #
         # @since 0.1.0
         # @api private
-        def method_missing(*) # rubocop:disable Style/MethodMissing
+        def method_missing(*) # rubocop:disable Style/MethodMissingSuper
           ::Kernel.raise(
             ::Hanami::Assets::MissingManifestFileError.new(@configuration.manifest_path)
           )

data/lib/hanami/assets/configuration.rb

@@ -82,7 +82,7 @@ module Hanami
       def self.for(base)
         # TODO: this implementation is similar to Hanami::Controller::Configuration consider to extract it into Hanami::Utils
         namespace = Utils::String.namespace(base)
-        framework = Utils::Class.load_from_pattern!("(#{namespace}|Hanami)::Assets")
+        framework = Utils::Class.load("#{namespace}::Assets") || Utils::Class.load!('Hanami::Assets')
         framework.configuration
       end
 
@@ -384,6 +384,16 @@ module Hanami
         pathname.absolute? ? pathname : find(file)
       end
 
+      # @since 1.3.0
+      def base_directories
+        @base_directories ||= %w[
+          stylesheets
+          javascripts
+          images
+          fonts
+        ]
+      end
+
       # Find a file from sources
       #
       # @since 0.1.0

data/lib/hanami/assets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -240,12 +240,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Assets management