fanforce-app-factory 1.6.0 → 1.6.1

data/lib/fanforce/app_factory/sprockets/compiler.rb

@@ -82,7 +82,6 @@ class SprocketsCompiler
   def self.setup(base_dir)
     sprockets = ::Sprockets::Environment.new(base_dir)
 
-    sprockets.append_path 'assets'
     sprockets.append_path 'assets/img'
     sprockets.append_path 'assets/js'
     sprockets.append_path 'assets/css'
@@ -91,12 +90,13 @@ class SprocketsCompiler
     sprockets.append_path 'assets/_js'
     sprockets.append_path 'assets/_css'
     sprockets.append_path 'assets/_lib'
+    sprockets.append_path 'assets'
 
-    default_assets_dir = File.dirname( File.expand_path( __FILE__ ) ) + '/..'
-    sprockets.append_path default_assets_dir + '/assets/img'
-    sprockets.append_path default_assets_dir + '/assets/js'
-    sprockets.append_path default_assets_dir + '/assets/css'
-    sprockets.append_path default_assets_dir + '/assets/lib'
+    default_assets_dir = File.dirname(File.expand_path(__FILE__)) + '/../assets'
+    sprockets.append_path default_assets_dir + '/img'
+    sprockets.append_path default_assets_dir + '/js'
+    sprockets.append_path default_assets_dir + '/css'
+    sprockets.append_path default_assets_dir + '/lib'
 
     if ENV['RACK_ENV'] != 'development'
       require 'yui/compressor'

data/lib/fanforce/app_factory/sprockets/hacks.rb

@@ -30,7 +30,7 @@ module Sprockets
         paths << path_without_extensions.join("index#{extensions.join}").to_s
       end
 
-      if paths[0] !~ /\/assets\/(js|css|img)\// and paths[0] =~ /^(\/?[^\/]+)(\/.+)$/
+      if paths[0] !~ /\/assets\/_?(js|css|img)\// and paths[0] =~ /^(\/?[^\/]+)(\/.+)$/
         paths << $1 + '/assets/css' +$2
         paths << $1 + '/assets/js'  +$2
         paths << $1 + '/assets/img' +$2

data/lib/fanforce/app_factory/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module AppFactory
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-app-factory
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors: