classy_assets 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0eec968fdf1170678ea939441edf11e9fe3629
-  data.tar.gz: 8e58a263f3873ad6970f980dcee8aeb2269f0fc0
+  metadata.gz: 7ae68f4846cdfc63757cd698e09ccb68299ba1e1
+  data.tar.gz: bfcadb8dbf17457e24675413a9c4c77941ec3fb5
 SHA512:
-  metadata.gz: cbe058fcda793e74912ae040469c25ada1c9b1503322933ef1206c299db05501fbbf3c10fb28c2289d10dd5fe78a8d0e879a322f2d530821dc3d2cb631309906
-  data.tar.gz: c957764106f6bff9f9a04ffe67c4757ba7070b9b612261c74c3b892bdd1b22e781e00e75c8d378e846a64e2f01607b7e7833535f2647678d1b637408e79a5ad3
+  metadata.gz: 61802ad99b6dadbd523bcd0a69f84ef66f56f496f974914b2b88dae310e0d85fd95dc3ea65f883653d689a7f7a4bb8464ee596f6416246ef6f61e9299640537a
+  data.tar.gz: 83a22842adb3bcb5fe5aadc093a898211179f15ec1ed94876855a2fc28464d778c70eb2b04c59b7ba571e6045e1ac860592b53ae441bb9b15a77560b7849aeed

data/lib/classy_assets/config.rb

@@ -7,34 +7,24 @@ module ClassyAssets
   class Config
     include Singleton
 
-    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
+    attr_accessor :asset_cache, :asset_compress, :asset_debug, :asset_digest,
+                  :asset_host, :asset_manifest_path, :asset_paths,
+                  :asset_precompile, :asset_precompile_keep,
+                  :asset_precompile_path, :asset_prefix, :asset_public_path,
+                  :asset_root, :asset_version, :css_compressor, :js_compressor
 
     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
-
-    def css_compressor
-      @css_compressor ||= :yui
-    end
-
-    def js_compressor
-      @js_compressor ||= :uglifier
-    end
-
     def asset_debug
       @asset_debug = (ENV['RACK_ENV'] == 'development') unless defined? @asset_debug
       @asset_debug
     end
 
-    def asset_digest
-      @asset_digest if defined? @asset_digest
+    def asset_manifest_path
+      @asset_manifest_path ||= File.join(asset_precompile_path, 'manifest.json')
     end
 
     def asset_paths
@@ -43,21 +33,41 @@ module ClassyAssets
       @asset_paths
     end
 
+    def asset_precompile
+      @asset_precompile ||= [/\w+\.(?!js|css).+/, /application.(css|js)$/]
+    end
+
+    def asset_precompile_keep
+      @asset_precompile_keep ||= 2
+    end
+
+    def asset_precompile_path
+      @asset_precompile_path ||= File.join(asset_public_path, asset_prefix)
+    end
+
     def asset_prefix
       @asset_prefix ||= 'assets'
     end
 
+    def asset_public_path
+      @asset_public_path ||= File.join(asset_root, 'public')
+    end
+
     def asset_root
       raise Errors::NilAssetRoot.new if @asset_root.nil?
       @asset_root
     end
 
-    def asset_precompile_files
-      @asset_precompile_files ||= [/\w+\.(?!js|css).+/, /application.(css|js)$/]
+    def asset_version
+      @asset_version ||= ClassyAssets::VERSION
     end
 
-    def asset_precompile_folder
-      @asset_precompile_folder ||= "./public/#{ClassyAssets.config.asset_prefix}"
+    def css_compressor
+      @css_compressor ||= :yui
+    end
+
+    def js_compressor
+      @js_compressor ||= :uglifier
     end
 
     private

data/lib/classy_assets/sprockets.rb

@@ -6,31 +6,34 @@ module ClassyAssets
   class Sprockets
     attr_accessor :asset_root, :environment
     def initialize
-      @asset_root = ClassyAssets.config.asset_root
+      @config = ClassyAssets.config
+      @asset_root = @config.asset_root
       @environment = new_sprockets_environment
     end
 
     private
 
     def new_sprockets_environment
-      @environment = ::Sprockets::Environment.new(asset_root) { @version = ClassyAssets::VERSION }
+      sprockets_environment = ::Sprockets::Environment.new(asset_root) do
+        @version = @config.asset_version
+      end
       
-      ClassyAssets.config.asset_paths.each do |asset_path|
-        @environment.append_path asset_path
+      @config.asset_paths.each do |asset_path|
+        sprockets_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
+      if @config.asset_compress
+        sprockets_environment.css_compressor = @config.css_compressor
+        sprockets_environment.js_compressor  = @config.css_compressor
       end
 
-      @environment.context_class.class_eval do
+      sprockets_environment.context_class.class_eval do
         def asset_path(path, options = {})
           ClassyAssets.asset_url_for(path)
         end
       end
 
-      @environment
+      sprockets_environment
     end
   end
 end

data/lib/classy_assets/tasks.rb

@@ -5,16 +5,18 @@ require 'rake/sprocketstask'
 require 'classy_assets'
 
 module ClassyAssets 
-  class Tasks < Rake::SprocketsTask 
-    def precompile
+  class Tasks < Rake::SprocketsTask
+    def define_precompile_task
       task "assets:precompile" => [:clean_assets, :assets]
     end
   end
 end
 
 ClassyAssets::Tasks.new do |t|
+  t.define_precompile_task
   t.environment  = ClassyAssets.sprockets
-  t.output       = ClassyAssets.config.asset_precompile_folder
-  t.assets       = ClassyAssets.config.asset_precompile_files
-  t.precompile
+  t.output       = ClassyAssets.config.asset_precompile_path
+  t.assets       = ClassyAssets.config.asset_precompile
+  t.keep         = ClassyAssets.config.asset_precompile_keep
+  t.manifest     = ::Sprockets::Manifest.new(t.environment, ClassyAssets.config.asset_manifest_path)
 end

data/lib/classy_assets/version.rb

@@ -1,3 +1,3 @@
 module ClassyAssets
-  VERSION = "0.9.4"
+  VERSION = "0.10.0"
 end

data/spec/classy_assets/config_spec.rb

@@ -4,15 +4,18 @@ require 'spec_helper'
 
 describe ClassyAssets::Config do
   before(:all) do
+    @asset_prefix = 'assets'
     @asset_root = File.expand_path('../../support', __FILE__)
     @asset_host = 'http://example.com'
-    @asset_prefix = 'assets'
-    
+    @asset_public_path = File.join(@asset_root, 'public')
+    @asset_precompile_path = File.join(@asset_public_path, @asset_prefix)
+    @asset_manifest_path = File.join(@asset_precompile_path, 'manifest.json')
+    @asset_precompile = %w(application.css application.js)
+    @asset_version = ClassyAssets::VERSION
+
     @asset_paths = Dir.glob(File.join(@asset_root, @asset_prefix, '*'))
     @vendor_path = File.expand_path('../../support/vendor', __FILE__)
     @asset_paths << @vendor_path
-    @asset_precompile_files = %w(application.css application.js)
-    @asset_precompile_folder = "./public/#{@asset_prefix}"
 
     ClassyAssets.config do |config|
       config.asset_root = @asset_root # must be configured first
@@ -20,7 +23,7 @@ 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
+      config.asset_precompile = @asset_precompile
     end
 
     @configuration = ClassyAssets.config
@@ -34,14 +37,6 @@ describe ClassyAssets::Config do
     @configuration.asset_compress.must_equal nil
   end
 
-  it "returns the configured css_compressor" do
-    @configuration.css_compressor.must_equal :yui
-  end
-
-  it "returns the configured js_compressor" do
-    @configuration.js_compressor.must_equal :uglifier
-  end
-
   it "returns the configured asset_debug" do
     @configuration.asset_debug.must_equal true
   end
@@ -54,23 +49,47 @@ describe ClassyAssets::Config do
     @configuration.asset_host.must_equal @asset_host
   end
 
+  it "returns the configured asset_manifest_path" do
+    @configuration.asset_manifest_path.must_equal @asset_manifest_path
+  end
+
+  it "returns the configured asset_paths" do
+    @configuration.asset_paths.must_equal @asset_paths
+  end
+
+  it "returns the configured asset_precompile" do
+    @configuration.asset_precompile.must_equal @asset_precompile
+  end
+
+  it "returns the configured asset_precompile_keep" do
+    @configuration.asset_precompile_keep.must_equal 2
+  end
+  
+  it "returns the configured asset_precompile_path" do
+    @configuration.asset_precompile_path.must_equal @asset_precompile_path
+  end
+
   it "returns the configured asset_prefix" do
     @configuration.asset_prefix.must_equal @asset_prefix
   end
 
+  it "returns the configured asset_public_path" do
+    @configuration.asset_public_path.must_equal @asset_public_path
+  end
+
   it "returns the configured asset_root" do
     @configuration.asset_root.must_equal @asset_root
   end
-
-  it "returns the configured asset_paths" do
-    @configuration.asset_paths.must_equal @asset_paths
+  
+  it "returns the configured asset_version" do
+    @configuration.asset_version.must_equal @asset_version
   end
 
-  it "returns the configured asset_precompile_files" do
-    @configuration.asset_precompile_files.must_equal @asset_precompile_files
+  it "returns the configured css_compressor" do
+    @configuration.css_compressor.must_equal :yui
   end
 
-  it "returns the configured asset_precompile_folder" do
-    @configuration.asset_precompile_folder.must_equal @asset_precompile_folder
+  it "returns the configured js_compressor" do
+    @configuration.js_compressor.must_equal :uglifier
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classy_assets
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - StyleSeek Engineering