classy_assets 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb2e760e3ed3c241cdc126be0b0bc2f2217469d
-  data.tar.gz: 3adad204422df1062aa2ba6c80674b882a62f1a9
+  metadata.gz: 09060ae6447ae8e3f17758b01987a1cfef968a48
+  data.tar.gz: 78b1c6731372676a92be58dacea8bacadd83f79e
 SHA512:
-  metadata.gz: 9b30a3e2e8d9d819a475e1a1980bb632acb6aee245264a56873825c807ec1f02f756e46bbaeeb7f531ba420793619b0c1e70eedb59abdc1f7d2b3275f6ff5efe
-  data.tar.gz: ac6910479d8b9af07b230c28520599d1e254e7ec717172010a68db3f54154aa6257815d6de8c0cad26dd303173ffdd982bd4517eb74b76baef3293ddef183028
+  metadata.gz: 82cc2abbe97b65df3ed5efb942172d2706f0fa543afb0159a1f89d318f2a4df714d2685f421701b62587716ca559161675c990fdaf8ed077cb825bf8188522e4
+  data.tar.gz: b39d1aad214784f364dea6f30c78697555d03d366eec50cfa07ebec4d7b738400472295c5e390fdfc7324d2f3162aa73017a4a610baec8babdebe59ad7d6e7db

data/Gemfile

@@ -2,6 +2,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'coffee-script', require: false
+  gem 'sass', require: false
+  gem 'compass', require: false
+  gem 'uglifier', require: false
+  gem 'yui-compressor', require: false
   gem 'slim', require: false
   gem 'minitest', require: false
   gem 'minitest-spec-context', require: false

data/classy_assets.gemspec

@@ -18,12 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'coffee-script'
-  gem.add_dependency 'sass'
   gem.add_dependency 'sprockets'
-  gem.add_dependency 'compass'
-  gem.add_dependency 'uglifier'
-  gem.add_dependency 'yui-compressor'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'escape_utils'
 

data/lib/classy_assets/config.rb

@@ -1,15 +1,21 @@
 # encoding: utf-8
 
 require 'singleton'
+require 'classy_assets/errors/nil_asset_root'
 
 module ClassyAssets
   class Config
     include Singleton
 
-    attr_accessor :asset_compress, :css_compressor, :js_compressor
+    attr_accessor :asset_cache, :asset_compress, :css_compressor, :js_compressor
     attr_accessor :asset_debug, :asset_digest, :asset_host, :asset_paths, :asset_prefix, :asset_root
     attr_accessor :asset_precompile_folder, :asset_precompile_files
 
+    def asset_cache
+      @asset_cache = (ENV['RACK_ENV'] == 'production') unless defined? @asset_cache
+      @asset_cache
+    end
+
     def asset_compress
       @asset_compress if defined? @asset_compress
     end
@@ -47,7 +53,7 @@ module ClassyAssets
     end
 
     def asset_precompile_files
-      @asset_precompile_files ||= %w(application.css application.js)
+      @asset_precompile_files ||= [/\w+\.(?!js|css).+/, /application.(css|js)$/]
     end
 
     def asset_precompile_folder

data/lib/classy_assets/sprockets.rb

@@ -1,25 +1,22 @@
 # encoding: utf-8
 
-require 'singleton'
-require 'sprockets'
 
+require 'sprockets'
 module ClassyAssets
   class Sprockets
-    include Singleton
+    attr_accessor :asset_root
+    def initialize
+      @asset_root = ClassyAssets.config.asset_root
+    end
 
     def environment
-      asset_root = ClassyAssets.config.asset_root
+      return @environment if @environment.instance_of? ::Sprockets::Environment
       @environment = ::Sprockets::Environment.new(asset_root)
-
+      
       ClassyAssets.config.asset_paths.each do |asset_path|
         @environment.append_path asset_path
       end
 
-      if ClassyAssets.config.asset_compress
-        @environment.css_compressor = ClassyAssets.config.css_compressor
-        @environment.js_compressor  = ClassyAssets.config.css_compressor
-      end
-
       @environment.context_class.class_eval do
         def asset_path(path, options = {})
           ClassyAssets.asset_url_for(path)

data/lib/classy_assets/tasks.rb

@@ -4,17 +4,17 @@ require 'rake'
 require 'rake/sprocketstask'
 require 'classy_assets'
 
-class Rake::ClassyAssetsTask < Rake::SprocketsTask
-  def define_precompile
-    desc "Precompile assets"
-    task "assets:precompile" => [:assets]
-  end
+module ClassyAssets 
+  class Tasks < Rake::SprocketsTask ; end
 end
 
 Rake::ClassyAssetsTask.new do |t|
-  ClassyAssets.config.asset_compress = true
+  if ClassyAssets.config.asset_compress
+    ClassyAssets.sprockets.css_compressor = ClassyAssets.config.css_compressor
+    ClassyAssets.sprockets.js_compressor  = ClassyAssets.config.css_compressor
+  end
+
   t.environment  = ClassyAssets.sprockets
   t.output       = ClassyAssets.config.asset_precompile_folder
   t.assets       = ClassyAssets.config.asset_precompile_files
-  t.define_precompile
 end

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/lib/classy_assets.rb

@@ -1,10 +1,5 @@
 # encoding: utf-8
 
-# ensure these come first to avoid tilt warnings
-require 'compass'
-require 'sass'
-require 'coffee_script'
-
 # stdlib
 require 'base64'
 require 'escape_utils'
@@ -13,16 +8,19 @@ require 'sprockets'
 
 # classy assets components
 require 'classy_assets/config'
-require 'classy_assets/errors/nil_asset_root'
-require 'classy_assets/sass/script/functions'
 require 'classy_assets/sprockets'
+require 'classy_assets/sass/script/functions'
 require 'classy_assets/sprockets/sass_importer'
 require 'classy_assets/version'
 
 module ClassyAssets
-  # singleton sprockets environment
+  # sprockets environment
   def self.sprockets
-    ClassyAssets::Sprockets.instance.environment
+    if ClassyAssets.config.asset_cache
+      ClassyAssets::Sprockets.new.environment.index
+    else
+      ClassyAssets::Sprockets.new.environment
+    end
   end
 
   # singleton configuration

data/spec/classy_assets/config_spec.rb

@@ -20,11 +20,16 @@ describe ClassyAssets::Config do
       config.asset_digest = true
       config.asset_host = @asset_host
       config.asset_paths << @vendor_path
+      config.asset_precompile_files = @asset_precompile_files
     end
 
     @configuration = ClassyAssets.config
   end
 
+  it "returns the configured asset_cache" do
+    @configuration.asset_cache.must_equal false
+  end
+
   it "returns the configured asset_compress" do
     @configuration.asset_compress.must_equal nil
   end

data/spec/sinatra/classy_assets_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 require 'sinatra/classy_assets'
 
 class ClassySinatraApp < Sinatra::Base
+  use Rack::ClassyAssets
   register Sinatra::ClassyAssets
 
   get "/stylesheet_tag" do
@@ -77,11 +78,4 @@ describe Sinatra::ClassyAssets do
       last_response.body.must_match(/<script src="\/assets\/application.js"><\/script>/)
     end
   end
-
-  context "uses Rack::ClassyAssets middleware" do
-    it "requests for assets will respond sucessfully" do
-      get '/assets/stylesheet.css'
-      last_response.status.must_equal 200
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -5,11 +5,22 @@ lib_path = File.expand_path('../lib', __FILE__)
 ($:.unshift lib_path) unless ($:.include? lib_path)
 require 'bundler'
 Bundler.setup(:default, ENV['RACK_ENV'])
-require 'rack/test'
+
+# ensure these come first to avoid tilt warnings
+require 'compass'
+require 'sass'
+require 'coffee_script'
 require 'slim'
+
+# require gem
 require 'classy_assets'
+
+# testing stack
+require 'rack/test'
 require 'minitest/autorun'
 require "minitest-spec-context"
 require 'minitest/reporters'
+
+# boot the infernal machine
 MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 include Rack::Test::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - StyleSeek Engineering
@@ -10,34 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  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: sass
-  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: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: compass
-  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: uglifier
-  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: yui-compressor
-  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: sinatra
   requirement: !ruby/object:Gem::Requirement