machined 0.3.0 → 0.3.1

data/lib/machined/environment.rb

@@ -143,6 +143,15 @@ module Machined
         append_paths assets, Utils.existent_directories(root.join(asset_path))
       end
       
+      # Search for Rails Engines with assets and append those
+      if defined?(Rails) && defined?(Rails::Engine)
+        Rails::Engine.subclasses.each do |engine|
+          append_paths assets, engine.paths["vendor/assets"].existent_directories
+          append_paths assets, engine.paths["lib/assets"].existent_directories
+          append_paths assets, engine.paths["app/assets"].existent_directories
+        end
+      end
+      
       # Set the URLs for the compilable default sprockets.
       assets.config.url = config.assets_url
       pages.config.url  = config.pages_url
@@ -158,7 +167,7 @@ module Machined
       assets.js_compressor  = js_compressor  if config.compress_js
       assets.css_compressor = css_compressor if config.compress_css
       
-      # Finally, configure Sprockets::Helpers
+      # Finally, configure Sprockets::Helpers to
       # match curernt configuration.
       Sprockets::Helpers.configure do |helpers|
         helpers.environment = assets

data/lib/machined/utils.rb

@@ -12,7 +12,7 @@ module Machined
         Tilt.mappings.each_key do |ext|
           begin
             templates[Sprockets::Utils.normalize_extension(ext)] = Tilt[ext]
-          rescue LoadError
+          rescue LoadError, NameError
             # safely ignore...
           end
         end

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/machined.gemspec

@@ -36,5 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "erubis"
   s.add_development_dependency "rdiscount"
   s.add_development_dependency "uglifier"
+  s.add_development_dependency "railties"
+  s.add_development_dependency "jquery-rails"
   s.add_development_dependency "rake"
 end

data/spec/machined/environment_spec.rb

@@ -121,6 +121,12 @@ describe Machined::Environment do
       end
     end
     
+    it "appends Rails::Engine paths" do
+      require "rails"
+      require "jquery-rails"
+      machined.assets.paths.first.should =~ %r(/jquery-rails-[\d\.]+/vendor/assets/javascripts)
+    end
+    
     it "compiles web assets" do
       within_construct do |c|
         c.file "assets/javascripts/main.js",       "//= require dep"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: machined
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -302,10 +302,38 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
+  name: railties
   version_requirements: *id019
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jquery-rails
+  version_requirements: *id020
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  version_requirements: *id021
+  prerelease: false
+  type: :development
 description: Why another static site generator? Machined is for the developers who know and love the asset pipeline of Rails 3.1 and want to develop blazingly fast static websites. It's built from the ground up using Sprockets 2.0.
 email: 
 - me@petebrowne.com