Merge 49f0f80 into a932d56

features/index/index_scopes.feature

@@ -14,6 +14,25 @@ Feature: Index Scoping
     And I should see the scope "All" with the count 3
     And I should see 3 posts in the table
 
+  Scenario: Viewing resources with one scope with dynamic name
+    Given 3 posts exist
+    And an index configuration of:
+      """
+      ActiveAdmin.register Post do
+        scope -> { scope_title }, :all
+
+        controller do
+          def scope_title
+            'Neat scope'
+          end
+
+          helper_method :scope_title
+        end
+      end
+      """
+    Then I should see the scope with label "Neat scope"
+    And I should see 3 posts in the table
+
   Scenario: Viewing resources with one scope as the default
     Given 3 posts exist
     And an index configuration of:

features/step_definitions/index_scope_steps.rb

@@ -14,6 +14,10 @@
   step %{I should see "#{count}" within ".scopes .#{name} .count"}
 end
 
+Then /^I should see the scope with label "([^"]*)"$/ do |label|
+  expect(page).to have_link(label)
+end
+
 Then /^I should see the scope "([^"]*)" with no count$/ do |name|
   name = name.tr(" ", "").underscore.downcase
   expect(page).to     have_css ".scopes .#{name}"

lib/active_admin/scope.rb

@@ -45,10 +45,9 @@ def initialize(name, method = nil, options = {}, &block)
 
     def name
       case @name
-        when Proc   then @name.call.to_s
         when String then @name
         when Symbol then @name.to_s.titleize
-        else             @name.to_s
+        else             @name
       end
     end
 

lib/active_admin/views/components/scopes.rb

@@ -31,7 +31,7 @@ def build(scopes, options = {})
 
       def build_scope(scope, options)
         li class: classes_for_scope(scope) do
-          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: scope.name
+          scope_name = I18n.t "active_admin.scopes.#{scope.id}", default: name_for_scope(scope)
           params     = request.query_parameters.except :page, :scope, :commit, :format
 
           a href: url_for(scope: scope.id, params: params), class: 'table_tools_button' do
@@ -61,6 +61,13 @@ def current_scope?(scope)
       def get_scope_count(scope)
         collection_size(scope_chain(scope, collection_before_scope))
       end
+
+      def name_for_scope(scope)
+        case scope.name
+          when Proc then self.instance_exec(&scope.name).to_s
+          else      scope.name.to_s
+        end
+      end
     end
   end
 end

spec/unit/scope_spec.rb

@@ -135,7 +135,7 @@
 
       it "should properly render the proc" do
         scope = ActiveAdmin::Scope.new proc{ Date.today.strftime '%A' }, :foobar
-        expect(scope.name).to eq Date.today.strftime '%A'
+        expect(scope.name.call).to eq Date.today.strftime '%A'
       end
     end