active_scaffold_vho 3.2.6 → 3.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGRkMDJiNzc1YjJkNmZkMTViODdmMjEzY2ZkZjg4OGE3OTUxYjgzNw==
+    Y2Q4ZjNiYmY1OGY2ZjRjZDM5NDk2YzA0M2QyODZlNDNjMzU0ZDJlNQ==
   data.tar.gz: !binary |-
-    YWJkODA0NGI4OTQ1YjMxNmJmYmJhZWQwNWUwNTIwYTQxNjJmNTAyNQ==
+    MzAyMTAzNDZjMTA2MzhiZTVkOTEyOTc0ZGRjYzM4NTk5NDI4MDQ1Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZmY0ZjczYTMyODc4ZTU2YWE2ZjdmZGY3OTg4N2FlNzJjZjMyNTJkM2U0NjY1
-    YTI0Y2Y4OTI4Mzc5MjA0MTYyYzlhMGJlNTFmYTliN2Y3MDQ3ZmE3ZThjMDAw
-    NGVjYTgzYWI4MWY2MmI4Njc5MTZlY2FiY2RmZDg1NDMwNTYwYTE=
+    MzM4NjI4OWNmNzczNTY5OTgyNjE2NmNhYmQzZmY2YTNkOWQyOTA1ZDU5N2E2
+    MTQzNTVmZjc1MWYzMTVhYWMyOGE4Yjk0YzEzM2JiNWE3OGEyNTg3MjRiZjUx
+    YjkxYmM3NWE5Y2FjZWE1YTY5YjM1M2I4MTQ5NjJjMmNhYTk2OTY=
   data.tar.gz: !binary |-
-    OGZkMWE5NmQzMTU0YTlkMTlhMGNhOTRhZTJjYWNjMzFmMmEzMzYwMmJlOTI0
-    NTA2MTU0YTVmOTNkMDE3MGFjMWNlMWZiNjA4ZDgyZDU4ZTZmYzEyNThlY2I2
-    OTY5NDFmODJlOGQ5ZGNjNWMyZDVlOWU1MDZjM2E1NWVhMzA2Mzg=
+    MDQxMTczYTNiYzY5NjE1NWM1MTQwYTc1NDlkM2E5MTZlMDM1MDZkNGY3ZTMz
+    Y2ZhMTVmMTcwZjIwMGI1NThjZmUyMzRmNDRhODcyMjhhMmMwNzdlZjMyZWRm
+    ODAyMDg2OTdmM2U4OWNkNGQ2YTVjMGQzNWM4ZjgzZTY4NjAyMDE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.5)
+    active_scaffold_vho (3.2.6)
       kaminari
       rails (>= 3.1.0)
 

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold.rb

@@ -149,14 +149,16 @@ module ActiveScaffold
     File.dirname(__FILE__) + "/.."
   end
 
-  def self.default_view_paths
+  def self.default_view_paths(custom_paths = [])
     default_paths = []
     ActionController::Base.view_paths.each do |dir|
-        active_scaffold_override_dir = File.join(dir.to_s,"active_scaffold_overrides")
-        default_paths << active_scaffold_override_dir if File.exists?(active_scaffold_override_dir)
+      active_scaffold_override_dir = File.join(dir.to_s,"active_scaffold_overrides")
+      default_paths << active_scaffold_override_dir if File.exists?(active_scaffold_override_dir)
     end
     default_paths.uniq!
 
+    default_paths.concat(custom_paths) unless custom_paths.nil?
+
     active_scaffold_default_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views')
     default_paths << active_scaffold_default_frontend_path
     default_paths
@@ -303,8 +305,7 @@ module ActiveScaffold
     def active_scaffold_view_paths
       return @active_scaffold_paths unless @active_scaffold_paths.nil?
 
-      @active_scaffold_paths = ActiveScaffold.default_view_paths
-      @active_scaffold_paths.concat @active_scaffold_custom_paths unless @active_scaffold_custom_paths.nil?
+      @active_scaffold_paths = ActiveScaffold.default_view_paths(@active_scaffold_custom_paths)
       @active_scaffold_paths
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda