meta_search 1.1.0.pre → 1.1.0.pre2

data/README.rdoc

@@ -322,6 +322,10 @@ your controller. The other required parameter is the attribute name itself. Opti
 you can provide a string as a 3rd parameter to override the default link name, and then
 additional hashed for the +options+ and +html_options+ hashes for link_to.
 
+By default, the link that is created will sort by the given column in ascending order when first clicked. If you'd like to reverse this (so the first click sorts the results in descending order), you can pass +:default_order => :desc+ in the options hash, like so:
+
+  <%= sort_link @search, :ratings, "Highest Rated", :default_order => :desc %>
+
 You can sort by more than one column as well, by creating a link like:
 
   <%= sort_link :name_and_salary %>

data/VERSION

@@ -1 +1 @@
-1.1.0.pre
+1.1.0.pre2

data/lib/meta_search.rb

@@ -15,7 +15,7 @@ module MetaSearch
     ['contains', 'like', 'matches', {:types => STRINGS, :predicate => :matches, :formatter => '"%#{param}%"'}],
     ['does_not_contain', 'nlike', 'not_matches', {:types => STRINGS, :predicate => :does_not_match, :formatter => '"%#{param}%"'}],
     ['starts_with', 'sw', {:types => STRINGS, :predicate => :matches, :formatter => '"#{param}%"'}],
-    ['does_not_start_with', 'dnsw', {:types => STRINGS, :predicate => :does_not_match, :formatter => '"%#{param}%"'}],
+    ['does_not_start_with', 'dnsw', {:types => STRINGS, :predicate => :does_not_match, :formatter => '"#{param}%"'}],
     ['ends_with', 'ew', {:types => STRINGS, :predicate => :matches, :formatter => '"%#{param}"'}],
     ['does_not_end_with', 'dnew', {:types => STRINGS, :predicate => :does_not_match, :formatter => '"%#{param}"'}],
     ['greater_than', 'gt', {:types => (NUMBERS + DATES + TIMES), :predicate => :gt}],

data/lib/meta_search/helpers/url_helper.rb

@@ -16,14 +16,27 @@ module MetaSearch
       #   <%= sort_link @search, :name, 'Company Name' %>
       #   <%= sort_link @search, :name, :class => 'name_sort' %>
       #   <%= sort_link @search, :name, 'Company Name', :class => 'company_name_sort' %>
+      #   <%= sort_link @search, :name, :default_order => :desc %>
+      #   <%= sort_link @search, :name, 'Company Name', :default_order => :desc %>
+      #   <%= sort_link @search, :name, :class => 'name_sort', :default_order => :desc %>
+      #   <%= sort_link @search, :name, 'Company Name', :class => 'company_name_sort', :default_order => :desc %>
+
       def sort_link(builder, attribute, *args)
         raise ArgumentError, "Need a MetaSearch::Builder search object as first param!" unless builder.is_a?(MetaSearch::Builder)
         attr_name = attribute.to_s
         name = (args.size > 0 && !args.first.is_a?(Hash)) ? args.shift.to_s : builder.base.human_attribute_name(attr_name)
         prev_attr, prev_order = builder.search_attributes['meta_sort'].to_s.split('.')
-        current_order = prev_attr == attr_name ? prev_order : nil
-        new_order = current_order == 'asc' ? 'desc' : 'asc'
+
         options = args.first.is_a?(Hash) ? args.shift : {}
+        current_order = prev_attr == attr_name ? prev_order : nil
+
+        if options[:default_order] == :desc
+          new_order = current_order == 'desc' ? 'asc' : 'desc'
+        else
+          new_order = current_order == 'asc' ? 'desc' : 'asc'
+        end
+        options.delete(:default_order)
+
         html_options = args.first.is_a?(Hash) ? args.shift : {}
         css = ['sort_link', current_order].compact.join(' ')
         html_options[:class] = [css, html_options[:class]].compact.join(' ')
@@ -50,4 +63,4 @@ module MetaSearch
       end
     end
   end
-end
+end

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "1.1.0.pre"
+  s.version = "1.1.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ernie Miller"]
-  s.date = %q{2011-05-26}
+  s.authors = [%q{Ernie Miller}]
+  s.date = %q{2011-07-07}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links
@@ -70,8 +70,8 @@ you're feeling especially appreciative. It'd help me justify this
 "open source" stuff to my lovely wife. :)
 
 }
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Object-based searching (and more) for simply creating search forms.}
 
   if s.respond_to? :specification_version then

data/test/fixtures/data_types.yml

@@ -6,9 +6,9 @@ dt_<%= n %>:
   int       : <%= n ** 3 %>
   flt       : <%= n.to_f / 2.0 %>
   dec       : <%= n.to_f ** (n + 0.1) %>
-  dtm       : <%= (Time.utc(2009, 12, 24) + 86400 * n).to_s(:db) %>
-  tms       : <%= (Time.utc(2009, 12, 24) + 86400 * n).to_s(:db) %>
-  tim       : <%= Time.utc(2000, 01, 01, n+8, n).to_s(:db) %>
+  dtm       : <%= (Time.local(2009, 12, 24) + 86400 * n).in_time_zone.to_s(:db) %>
+  tms       : <%= (Time.local(2009, 12, 24) + 86400 * n).in_time_zone.to_s(:db) %>
+  tim       : <%= Time.local(2000, 01, 01, n+8, n).in_time_zone.to_s(:db) %>
   dat       : <%= (Date.new(2009, 12, 24) + n).strftime("%Y-%m-%d") %>
   bin       : <%= "BLOB#{n}" * n %>
   bln       : <%= n % 2 > 0 ? true : false %>

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'active_support/time'
 require 'active_record'
 require 'active_record/fixtures'
 require 'action_view'

data/test/test_view_helpers.rb

@@ -321,6 +321,21 @@ class TestViewHelpers < ActionView::TestCase
       @s = Company.search
     end
 
+    should "generate a sort link for descending order if set as the default order" do
+      assert_match /name.desc/,
+        sort_link(@s, :name, :controller => 'companies', :default_order => :desc)
+    end
+
+    should "generate a sort link for ascending order if set as the default order" do
+      assert_match /name.asc/,
+        sort_link(@s, :name, :controller => 'companies', :default_order => :asc)
+    end
+
+    should "generate a sort link for ascending order if default is specified incorectly" do
+      assert_match /name.asc/,
+        sort_link(@s, :name, :controller => 'companies', :default_order => :something_else)
+    end
+
     context "sorted by name ascending" do
       setup do
         @s.meta_sort = 'name.asc'
@@ -336,6 +351,21 @@ class TestViewHelpers < ActionView::TestCase
                         sort_link(@s, :created_at, :controller => 'companies')
       end
 
+      should "generate a sort link for descending order if ascending order is the default" do
+        assert_match /name.desc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :asc)
+      end
+
+      should "generate a sort link for descending order if descending order is the default" do
+        assert_match /name.desc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :desc)
+      end
+
+      should "generate a sort link for descending order if default is specified incorrectly" do
+        assert_match /name.desc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :something_else)
+      end
+
       context "with existing search options" do
         setup do
           @s.name_contains = 'a'
@@ -347,6 +377,27 @@ class TestViewHelpers < ActionView::TestCase
         end
       end
     end
+
+    context "sorted by name descending" do
+      setup do
+        @s.meta_sort = 'name.desc'
+      end
+
+      should "generate a sort link for ascending order if descending order is the default" do
+        assert_match /name.asc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :desc)
+      end
+
+      should "generate a sort link for ascending order if ascending order is the default" do
+        assert_match /name.asc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :asc)
+      end
+
+      should "generate a sort link for ascending order if default is specified incorrectly" do
+        assert_match /name.asc/,
+          sort_link(@s, :name, :controller => 'companies', :default_order => :desc)
+      end
+    end
   end
 
   context "A developer search" do
@@ -381,4 +432,4 @@ class TestViewHelpers < ActionView::TestCase
       end
     end
   end
-end
+end

metadata

@@ -1,71 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: meta_search
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0.pre2
   prerelease: 6
-  version: 1.1.0.pre
 platform: ruby
-authors: 
+authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2162080940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2162080940
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2162080440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0.alpha
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2162080440
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2162079960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0.alpha
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2162079960
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &2162079460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.1.0.alpha
   type: :runtime
-  version_requirements: *id004
-description: "\n      Allows simple search forms to be created against an AR3 model\n      and its associations, has useful view helpers for sort links\n      and multiparameter fields as well.\n    "
+  prerelease: false
+  version_requirements: *2162079460
+description: ! "\n      Allows simple search forms to be created against an AR3 model\n
+  \     and its associations, has useful view helpers for sort links\n      and multiparameter
+  fields as well.\n    "
 email: ernie@metautonomo.us
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitmodules
 - CHANGELOG
@@ -107,35 +106,39 @@ files:
 - test/test_view_helpers.rb
 homepage: http://metautonomo.us/projects/metasearch/
 licenses: []
+post_install_message: ! '
 
-post_install_message: "\n\
-  *** Thanks for installing MetaSearch! ***\n\
-  Be sure to check out http://metautonomo.us/projects/metasearch/ for a\n\
-  walkthrough of MetaSearch's features, and click the donate button if\n\
-  you're feeling especially appreciative. It'd help me justify this\n\
-  \"open source\" stuff to my lovely wife. :)\n\n"
-rdoc_options: []
+  *** Thanks for installing MetaSearch! ***
+
+  Be sure to check out http://metautonomo.us/projects/metasearch/ for a
+
+  walkthrough of MetaSearch''s features, and click the donate button if
+
+  you''re feeling especially appreciative. It''d help me justify this
 
-require_paths: 
+  "open source" stuff to my lovely wife. :)
+
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Object-based searching (and more) for simply creating search forms.
 test_files: []
-