active_scaffold 3.4.13 → 3.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd09ee16b2e93880391fad8eab47d2b2e41687c4
-  data.tar.gz: 186a9efd135d86b371ae7cf93206634753aed0ca
+  metadata.gz: 4dd09eacd583985f362d688856906e072120a233
+  data.tar.gz: 3d48f8933ac709ea1f6b9e4495b1144ab4510abd
 SHA512:
-  metadata.gz: 4cf41d9f68f77f7bd4ce86e457ad7ce536a4cf646a088b196867cacd74d654f428966f30f148f11aa2972a00575609e14bdd9b3ccb297ece4833927315a7de7f
-  data.tar.gz: cff3c6c6c20eabb9a99961a1991fb7ddaada2baef7476170c5c508a8017a8fbea6d986710d153ba3ebb38cb0d058fc122d1ee5046741ed1920e8e98c8f26682d
+  metadata.gz: 15888fe68ed0b4c072285d1dab51508ac3f2f5efb90a8bcf100d84324d8ed5734b2adab150e8f456062c1300a4a1383d3922529825f2668e7cd6ffaacccd18b0
+  data.tar.gz: 74c98c0d0578b2bf00c652b4e645f9d029bceae3140dd0432c2340dd8f88461bea5bbb891577d04f90f0b52928f4ea248fe2298ad86cf9872b82ccf8bdc4c080

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.4.14
+- fix filter order in AS controllers which inherit from AS controllers
+- clean code
+
 = 3.4.13
 - fix parent_prefixes deprecation on rails 4.2
 - set parent record on add existing

data/lib/active_scaffold/actions/core.rb

@@ -238,15 +238,29 @@ module ActiveScaffold::Actions
       @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
     end
 
+    def active_scaffold_session_storage_key(id = nil)
+      id ||= params[:eid] || "#{params[:controller]}#{"_#{nested_parent_id}" if nested?}"
+      "as:#{id}"
+    end
+
+    def active_scaffold_session_storage(id = nil)
+      session_index = active_scaffold_session_storage_key(id)
+      session[session_index] ||= {}
+      session[session_index]
+    end
+
+    def clear_storage
+      session_index = active_scaffold_session_storage_key
+      session.delete(session_index) unless session[session_index].present?
+    end
+
     # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
     def handle_user_settings
-      if self.class.uses_active_scaffold?
-        storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
-        active_scaffold_config.actions.each do |action_name|
-          conf_instance = active_scaffold_config.send(action_name) rescue next
-          next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-          conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
-        end
+      storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
+      active_scaffold_config.actions.each do |action_name|
+        conf_instance = active_scaffold_config.send(action_name) rescue next
+        next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
+        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
       end
     end
 

data/lib/active_scaffold/constraints.rb

@@ -1,5 +1,8 @@
 module ActiveScaffold
   module Constraints
+    def self.included(base)
+      base.helper_method :active_scaffold_constraints
+    end
 
     protected
 
@@ -22,14 +25,12 @@ module ActiveScaffold
         end
       end
 
-      if self.class.uses_active_scaffold?
-        # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't
-        active_scaffold_config.actions.each do |action_name|
-          next if exclude_actions.include?(action_name)
-          action = active_scaffold_config.send(action_name)
-          next unless action.respond_to? :columns
-          action.columns.constraint_columns = constrained_fields
-        end
+      # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't
+      active_scaffold_config.actions.each do |action_name|
+        next if exclude_actions.include?(action_name)
+        action = active_scaffold_config.send(action_name)
+        next unless action.respond_to? :columns
+        action.columns.constraint_columns = constrained_fields
       end
     end
 

data/lib/active_scaffold/core.rb

@@ -2,7 +2,6 @@ module ActiveScaffold
   module Core
     def self.included(base)
       base.extend(ClassMethods)
-      base.helper_method :active_scaffold_constraints
     end
 
     def active_scaffold_config
@@ -12,22 +11,6 @@ module ActiveScaffold
     def active_scaffold_config_for(klass)
       self.class.active_scaffold_config_for(klass)
     end
-
-    def active_scaffold_session_storage_key(id = nil)
-      id ||= params[:eid] || "#{params[:controller]}#{"_#{nested_parent_id}" if nested?}"
-      "as:#{id}"
-    end
-
-    def active_scaffold_session_storage(id = nil)
-      session_index = active_scaffold_session_storage_key(id)
-      session[session_index] ||= {}
-      session[session_index]
-    end
-
-    def clear_storage
-      session_index = active_scaffold_session_storage_key
-      session.delete(session_index) unless session[session_index].present?
-    end
       
     module ClassMethods
       def active_scaffold(model_id = nil, &block)
@@ -60,10 +43,12 @@ module ActiveScaffold
         end
         # include the rest of the code into the controller: the action core and the included actions
         module_eval do
-          include ActiveScaffold::Finder
-          include ActiveScaffold::Constraints
-          include ActiveScaffold::AttributeParams
-          include ActiveScaffold::Actions::Core
+          unless self < ActiveScaffold::Actions::Core
+            include ActiveScaffold::Finder
+            include ActiveScaffold::Constraints
+            include ActiveScaffold::AttributeParams
+            include ActiveScaffold::Actions::Core
+          end
           active_scaffold_config.actions.each do |mod|
             name = mod.to_s.camelize
             include "ActiveScaffold::Actions::#{name}".constantize

data/lib/active_scaffold/version.rb

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

data/test/misc/constraints_test.rb

@@ -84,6 +84,7 @@ end
 class ConstraintsTestObject
   # stub out what the mixin expects to find ...
   def self.before_filter(*args); end
+  def self.helper_method(*); end
   attr_accessor :active_scaffold_preload
   attr_accessor :active_scaffold_references
   attr_accessor :active_scaffold_habtm_joins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.13
+  version: 3.4.14
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda