scopes.rb in activeadmin-0.4.0

- old
+ new

@@ -20,13 +20,26 @@
       # Create a new scope object for this resource.
       # If you want to internationalize the scope name, you can add
       # to your i18n files a key like "active_admin.scopes.scope_method".
       def scope(*args, &block)
         options = args.extract_options!
-        self.scopes << ActiveAdmin::Scope.new(*args, &block)
-        if options[:default]
-          @default_scope = scopes.last
+        title = args[0] rescue nil
+        method = args[1] rescue nil
+
+        scope = ActiveAdmin::Scope.new(title, method, options, &block)
+
+        # Finds and replaces a scope by the same name if it already exists
+        existing_scope_index = scopes.index{|existing_scope| existing_scope.id == scope.id }
+        if existing_scope_index
+          scopes.delete_at(existing_scope_index)
+          scopes.insert(existing_scope_index, scope)
+        else
+          self.scopes << scope
         end
+
+        @default_scope = scope if options[:default]
+
+        scope
       end
 
     end
   end
 end