wagons 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE3ODViY2QwNDc1NzRlYzIyOWU1OTI1NDE5YzZlMGU0YTIxMDY4Nw==
+    NWQ2Nzc1MmJiZDAyMGIzODhkYjcxZjkxYzM4YzU1NTc0NGZjODVjNQ==
   data.tar.gz: !binary |-
-    NDk2MzgzNzIxNWZkYzJmMDYyNjQ0MjBjNTQ2YjZiYTlkOWE3YzdhYw==
+    MzVlNmQ4MjNiYzM0YjM1ZjIzYTdjYzAzOGQ5NzFmMjFlM2QzMTY4MQ==
 SHA512:
   metadata.gz: !binary |-
-    OTE5OTA1OTBjMDBjMWMxMzI5OTlkNjcxZjlmYmM2ZDNjMmEzZjFiNDZhNDkz
-    OWUyZDE3YjhjZWFiZWRjNzFkOTA4Y2VkZjU2NzY5MWY3ZTBhZWQ4MjU0OGFj
-    ODVkZjE2YmNhOTQ5Y2NiM2JmMDg5Mzg1NmMyM2RlMjNlOGMyZDY=
+    ZmQxOTQyZmIwMzExYTUxMmVkMDE4ODg5ZmY4NWM3ZmNlMDU5Zjc3YTVjZmE0
+    YWRhMmFkNjllZWJjODUxNTU1Yzc3YTRhYWNkZTZlZTM2MGY3YTc2MTkyZDM2
+    NWQxNTE0Y2UxMTE5Mzk3Yjg1YjMyYmI5NDY2YzhiODcxZmZhY2Y=
   data.tar.gz: !binary |-
-    YjBhYTFjNmQyYWFhZTQyOGEzYWU2OTJjNTYzMWEzODIwM2Q1MGI0ZWEzYzQ2
-    MDAyZDcwYjdkZmFiNGUzMDUzOGNjYmE2ZTZhNzcxOGVlMjVkYWYwMWVhMmJl
-    YmQyZTMzYTljYmExMzY1NDk5NjhmN2I3Y2UwNWY1NDE5NmM5NzI=
+    Mzg3NThjODk1YzBkOWRjOWQ5M2RlNjUzNzg0ZmJkMmY5YzM0OWRhN2NhNWQ2
+    MmViYTE0ZTc5YmFiMWI5MGM3NDcyZTRlMDUxMTViZWQ3MTgwN2ZlMGY0M2Vm
+    OTdhZjY0ZDcxZWM5YjJjYjRlYTQ4YmY3NGUwMzEzN2YwZWJlYWQ=

data/lib/wagons/extensions/application.rb

@@ -6,11 +6,25 @@ module Rails
     def ordered_railties_with_wagons
       @ordered_railties ||= ordered_railties_without_wagons.tap do |ordered|
         Wagons.all.each do |w|
-          ordered.push(ordered.delete(w))
+          if Rails::VERSION::STRING < '4.1.6'
+            ordered.push(ordered.delete(w))
+          else
+            ordered.unshift(array_deep_delete(ordered, w))
+          end
         end
       end
     end
-
     alias_method_chain :ordered_railties, :wagons
+
+    private
+
+    def array_deep_delete(array, item)
+      array.delete(item) ||
+      array.select  { |i| i.is_a?(Array) }.
+            collect { |i| array_deep_delete(i, item) }.
+            compact.
+            first
+    end
+
   end
 end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/wagons/view_helper.rb

@@ -26,14 +26,14 @@ module Wagons
 
     def find_extension_partials(key, folder = nil)
       folders = extension_folders.dup
-      folders << folder if folder
+      folders << folder.to_s if folder
 
       files = find_extension_files(key, folders).sort_by { |f| File.basename(f) }
       files_to_partial_names(files)
     end
 
     def find_extension_files(key, folders)
-      folder_pattern = glob_pattern(folders)
+      folder_pattern = glob_pattern(folders.uniq)
       formats = glob_pattern(lookup_context.formats)
       handlers = glob_pattern(lookup_context.handlers)
 

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/pzumkehr/src/ruby/wagons
   specs:
-    wagons (0.3.1)
+    wagons (0.4.0)
       bundler (>= 1.1)
       rails (>= 3.2)
       seed-fu-ndo (>= 0.0.2)
@@ -19,27 +19,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
       builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
       arel (~> 5.0.0)
-    activesupport (4.1.5)
+    activesupport (4.1.6)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -51,32 +51,30 @@ GEM
     hike (1.2.3)
     i18n (0.6.11)
     json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitest (5.4.1)
+    mime-types (2.3)
+    minitest (5.4.2)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
+      railties (= 4.1.6)
       sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -98,9 +96,6 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)