active_scaffold_config_list 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ec1ab3c0bb40aedcad39ecf8ebb4b58f09575d
-  data.tar.gz: 9da07cbac9fd062852d28def657720c4e6584bc1
+  metadata.gz: a41bc3b2745e37795c8e88b0b9a4df1e06cb0002
+  data.tar.gz: a66a131e82ae3de248d96ec953f38699d63f3669
 SHA512:
-  metadata.gz: 5c0c323cc36f7eaf5458a5dfd9569df826dbea9954a5e0b7e790d6a90ce08b4e25c7a1ca62c1e6f8055126cb0c5e507ab4717971c74748c6fe9eca84d0537dec
-  data.tar.gz: 689ae75ee360f5fbd87eb03a53abb06d41072431c0b6b1eabe4565d9e5d621435423f2b81263a4f601f537e7be0a20e0fb34c46b1673a820dd87d49151cc3eff
+  metadata.gz: 644d52a6dc238a0e64e79fed00c0d96daf1066cf8b1b4f63cb7945c4662d177bcc459cfe7d8355124fa87b1cb899b094918e8fa525adecf7e7c8d841cc63e592
+  data.tar.gz: cdba76d1446a9da73f5d54cdd61a3abd083886c89a27df90ea089a401d10043723c20b5558e75a5ac2fd10111e6d2ee039a41923c895c83e2977e4a6ff0faf9d

data/README

@@ -1,4 +1,5 @@
-This works with Rails 3.2 and ActiveScaffold >= 3.4.4
+This works with Rails >= 4.0 and ActiveScaffold >= 3.4.4
+Version 3.3.x worked with Rails 3.2 and ActiveScaffold >= 3.4.4
 Version 3.2.x worked with Rails 3.2 and ActiveScaffold >= 3.3.0
 
 Usage:

data/lib/active_scaffold/actions/config_list.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Actions
   module ConfigList
     
     def self.included(base)
-      base.before_filter :store_config_list_params, :set_default_sorting, :only => [:index]
+      base.before_action :store_config_list_params, :set_default_sorting, :only => [:index]
       base.helper_method :config_list_params, :config_list_sorting
       base.extend ClassMethods
     end
@@ -65,9 +65,13 @@ module ActiveScaffold::Actions
       send(self.class.config_list_session_storage_method)
     end
 
+    def active_scaffold_current_user
+      @active_scaffold_current_user ||= send(self.class.active_scaffold_config.class.security.current_user_method)
+    end
+
     def delete_config_list_params
-      if active_scaffold_config.config_list.save_to_user && current_user = send(active_scaffold_config.class.security.current_user_method)
-        current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).destroy
+      if active_scaffold_config.config_list.save_to_user && active_scaffold_current_user
+        active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name).destroy
       else
         config_list_session_storage['config_list'] = nil
         config_list_session_storage['config_list_sorting'] = nil
@@ -79,8 +83,8 @@ module ActiveScaffold::Actions
     end
 
     def save_config_list_params(config_list, config_list_sorting)
-      if active_scaffold_config.config_list.save_to_user && current_user = send(active_scaffold_config.class.security.current_user_method)
-        record = current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+      if active_scaffold_config.config_list.save_to_user && active_scaffold_current_user
+        record = active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
         record.config_list = config_list.join(',')
         record.config_list_sorting = config_list_sorting if record.respond_to? :config_list_sorting
         record.save
@@ -110,9 +114,8 @@ module ActiveScaffold::Actions
     def config_list_record
       return @config_list_record if defined? @config_list_record
       @config_list_record = if active_scaffold_config.config_list.save_to_user
-        current_user = send(active_scaffold_config.class.security.current_user_method)
-        if current_user
-          current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
+        if active_scaffold_current_user
+          active_scaffold_current_user.send(active_scaffold_config.config_list.save_to_user, active_scaffold_session_storage_key, controller_name)
         end
       end
     end

data/lib/active_scaffold/config/config_list.rb

@@ -50,7 +50,7 @@ module ActiveScaffold::Config
     # provides access to the list of columns specifically meant for the config_list to use
     columns_accessor :columns do
       columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
-      columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
+      columns.exclude *@core.columns.collect{|c| c.name if c.association.try(:polymorphic?)}.compact
     end
     
     # the ActionLink for this action

data/lib/active_scaffold_config_list/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldConfigList
   module Version
     MAJOR = 3
-    MINOR = 3
-    PATCH = 3
+    MINOR = 4
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_config_list
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.31
 - !ruby/object:Gem::Dependency
   name: active_scaffold_sortable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: User may reorder and hide/show list columns
 email: activescaffold@googlegroups.com
 executables: []
@@ -73,17 +87,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: User specific column configuration for ActiveScaffold