midas-g_named_scope_filters 1.0.0 → 1.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.1 2009-04-16
+
+* Added namespace option
+
 == 1.0.0 2009-03-12
 
 * Initial release (ported from plugin)

data/README.rdoc

@@ -35,7 +35,7 @@ In your Rails environment.rb file:
 
   config.gem 'midas-g_named_scope_filters', :version => '1.0.0', :lib => 'g_named_scope_filters', :source => 'http://gems.github.com'
 
-
+	
 == USAGE:
 
 Model:

data/g_named_scope_filters.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{g_named_scope_filters}
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   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-03-12}
+  s.date = %q{2009-04-17}
   s.description = %q{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  in a manipulation of any collection (list, table, etc.) it may be coupled with.}
   s.email = ["jason@lookforwardenterprises.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
@@ -25,18 +25,18 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<rails>, [">= 2.2.0"])
       s.add_development_dependency(%q<midas-guilded>, [">= 0.0.6"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<rails>, [">= 2.2.0"])
       s.add_dependency(%q<midas-guilded>, [">= 0.0.6"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<rails>, [">= 2.2.0"])
     s.add_dependency(%q<midas-guilded>, [">= 0.0.6"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])

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.0'
+  VERSION = '1.0.2'
 end
 
 if defined?( ActionView::Base )

data/lib/g_named_scope_filters/view_helpers.rb

@@ -5,26 +5,26 @@ module GNamedScopeFilters
     # 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*
+    # === 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 
     #   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.'
-    # :selected_class:: This will be the class that is used to show whih filter is selected.  Defaults to 'selected.'
-    # :only:: This is the filters to include.  Can be an array or string (for one filter).
-    # :include_count:: True if you would like a span created within each filter list item containg the count for
+    # === 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.'
+    # +selected_class+ - This will be the class that is used to show whih filter is selected.  Defaults to 'selected.'
+    # +only+ - This is the filters to include.  Can be an array or string (for one filter).
+    # +include_count+ - True if you would like a span created within each filter list item containg the count for
     #   items in that filter.
-    # :scoped_by:: This is the ActiveRecord object that this list is scoped by.  For instance, if an account
+    # +scoped_by+ - This is the ActiveRecord object that this list is scoped by.  For instance, if an account
     #   has many users and this is the user list for said acccount, then you would use :scoped_by => @account.
     #   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.
-    # :list_path_helper:: This is a string or symbol for the list path helper to use.  You will need to override
-    #   if your object is namespaced.
-    # :polymorphic:: A string representing the name of the type to use if the current type is just a polymorphic 
+    # +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 
     #   association table, etc.  For instance
+    # +polymorphic_as+ -
     #
     def g_named_scope_filters( ar_obj_col_or_class, *args )
       options = args.extract_options!
@@ -41,9 +41,9 @@ module GNamedScopeFilters
       end
       options[:filters] = filters
 
-      scoped_by = options.delete( :scoped_by )
-      polymorphic_type = options.delete( :polymorphic_type ).to_s if options.has_key?( :polymorphic_type )
-      polymorphic_as = options.delete( :polymorphic_as ).to_s if options.has_key?( :polymorphic_as )
+      scoped_by = options[:scoped_by] #options.delete( :scoped_by )
+      polymorphic_type = options[:polymorphic_type] #options.delete( :polymorphic_type ).to_s if options.has_key?( :polymorphic_type )
+      polymorphic_as = options[:polymorphic_as] #options.delete( :polymorphic_as ).to_s if options.has_key?( :polymorphic_as )
 
       raise "You must provide the 'polymorphic_as' option if you provide the 'polymorphic_type' option." if polymorphic_type && !polymorphic_as
 
@@ -61,13 +61,15 @@ module GNamedScopeFilters
         throw 'You must provide either an ActiveRecord object, collection or type in order to generate filters.'
       end
 
-      if options[:list_path_helper]
-        list_path_helper = options[:list_path_helper].to_s
-      elsif scoped_by
-        list_path_helper = "#{scoped_by.class.to_s.underscore}_#{klass.to_s.tableize}_path"
-      else
-        list_path_helper = "#{klass.to_s.tableize}_path"
-      end
+      path_helpers = Guilded::Rails::Helpers.resolve_rest_path_helpers( ar_obj_col_or_class, options )
+      list_path_helper = path_helpers[:index_rest_helper]
+      #if options[:list_path_helper]
+      #  list_path_helper = options[:list_path_helper].to_s
+      #elsif scoped_by
+      #  list_path_helper = "#{scoped_by.class.to_s.underscore}_#{klass.to_s.tableize}_path"
+      #else
+      #  list_path_helper = "#{klass.to_s.tableize}_path"
+      #end
 
       html = ''
 
@@ -92,11 +94,13 @@ module GNamedScopeFilters
         end
       end
 
-      filter_options = {}
-      filter_options.merge!( :order => params[:order] ) if params[:order]
+      #filter_options = {}
+      #filter_options.merge!( :order => params[:order] ) if params[:order]
+      filter_options = Array.new
+      filter_options.push( :order => params[:order] ) if params[:order]
 
       html << "<li>"
-      html << link_to( link_text, @controller.send( list_path_helper, filter_options ), 
+      html << link_to( link_text, @controller.send( list_path_helper, *(path_helpers[:index_rest_args] + filter_options) ), 
                 :class => "#{params[:filter].nil? ? options[:selected_class] : ''}" )
 
       filters.each do |filter|
@@ -129,10 +133,15 @@ module GNamedScopeFilters
 
         end
 
-        filter_options.merge!( :filter => filter )
+        #filter_options.merge!( :filter => filter )
+        if filter_options[filter_options.size-1].is_a?( Hash )
+          filter_options[filter_options.size-1].merge!( :filter => filter )
+        else
+          filter_options.push( :filter => filter )
+        end
 
         html << "<li>"
-        html << link_to( link_text, @controller.send( list_path_helper, 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: midas-g_named_scope_filters
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails