active_scaffold_vho 3.2.13 → 3.2.14

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +26 -26
  3. data/lib/active_scaffold/extensions/action_view_resolver.rb +7 -2
  4. data/lib/active_scaffold/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b7d22a443d84c4528dbc6a4dd20edcd43ec5c836
4
- data.tar.gz: 68768f2e8d6207f75a9b4579538aa7a7ee9dbec8
3
+ metadata.gz: c576f0fdb424066e52144dcec305c1c178ca4918
4
+ data.tar.gz: 1bc3acea47c7574dd2734fb058743c0778d09987
5
5
  SHA512:
6
- metadata.gz: 2103e3d224aa1ba42878755eca157821e61e4eb961ca8224cac673db6c7767d40c0fdb500bf79d7c1f0a77428ee076b3ca4591e26d079ff484e431ec77576011
7
- data.tar.gz: c426f36bed2c7caa9e0b717d0d3be42cbb1ad7992f6ce4253ae743112f6797fa6d89f35a7dbc22e2f51c959ea298c49b655c9bdd18e48f096d787e3815b6d1ff
6
+ metadata.gz: a8b66e04ad0ee3cbbcb180a25c6f4810233cc52b43868512b390da0354e74bd128bbdaa0159c25c869b6c99c4cd6ae4bd0e20934de72a0ffc15a4ad9b3c92367
7
+ data.tar.gz: 8aafbe16e23775702d32c62f2446af94ed9f38fb829ba3e9d043f11d7173ef4ea55fa7f5665dcf902fc4c114564b4440d111b130847ebba5cb7957d8415d287e
data/Gemfile.lock CHANGED
@@ -1,19 +1,19 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- active_scaffold_vho (3.2.13)
4
+ active_scaffold_vho (3.2.14)
5
5
  kaminari
6
6
  rails (>= 3.1.0)
7
7
 
8
8
  GEM
9
9
  remote: http://rubygems.org/
10
10
  specs:
11
- actionmailer (3.2.18)
12
- actionpack (= 3.2.18)
11
+ actionmailer (3.2.22.4)
12
+ actionpack (= 3.2.22.4)
13
13
  mail (~> 2.5.4)
14
- actionpack (3.2.18)
15
- activemodel (= 3.2.18)
16
- activesupport (= 3.2.18)
14
+ actionpack (3.2.22.4)
15
+ activemodel (= 3.2.22.4)
16
+ activesupport (= 3.2.22.4)
17
17
  builder (~> 3.0.0)
18
18
  erubis (~> 2.7.0)
19
19
  journey (~> 1.0.4)
@@ -21,18 +21,18 @@ GEM
21
21
  rack-cache (~> 1.2)
22
22
  rack-test (~> 0.6.1)
23
23
  sprockets (~> 2.2.1)
24
- activemodel (3.2.18)
25
- activesupport (= 3.2.18)
24
+ activemodel (3.2.22.4)
25
+ activesupport (= 3.2.22.4)
26
26
  builder (~> 3.0.0)
27
- activerecord (3.2.18)
28
- activemodel (= 3.2.18)
29
- activesupport (= 3.2.18)
27
+ activerecord (3.2.22.4)
28
+ activemodel (= 3.2.22.4)
29
+ activesupport (= 3.2.22.4)
30
30
  arel (~> 3.0.2)
31
31
  tzinfo (~> 0.3.29)
32
- activeresource (3.2.18)
33
- activemodel (= 3.2.18)
34
- activesupport (= 3.2.18)
35
- activesupport (3.2.18)
32
+ activeresource (3.2.22.4)
33
+ activemodel (= 3.2.22.4)
34
+ activesupport (= 3.2.22.4)
35
+ activesupport (3.2.22.4)
36
36
  i18n (~> 0.6, >= 0.6.4)
37
37
  multi_json (~> 1.0)
38
38
  arel (3.0.3)
@@ -42,7 +42,7 @@ GEM
42
42
  hike (1.2.3)
43
43
  i18n (0.7.0)
44
44
  journey (1.0.4)
45
- json (1.7.7)
45
+ json (1.8.3)
46
46
  kaminari (0.17.0)
47
47
  actionpack (>= 3.0.0)
48
48
  activesupport (>= 3.0.0)
@@ -59,17 +59,17 @@ GEM
59
59
  rack
60
60
  rack-test (0.6.3)
61
61
  rack (>= 1.0)
62
- rails (3.2.18)
63
- actionmailer (= 3.2.18)
64
- actionpack (= 3.2.18)
65
- activerecord (= 3.2.18)
66
- activeresource (= 3.2.18)
67
- activesupport (= 3.2.18)
62
+ rails (3.2.22.4)
63
+ actionmailer (= 3.2.22.4)
64
+ actionpack (= 3.2.22.4)
65
+ activerecord (= 3.2.22.4)
66
+ activeresource (= 3.2.22.4)
67
+ activesupport (= 3.2.22.4)
68
68
  bundler (~> 1.0)
69
- railties (= 3.2.18)
70
- railties (3.2.18)
71
- actionpack (= 3.2.18)
72
- activesupport (= 3.2.18)
69
+ railties (= 3.2.22.4)
70
+ railties (3.2.22.4)
71
+ actionpack (= 3.2.22.4)
72
+ activesupport (= 3.2.22.4)
73
73
  rack-ssl (~> 1.3.2)
74
74
  rake (>= 0.8.7)
75
75
  rdoc (~> 3.4)
data/lib/active_scaffold/extensions/action_view_resolver.rb CHANGED
@@ -2,8 +2,13 @@ module ActionView
2
2
  class ActiveScaffoldResolver < FileSystemResolver
3
3
  # standard resolvers have a base path to views and append a controller subdirectory
4
4
  # activescaffolds view path do not have a subdir, so just remove the prefix
5
- def find_templates(name, prefix, partial, details)
6
- super(name,'',partial, details)
5
+ # > rails 3.2.22 uses an additional fifth parameter
6
+ def find_templates(name, prefix, partial, details, outside_app_allowed = false)
7
+ if ::Rails::VERSION::MAJOR >= 4 || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2 && ::Rails::VERSION::TINY >= 22)
8
+ super(name,'',partial, details, outside_app_allowed)
9
+ else
10
+ super(name,'',partial, details)
11
+ end
7
12
  end
8
13
  end
9
14
  end
data/lib/active_scaffold/version.rb CHANGED
@@ -2,7 +2,7 @@ module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 2
5
- PATCH = 13
5
+ PATCH = 14
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
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.13
4
+ version: 3.2.14
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: 2016-07-13 00:00:00.000000000 Z
11
+ date: 2016-08-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: shoulda