active_scaffold_vho 3.2.13 → 3.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d22a443d84c4528dbc6a4dd20edcd43ec5c836
-  data.tar.gz: 68768f2e8d6207f75a9b4579538aa7a7ee9dbec8
+  metadata.gz: c576f0fdb424066e52144dcec305c1c178ca4918
+  data.tar.gz: 1bc3acea47c7574dd2734fb058743c0778d09987
 SHA512:
-  metadata.gz: 2103e3d224aa1ba42878755eca157821e61e4eb961ca8224cac673db6c7767d40c0fdb500bf79d7c1f0a77428ee076b3ca4591e26d079ff484e431ec77576011
-  data.tar.gz: c426f36bed2c7caa9e0b717d0d3be42cbb1ad7992f6ce4253ae743112f6797fa6d89f35a7dbc22e2f51c959ea298c49b655c9bdd18e48f096d787e3815b6d1ff
+  metadata.gz: a8b66e04ad0ee3cbbcb180a25c6f4810233cc52b43868512b390da0354e74bd128bbdaa0159c25c869b6c99c4cd6ae4bd0e20934de72a0ffc15a4ad9b3c92367
+  data.tar.gz: 8aafbe16e23775702d32c62f2446af94ed9f38fb829ba3e9d043f11d7173ef4ea55fa7f5665dcf902fc4c114564b4440d111b130847ebba5cb7957d8415d287e

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.2.13)
+    active_scaffold_vho (3.2.14)
       kaminari
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.18)
-      actionpack (= 3.2.18)
+    actionmailer (3.2.22.4)
+      actionpack (= 3.2.22.4)
       mail (~> 2.5.4)
-    actionpack (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    actionpack (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -21,18 +21,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.18)
-      activesupport (= 3.2.18)
+    activemodel (3.2.22.4)
+      activesupport (= 3.2.22.4)
       builder (~> 3.0.0)
-    activerecord (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
+    activerecord (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.18)
-      activemodel (= 3.2.18)
-      activesupport (= 3.2.18)
-    activesupport (3.2.18)
+    activeresource (3.2.22.4)
+      activemodel (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
+    activesupport (3.2.22.4)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -42,7 +42,7 @@ GEM
     hike (1.2.3)
     i18n (0.7.0)
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.3)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -59,17 +59,17 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.18)
-      actionmailer (= 3.2.18)
-      actionpack (= 3.2.18)
-      activerecord (= 3.2.18)
-      activeresource (= 3.2.18)
-      activesupport (= 3.2.18)
+    rails (3.2.22.4)
+      actionmailer (= 3.2.22.4)
+      actionpack (= 3.2.22.4)
+      activerecord (= 3.2.22.4)
+      activeresource (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       bundler (~> 1.0)
-      railties (= 3.2.18)
-    railties (3.2.18)
-      actionpack (= 3.2.18)
-      activesupport (= 3.2.18)
+      railties (= 3.2.22.4)
+    railties (3.2.22.4)
+      actionpack (= 3.2.22.4)
+      activesupport (= 3.2.22.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)

data/lib/active_scaffold/extensions/action_view_resolver.rb

@@ -2,8 +2,13 @@ module ActionView
   class ActiveScaffoldResolver < FileSystemResolver
     # standard resolvers have a base path to views and append a controller subdirectory
     # activescaffolds view path do not have a subdir, so just remove the prefix
-    def find_templates(name, prefix, partial, details)
-      super(name,'',partial, details)
+    # > rails 3.2.22 uses an additional fifth parameter
+    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+      if ::Rails::VERSION::MAJOR >= 4 || (::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2 && ::Rails::VERSION::TINY >= 22)
+        super(name,'',partial, details, outside_app_allowed)
+      else
+        super(name,'',partial, details)
+      end
     end
   end
 end

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.2.13
+  version: 3.2.14
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda