fronton 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8c91394908a4f20e90e8c257a5b26072bc1f547
-  data.tar.gz: 1a04c819b80d78702d67fd5b79195105467aa6d0
+  metadata.gz: 7137692de297bf2d434dfa04d901458b1ba817a2
+  data.tar.gz: 0e370701e42502692d1f4520dcda2f4e286f50ab
 SHA512:
-  metadata.gz: 848900d19a40c9cc50609cf954aaf1871ce2ee3ddf7600190afc5f72527b4ae4fb4c8d8a4cc44530ee38c4d4da3e46ce855bf840c529d42767e4196c5719d882
-  data.tar.gz: ef8c1a3bebbc35b8b9e2b84cec6c0c1f2b0eb75405a743d023da4a7a64217dfc54198c06f83143c5dd6b1fefa7f1cb31e9e7a367194883033615aeb98e931d94
+  metadata.gz: 421be3479ef525f1ed45d41a2d9e58df611c71f559fa9ed968089cfada432278f863243dcaa98f51898f4e51e021b8d8f081c48ec2e5833d99d1ba617e101d02
+  data.tar.gz: 3f7830b8cbd2504440a517e75eb0ea8dfc37d21a4fee516bb92a980b4cce16684f208b47233dac9035ec29e0c2bfcc383f610b3aa33c9779f70e28cb630b9e54

data/README.md

@@ -39,13 +39,12 @@ $ gem install fronton
 ### Config file
 
 Configuration options are readed from a `fronton.yml` file located in project
-top folder.
+top folder. `application.js`, `application.css` and all non js&css files in
+*assets_paths* are already added.
 
 ```yaml
 assets:
-  - application.js
-  - application.css
-  - "*.png"
+  - otherfile.js
 assets_paths:
   - assets/javascripts
   - assets/stylesheets
@@ -72,7 +71,7 @@ pages_paths:
 
 | Attribute     | Type   | Description                                                |
 | ------------- | ------ | ---------------------------------------------------------- |
-| assets        | Array  | List of assets to compile (only js and css files)          |
+| assets        | Array  | List of assets to compile                                  |
 | assets_paths  | Array  | List of directories where Sprockets find files for require |
 | assets_url    | String | URL for assets in production                               |
 | compressors   | Hash   | Hash with selected compressors by type                     |

data/fronton.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
   #
   ## DEPENDENCIES
   #
-  spec.add_dependency 'thor',      '~> 0.19'
-  spec.add_dependency 'rack',      '~> 2.0'
-  spec.add_dependency 'sprockets', '~> 3.7'
+  spec.add_dependency 'activesupport', '~> 5.0'
+  spec.add_dependency 'rack',          '~> 2.0'
+  spec.add_dependency 'sprockets',     '~> 3.7'
+  spec.add_dependency 'thor',          '~> 0.19'
 
   #
   ## DEVELOPMENT DEPENDENCIES

data/lib/fronton/assets_helpers.rb

@@ -2,7 +2,7 @@ module Fronton
   class AssetsHelpers
     def initialize(options = {})
       @use_digest = options.fetch(:digest, false)
-      @prefix     = options.fetch(:prefix, 'assets')
+      @prefix     = options.fetch(:prefix, '/assets')
       @manifest   = options.fetch(:manifest)
     end
 
@@ -18,7 +18,7 @@ module Fronton
 
     def asset_path(name)
       asset_name = @use_digest && @manifest.assets[name] ? @manifest.assets[name] : name
-      "/#{@prefix}/#{asset_name}"
+      File.join(@prefix, asset_name)
     end
   end
 end

data/lib/fronton/cli.rb

@@ -48,17 +48,8 @@ module Fronton
       config.require_dependencies
 
       # assets helpers
-      config.environment.context_class.class_eval do
-        def asset_path(path, _options = {})
-          "/assets/#{path}"
-        end
-        alias_method :'asset-path', :asset_path
-
-        def asset_url(path, _options = {})
-          "url(#{asset_path(path)})"
-        end
-        alias_method :'asset-url', :asset_url
-      end
+      config.environment.context_class.digest_assets = false
+      config.environment.context_class.assets_prefix = '/assets'
 
       conf = config
 
@@ -93,24 +84,9 @@ module Fronton
       end
 
       # assets helpers
-      config.environment.context_class.class_eval do
-        class << self
-          attr_accessor :fronton_config
-        end
-
-        def asset_path(path, _options = {})
-          path = self.class.superclass.fronton_config.manifest.assets[path]
-          "#{self.class.superclass.fronton_config.assets_url}/#{path}"
-        end
-        alias_method :'asset-path', :asset_path
-
-        def asset_url(path, _options = {})
-          "url(#{asset_path(path)})"
-        end
-        alias_method :'asset-url', :asset_url
-      end
-
-      config.environment.context_class.fronton_config = config
+      prefix = "#{config.assets_url}/assets"
+      config.environment.context_class.digest_assets = true
+      config.environment.context_class.assets_prefix = prefix
 
       # compile assets
       config.manifest.compile(config.assets)

data/lib/fronton/config.rb

@@ -3,11 +3,16 @@ require 'logger'
 require 'yaml'
 require 'sprockets'
 require 'fronton/dependency'
+require 'fronton/context'
 
 module Fronton
   class Config
     class YAMLNotFound < StandardError; end
 
+    PRECOMPILE_CRITERIA = lambda do |logical_path, filename|
+      filename.start_with?(Dir.pwd) && !['.js', '.css', ''].include?(File.extname(logical_path))
+    end
+
     def self.load!
       file = Pathname.pwd.join('fronton.yml')
 
@@ -29,7 +34,10 @@ module Fronton
     #
 
     def assets
-      @assets ||= @config['assets'].is_a?(Array) ? @config['assets'] : []
+      @assets ||= begin
+        assets_conf = @config['assets'].is_a?(Array) ? @config['assets'] : []
+        [PRECOMPILE_CRITERIA, /(?:\/|\\|\A)application\.(css|js)$/] + assets_conf
+      end
     end
 
     def assets_paths
@@ -43,7 +51,7 @@ module Fronton
     end
 
     def assets_url
-      @config['assets_url'] || '/assets'
+      @config['assets_url']
     end
 
     def output
@@ -109,6 +117,9 @@ module Fronton
           RailsAssets.load_paths.each { |path| env.append_path path }
         end
 
+        # context helpers
+        env.context_class.send :include, ::Fronton::Context
+
         env
       end
     end

data/lib/fronton/context.rb

@@ -0,0 +1,22 @@
+module Fronton
+  module Context
+    def self.included(klass)
+      klass.class_eval do
+        class_attribute :assets_prefix, :digest_assets
+      end
+    end
+
+    def asset_url(path, _options = {})
+      "url(#{asset_path(path)})"
+    end
+    alias_method :'asset-url', :asset_url
+
+    def asset_path(path, _options = {})
+      asset = link_asset(path)
+      digest_path = asset.digest_path
+      path = digest_path if digest_assets
+      File.join(assets_prefix || "/", path)
+    end
+    alias_method :'asset-path', :asset_path
+  end
+end

data/lib/fronton/version.rb

@@ -1,8 +1,8 @@
 module Fronton
   module VERSION
     MAJOR = 0
-    MINOR = 3
-    TINY  = 0
+    MINOR = 4
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/fronton.rb

@@ -1,2 +1,3 @@
+require 'active_support/core_ext/class/attribute'
 require 'fronton/version'
 require 'fronton/cli'

data/template/fronton.yml

@@ -1,7 +1,5 @@
 assets:
-  - application.js
-  - application.css
-  - "*.png"
+  - otherfile.js
 assets_paths:
   - assets/javascripts
   - assets/stylesheets

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fronton
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Javier Aranda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - lib/fronton/assets_helpers.rb
 - lib/fronton/cli.rb
 - lib/fronton/config.rb
+- lib/fronton/context.rb
 - lib/fronton/dependency.rb
 - lib/fronton/html_server.rb
 - lib/fronton/page.rb
@@ -175,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A command-line tool for build frontend apps in Ruby