active_scaffold_vho 3.2.6 → 3.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZGRkMDJiNzc1YjJkNmZkMTViODdmMjEzY2ZkZjg4OGE3OTUxYjgzNw==
4
+ Y2Q4ZjNiYmY1OGY2ZjRjZDM5NDk2YzA0M2QyODZlNDNjMzU0ZDJlNQ==
5
5
  data.tar.gz: !binary |-
6
- YWJkODA0NGI4OTQ1YjMxNmJmYmJhZWQwNWUwNTIwYTQxNjJmNTAyNQ==
6
+ MzAyMTAzNDZjMTA2MzhiZTVkOTEyOTc0ZGRjYzM4NTk5NDI4MDQ1Yw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZmY0ZjczYTMyODc4ZTU2YWE2ZjdmZGY3OTg4N2FlNzJjZjMyNTJkM2U0NjY1
10
- YTI0Y2Y4OTI4Mzc5MjA0MTYyYzlhMGJlNTFmYTliN2Y3MDQ3ZmE3ZThjMDAw
11
- NGVjYTgzYWI4MWY2MmI4Njc5MTZlY2FiY2RmZDg1NDMwNTYwYTE=
9
+ MzM4NjI4OWNmNzczNTY5OTgyNjE2NmNhYmQzZmY2YTNkOWQyOTA1ZDU5N2E2
10
+ MTQzNTVmZjc1MWYzMTVhYWMyOGE4Yjk0YzEzM2JiNWE3OGEyNTg3MjRiZjUx
11
+ YjkxYmM3NWE5Y2FjZWE1YTY5YjM1M2I4MTQ5NjJjMmNhYTk2OTY=
12
12
  data.tar.gz: !binary |-
13
- OGZkMWE5NmQzMTU0YTlkMTlhMGNhOTRhZTJjYWNjMzFmMmEzMzYwMmJlOTI0
14
- NTA2MTU0YTVmOTNkMDE3MGFjMWNlMWZiNjA4ZDgyZDU4ZTZmYzEyNThlY2I2
15
- OTY5NDFmODJlOGQ5ZGNjNWMyZDVlOWU1MDZjM2E1NWVhMzA2Mzg=
13
+ MDQxMTczYTNiYzY5NjE1NWM1MTQwYTc1NDlkM2E5MTZlMDM1MDZkNGY3ZTMz
14
+ Y2ZhMTVmMTcwZjIwMGI1NThjZmUyMzRmNDRhODcyMjhhMmMwNzdlZjMyZWRm
15
+ ODAyMDg2OTdmM2U4OWNkNGQ2YTVjMGQzNWM4ZjgzZTY4NjAyMDE=
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- active_scaffold_vho (3.2.5)
4
+ active_scaffold_vho (3.2.6)
5
5
  kaminari
6
6
  rails (>= 3.1.0)
7
7
 
@@ -2,7 +2,7 @@ module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 2
5
- PATCH = 6
5
+ PATCH = 7
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
@@ -149,14 +149,16 @@ module ActiveScaffold
149
149
  File.dirname(__FILE__) + "/.."
150
150
  end
151
151
 
152
- def self.default_view_paths
152
+ def self.default_view_paths(custom_paths = [])
153
153
  default_paths = []
154
154
  ActionController::Base.view_paths.each do |dir|
155
- active_scaffold_override_dir = File.join(dir.to_s,"active_scaffold_overrides")
156
- default_paths << active_scaffold_override_dir if File.exists?(active_scaffold_override_dir)
155
+ active_scaffold_override_dir = File.join(dir.to_s,"active_scaffold_overrides")
156
+ default_paths << active_scaffold_override_dir if File.exists?(active_scaffold_override_dir)
157
157
  end
158
158
  default_paths.uniq!
159
159
 
160
+ default_paths.concat(custom_paths) unless custom_paths.nil?
161
+
160
162
  active_scaffold_default_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views')
161
163
  default_paths << active_scaffold_default_frontend_path
162
164
  default_paths
@@ -303,8 +305,7 @@ module ActiveScaffold
303
305
  def active_scaffold_view_paths
304
306
  return @active_scaffold_paths unless @active_scaffold_paths.nil?
305
307
 
306
- @active_scaffold_paths = ActiveScaffold.default_view_paths
307
- @active_scaffold_paths.concat @active_scaffold_custom_paths unless @active_scaffold_custom_paths.nil?
308
+ @active_scaffold_paths = ActiveScaffold.default_view_paths(@active_scaffold_custom_paths)
308
309
  @active_scaffold_paths
309
310
  end
310
311
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold_vho
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.6
4
+ version: 3.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Many, see README
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-09 00:00:00.000000000 Z
11
+ date: 2014-08-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: shoulda