sinatra-asset-snack 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzMxNmMwNWNjMzAwMTIwODk5NmMyZTJlMzdiZWFhYjNmM2MzZDU1YQ==
+    ZTI0NGUxZDJmYTlkODE1MzBkZTc3MmFjNTEyMzU3ODkxZDlkY2EwZA==
   data.tar.gz: !binary |-
-    MGU2ZGI1NWI4ZTdiNGUwNTg2MjE3NzE4ZTYzMGNlNDgzZDU4YzliNQ==
-!binary "U0hBNTEy":
+    M2M2NzhlMzA5ODc3MGQ3YzAzMGViMzlkMDcxYWVmZmExYjQwNzBiMQ==
+SHA512:
   metadata.gz: !binary |-
-    ZGVhNDVjZjY0MjEwMzM1NzY3NTViYjNiZTk3NmE0OTBlZjQ0Y2I2NWY4YjZl
-    ODkwYjZjM2Q0Zjk5ODM4ZmU1ZTc1OGUwN2ZiMjM2YTRiOTE5ZGFhYTU4MDM3
-    ZDQyNGFiNjdmM2RiYzU3YjQ4MDJmMDkyOGZiMzc5MDJiNWJhZTM=
+    MTJhYmU2ZDk2MTQ2YTVkNGJkNzI0ZGY3YTMwNzMzMWRlYjExMWZiNGM3YjIz
+    NzEwMGM2MGI4Y2FmN2NhZGVlZjdiNmM1ZThkMTRlOWIxZDc2ZjdiYmY3Mzc1
+    OGU2ZDU3MjRhZmRjYmIwZjc5MDRjYTBiMTI4ZTAyYjNhNWJiZTY=
   data.tar.gz: !binary |-
-    NTM5MzhjZjJlMjgyZGUzNTJjMzY5MjBjNDMzMDgxY2FlZWM4OGNjM2FmYzli
-    MWViN2ZmNzk4MDFlNTQ4MDExMTFiNzUzOWYyNWNhYzUwOTk0NTZmMjlkOTE0
-    YTVhMmU3N2QwYmMxNWRlZjNlNjc2MDgzNjNmMjYwMWRiYmE0ODc=
+    YWM5ZTNiYWNmNmUyYWM4NzRiZWRiODBkYjA1NzFkYzYxNWU2NzUxYzZmNjZi
+    NTllYzNkMzkxZmVlMTMxZDMxMDVmOWMyYThhOTE3YTgzMzY2MDMzOTYyYjEw
+    Yjc4MGYzOWZmZjhmZmY2MThkMjdlMmYwNGVhM2FjM2NiNGJjOTE=

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-19mode
+# script: "rake ci"

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    sinatra-asset-snack (0.1.4)
+    sinatra-asset-snack (0.1.5)
       coffee-script
       mime-types
       sass
       sinatra
+      yajl-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.4.3)
-    builder (3.2.0)
+    builder (3.2.2)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    hashie (2.0.3)
+    coffee-script-source (1.7.0)
+    execjs (2.1.0)
+    hashie (2.0.5)
     metaclass (0.0.1)
-    mime-types (1.21)
-    minitest (4.7.0)
-    minitest-reporters (0.14.11)
+    mime-types (2.3)
+    minitest (4.7.4)
+    minitest-reporters (0.14.20)
       ansi
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
-    mocha (0.13.3)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.2)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.4)
-    sass (3.2.7)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sass (3.3.8)
+    sinatra (1.4.5)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    tilt (1.3.6)
+    tilt (1.4.1)
+    yajl-ruby (1.2.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/benkitzelman/sinatra-asset-snack.png?branch=master)](https://travis-ci.org/benkitzelman/sinatra-asset-snack)
 [![Gem Version](https://badge.fury.io/rb/sinatra-asset-snack.png)](http://badge.fury.io/rb/sinatra-asset-snack)
+[![endorse](https://api.coderwall.com/benkitzelman/endorsecount.png)](https://coderwall.com/benkitzelman)
 
 A lean asset compiler for Sinatra developed specifically for Coffeescript and SASS. 
 It stitches all assets for a route into a single file, no uglification, no minification (configure your server to use Gzip),
@@ -59,3 +60,22 @@ See each compiler's repo for the list of configuration options
 [coffee-script](http://github.com/josh/ruby-coffee-script)
 
 [sass](http://sass-lang.com/)
+
+## Precompile
+
+To precompile your assets, you must set a constant `APP_FILE` to the
+source file which defines your Sinatra app.
+
+### Rakefile
+
+```ruby
+APP_FILE = "lib/app/app.rb"
+require 'sinatra/asset_snack/rake'
+```
+
+This defines the rake task `assetsnack:build` which will precompile your
+assets.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/benkitzelman/sinatra-asset-snack/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/sinatra/asset_snack.rb

@@ -2,9 +2,13 @@ require 'mime/types'
 require 'sass'
 require 'coffee-script'
 
-here = File.dirname(__FILE__)
+require 'sinatra/asset_snack/compilers/asset_compiler'
 
-require File.join here, 'asset_snack', 'compilers', 'asset_compiler'
+require 'sinatra/asset_snack/version'
+require 'sinatra/asset_snack/helpers'
+require 'sinatra/asset_snack/extensions'
+require 'sinatra/asset_snack/configuration'
+require 'sinatra/asset_snack/asset_snack'
 
-Dir[File.join(here, 'asset_snack', '*.rb')].each { |f| require f }
-Dir[File.join(here, 'asset_snack', 'compilers', '*.rb')].each { |f| require f }
+require 'sinatra/asset_snack/compilers/coffee_script_compiler'
+require 'sinatra/asset_snack/compilers/sass_compiler'

data/lib/sinatra/asset_snack/asset_snack.rb

@@ -1,10 +1,11 @@
 module Sinatra
   module AssetSnack
     class << self
-      attr_reader :compilers, :configuration
+      attr_reader :compilers, :configuration, :app
 
       def registered(app, &block)
         @configuration = Configuration.new
+        @app = app # Used in precompile step
 
         app.extend ClassMethods
         app.send(:include, InstanceMethods)
@@ -13,14 +14,12 @@ module Sinatra
 
       def register_compiler(compiler, handled_extensions)
         @compilers ||= {}
-        handled_extensions.each do |ext|
-          @compilers[ext.downcase.to_sym] = compiler
-        end
+        handled_extensions.each { |ext| @compilers[ext.downcase.to_sym] = compiler }
       end
 
       def compiler_for(file_path)
         ext = (File.extname(file_path) || '.').downcase[1..-1]
-        @compilers[ext.to_sym]
+        @compilers[ext.to_sym] || Compilers::AssetCompiler
       end
 
       def assets
@@ -44,13 +43,9 @@ module Sinatra
         expand(paths).reduce({body: '', mime_type: 'text/plain'}) do |content, path|
           next unless File.exists?(path)
 
-          if compiler = AssetSnack.compiler_for(path)
-            compiled = compiler.compile_file(path)
-            content_type = compiler.compiled_mime_type
-          else
-            compiled = File.read path
-            content_type = MIME::Types.type_for(path).first.to_s
-          end
+          compiler = AssetSnack.compiler_for(path)
+          compiled = compiler.compile_file(path)
+          content_type = compiler.compiled_mime_type || MIME::Types.type_for(path).first.to_s
 
           {
             mime_type: content_type || content[:mime_type],
@@ -60,7 +55,9 @@ module Sinatra
       end
 
       def expand(paths)
-        paths.reduce([]) { |file_list, path| file_list + Dir.glob(path) }.uniq
+        paths.reduce([]) do |file_list, path|
+          file_list += File.file?(path) ? [path] : Dir.glob(path)
+        end.uniq
       end
     end # InstanceMethods
   end # AssetSnack

data/lib/sinatra/asset_snack/compilers/asset_compiler.rb

@@ -24,9 +24,9 @@ module Sinatra
 
           def compile_file(file_path)
             ext = ext_for file_path
-            return unless ext && handled_extensions.include?(ext.to_sym)
-
             file_content = File.read file_path
+
+            return file_content unless ext && (handled_extensions || []).include?(ext.to_sym)
             new.compile(file_content, file_path)
           end
 

data/lib/sinatra/asset_snack/compilers/sass_compiler.rb

@@ -11,13 +11,8 @@ module Sinatra
 
         def compile(sass_script, file_path = nil)
           config = self.class.configuration
-          if file_path && ext_for(file_path) == 'sass'
-            config.merge!(syntax: :sass)
-          else
-            config.merge!(syntax: :scss)
-          end
-
-          Sass.compile(sass_script, config)
+          syntax = (file_path && ext_for(file_path) == 'sass') ? :sass : :scss
+          Sass.compile sass_script, config.merge(syntax: syntax)
         end
       end
     end # Compilers

data/lib/sinatra/asset_snack/precompile.rb

@@ -0,0 +1,21 @@
+require 'fileutils'
+
+module Sinatra
+  module AssetSnack
+    def self.precompile!(opts={})
+      snack = self
+      Module.new do
+        extend snack::InstanceMethods
+        snack.assets.each do |assets|
+          path = File.join(snack.app.public_dir, assets[:route])
+          FileUtils.mkdir_p File.dirname(path)
+          puts "compiling #{path}" if opts[:verbose]
+          File.open(path, 'w') do |file|
+            file.write compile(assets[:paths])[:body]
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/sinatra/asset_snack/rake.rb

@@ -0,0 +1,17 @@
+unless defined?(APP_FILE)
+  $stderr.write "Error: Please set APP_FILE before setting up AssetSnack rake tasks.\n"
+  $stderr.write "Example:\n"
+  $stderr.write "    APP_FILE  = 'init.rb'\n"
+  $stderr.write "    require 'sinatra/asset_snack/rake'\n"
+  $stderr.write "\n"
+  exit
+end
+
+namespace :assetsnack do
+  desc "Build assets"
+  task :build do
+    require File.expand_path(APP_FILE, Dir.pwd)
+    require 'sinatra/asset_snack/precompile'
+    Sinatra::AssetSnack.precompile!(verbose:true)
+  end
+end

data/lib/sinatra/asset_snack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetSnack
     def self.version
-      '0.1.5'
+      '0.1.6'
     end
   end # AssetSnack
 end # Sinatra

data/sinatra-asset-snack.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-script'
   s.add_dependency 'sass'
   s.add_dependency 'mime-types'
+  s.add_dependency 'yajl-ruby'
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "minitest-reporters"

data/test/asset_snack_test.rb

@@ -39,5 +39,9 @@ module Sinatra
       Sinatra::AssetSnack.assets.must_include js_assets
       Sinatra::AssetSnack.assets.must_include css_assets
     end
+
+    it 'should be able to determine public directory' do
+      Sinatra::AssetSnack.app.public_dir.must_equal App.public_dir
+    end
   end
-end
+end

data/test/compilers/coffee_script_compiler_test.rb

@@ -10,7 +10,6 @@ module Sinatra
 (function() {
   (function() {
     var x;
-
     return x = "test";
   });
 
@@ -18,7 +17,7 @@ module Sinatra
   EOS
     }
 
-    before(:all) do
+    before do
       Sinatra::AssetSnack.configuration.compilers[:coffee_script] = {}
     end
 
@@ -43,4 +42,4 @@ module Sinatra
       AssetSnack.compiler_for('test.coffee').must_equal AssetSnack::Compilers::CoffeeScriptCompiler
     end
   end
-end
+end

data/test/precompile_test.rb

@@ -0,0 +1,28 @@
+require './test/test_helper'
+require 'sinatra/asset_snack/precompile'
+
+module Sinatra::AssetSnack
+  describe "Sinatra::AssetSnack.precompile!" do
+    let(:app) { App.new }
+    let(:public) { App.public_dir }
+    let(:paths) do
+      Sinatra::AssetSnack.assets.map do |i| 
+        File.join(public, File.dirname(i[:route]))
+      end
+    end
+
+    before do
+      FileUtils.rm_r(public) if Dir.exists?(public)
+    end
+
+    it "must write compiled files to the public directory" do
+      Sinatra::AssetSnack.precompile!
+      paths.wont_be_empty
+      paths.each {|dir| Dir.glob("#{dir}/*").wont_be_empty }
+    end
+
+    after do
+      FileUtils.rm_r(public) if Dir.exists?(public)
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 ENV['RACK_ENV'] = 'test'
-require 'minitest/spec'
 require 'minitest/autorun'
+require 'minitest/spec'
 require "minitest/reporters"
 require "mocha/setup"
 require 'rack/test'
@@ -15,3 +15,4 @@ class App < Sinatra::Base
   asset_map '/javascript/application_js_only.js', ['test/fixtures/**/*.js']
   asset_map '/stylesheets/application.css', ['test/fixtures/**/*.scss']
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-asset-snack
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ben Kitzelman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -158,6 +173,8 @@ files:
 - lib/sinatra/asset_snack/configuration.rb
 - lib/sinatra/asset_snack/extensions.rb
 - lib/sinatra/asset_snack/helpers.rb
+- lib/sinatra/asset_snack/precompile.rb
+- lib/sinatra/asset_snack/rake.rb
 - lib/sinatra/asset_snack/version.rb
 - sinatra-asset-snack.gemspec
 - test/asset_snack_test.rb
@@ -170,8 +187,8 @@ files:
 - test/fixtures/test.scss
 - test/fixtures/test_two.coffee
 - test/helpers_test.rb
+- test/precompile_test.rb
 - test/test_helper.rb
-- travis.yml
 homepage: http://github.com/benkitzelman/sinatra-asset-snack
 licenses: []
 metadata: {}
@@ -191,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Real quick asset compilation of Coffeescript to Javascript and SASS to CSS

data/travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
-# script: "rake ci"