asset 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479c8dc6efb7f01a5694c691ed57cc7b8c76670a
-  data.tar.gz: bc9b8e3a07bc3fb783c4cfb241ed10fb6bb73632
+  metadata.gz: 45bfd8e5aba5d8941fc5dad1e7b6cfb13618f51e
+  data.tar.gz: fa9dfa2916357553683779b8988d60604fbd8a90
 SHA512:
-  metadata.gz: 497dc2eca7a3fb680577b0092fd12d76105189dda0b386552a9d77a9b504205923972b9170459477b715c470d684b1b6031246868d387e8c5e6c409078817c46
-  data.tar.gz: 2883a55245975e3f0f54f5ee06c18bd9d8c07e29af8e3faec9c0be101d741b7f4b4725f56725f5bcff2410c76b46fc3860c267dd3bce6c874893fec49363925a
+  metadata.gz: b3f53b15353d381dde1a06e2a798bcfcbab10bb3e5089d8bb3a216dcbb5d252830fe3a52d3e450374cd2dd0af7eec2a80563465a8e1d89eb8e24b9ea5ef97106
+  data.tar.gz: 6a6eec4c65c51c5b8bfc3803aecb63dbd743a94e892e113ff28799ebfd2cbd5784fb3e4b117d5bac88e0ca54886147149dfe5d1cf5716983330ba2a76f8e46ff

data/README.md

@@ -42,8 +42,7 @@ helpers Asset::Router
 ```yaml
 # Install your manifest file in APP_ROOT/app/assets/manifest.yml
 
-# Asset manifest. Only the files mentioned here will be available.
-# Options are compress: true/false, bundle: true/false
+# Asset manifest. Only the files mentioned here will be bundled.
 css:
 - app.css
 - themes/themes.css
@@ -51,21 +50,6 @@ css:
 js:
 - app.js
 - lib/cookie.js
-
-# Example with options:
-css:
-- app.css:
-  # Compress = false will prevent the file from being compressed (default true)
-  - compress: true
-  # This will not be part of the bundle.js if bundle = false (default true)
-  - bundle: true
-- themes/themes.css
-
-js:
-  # The same options apply to JS files
-- app.js:
-  - bundle: false
-- lib/cookie.js
 ```
 
 ```erb

data/app.rb

@@ -1,6 +1,6 @@
 class App < Sinatra::Base
 
-  # helpers Asset::Helpers
+  helpers Asset::Helpers
 
   configure do
     # Settings
@@ -19,6 +19,7 @@ class App < Sinatra::Base
 
     # Liquid setup
     Liquid::Template.file_system = Liquid::LocalFileSystem.new(APP_VIEWS)
+    Liquid::Template.register_filter(::Asset::Filters)
 
     # Set up loggers and tmp files
     Dir.mkdir('./tmp') unless File.exists?('./tmp')
@@ -39,6 +40,10 @@ class App < Sinatra::Base
     erb(:index)
   end
 
+  get('/liquid') do
+    liquid(:index)
+  end
+
   # Default not found page
   not_found do
     "404, Not found".tap{|m| puts m}

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.1'
-  s.date        = '2017-01-16'
+  s.version     = '0.1.2'
+  s.date        = '2017-01-18'
   s.summary     = "Compress and serve your CSS and JS automatically"
   s.description = "The only thing you need for your assets."
   s.authors     = ["Fugroup Limited"]

data/lib/asset.rb

@@ -8,7 +8,7 @@ autoload :Tilt, 'tilt'
 # @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
 # @license:  MIT, contributions are welcome.
 module Asset
-  class << self; attr_accessor :mode, :path, :cache, :favicon, :robots, :manifest, :images, :debug; end
+  class << self; attr_accessor :mode, :path, :cache, :favicon, :robots, :manifest, :bundle, :images, :debug; end
 
   # Default is development
   @mode = ENV['RACK_ENV'] || 'development'
@@ -35,8 +35,12 @@ require_relative 'assets/item'
 # Load the manifest
 ::Asset.manifest = ::Asset::Util.load_manifest
 
+# Load the bundle
+::Asset.bundle = YAML.load_file(File.join(::Asset.path, 'manifest.yml'))
+
 # Load the images
 ::Asset.images = ::Asset::Util.load_images
 
 require_relative 'assets/helpers'
+require_relative 'assets/filters'
 require_relative 'assets/router'

data/lib/assets/filters.rb

@@ -0,0 +1,7 @@
+module Asset
+  module Filters
+
+    include ::Asset::Helpers
+
+  end
+end

data/lib/assets/helpers.rb

@@ -1,6 +1,11 @@
 module Asset
   module Helpers
 
+    # Asset URL
+    def asset_url(path)
+      ::Asset.manifest.find{|i| i.path == path}.src rescue path
+    end
+
     # Script tags
     def script_tag(*paths)
       tag('js', *paths) do |src|
@@ -18,7 +23,9 @@ module Asset
     # Image tags
     def image_tag(path)
       b = ::Asset.images[path] rescue nil
-      %{<img src="/assets/images/#{CGI.escapeHTML(path)}#{b ? "?#{b}" : ''}">} rescue path
+      # Just slip through if the path starts with http(s) or //
+      src = path =~ /^(http[s]?)?:?\/\// ? path : %{/assets/images/#{path}}
+      %{<img src="#{src}#{b ? "?#{b}" : ''}">} rescue path
     end
 
     private
@@ -26,13 +33,11 @@ module Asset
     # Build the tags
     def tag(type, *paths, &block)
       paths.map do |path|
-
         # Yield the source back to the tag builder
         item = ::Asset.manifest.find{|i| i.path == path}
 
         # Src is same as path if item not found
-        item ? item.files.map{|src| yield(%{/assets/#{type}/#{src}})} : yield(path)
-
+        item ? item.files.map{|f| yield(asset_url(f))} : yield(path)
       end.flatten.join("\n")
     end
 

data/lib/assets/item.rb

@@ -1,11 +1,11 @@
 module Asset
   class Item
 
-    attr_accessor :path, :type, :key, :modified, :compress, :bundle, :app, :name, :kpath
+    attr_accessor :path, :type, :key, :modified, :app, :name, :kpath
 
     # Init
     def initialize(*args)
-      @path, @type, @key, @modified, @compress, @bundle = args
+      @path, @type, @key, @modified = args
       @app = !!(@path =~ /^bundle\.(js|css)$/)
       @name = @path.rpartition('.')[0]
       @kpath = "#{@name}-#{kext}"
@@ -13,17 +13,22 @@ module Asset
 
     # Get the files for this item
     def files
-      (@app and !p?) ? bundle_files : [p? ? @kpath : @path]
+      (@app and !p?) ? bundle_files : [@path]
+    end
+
+    # Get the full path
+    def src
+      File.join('/assets', @type, (p? ? @kpath : @path))
     end
 
     # Get the files for the bundle
     def bundle_files
-      @bundle_files ||= ::Asset.manifest.select{|i| i.type == @type and i.bundle and !i.app}.map{|i| p? ? i.kpath : i.path}
+      @bundle_files ||= ::Asset.manifest.select{|i| ::Asset.bundle[type].include?(i.path) and i.type == @type and !i.app}.map{|i| i.path}
     end
 
     # Get the content. Pass cache = false to fetch from disk instead of the cache.
     def content(key = nil)
-      (!key or !@compress) ? (@joined ||= joined) : (@cached ||= cached)
+      !key ? (@joined ||= joined) : (@cached ||= cached)
     end
 
     # The cached content

data/lib/assets/util.rb

@@ -18,36 +18,27 @@ module Asset
 
     # Load manifest
     def self.load_manifest
-      list = YAML.load_file(File.join(::Asset.path, 'manifest.yml'))
+      list = Dir["#{Asset.path}/{css,js}/**/*"].select{|f| File.file?(f)}.map{|f| f.gsub(Asset.path + '/', '')}
       manifest = []
+      list.each do |file|
+        file =~ /(js|css)\/(.+)/
+        type, name = $1, $2
 
-      list.each do |type, files|
-        max = Time.new(0).utc
-        files.each do |name|
+        # Get the modified time of the asset
+        modified = mtime("#{type}/#{name}")
 
-          # Depending on the options, the name can be a string or a Hash
-          h = name.is_a?(Hash)
-
-          # Path looks like app.js or similar
-          path = h ? name.keys[0] : name
-
-          # Get the modified time of the asset
-          modified = mtime("#{type}/#{path}")
+        # Loading manifest with items
+        manifest << ::Asset::Item.new(name, type, digest(name, modified), modified)
+      end
 
-          # Record max to know the latest change
-          max = modified if modified > max
+      # Insert the css bundle
+      max = manifest.select{|r| r.type == 'css'}.map{|r| r.modified}.max
+      manifest.insert(0, ::Asset::Item.new('bundle.css', 'css', digest('bundle.css', max), max))
 
-          # Loading manifest with items
-          manifest << ::Asset::Item.new(
-            path, type, digest(path, modified), modified,
-            (h ? name['compress'] : true), (h ? name['bundle'] : true))
-        end
+      # Insert the js bundle
+      max = manifest.select{|r| r.type == 'js'}.map{|r| r.modified}.max
+      manifest.insert(0, ::Asset::Item.new('bundle.js', 'js', digest('bundle.js', max), max))
 
-        # Insert the bundle
-        manifest.insert(0, ::Asset::Item.new(
-          "bundle.#{type}", type,
-          digest("bundle.#{type}", max), max))
-      end
       manifest
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -193,6 +193,7 @@ files:
 - asset.gemspec
 - config.ru
 - lib/asset.rb
+- lib/assets/filters.rb
 - lib/assets/helpers.rb
 - lib/assets/item.rb
 - lib/assets/router.rb