lib/active_admin/scope.rb in yousty-activeadmin-1.0.4.pre vs lib/active_admin/scope.rb in yousty-activeadmin-1.0.5.pre

@@ -11,35 +11,35 @@
     #   # => Scope with name 'Published' and scope method :published
     #
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
-    #   Scope.new 'Published', :public, :if => proc { current_admin_user.can? :manage, resource_class } do |articles|
-    #     articles.where :published => true
+    #   Scope.new 'Published', :public, if: proc { current_admin_user.can? :manage, resource_class } do |articles|
+    #     articles.where published: true
     #   end
     #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block
     #
-    #   Scope.new('Published') { |articles| articles.where(:published => true) }
+    #   Scope.new('Published') { |articles| articles.where(published: true) }
     #   # => Scope with name 'Published' using a block to scope
     #
     #   Scope.new ->{Date.today.strftime '%A'}, :published_today
     #   # => Scope with dynamic title using the :published_today scope method
     #
     def initialize(name, method = nil, options = {}, &block)
       @name, @scope_method = name, method.try(:to_sym)
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
-        @id = method.to_s.gsub(' ', '').underscore
+        @id = method.to_s.parameterize("_")
       else
         @scope_method ||= name.to_sym
-        @id = name.to_s.gsub(' ', '').underscore
+        @id = name.to_s.parameterize("_")
       end
 
       @scope_method               = nil        if @scope_method == :all
       @scope_method, @scope_block = nil, block if block_given?
 
-      @show_count       = options[:show_count].nil? ? true : options[:show_count]
+      @show_count       = options.fetch(:show_count, true)
       @display_if_block = options[:if]      || proc{ true }
       @default_block    = options[:default] || proc{ false }
 
     end