wagons 0.0.9 → 0.1.0

data/lib/tasks/wagons.rake

@@ -124,9 +124,10 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
       rel_dir = w.root.to_s.sub(Rails.root.to_s + File::SEPARATOR, '')
       cmd = "cd #{rel_dir} && #{ENV['CMD']}"
       Bundler.with_clean_env do
-        verbose(false) { sh cmd }
+        verbose(Rake.application.options.trace) { sh cmd }
       end
     end
+    Rake::Task['wagon:exec'].reenable
   end
   
   namespace :bundle do

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/wagons/view_helper.rb

@@ -34,14 +34,12 @@ module Wagons
     end
     
     def find_extension_files(key, folders)
+      folder_pattern = glob_pattern(folders)
+      formats = glob_pattern(lookup_context.formats)
+      handlers = glob_pattern(lookup_context.handlers)
+      
       view_paths.collect do |path|
-        folders.collect do |folder|
-          lookup_context.formats.collect do |format|
-            lookup_context.handlers.collect do |handler|
-              Dir.glob(File.join(path, folder, "_#{key}_*.#{format}.#{handler}"))
-            end
-          end
-        end
+        Dir.glob(File.join(path, folder_pattern, "_#{key}_*.#{formats}.#{handlers}"))
       end.flatten
     end
     
@@ -52,6 +50,14 @@ module Wagons
       end
     end
       
+    def glob_pattern(list)
+      if list.size == 1
+        list.first
+      else
+        "{#{list.join(',')}}"
+      end
+    end
+    
   end
 end
 

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/pascal/Code/ruby/wagons
+  remote: /home/pzumkehr/src/ruby/wagons
   specs:
-    wagons (0.0.9)
+    wagons (0.1.0)
       bundler (>= 1.1)
       rails (>= 3.2)
       seed-fu-ndo (>= 0.0.2)
@@ -19,31 +19,31 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -70,22 +70,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
     seed-fu (2.2.0)
@@ -93,8 +93,9 @@ GEM
       activesupport (~> 3.1)
     seed-fu-ndo (0.0.2)
       seed-fu (>= 2.2.0)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
@@ -103,7 +104,7 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

data/test/dummy/app/views/people/_details.html.erb

@@ -0,0 +1 @@
+Main Details

data/test/dummy/app/views/people/index.html.erb

@@ -1,5 +1,7 @@
 <h1>People</h1>
 
+<%= render 'details' %>
+
 <%= render_extensions :list, :locals => {:test => 42} %>