asset 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52ee1bd409970275c4b77e36b0e989611e08760
-  data.tar.gz: 3e74438b8cfb42423213cb985e2479498749aa5c
+  metadata.gz: 4f17565f109c0b351777b0d7cfa88144524534ed
+  data.tar.gz: be03e366951fb2b26382bc2b07b4ed64f1973779
 SHA512:
-  metadata.gz: c6649232a66e95a25ffc558a74af705fe3db0d04e185f51c025b8cfad8146b75152e20621001fa78c640370e2454dc4c3713e8f901355852d6176a57dfba844f
-  data.tar.gz: 33ee769be170459df7427bef9d7039b5af25d53b07f1e3bdace11cba29af6ac50c50594a2532da54d46fcbca5270aa24402f487f6b0fdc1ae87e6724459cf8bc
+  metadata.gz: 284bbb2daa6970e6b1f90a812b19120a7d77d857f5b338bfdc69610c868da2ce684933e2f19258ec1b8fdb4c6e38e89ecfa5fd9a744ede4f7a7dab22e31b3088
+  data.tar.gz: f86dbc037a1e5f703a674ad1f7b604b5ae3fa26660c9aaa62372a440c79f049b343c64a9555d36cd40ff6b36b20c844272413b2a86030db9176cdb7e8c2a4327

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+**Version 0.1.8** - *2017-01-19*
+
+- Removed tilt as dependency, using Sass only
+- Fixed cache disk writing
+
 **Version 0.1.7** - *2017-01-18*
 
 - Production mode also for staging

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.7'
-  s.date        = '2017-01-18'
+  s.version     = '0.1.8'
+  s.date        = '2017-01-19'
   s.summary     = "Compress and serve your CSS and JS assets automatically"
   s.description = "The only thing you need for your assets."
   s.authors     = ["Fugroup Limited"]
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'sinatra', '>= 0'
   s.add_development_dependency 'puma', '>= 0'
-  s.add_development_dependency 'tilt', '>= 0'
   s.add_development_dependency 'liquid', '>= 0'
   s.add_development_dependency 'erubis', '>= 0'
   s.add_development_dependency 'rest-client', '>= 0'

data/lib/asset.rb

@@ -1,13 +1,15 @@
 require 'rack'
 require 'yaml'
-autoload :Uglifier, 'uglifier'
-autoload :Tilt, 'tilt'
 
 # Asset packer, middleware and helpers
 # @homepage: https://github.com/fugroup/asset
 # @author:   Vidar <vidar@fugroup.net>, Fugroup Ltd.
 # @license:  MIT, contributions are welcome.
 module Asset
+
+  autoload :Uglifier, 'uglifier'
+  autoload :Sass, 'sass'
+
   class << self; attr_accessor :mode, :path, :cache, :favicon, :robots, :manifest, :bundle, :images, :debug; end
 
   # Default is development

data/lib/assets/item.rb

@@ -26,15 +26,14 @@ module Asset
       File.join('/assets', @type, (p? ? @kpath : @path))
     end
 
-    # Get the content. Pass cache = false to fetch from disk instead of the cache.
+    # Get the content. Pass key = false to fetch from disk instead of the cache.
     def content(key = nil)
-      !key ? (@joined ||= joined) : (@cached ||= cached)
+      key ? (@cached ||= cached) : (@joined ||= joined)
     end
 
     # The cached content
     def cached
-      File.read(cache_path).tap{|f| return f if f} rescue nil
-      compressed.tap{|r| write_cache(r)}
+      return File.read(cache_path) rescue compressed.tap{|r| write_cache(r)}
     end
 
     # Store in cache
@@ -56,7 +55,7 @@ module Asset
     def compressed
       @compressed ||= case @type
       when 'css'
-        Tilt.new('scss', :style => :compressed){ joined }.render rescue joined
+        Sass::Engine.new(joined, :syntax => :scss, :cache => false, :style => :compressed).render rescue joined
       when 'js'
         Uglifier.compile(joined, {}) rescue joined
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement