sort_this 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+gemfile:
+  - Gemfile
+  - Gemfile.rails3.1
+  - Gemfile.rails3.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
 ## v1.0.0
 
-* Initial Release
+* Initial Release
+
+## v1.0.1
+
+* column_name is now optional
+* added a table_name option to use when using joins
+* added default_sort class method
+* sort and default_sort are memoized

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in sortable.gemspec
-gemspec
+gem 'rails', '~> 3.2.0'
+gem 'memoist', '0.2.0'
+
+gem 'rspec', '2.12.0'
+gem 'sqlite3', '1.3.6'
+gem 'factory_girl', '4.1.0'
+gem 'database_cleaner', '0.9.1'
+gem 'capybara', '2.0.1'
+gem 'rake'

data/Gemfile.rails3.0

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.0.0'
+gem 'memoist', '0.2.0'
+
+gem 'rspec', '2.12.0'
+gem 'sqlite3', '1.3.6'
+gem 'factory_girl', '4.1.0'
+gem 'database_cleaner', '0.9.1'
+gem 'capybara', '2.0.1'
+gem 'rake'

data/Gemfile.rails3.0.lock

@@ -0,0 +1,122 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.17)
+      actionpack (= 3.0.17)
+      mail (~> 2.2.19)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+    activesupport (3.0.17)
+    addressable (2.3.2)
+    arel (2.0.10)
+    builder (2.1.2)
+    capybara (2.0.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    database_cleaner (0.9.1)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
+    ffi (1.2.0)
+    i18n (0.5.0)
+    json (1.7.5)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memoist (0.2.0)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.17)
+      actionmailer (= 3.0.17)
+      actionpack (= 3.0.17)
+      activerecord (= 3.0.17)
+      activeresource (= 3.0.17)
+      activesupport (= 3.0.17)
+      bundler (~> 1.0)
+      railties (= 3.0.17)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.27.2)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    websocket (1.0.6)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara (= 2.0.1)
+  database_cleaner (= 0.9.1)
+  factory_girl (= 4.1.0)
+  memoist (= 0.2.0)
+  rails (~> 3.0.0)
+  rake
+  rspec (= 2.12.0)
+  sqlite3 (= 1.3.6)

data/Gemfile.rails3.1

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 3.1.0'
+gem 'memoist', '0.2.0'
+
+gem 'rspec', '2.12.0'
+gem 'sqlite3', '1.3.6'
+gem 'factory_girl', '4.1.0'
+gem 'database_cleaner', '0.9.1'
+gem 'capybara', '2.0.1'
+gem 'rake'

data/Gemfile.rails3.1.lock

@@ -0,0 +1,132 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
+      mail (~> 2.3.3)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    addressable (2.3.2)
+    arel (2.2.3)
+    builder (3.0.4)
+    capybara (2.0.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    database_cleaner (0.9.1)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
+    ffi (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memoist (0.2.0)
+    mime-types (1.19)
+    multi_json (1.2.0)
+    nokogiri (1.5.6)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
+      bundler (~> 1.0)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.27.2)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    websocket (1.0.6)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara (= 2.0.1)
+  database_cleaner (= 0.9.1)
+  factory_girl (= 4.1.0)
+  memoist (= 0.2.0)
+  rails (~> 3.1.0)
+  rake
+  rspec (= 2.12.0)
+  sqlite3 (= 1.3.6)

data/README.md

@@ -1,4 +1,4 @@
-# SortThis
+# SortThis [![Build Status](https://secure.travis-ci.org/spullen/sort_this.png)](http://travis-ci.org/spullen/sort_this)
 
 SortThis provides a way to sort.
 
@@ -10,7 +10,7 @@ Here is an [example app](https://github.com/spullen/sort_example) that demonstra
 
 Add this line to your application's Gemfile:
 
-    gem 'sort_this', :git => 'git://github.com/spullen/sort_this.git'
+    gem 'sort_this'
 
 And then execute:
 
@@ -24,7 +24,7 @@ Add a call to the `sortable` method with a hash of sorts
 
     class YourModel < ActiveRecord::Base
       
-      sort_this :sort_name => {:column_name => :name, :default => 'ASC', :joins => :association, :clause => "some.clause"}
+      sort_this :sort_name => {:column_name => :name, :default => 'ASC', :table_name => 'some_other_table_name', :joins => :association, :clause => "some.clause"}
       
     end
     
@@ -34,14 +34,16 @@ The options are
     
     Sort Options:
     
-      column_name: (Required) The name of the column to sort on.
+      column_name: (Optional) The name of the column to sort on. If left blank it will use the sort name.
       default:     (Optional) Defines a default sort if provided. The valid options are 'ASC' or 'DESC'.
-      joins:       (Optional) Defines an association to join on, this should be provided if the column is in another table.
+      table_name   (Optional) Overrides the table name used, should usually be used in coordination with joins.
+      joins:       (Optional) Defines an association to join on, this should be provided if the column is in another table. ** Requires table name to be set. **
+                              This is what you would usually pass into a joins or includes clause for ActiveRecord.
       clause:      (Optional) Overrides the clause used for the sort.
       
 Then to sort
 
-    YourModel.sort("sort_name", "asc|desc") => sorted list of YourModel objects
+    YourModel.sort("sort_name", "asc|desc|ASC|DESC") => sorted list of YourModel objects
     
 ### Controller
 
@@ -67,11 +69,26 @@ In you controller define a default sort
     
 ## TODO:
 
-- Add error handling to active record sortable
-- Add the ability to customize the sort and direction parameters
-- Define scopes for each sort defined (individual sort scopes)
+Defined Highest to Lowest priority
 
+- Throw error when the table_name option is not set and joins is set.
+- Being able to define multiple column sorts
+
+      Something like:
+      sort_this :some_crazy_sort => {
+        [
+          {:column_name => :some_column, other options},
+          ...
+        ] 
+      }
+    
+      not sure how that'd be called though...
+
+- Define a default scope and remove from the sort method, gives more control to developer.
+- Define scopes for each sort defined (individual sort scopes)
+- Add the ability to customize the sort and direction parameters
 - Testing on different databases (should probably hit postgresql and mysql unless the way SQLite handles it in the same way)
+- Define rails 3.0 with ruby 1.8.7 gemfile for travis ci tests as 1.8.7 is still prevelant for 3.0
 
 ## Contributing
 

data/lib/sort_this/active_record.rb

@@ -7,8 +7,7 @@ module SortThis
       base.class_eval do
         extend ClassMethods
         
-        class << self; extend Memoist; self; end.memoize :sort
-        
+        class << self; extend Memoist; self; end.memoize :sort, :default_sort
         
         class_attribute :sort_columns, :default_sort_columns
       end
@@ -19,10 +18,10 @@ module SortThis
       #
       # Input is a hash of sort_name => sort_options pairs
       #
-      # :column_name  => (required) Column name to sort on
+      # :column_name  => (optional) Column name to sort on, if left blank it will use the sort_name
       # :default      => (optional) 'ASC'|'DESC'
+      # :table_name   => (optional) Override the table name, required if using joins
       # :joins        => (optional) Association to join on. Note: must be an association of the model being sorted.
-      #                             Prefixes the column_name with the table name to prevent collisions
       # :clause       => (optional) Override the clause of the sort
       #
       # ex.
@@ -33,34 +32,43 @@ module SortThis
       #
       # :sort_name1 => { :column_name => :quantity }
       # :sort_name2 => { :column_name => :price, :default => 'DESC' }
-      # :sort_name3 => { :column_name => :name, :joins => :product }
+      # :sort_name3 => { :column_name => :name, :table_name => 'products', :joins => :product }
       #
       def sort_this(sorts = {})
         self.sort_columns = {}
         self.default_sort_columns = {}
         
-        empty_sort_options = { :column_name => nil, :default => nil, :joins => nil, :clause => nil }
+        empty_sort_options = { :column_name => nil, :default => nil, :table_name => nil, :joins => nil, :clause => nil }
         
         sorts.each do |sort_name, sort_options|
           sort_options = empty_sort_options.merge(sort_options)
           
           self.sort_columns[sort_name] = sort_options
           
-          column  = sort_options[:column_name] # TODO: raise exception if this is nil
-          table   = (sort_options[:joins].blank?)   ? table_name            : sort_options[:joins].to_s.pluralize
-          clause  = (sort_options[:clause].blank?)  ? "#{table}.#{column}"  : sort_options[:clause]
+          column  = (sort_options[:column_name].blank?) ? sort_name             : sort_options[:column_name]
+          table   = (sort_options[:table_name].blank?)  ? table_name            : sort_options[:table_name].to_s.pluralize
+          clause  = (sort_options[:clause].blank?)      ? "#{table}.#{column}"  : sort_options[:clause]
           
-          self.sort_columns[sort_name][:clause] = clause if sort_options[:clause].blank?
+          self.sort_columns[sort_name][:column_name]  = column
+          self.sort_columns[sort_name][:table_name]   = table
+          self.sort_columns[sort_name][:clause]       = clause
           
           unless sort_options[:default].blank?
-            # TODO: raise exception if the default is not ASC|DESC
             default_sort_direction = sort_options[:default].upcase
+            
+            unless VALID_SORT_DIRECTIONS.include?(default_sort_direction)
+              raise SortThisError, "Invalid sort direction for: #{sort_name}. Must be 'ASC'/'asc' or 'DESC'/'desc'."
+            end   
+            
             self.default_sort_columns[sort_name] = "#{clause} #{default_sort_direction}"
           end
-          
         end
       end
       
+      def default_sort
+        order(self.default_sort_columns.values.join(', '))
+      end
+      
       def sort(sort_column = nil, sort_direction = DEFAULT_SORT_DIRECTION)
         query = scoped
     

data/lib/sort_this/sort_this_error.rb

@@ -0,0 +1,4 @@
+module SortThis
+  class SortThisError < StandardError
+  end
+end

data/lib/sort_this/version.rb

@@ -1,3 +1,3 @@
 module SortThis
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/sort_this.rb

@@ -1,4 +1,5 @@
 require 'sort_this/version'
+require 'sort_this/sort_this_error'
 require 'sort_this/active_record'
 require 'sort_this/action_controller'
 require 'sort_this/view_helpers/action_view'

data/sort_this.gemspec

@@ -19,11 +19,4 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency 'rails', '>= 3.0'
   gem.add_dependency 'memoist', '0.2.0'
-  
-  gem.add_development_dependency 'debugger', '1.2.2'
-  gem.add_development_dependency 'rspec', '2.12.0'
-  gem.add_development_dependency 'sqlite3', '1.3.6'
-  gem.add_development_dependency 'factory_girl', '4.1.0'
-  gem.add_development_dependency 'database_cleaner', '0.9.1'
-  gem.add_development_dependency 'capybara', '2.0.1'
 end

data/spec/active_record_spec.rb

@@ -43,6 +43,10 @@ describe SortThis::ActiveRecord do
           Quote.sort_columns[sort_name][:default].should == default_option
         end
         
+        it 'should properly set the table_name' do
+          Quote.sort_columns[sort_name][:table_name].should == table_name_option
+        end
+        
         it 'should properly set the joins option' do
           Quote.sort_columns[sort_name][:joins].should == joins_option
         end
@@ -67,15 +71,16 @@ describe SortThis::ActiveRecord do
       end
     end
     
-    context 'given a sort column with just the required sort options' do
+    context 'given a sort column with no options specified' do
       let!(:sort_name)          { :price }
       let!(:column_name_option) { :price }
+      let!(:table_name_option)  { 'quotes' }
       let!(:default_option)     { nil }
       let!(:joins_option)       { nil }
       let!(:clause_option)      { "quotes.price" }
-    
+      
       before(:each) do
-        Quote.sort_this sort_name => {:column_name => column_name_option}
+        Quote.sort_this sort_name => {}
       end
       
       it_should_behave_like 'sort_columns_defined'
@@ -85,37 +90,75 @@ describe SortThis::ActiveRecord do
       end
     end
     
-    context 'given a sort column with a default specified in the sort options' do
+    context 'given a sort column with just the required sort options' do
       let!(:sort_name)          { :price }
       let!(:column_name_option) { :price }
-      let!(:default_option)     { 'DESC' }
+      let!(:table_name_option)  { 'quotes' }
+      let!(:default_option)     { nil }
       let!(:joins_option)       { nil }
       let!(:clause_option)      { "quotes.price" }
     
       before(:each) do
-        Quote.sort_this sort_name => {:column_name => column_name_option, :default => default_option}
+        Quote.sort_this sort_name => {:column_name => column_name_option}
       end
       
       it_should_behave_like 'sort_columns_defined'
       
-      it 'should set the default_sort_columns options for the specified sort name' do
-        Quote.default_sort_columns.should have_key(sort_name)
+      it 'should set default_sort_columns to an empty hash' do
+        Quote.default_sort_columns.should == {}
       end
+    end
+    
+    context 'given a sort column with a default specified in the sort options' do
+      context 'when the default is valid' do
+        let!(:sort_name)          { :price }
+        let!(:column_name_option) { :price }
+        let!(:table_name_option)  { 'quotes' }
+        let!(:default_option)     { 'DESC' }
+        let!(:joins_option)       { nil }
+        let!(:clause_option)      { "quotes.price" }
       
-      it 'should set the clause of the default_sort_columns for the specified sort name' do
-        Quote.default_sort_columns[sort_name].should == "#{clause_option} #{default_option}"
+        before(:each) do
+          Quote.sort_this sort_name => {:column_name => column_name_option, :default => default_option}
+        end
+        
+        it_should_behave_like 'sort_columns_defined'
+        
+        it 'should set the default_sort_columns options for the specified sort name' do
+          Quote.default_sort_columns.should have_key(sort_name)
+        end
+        
+        it 'should set the clause of the default_sort_columns for the specified sort name' do
+          Quote.default_sort_columns[sort_name].should == "#{clause_option} #{default_option}"
+        end
+      end
+      
+      context 'when the default is not ASC or DESC' do
+        let!(:sort_name)          { :quantity }
+        let!(:column_name_option) { :quantity }
+        let!(:table_name_option)  { 'quotes' }
+        let!(:default_option)     { 'GARBAGE' }
+        let!(:joins_option)       { nil }
+        let!(:clause_option)      { "custom.joins_clause" }
+      
+        it 'should raise a SortThisError' do
+          lambda {
+            Quote.sort_this sort_name => {:column_name => column_name_option, :default => default_option, :clause => clause_option}
+          }.should raise_error(SortThis::SortThisError, "Invalid sort direction for: #{sort_name}. Must be 'ASC'/'asc' or 'DESC'/'desc'.")
+        end
       end
     end
     
     context 'given a sort column with a joins specified in the sort options' do
       let!(:sort_name)          { :product_name }
       let!(:column_name_option) { :name }
+      let!(:table_name_option)  { 'products' }
       let!(:default_option)     { nil }
       let!(:joins_option)       { :product }
       let!(:clause_option)      { "products.name" }
 
       before(:each) do
-        Quote.sort_this sort_name => {:column_name => column_name_option, :joins => joins_option}
+        Quote.sort_this sort_name => {:column_name => column_name_option, :table_name => table_name_option, :joins => joins_option}
       end
       
       it_should_behave_like 'sort_columns_defined'
@@ -128,6 +171,7 @@ describe SortThis::ActiveRecord do
     context 'given a sort column with a custom clause specified in the sort options' do
       let!(:sort_name)          { :price }
       let!(:column_name_option) { :price }
+      let!(:table_name_option)  { 'quotes' }
       let!(:default_option)     { nil }
       let!(:joins_option)       { nil }
       let!(:clause_option)      { "custom.joins_clause" }
@@ -146,6 +190,7 @@ describe SortThis::ActiveRecord do
     context 'given a sort column with a custom clause and default specified in the sort options' do
       let!(:sort_name)          { :quantity }
       let!(:column_name_option) { :quantity }
+      let!(:table_name_option)  { 'quotes' }
       let!(:default_option)     { 'DESC' }
       let!(:joins_option)       { nil }
       let!(:clause_option)      { "custom.joins_clause" }
@@ -164,6 +209,52 @@ describe SortThis::ActiveRecord do
         Quote.default_sort_columns[sort_name].should == "#{clause_option} #{default_option}"
       end
     end
+    
+    context 'given a sort column where the table name is overridden' do
+      context 'when the table name option is already pluralized' do
+        let!(:sort_name)          { :price }
+        let!(:column_name_option) { :price }
+        let!(:table_name_option)  { 'some_other_tables' }
+        let!(:default_option)     { nil }
+        let!(:joins_option)       { nil }
+        let!(:clause_option)      { "some_other_tables.price" }
+        
+        before(:each) do
+          Quote.sort_this sort_name => {:table_name => table_name_option}
+        end
+        
+        it_should_behave_like 'sort_columns_defined'
+      end
+      
+      context 'when the table name option is not pluralized' do
+        let!(:table_name_singular) { 'another_table' }
+        
+        let!(:sort_name)          { :price }
+        let!(:column_name_option) { :price }
+        let!(:table_name_option)  { 'another_tables' }
+        let!(:default_option)     { nil }
+        let!(:joins_option)       { nil }
+        let!(:clause_option)      { "another_tables.price" }
+        
+        before(:each) do
+          Quote.sort_this sort_name => {:table_name => table_name_option}
+        end
+        
+        it_should_behave_like 'sort_columns_defined'
+      end
+    end
+  end
+  
+  describe '.default_sort' do
+    let!(:product1) { create(:product, :name => 'D Name') }
+    let!(:product2) { create(:product, :name => 'B Name') }
+    let!(:product3) { create(:product, :name => 'A Name') }
+    let!(:product4) { create(:product, :name => 'C Name') }
+    
+    it 'should return a sorted collection given by the specified default sort' do
+      Product.sort_this(:name => { :column_name => :name, :default => 'DESC' })
+      Product.default_sort.should == [product1, product4, product2, product3]
+    end
   end
   
   describe '.sort' do
@@ -185,8 +276,12 @@ describe SortThis::ActiveRecord do
     before(:each) do
       Quote.sort_this :price         => {:column_name => :price, :default => 'ASC'},
                       :quantity      => {:column_name => :quantity},
-                      :product_name  => {:column_name => :name, :joins => :product},
-                      :vendor_name   => {:column_name => :name, :joins => :vendor}
+                      :product_name  => {:column_name => :name, :table_name => 'products', :joins => :product},
+                      :vendor_name   => {:column_name => :name, :table_name => 'vendors', :joins => :vendor}
+    end
+    
+    it 'should return a relation' do
+      Quote.sort.class.should == ActiveRecord::Relation
     end
     
     context 'default parameters' do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'debugger'
 require 'sqlite3'
 require 'active_record'
 require 'factory_girl'

data/spec/support/models.rb

@@ -30,10 +30,14 @@ def teardown_db
 end
 
 class Product < ActiveRecord::Base
+  include SortThis::ActiveRecord
+
   has_many :quotes
 end
 
 class Vendor < ActiveRecord::Base
+  include SortThis::ActiveRecord
+
   has_many :quotes
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sort_this
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,102 +43,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 description: SortThis
 email:
 - s.pullen05@gmail.com
@@ -149,8 +53,13 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.rails3.0
+- Gemfile.rails3.0.lock
+- Gemfile.rails3.1
+- Gemfile.rails3.1.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -158,6 +67,7 @@ files:
 - lib/sort_this/action_controller.rb
 - lib/sort_this/active_record.rb
 - lib/sort_this/railtie.rb
+- lib/sort_this/sort_this_error.rb
 - lib/sort_this/version.rb
 - lib/sort_this/view_helpers/action_view.rb
 - sort_this.gemspec
@@ -182,16 +92,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2103404262135696406
+      hash: -2410530305062139336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2103404262135696406
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24