savanna 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg1MTM4MzQ5MjY2NWY1NzEzM2Y1OTZlMDcxZjFhZWMwODY0NzZhOA==
+    NTc1NWIzZTBhMDU5NmYwYTU3NGY0NTljYWU1ZTc0ZGQ1YTY4NjgzMg==
   data.tar.gz: !binary |-
-    OTI4MDViNTg1MDRkZmYyMjJmYmZhZmM5OTgyMGI0NWY1YTkyZDllMg==
+    ODliMDcwMTM1N2YwYjkxMDc2MzU3MWYwYWQxYTgxNWIxNzM4YjU1MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWE0ODcyNDA1M2QwNDZhODdhM2U5ZmRhNmM5OWYwNDFiNjdiMTU5YmE2ZGM1
-    ZmVkMWI1OTZiYTAyNTAyMjRlNTU3ZWUxZTU4MGE2OGNkMmI1NTkwMjY3OWQz
-    NGZmMDJjYmI4YmU4Mjg2NTA3ZmE0M2FjOWE5OWIxNmM1MzhkM2I=
+    MDdiYTAzMTI1ZjQ5Njc1ZTFmOTJhZDViYWQ4NjM4NGM2MGFmNGJhYTFlZjA2
+    NTRhNWY0NDQyYjRkYmRmOTU3ZTIzZjk0OTQxMDkwZWU0ZmFkMWViZjg2ZDk3
+    MTBmZGEwOGQzMDRhNzhkMTAwNDJjY2NkMmE1OTc4ODhkMzQ4NDI=
   data.tar.gz: !binary |-
-    MzhhNmQ1OTAzNzhiMTMyY2I4MTJjMThiMjgxYTQ3OTMyYWIzMTI4NjcwODRh
-    ZGEyYTY5ZGIyMmZkNTBlZjhiZWNmODhkZWIxYjYwYWZiZDVlZmI1ZDYzMWU3
-    N2VlZmEzNzM1ODc3ZjdhZjZkNzg4NmYzM2E5NWNlNGMyZmFjNTI=
+    YjkzYjIzNDFkNjE5NzFlY2MwYTNjMTljMWNkMTZmNThjNjNhMjBiNzdkOGFm
+    YjcyYjU1YjdmYTI1ZGNlNDc2ZGY3NTA5YzZmMmU5NjUzNGMzNmE5NzU3NDUw
+    YWM5YjRjMDY3NmFiZTQ1NzA2ODg2M2FkYjUyZjQwOWU3MzFjZDU=

data/lib/savanna/assets.rb

@@ -2,6 +2,7 @@ require "sass"
 require 'coffee-script'
 require "compass"
 require "sprockets"
+require "sprockets-helpers"
 require "sprockets-sass"
 require "yui/compressor"
 require "uglifier"
@@ -19,19 +20,23 @@ class Savanna::Assets
 
   def initialize(options)
     @root_path = options[:root_path]
-    @sprockets = Sprockets::Environment.new { |env| env.logger = Logger.new(STDOUT) }
+    @sprockets = Sprockets::Environment.new do |env|
+      env.logger = Logger.new(STDOUT)
 
-    add_append_path @root_path
+      define_children_directories [@root_path] + ASSET_PATH do |path|
+        env.append_path path
+      end
 
-    ASSET_PATH << @root_path
-    ASSET_PATH.each do |path|
-      add_append_path [path, 'app'].join('/')
-      add_append_path [path, 'vendor'].join('/')
-    end
+      Sprockets::Helpers.configure do |config|
+        config.environment = env
+        config.prefix      = "/#{ASSET_DIR}"
+        config.digest      = false
+      end
 
-    if options[:precompile]
-      @sprockets.css_compressor = ::YUI::CssCompressor.new
-      @sprockets.js_compressor  = ::Uglifier.new mangle: true
+      if options[:precompile]
+        env.css_compressor = ::YUI::CssCompressor.new
+        env.js_compressor  = ::Uglifier.new mangle: true
+      end
     end
   end
 
@@ -48,6 +53,7 @@ class Savanna::Assets
 
     precompile_files.each do |file|
       asset       = @sprockets[file]
+      raise FileNotFound.new file if asset.nil?
       output_file = Pathname.new(output_dir).join file
       FileUtils.mkdir_p output_file.dirname
       asset.write_to output_file
@@ -70,7 +76,7 @@ class Savanna::Assets
       end
       raise EmptyPrecompileList if precompile_files.empty?
     else
-      raise FileNotFound
+      raise PrecompileFileNotFound
     end
 
     return precompile_files
@@ -79,10 +85,14 @@ class Savanna::Assets
 
 
 protected
-  def add_append_path (path, dir = 'assets')
-    puts "Appended path: #{[path, dir].join('/')}"
-    @sprockets.append_path [path, dir, "javascripts"].join('/')
-    @sprockets.append_path [path, dir, "images"].join('/')
-    @sprockets.append_path [path, dir, "stylesheets"].join('/')
+  def define_children_directories (paths, asset_dir = 'assets')
+    paths.each do |path|
+      ['', 'app', 'vendor'].each do |dir|
+        puts "Appended path: #{File.join(path, dir, asset_dir)}"
+        yield File.join(path, dir, asset_dir, "javascripts")
+        yield File.join(path, dir, asset_dir, "images")
+        yield File.join(path, dir, asset_dir, "stylesheets")
+      end
+    end
   end
 end

data/lib/savanna/exceptions.rb

@@ -1,4 +1,10 @@
 class Savanna::Assets::FileNotFound < Exception
+  def initialize(file_name)
+    super "Cannot find '#{file_name}' in assets."
+  end
+end
+
+class Savanna::Assets::PrecompileFileNotFound < Exception
   def initialize
     super "Please make 'savanna' file to precompile, check this: https://github.com/shawnjung/savanna"
   end

data/lib/savanna/version.rb

@@ -1,3 +1,3 @@
 module Savanna
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/savanna.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack'
   spec.add_dependency 'sprockets'
   spec.add_dependency 'sprockets-sass'
+  spec.add_dependency 'sprockets-helpers'
   spec.add_dependency 'sass'
   spec.add_dependency 'compass'
   spec.add_dependency 'coffee-script'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savanna
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Shawn Jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-helpers
+  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