g_named_scope_filters 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.5 2010-07-19
+
+* Fixed bug with the all filter selection when no all filter parameter name is specified.
+
 == 1.0.5 2009-11-19
 
 * Added options to control 'All' filter display, parameter and label.
@@ -6,7 +10,7 @@
 
 == 1.0.4 2009-10-11
 
-* Added ability to pass in record counts for the filters to override the control's way of calculating 
+* Added ability to pass in record counts for the filters to override the control's way of calculating
   the available record counts.
 
 

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/g_named_scope_filters.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{g_named_scope_filters}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2010-07-19}
   s.description = %q{A UI component that generates an unordered list of filters that use named scopes within an ActiveRecord model to filter a list.  It is not tied to a table or list specifically as it simply manipulates the url, resulting  in a manipulation of any collection (list, table, etc.) it may be coupled with.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/midas/g_named_scope_filters}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A UI component that generates an unordered list of filters that use named scopes within an ActiveRecord model to filter a list.}
   s.test_files = [
     "spec/g_named_scope_filters_spec.rb",

data/lib/g_named_scope_filters.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'g_named_scope_filters/view_helpers'
 
 module GNamedScopeFilters
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end
 
 if defined?( ActionView::Base )

data/lib/g_named_scope_filters/view_helpers.rb

@@ -1,15 +1,15 @@
 module GNamedScopeFilters
   module ViewHelpers
-    
+
     # Guilded component.  This is an unordered list of filters that use named scopes within an ActiveRecord model
-    # to filter a list.  It is not tied to a table or list specifically as it simply manipulates the url, resulting 
+    # to filter a list.  It is not tied to a table or list specifically as it simply manipulates the url, resulting
     # in a manipulation of a list or table.
-    # 
+    #
     # === Parameters
     # :ar_obj_col_or_class:: The ActiveRecord object, collection or class to make the filters from.  Warning:
-    #   if you use anything but the class and the collection or object comes up nil or empty, then you will 
+    #   if you use anything but the class and the collection or object comes up nil or empty, then you will
     #   not have filters renderred.  The prefferred way is to use the class unless you cannot due to dynamic reasons.
-    #   
+    #
     # === Options
     # +id+ - (Required) This will be the id of the ul returned that wraps the filters.
     # +class+ - This will be the id of the ul returned that wraps the filters.  Defaults to 'filters.'
@@ -20,7 +20,7 @@ module GNamedScopeFilters
     # +record_counts+ - A hash providing teh counts for each filter to override the built in counting funcitonality.
     # +include_all+ - True if you want the all filter to be renderred, otherwise false.  Defaults to true.
     # +all_label+ - The text to use for the All filter's label.  Defaults to 'All.'
-    # +all_param+ - The param to pass for the all filter.  Set to :none or false for no filter parameter added to URL 
+    # +all_param+ - The param to pass for the all filter.  Set to :none or false for no filter parameter added to URL
     #   when all selected.  Defaults to false.
     # +filter_param_key+ - The key for the filter param.  Defaults to 'filter.'  ie. &filter=something
     # +scoped_by+ - This is the ActiveRecord object that this list is scoped by.  For instance, if an account
@@ -28,7 +28,7 @@ module GNamedScopeFilters
     #   This will scope the user list with filter to that account.  It will also change the path helper from
     #   users_path to account_users_path, unless you overrode the path helper with :list_path_helper.
     # +namespace+ - The name of the namespace being used for this resource.
-    # +polymorphic_type+ - A string representing the name of the type to use if the current type is just a polymorphic 
+    # +polymorphic_type+ - A string representing the name of the type to use if the current type is just a polymorphic
     #   association table, etc.  For instance
     # +polymorphic_as+ -
     #
@@ -36,7 +36,7 @@ module GNamedScopeFilters
       options = args.extract_options!
       options.merge! :class => "filters" unless options.include?( :class )
       options.merge! :selected_class => "selected" unless options.include?( :selected_class )
-      options.merge! :exclude_css => true, :exclude_js => true 
+      options.merge! :exclude_css => true, :exclude_js => true
 
       if options[:only]
         if options[:only].is_a?( String ) || options[:only].is_a?( Symbol )
@@ -57,7 +57,7 @@ module GNamedScopeFilters
       all_param = options[:all_param]
       all_param = nil if all_param == :none || all_param == false
       filter_param_key = options[:filter_param_key] || 'filter'
-      
+
       raise "You must provide the 'polymorphic_as' option if you provide the 'polymorphic_type' option." if polymorphic_type && !polymorphic_as
 
       Guilded::Guilder.instance.add( :named_scope_filters, options )
@@ -83,7 +83,7 @@ module GNamedScopeFilters
 
       # Resolve scoped by if it is an array
       scoped_by = scoped_by.last if scoped_by.is_a?( Array )
-      
+
       html << "<ul id=\"#{options[:id].to_s}\" class=\"#{options[:class].to_s}\">"
 
       # Handle the all filter
@@ -93,7 +93,7 @@ module GNamedScopeFilters
         if options[:include_count]
           if record_counts
             link_text << " <span>#{record_counts[:all]}</span>"
-          elsif scoped_by   
+          elsif scoped_by
             if polymorphic_type
               poly_scoped_finder = polymorphic_type.to_s.tableize
               link_text << " <span>#{scoped_by.send( poly_scoped_finder.to_sym ).count}</span>"
@@ -102,7 +102,7 @@ module GNamedScopeFilters
               link_text << " <span>#{scoped_by.send( scoped_finder.to_sym ).count}</span>"
             end
           else
-            link_text << " <span>#{klass.count}</span>" 
+            link_text << " <span>#{klass.count}</span>"
           end
         end
 
@@ -110,9 +110,11 @@ module GNamedScopeFilters
         filter_options.push( :order => params[:order] ) if params[:order]
         filter_options.push( filter_param_key.to_sym => all_param ) if all_param # Send a param for 'All' filter
 
+        is_selected = all_param.nil? ? params[:filter] == all_param : params[:filter] == all_param.to_s
+
         html << "<li>"
-        html << link_to( link_text, @controller.send( list_path_helper, *(path_helpers[:index_rest_args] + filter_options) ), 
-                  :class => "#{params[:filter] == all_param.to_s ? options[:selected_class] : ''}" )
+        html << link_to( link_text, @controller.send( list_path_helper, *(path_helpers[:index_rest_args] + filter_options) ),
+                  :class => "#{is_selected ? options[:selected_class] : ''}" )
       end
 
       filters.each do |filter|
@@ -126,7 +128,7 @@ module GNamedScopeFilters
             scoped_finder = klass.to_s.tableize if scoped_finder.nil? || scoped_finder.empty?
 
             if polymorphic_type
-              # If there is a named scope finder defined on the root klass that can get the 
+              # If there is a named scope finder defined on the root klass that can get the
               # polymorpic associated objects, the use it
               if klass.respond_to?( poly_scoped_finder )
                 link_text << " <span>#{scoped_by.send( scoped_finder.to_sym ).send( poly_scoped_finder.to_sym ).send( filter.to_sym ).count}</span>"
@@ -150,7 +152,7 @@ module GNamedScopeFilters
         end
 
         html << "<li>"
-        html << link_to( link_text, @controller.send( list_path_helper, *(path_helpers[:index_rest_args] + filter_options) ), 
+        html << link_to( link_text, @controller.send( list_path_helper, *(path_helpers[:index_rest_args] + filter_options) ),
                   :class => "#{params[:filter] == filter.to_s ? options[:selected_class] : ''}" )
         html << "</li>"
       end
@@ -158,6 +160,6 @@ module GNamedScopeFilters
       html << "</ul>"
       html
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: g_named_scope_filters
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -06:00
+date: 2010-07-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: guilded
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: A UI component that generates an unordered list of filters that use named scopes within an ActiveRecord model to filter a list.  It is not tied to a table or list specifically as it simply manipulates the url, resulting  in a manipulation of any collection (list, table, etc.) it may be coupled with.
 email: jason@lookforwardenterprises.com
 executables: []
@@ -78,18 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A UI component that generates an unordered list of filters that use named scopes within an ActiveRecord model to filter a list.