fronton 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b2a7eeb7866101efc45c8b5403e62ab6599040
-  data.tar.gz: c97a76b060b4ad86eb03171adeefb90442ae3dc3
+  metadata.gz: f8a04f1ecd7b94cd1b50b9570f7ad5049e95447f
+  data.tar.gz: dd94d989deeeb470cc88388f254df9410f0c442c
 SHA512:
-  metadata.gz: c5c89f46c43b1191aecf10f1e697c8bd7ba642d565b46562a5421ae968cc3019fd064d98c46c4fa0546e9763c2d5617202c6fd053f1b3c992ed7014ba13777ee
-  data.tar.gz: 7d3536566d98d26664e1e909fe32eb27a57885e0794913e567a0943875651f8c91e6570c3b618ff4a628181e0a6e9df1a87a77141efd8a1e316392430e6d9065
+  metadata.gz: 3d4684663e599a0a21824956518c1b0a53894936f394d5523da98585e4442e20087753bf61a53ee691c60722039cdc77435c895bd12d6e8c676cae543d143b75
+  data.tar.gz: 1458d67f6a156d35d393837c8a57150218e47c8264fd082e64b8f8f1b5744db64c235344e64f068e52f53554eb1d94a3faee27591d484de69e2cfb249636bfdd

data/README.md

@@ -60,7 +60,7 @@ assets_paths:
   - vendor/stylesheets
   - vendor/fonts
   - vendor/images
-assets_url: https://assets.example.com
+base_url: https://assets.example.com
 compressors:
   css: scss
   js: uglifier
@@ -79,7 +79,7 @@ pages_paths:
 | ------------- | ------ | ---------------------------------------------------------- |
 | assets        | Array  | List of assets to compile (non js&css already included)    |
 | assets_paths  | Array  | List of directories where Sprockets find files for require |
-| assets_url    | String | URL for assets in production                               |
+| base_url      | String | Base URL for assets in production                          |
 | compressors   | Hash   | Hash with selected compressors by type                     |
 | dependencies  | Array  | List of gems to install and require                        |
 | fallback_page | String | Fallback page (i.e HTML5 mode in frontend routers)         |

data/fronton.gemspec

@@ -28,12 +28,13 @@ Gem::Specification.new do |spec|
   #
   ## DEPENDENCIES
   #
-  spec.add_dependency 'activesupport',   '~> 5.0'
-  spec.add_dependency 'rack',            '~> 2.0'
-  spec.add_dependency 'rack-livereload', '~> 0.3'
-  spec.add_dependency 'sprockets',       '~> 3.7'
-  spec.add_dependency 'tilt',            '~> 2.0'
-  spec.add_dependency 'thor',            '~> 0.19'
+  spec.add_dependency 'activesupport',            '~> 4.2'
+  spec.add_dependency 'non-stupid-digest-assets', '~> 1.0'
+  spec.add_dependency 'rack',                     '~> 2.0'
+  spec.add_dependency 'rack-livereload',          '~> 0.3'
+  spec.add_dependency 'sprockets',                '~> 3.7'
+  spec.add_dependency 'tilt',                     '~> 2.0'
+  spec.add_dependency 'thor',                     '~> 0.19'
 
   #
   ## DEVELOPMENT DEPENDENCIES

data/lib/fronton.rb

@@ -1,3 +1,6 @@
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/module/aliasing'
+require 'active_support/deprecation'
 require 'fronton/version'
 require 'fronton/cli'

data/lib/fronton/cli.rb

@@ -1,172 +1,33 @@
-require 'fileutils'
-require 'rack'
-require 'rack/livereload'
 require 'thor'
+require 'active_support/concern'
 require 'fronton/config'
-require 'fronton/html_server'
+require 'fronton/commands/new'
+require 'fronton/commands/server'
+require 'fronton/commands/compile'
+require 'fronton/commands/clean'
+require 'fronton/commands/clobber'
+require 'fronton/commands/info'
 
 module Fronton
-  class CLI < Thor # rubocop:disable Metrics/ClassLength
+  class CLI < Thor
     include Thor::Actions
+    include Fronton::Commands::New
+    include Fronton::Commands::Server
+    include Fronton::Commands::Compile
+    include Fronton::Commands::Clean
+    include Fronton::Commands::Clobber
+    include Fronton::Commands::Info
 
-    def self.source_root
-      File.expand_path('../../..', __FILE__)
-    end
+    Fronton::Config.load!
 
     no_commands do
       def config
-        if !@config.is_a?(Fronton::Config) && @config.respond_to?(:call)
-          @config = @config.call
-        else
-          @config
-        end
-      end
-    end
-
-    def initialize(*args)
-      super(*args)
-      @config = -> { Fronton::Config.load! }
-    end
-
-    desc 'new APP_NAME', 'Creates new frontend app'
-    def new(name)
-      if Dir.exist? name
-        say_status 'create', "#{name} directory already exists. Abort!", :red
-        exit 1
-      else
-        directory 'template', name
+        Fronton::Config
       end
     end
 
-    desc 'server', 'Preview your app in browser'
-    method_option :host, type: :string, default: '127.0.0.1', banner: 'HOST the host address to bind to'
-    method_option :port, type: :numeric, default: 3000, banner: 'PORT the port to bind to'
-    method_option :livereload, type: :boolean, default: false, banner: 'BOOLEAN enable or disable livereload support'
-    def server # rubocop:disable Metrics/AbcSize
-      # install dependencies for rails assets
-      config.install_dependencies
-
-      # require dependencies for rails assets
-      config.require_dependencies
-
-      # assets helpers
-      config.environment.context_class.digest_assets = false
-      config.environment.context_class.assets_prefix = '/assets'
-
-      conf = config
-      opts = options
-
-      app = Rack::Builder.new do
-        map('/assets') { run conf.environment }
-        map('/') do
-          use Rack::LiveReload if opts[:livereload]
-          run Fronton::HTMLServer.new(config: conf)
-        end
-      end
-
-      Rack::Server.start(
-        app: app,
-        environment: 'development',
-        Host: options[:host],
-        Port: options[:port]
-      )
-    end
-
-    desc 'compile', 'Compiles assets using digest and minification'
-    def compile # rubocop:disable Metrics/AbcSize
-      # install dependencies for rails assets
-      config.install_dependencies
-
-      # require dependencies for rails assets
-      config.require_dependencies
-
-      # configure environment
-      if config.compressor_js
-        config.environment.js_compressor  = config.compressor_js.to_sym
-      end
-
-      if config.compressor_css
-        config.environment.css_compressor = config.compressor_css.to_sym
-      end
-
-      # assets helpers
-      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)
-
-      # compile html pages
-      config.pages.map(&:save)
-    end
-
-    desc 'clean', 'Remove old assets'
-    method_option :keep, type: :numeric, default: 2, banner: 'KEEP assets versions to keep'
-    def clean
-      config.manifest.clean(options[:keep])
-    end
-
-    desc 'clobber', 'Remove all assets'
-    def clobber
-      # assets
-      config.manifest.clobber
-
-      # html
-      FileUtils.rm Dir.glob(config.output.join('*.html'))
-    end
-
-    desc 'info', 'Information about project'
-    def info # rubocop:disable Metrics/AbcSize
-      say 'Dependencies', :bold
-
-      @dependencies = config.dependencies.map do |dep|
-        status = dep.available? ? 'Installed' : 'Not Installed'
-        [dep.name, dep.version, status]
-      end
-
-      print_table @dependencies
-
-      puts ''
-
-      say 'Assets Paths', :bold
-      config.assets_paths.each do |path|
-        say path.to_s, Dir.exist?(path) ? nil : :red
-      end
-
-      puts ''
-
-      say 'Pages Paths', :bold
-      config.pages_paths.each do |path|
-        say path.to_s, Dir.exist?(path) ? nil : :red
-      end
-
-      puts ''
-
-      say 'Sprockets Engines', :bold
-
-      @engines = config.environment.engines.map { |ext, klass| [ext, klass] }
-      print_table @engines
-
-      puts ''
-
-      say 'Compressors', :bold
-
-      @available_compressors = []
-      @used_compressors = [config.compressor_css.to_sym, config.compressor_js.to_sym]
-
-      config.environment.compressors.each do |mime, list|
-        list.each do |id, klass|
-          mark = @used_compressors.include?(id) ? '<--' : ''
-          @available_compressors << [mime, id, klass, mark]
-        end
-      end
-
-      print_table @available_compressors
-
-      puts ''
-
-      say "Powered by Fronton v#{Fronton.version} - https://github.com/javierav/fronton", :bold
+    def self.source_root
+      File.expand_path('../../..', __FILE__)
     end
   end
 end

data/lib/fronton/commands/clean.rb

@@ -0,0 +1,16 @@
+module Fronton
+  module Commands
+    module Clean
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'clean', 'Remove old assets'
+        method_option :keep, type: :numeric, default: 2, banner: 'KEEP assets versions to keep'
+
+        def clean
+          config.manifest.clean(options[:keep])
+        end
+      end
+    end
+  end
+end

data/lib/fronton/commands/clobber.rb

@@ -0,0 +1,21 @@
+require 'fileutils'
+
+module Fronton
+  module Commands
+    module Clobber
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'clobber', 'Remove all assets'
+
+        def clobber
+          # assets
+          config.manifest.clobber
+
+          # html
+          FileUtils.rm Dir.glob(config.output.join('*.html'))
+        end
+      end
+    end
+  end
+end

data/lib/fronton/commands/compile.rb

@@ -0,0 +1,43 @@
+module Fronton
+  module Commands
+    module Compile
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'compile', 'Compile assets'
+        method_option :digest, type: :boolean, default: true, banner: 'BOOLEAN enable or disable assets digest'
+        method_option :compress, type: :boolean, default: true, banner: 'BOOLEAN enable or disable assets compression'
+        method_option :base, type: :boolean, default: true, banner: 'BOOLEAN enable or disable use of base_url in assets paths'
+
+        def compile # rubocop:disable Metrics/AbcSize
+          # install dependencies for rails assets
+          config.install_dependencies
+
+          # require dependencies for rails assets
+          config.require_dependencies
+
+          # configure environment
+          if config.compressor_js && options[:compress]
+            config.environment.js_compressor = config.compressor_js.to_sym
+          end
+
+          if config.compressor_css && options[:compress]
+            config.environment.css_compressor = config.compressor_css.to_sym
+          end
+
+          # configuration
+          config.use_base   = options[:base]
+          config.use_digest = options[:digest]
+
+          # compile assets
+          require 'non-stupid-digest-assets' unless options[:digest]
+
+          config.manifest.compile(config.assets)
+
+          # compile html pages
+          config.pages.each(&:save)
+        end
+      end
+    end
+  end
+end

data/lib/fronton/commands/info.rb

@@ -0,0 +1,63 @@
+module Fronton
+  module Commands
+    module Info
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'info', 'Display relevant information about a project'
+
+        def info # rubocop:disable Metrics/AbcSize
+          say 'Dependencies', :bold
+
+          @dependencies = config.dependencies.map do |dep|
+            status = dep.available? ? 'Installed' : 'Not Installed'
+            [dep.name, dep.version, status]
+          end
+
+          print_table @dependencies
+
+          puts ''
+
+          say 'Assets Paths', :bold
+          config.assets_paths.each do |path|
+            say path.to_s, Dir.exist?(path) ? nil : :red
+          end
+
+          puts ''
+
+          say 'Pages Paths', :bold
+          config.pages_paths.each do |path|
+            say path.to_s, Dir.exist?(path) ? nil : :red
+          end
+
+          puts ''
+
+          say 'Sprockets Engines', :bold
+
+          @engines = config.environment.engines.map { |ext, klass| [ext, klass] }
+          print_table @engines
+
+          puts ''
+
+          say 'Compressors', :bold
+
+          @available_compressors = []
+          @used_compressors = [config.compressor_css.to_sym, config.compressor_js.to_sym]
+
+          config.environment.compressors.each do |mime, list|
+            list.each do |id, klass|
+              mark = @used_compressors.include?(id) ? '<--' : ''
+              @available_compressors << [mime, id, klass, mark]
+            end
+          end
+
+          print_table @available_compressors
+
+          puts ''
+
+          say "Powered by Fronton v#{Fronton.version} - https://github.com/javierav/fronton", :bold
+        end
+      end
+    end
+  end
+end

data/lib/fronton/commands/new.rb

@@ -0,0 +1,20 @@
+module Fronton
+  module Commands
+    module New
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'new APP_NAME', 'Creates new frontend app'
+
+        def new(name)
+          if Dir.exist? name
+            say_status 'create', "#{name} directory already exists. Abort!", :red
+            exit 1
+          else
+            directory 'template', name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fronton/commands/server.rb

@@ -0,0 +1,44 @@
+require 'rack'
+require 'rack/livereload'
+require 'fronton/server'
+
+module Fronton
+  module Commands
+    module Server
+      extend ActiveSupport::Concern
+
+      included do
+        desc 'server', 'Preview your app in a browser'
+        method_option :host, type: :string, default: '127.0.0.1', banner: 'HOST the host address to bind to'
+        method_option :port, type: :numeric, default: 3000, banner: 'PORT the port to bind to'
+        method_option :livereload, type: :boolean, default: false, banner: 'BOOLEAN enable or disable livereload support'
+
+        def server # rubocop:disable Metrics/AbcSize
+          # install dependencies for rails assets
+          config.install_dependencies
+
+          # require dependencies for rails assets
+          config.require_dependencies
+
+          conf = config
+          opts = options
+
+          app = Rack::Builder.new do
+            map('/assets') { run conf.environment }
+            map('/') do
+              use Rack::LiveReload if opts[:livereload]
+              run Fronton::Server.new
+            end
+          end
+
+          Rack::Server.start(
+            app: app,
+            environment: 'development',
+            Host: options[:host],
+            Port: options[:port]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fronton/config.rb

@@ -2,8 +2,9 @@ require 'pathname'
 require 'logger'
 require 'yaml'
 require 'sprockets'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'fronton/dependency'
-require 'fronton/context'
+require 'fronton/contexts/sprockets'
 
 module Fronton
   class Config
@@ -13,137 +14,158 @@ module Fronton
       filename.start_with?(Dir.pwd) && !['.js', '.css', ''].include?(File.extname(logical_path))
     end
 
-    def self.load!
-      file = Pathname.pwd.join('fronton.yml')
+    class << self
+      attr_reader :logger
+      attr_writer :use_base, :use_digest, :assets_path
 
-      if file.exist?
-        self.new( YAML.load_file(file) )
-      else
-        raise YAMLNotFound, "File 'fronton.yml' not found in #{Dir.pwd}"
+      def load!
+        file = working_dir.join('fronton.yml')
+
+        if file.exist?
+          @config       = YAML.load_file(file).with_indifferent_access
+          @logger       = Logger.new($stderr)
+          @logger.level = Logger::INFO
+        else
+          raise YAMLNotFound, "File 'fronton.yml' not found in #{Dir.pwd}"
+        end
       end
-    end
 
-    def initialize(parsed_yaml)
-      @config       = parsed_yaml
-      @logger       = Logger.new($stderr)
-      @logger.level = Logger::INFO
-    end
+      #
+      ## ACCESSORS
+      #
 
-    #
-    ## ACCESSORS
-    #
+      def use_base
+        @use_base.nil? ? false : @use_base
+      end
 
-    def assets
-      @assets ||= begin
-        assets_conf = @config['assets'].is_a?(Array) ? @config['assets'] : []
-        [PRECOMPILE_CRITERIA, /(?:\/|\\|\A)application\.(css|js)$/] + assets_conf
+      def use_digest
+        @use_digest.nil? ? false : @use_digest
       end
-    end
 
-    def assets_paths
-      @assets_paths ||= begin
-        if @config['assets_paths'].is_a?(Array)
-          @config['assets_paths'].map { |p| working_dir.join(p) }
-        else
-          []
+      def assets_path
+        @assets_path.nil? ? 'assets' : @assets_path
+      end
+
+      def assets_prefix
+        use_base ? "#{base_url}/#{assets_path}" : assets_path
+      end
+
+      #
+      ## YAML CONFIG
+      #
+
+      def assets
+        @assets ||= begin
+          assets_conf = @config[:assets].is_a?(Array) ? @config[:assets] : []
+          [PRECOMPILE_CRITERIA, %r{(?:/|\\|\A)application\.(css|js)$}] + assets_conf
         end
       end
-    end
 
-    def assets_url
-      @config['assets_url']
-    end
+      def assets_paths
+        @assets_paths ||= begin
+          if @config[:assets_paths].is_a?(Array)
+            @config[:assets_paths].map { |p| working_dir.join(p) }
+          else
+            []
+          end
+        end
+      end
 
-    def output
-      @output ||= working_dir.join(@config['output'] || 'public')
-    end
+      def base_url
+        @config[:base_url]
+      end
+
+      def output
+        @output ||= working_dir.join(@config[:output] || 'public')
+      end
 
-    def dependencies
-      @dependencies ||= begin
-        dep = @config['dependencies'].is_a?(Array) ? @config['dependencies'] : []
+      def dependencies
+        @dependencies ||= begin
+          dep = @config[:dependencies].is_a?(Array) ? @config[:dependencies] : []
 
-        dep.map do |d|
-          Dependency.new(d.keys.first, d.values.first)
+          dep.map do |d|
+            Dependency.new(d.keys.first, d.values.first)
+          end
         end
       end
-    end
 
-    def fallback_page
-      if @config['fallback_page']
-        Page.new(@config['fallback_page'], '/', config: self)
+      def fallback_page
+        if @config[:fallback_page]
+          Page.new(@config[:fallback_page], '/')
+        end
       end
-    end
 
-    def pages
-      @pages ||= begin
-        pages = @config['pages'].is_a?(Array) ? @config['pages'] : []
+      def pages
+        @pages ||= begin
+          pages = @config[:pages].is_a?(Array) ? @config[:pages] : []
 
-        pages.map do |page|
-          Page.new(page.keys.first, page.values.first, config: self)
+          pages.map do |page|
+            Page.new(page.keys.first, page.values.first)
+          end
         end
       end
-    end
 
-    def pages_paths
-      @pages_paths ||= begin
-        if @config['pages_paths'].is_a?(Array)
-          @config['pages_paths'].map { |p| working_dir.join(p) }
-        else
-          []
+      def pages_paths
+        @pages_paths ||= begin
+          if @config[:pages_paths].is_a?(Array)
+            @config[:pages_paths].map { |p| working_dir.join(p) }
+          else
+            []
+          end
         end
       end
-    end
 
-    def compressor_js
-      @config['compressors'] && @config['compressors']['js']
-    end
+      def compressor_js
+        @config[:compressors] && @config[:compressors][:js]
+      end
 
-    def compressor_css
-      @config['compressors'] && @config['compressors']['css']
-    end
+      def compressor_css
+        @config[:compressors] && @config[:compressors][:css]
+      end
 
-    def environment
-      @environment ||= begin
-        env = Sprockets::Environment.new
+      def environment
+        @environment ||= begin
+          env = Sprockets::Environment.new
 
-        # logger
-        env.logger = @logger
+          # logger
+          env.logger = logger
 
-        # fronton.yml assets paths
-        assets_paths.each { |path| env.append_path path }
+          # fronton.yml assets paths
+          assets_paths.each { |path| env.append_path path }
 
-        # rails assets paths
-        if defined? RailsAssets
-          RailsAssets.load_paths.each { |path| env.append_path path }
-        end
+          # rails assets paths
+          if defined? RailsAssets
+            RailsAssets.load_paths.each { |path| env.append_path path }
+          end
 
-        # context helpers
-        env.context_class.send :include, ::Fronton::Context
+          # context helpers
+          env.context_class.send :include, ::Fronton::Contexts::Sprockets
 
-        env
+          env
+        end
       end
-    end
 
-    def manifest
-      @manifest ||= Sprockets::Manifest.new environment, File.join(output, 'assets', 'manifest.json')
-    end
+      def manifest
+        @manifest ||= Sprockets::Manifest.new environment, File.join(output, assets_path, 'manifest.json')
+      end
 
-    #
-    ## METHODS
-    #
+      #
+      ## METHODS
+      #
 
-    def install_dependencies
-      dependencies.map(&:install_dependency)
-    end
+      def install_dependencies
+        dependencies.map(&:install_dependency)
+      end
 
-    def require_dependencies
-      dependencies.map(&:require_dependency)
-    end
+      def require_dependencies
+        dependencies.map(&:require_dependency)
+      end
 
-    private
+      private
 
-    def working_dir
-      Pathname.pwd
+      def working_dir
+        Pathname.pwd
+      end
     end
   end
 end

data/lib/fronton/contexts/sprockets.rb

@@ -0,0 +1,38 @@
+module Fronton
+  module Contexts
+    module Sprockets
+      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 config.use_digest
+
+        if current_prefix.empty?
+          path
+        else
+          "#{current_prefix}/#{path}"
+        end
+      end
+      alias_method :'asset-path', :asset_path
+
+      private
+
+      # TODO, revisar esto para no tener logica aqui metida
+      def current_prefix
+        if !config.use_base && content_type == 'text/css'
+          ''
+        else
+          config.assets_prefix
+        end
+      end
+
+      def config
+        Fronton::Config
+      end
+    end
+  end
+end

data/lib/fronton/contexts/tilt.rb

@@ -0,0 +1,24 @@
+module Fronton
+  module Contexts
+    class Tilt
+      def javascript_tag(name)
+        %(<script src="#{asset_path("#{name}.js")}"></script>\n)
+      end
+
+      def stylesheet_tag(name)
+        %(<link href="#{asset_path("#{name}.css")}" media="screen" rel="stylesheet" />\n)
+      end
+
+      def asset_path(name)
+        asset_name = config.use_digest && config.manifest.assets[name] ? config.manifest.assets[name] : name
+        "#{config.assets_prefix}/#{asset_name}"
+      end
+
+      private
+
+      def config
+        Fronton::Config
+      end
+    end
+  end
+end

data/lib/fronton/page.rb

@@ -1,28 +1,21 @@
 require 'tilt'
-require 'fronton/assets_helpers'
+require 'fronton/contexts/tilt'
 
 module Fronton
   class Page
-    attr_reader :name, :url, :config
+    attr_reader :name, :url
 
-    def initialize(name, url, options = {})
+    def initialize(name, url)
       @name   = name
-      @config = options.fetch(:config)
-      @digest = options.fetch(:digest, false)
-      @prefix = options.fetch(:prefix, '/assets')
       @url    = url
     end
 
     def content
-      Tilt.new(template_path, template_options).render(AssetsHelpers.new(helpers_options))
+      Tilt.new(template_path, template_options).render(Fronton::Contexts::Tilt.new)
     end
 
     def save
-      with_digest do
-        with_prefix "#{config.assets_url}/assets" do
-          File.open(save_path, 'w') { |f| f.write(content) }
-        end
-      end
+      File.open(save_path, 'w') { |f| f.write(content) }
     end
 
     def exist?
@@ -31,6 +24,10 @@ module Fronton
 
     private
 
+    def config
+      Fronton::Config
+    end
+
     def template_path
       found_path = config.pages_paths.find do |path|
         File.exist?(path.join(name))
@@ -45,23 +42,8 @@ module Fronton
       { disable_escape: true, pretty: true }
     end
 
-    def helpers_options
-      { digest: @digest, manifest: @config.manifest, prefix: @prefix }
-    end
-
     def save_path
       config.output.join("#{File.basename(name, '.*')}.html")
     end
-
-    def with_digest
-      @digest = true; yield; @digest = false # rubocop:disable Style/Semicolon
-    end
-
-    def with_prefix(prefix)
-      old_prefix = @prefix
-      @prefix = prefix
-      yield
-      @prefix = old_prefix
-    end
   end
 end

data/lib/fronton/{html_server.rb → server.rb}

@@ -1,11 +1,7 @@
 require 'fronton/page'
 
 module Fronton
-  class HTMLServer
-    def initialize(options = {})
-      @config = options.fetch(:config)
-    end
-
+  class Server
     # Rack entrypoint
     def call(env)
       if page = requested_page(env) # rubocop:disable Lint/AssignmentInCondition
@@ -16,7 +12,7 @@ module Fronton
           error_404
         end
       else
-        fallback = @config.fallback_page
+        fallback = config.fallback_page
 
         if fallback
           render_page(fallback)
@@ -28,8 +24,12 @@ module Fronton
 
     private
 
+    def config
+      Fronton::Config
+    end
+
     def requested_page(env)
-      @config.pages.find { |page| page.url == env['PATH_INFO'] }
+      config.pages.find { |page| page.url == env['PATH_INFO'] }
     end
 
     def render_page(page)

data/lib/fronton/version.rb

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

data/template/fronton.yml

@@ -9,7 +9,7 @@ assets_paths:
   - vendor/stylesheets
   - vendor/fonts
   - vendor/images
-assets_url: https://assets.example.com
+base_url: https://assets.example.com
 compressors:
   css: scss
   js: uglifier

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fronton
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Javier Aranda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: non-stupid-digest-assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -178,13 +192,19 @@ files:
 - bin/fronton
 - fronton.gemspec
 - lib/fronton.rb
-- lib/fronton/assets_helpers.rb
 - lib/fronton/cli.rb
+- lib/fronton/commands/clean.rb
+- lib/fronton/commands/clobber.rb
+- lib/fronton/commands/compile.rb
+- lib/fronton/commands/info.rb
+- lib/fronton/commands/new.rb
+- lib/fronton/commands/server.rb
 - lib/fronton/config.rb
-- lib/fronton/context.rb
+- lib/fronton/contexts/sprockets.rb
+- lib/fronton/contexts/tilt.rb
 - lib/fronton/dependency.rb
-- lib/fronton/html_server.rb
 - lib/fronton/page.rb
+- lib/fronton/server.rb
 - lib/fronton/version.rb
 - template/assets/fonts/.keep
 - template/assets/images/.keep

data/lib/fronton/assets_helpers.rb

@@ -1,24 +0,0 @@
-module Fronton
-  class AssetsHelpers
-    def initialize(options = {})
-      @use_digest = options.fetch(:digest, false)
-      @prefix     = options.fetch(:prefix)
-      @manifest   = options.fetch(:manifest)
-    end
-
-    def javascript_tag(name)
-      name = asset_path("#{name}.js")
-      %(<script src="#{name}"></script>\n)
-    end
-
-    def stylesheet_tag(name)
-      name = asset_path("#{name}.css")
-      %(<link href="#{name}" media="screen" rel="stylesheet" />\n)
-    end
-
-    def asset_path(name)
-      asset_name = @use_digest && @manifest.assets[name] ? @manifest.assets[name] : name
-      File.join(@prefix, asset_name)
-    end
-  end
-end

data/lib/fronton/context.rb

@@ -1,22 +0,0 @@
-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