yousty-activeadmin 1.0.12.pre → 1.0.13.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b497063b50e326b529415a5e1d17a29ae61e1ea
-  data.tar.gz: 21c1845824f471e2c91fc72e67c15aed8c5cf840
+  metadata.gz: 09bd6eaa643df56eb1fb668486cb2d34e3e95f7a
+  data.tar.gz: 10f8c91f105f22b3d022dc138f99bc7110c48193
 SHA512:
-  metadata.gz: b82c6d65d02a4ef3c29a32e3f78419f7a5b389449e6d34e7449eb450a76c43a9ef828b08821c1942c558fb46c89297b2a8e9be392544f2d9d78b8857601da789
-  data.tar.gz: dc1e5ad2f129be003f111c80ff8e61723a4da74a5529c0809f03010b6055264c9bf05a9373af55ca7dda59afb52514e69690156d5ba656c300b08510886363af
+  metadata.gz: 810eb316f53b7ebda871143431dec9bdd2becec4f093339a73f504eb9412108b3cf5b2eea36c7c8b52aca46b94faeac50fd4eebbdb229d7249beec009236af5a
+  data.tar.gz: 7ba4cfd41ae04669e1ec7cf023138ac516ea07dc9f9313be70511900a265c0d31a281a374f154071421ee1d4a394222ccffa3f8baaf64d930ab3a4f480351e3a

data/docs/3-index-pages.md

@@ -211,7 +211,7 @@ You can change it per request / action too:
 
 ```ruby
 controller do
-  before_filter :only => :index do
+  before_action :only => :index do
     @per_page = 100
   end
 end

data/features/index/page_title.feature

@@ -34,7 +34,7 @@ Feature: Index - Page Title
     """
       ActiveAdmin.register Post do
         controller do
-          before_filter { @page_title = "List of #{resource_class.model_name.plural}" }
+          before_action { @page_title = "List of #{resource_class.model_name.plural}" }
         end
       end
     """

data/features/show/page_title.feature

@@ -51,7 +51,7 @@ Feature: Show - Page Title
     """
       ActiveAdmin.register Post do
         controller do
-          before_filter { @page_title = "List of #{resource_class.model_name.plural}" }
+          before_action { @page_title = "List of #{resource_class.model_name.plural}" }
         end
       end
     """

data/lib/active_admin/application.rb

@@ -211,9 +211,9 @@ module ActiveAdmin
 
     # Adds before, around and after filters to all controllers.
     # Example usage:
-    #   ActiveAdmin.before_filter :authenticate_admin!
+    #   ActiveAdmin.before_action :authenticate_admin!
     #
-    %w(before_filter skip_before_filter after_filter skip_after_filter around_filter skip_filter).each do |name|
+    %w(before_action skip_before_action after_filter skip_after_filter around_filter skip_filter).each do |name|
       define_method name do |*args, &block|
         controllers_for_filters.each do |controller|
           controller.public_send name, *args, &block

data/lib/active_admin/base_controller.rb

@@ -10,8 +10,8 @@ module ActiveAdmin
 
     layout :determine_active_admin_layout
 
-    before_filter :only_render_implemented_actions
-    before_filter :authenticate_active_admin_user
+    before_action :only_render_implemented_actions
+    before_action :authenticate_active_admin_user
 
     class << self
       # Ensure that this method is available for the DSL

data/lib/active_admin/base_controller/menu.rb

@@ -4,7 +4,7 @@ module ActiveAdmin
       extend ActiveSupport::Concern
 
       included do
-        before_filter :set_current_tab
+        before_action :set_current_tab
         helper_method :current_menu
       end
 

data/lib/active_admin/page_controller.rb

@@ -8,7 +8,7 @@ module ActiveAdmin
 
     actions :index
 
-    before_filter :authorize_access!
+    before_action :authorize_access!
 
     def index(options={}, &block)
       render "active_admin/page/index"

data/lib/active_admin/resource_dsl.rb

@@ -116,7 +116,7 @@ module ActiveAdmin
       title = options.delete(:title)
 
       controller do
-        before_filter(only: [name]) { @page_title = title } if title
+        before_action(only: [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -160,7 +160,7 @@ module ActiveAdmin
     delegate :before_destroy, :after_destroy, to: :controller
 
     # Standard rails filters
-    delegate :before_filter, :skip_before_filter, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
+    delegate :before_action, :skip_before_action, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
              to: :controller
 
     # Specify which actions to create in the controller

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.12.pre'
+  VERSION = '1.0.13.pre'
 end

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -138,7 +138,7 @@ ActiveAdmin.setup do |config|
   # You can add before, after and around filters to all of your
   # Active Admin resources and pages from here.
   #
-  # config.before_filter :do_something_awesome
+  # config.before_action :do_something_awesome
 
   # == Setting a Favicon
   #

data/spec/unit/action_builder_spec.rb

@@ -52,7 +52,7 @@ describe 'defining new actions from registration blocks' do
         end
       end
 
-      subject { find_before_filter controller, :comment }
+      subject { find_before_action controller, :comment }
 
       it { is_expected.to set_page_title_to "My Awesome Comment", for: controller }
     end
@@ -102,13 +102,13 @@ describe 'defining new actions from registration blocks' do
         end
       end
 
-      subject { find_before_filter controller, :comments }
+      subject { find_before_action controller, :comments }
 
       it { is_expected.to set_page_title_to "My Awesome Comments", for: controller }
     end
   end
 
-  def find_before_filter(controller, action)
+  def find_before_action(controller, action)
     finder = if ActiveAdmin::Dependency.rails? '>= 4.1.0'
       ->c { c.kind == :before && c.instance_variable_get(:@if) == ["action_name == '#{action}'"] }
     else
@@ -126,7 +126,7 @@ describe 'defining new actions from registration blocks' do
     end
 
     failure_message do |filter|
-      message = "expected before_filter to set the @page_title to '#{expected}', but was '#{@actual}'"
+      message = "expected before_action to set the @page_title to '#{expected}', but was '#{@actual}'"
     end
   end
 end

data/spec/unit/controller_filters_spec.rb

@@ -12,14 +12,14 @@ describe ActiveAdmin::Application do
     ]
   end
 
-  it 'before_filter' do
-    controllers.each{ |c| expect(c).to receive(:before_filter).and_return(true) }
-    application.before_filter :my_filter, only: :show
+  it 'before_action' do
+    controllers.each{ |c| expect(c).to receive(:before_action).and_return(true) }
+    application.before_action :my_filter, only: :show
   end
 
-  it 'skip_before_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_before_filter).and_return(true) }
-    application.skip_before_filter :my_filter, only: :show
+  it 'skip_before_action' do
+    controllers.each{ |c| expect(c).to receive(:skip_before_action).and_return(true) }
+    application.skip_before_action :my_filter, only: :show
   end
 
   it 'after_filter' do

data/spec/unit/resource_controller/sidebars_spec.rb

@@ -3,12 +3,12 @@ require 'rails_helper'
 describe ActiveAdmin::ResourceController::Sidebars do
   let(:controller){ Admin::PostsController }
 
-  context 'without before_filter' do
+  context 'without before_action' do
     before do
       ActiveAdmin.register Post
     end
 
-    subject { find_before_filter controller, :skip_sidebar! }
+    subject { find_before_action controller, :skip_sidebar! }
 
     it { is_expected.to set_skip_sidebar_to nil, for: controller }
   end
@@ -16,16 +16,16 @@ describe ActiveAdmin::ResourceController::Sidebars do
   describe '#skip_sidebar!' do
     before do
       ActiveAdmin.register Post do
-        before_filter :skip_sidebar!
+        before_action :skip_sidebar!
       end
     end
 
-    subject { find_before_filter controller, :skip_sidebar! }
+    subject { find_before_action controller, :skip_sidebar! }
 
     it { is_expected.to set_skip_sidebar_to true, for: controller }
   end
 
-  def find_before_filter(controller, filter)
+  def find_before_action(controller, filter)
     #raise controller._process_action_callbacks.map(&:filter).inspect
     controller._process_action_callbacks.detect { |f| f.raw_filter == filter.to_sym }
   end
@@ -39,7 +39,7 @@ describe ActiveAdmin::ResourceController::Sidebars do
     end
 
     failure_message do |filter|
-      message = "expected before_filter to set @skip_sidebar to '#{expected}', but was '#{@actual}'"
+      message = "expected before_action to set @skip_sidebar to '#{expected}', but was '#{@actual}'"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yousty-activeadmin
 version: !ruby/object:Gem::Version
-  version: 1.0.12.pre
+  version: 1.0.13.pre
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre