sort_this 1.0.2 → 1.0.3

data/.travis.yml

@@ -1,8 +1,17 @@
 language: ruby
+
 rvm:
-  - "1.9.2"
-  - "1.9.3"
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+
 gemfile:
   - Gemfile
+  - Gemfile.rails3.2
   - Gemfile.rails3.1
-  - Gemfile.rails3.0
+  - Gemfile.rails3.0
+
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: Gemfile

data/Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 4.0.0.beta', github: 'rails/rails', branch: 'master'
 gem 'memoist', '0.2.0'
 
 gem 'rspec', '2.12.0'
-gem 'sqlite3', '1.3.6'
+gem 'sqlite3'
 gem 'factory_girl', '4.1.0'
-gem 'database_cleaner', '0.9.1'
+gem 'database_cleaner', '1.0.0.RC1'
 gem 'capybara', '2.0.1'
 gem 'rake'

data/Gemfile.rails3.2

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+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/README.md

@@ -36,7 +36,7 @@ The options are
     
       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'.
-      table_name   (Optional) Overrides the table name used, should usually be used in coordination with joins.
+      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.
@@ -71,7 +71,10 @@ In you controller define a default sort
 
 Defined Highest to Lowest priority
 
-- Throw error when the table_name option is not set and joins is set.
+- Options on the `sortable` controller options
+    - Limiting which actions it can be applied on
+    - Allowing different types of sorts for different actions (defining multiple sortables)
+    - Customized sort parameters
 - Being able to define multiple column sorts
 
       Something like:
@@ -84,11 +87,9 @@ Defined Highest to Lowest priority
     
       not sure how that'd be called though...
 
+- Throw error when the table_name option is not set and joins is set.
 - 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

@@ -75,14 +75,14 @@ module SortThis
           order_clauses << sort_clause
         end
         
-        query = scoped
+        query = base_query
         query = joins(table_joins.uniq!) unless table_joins.empty?
         query = query.order(order_clauses.join(', '))
         query
       end
       
       def sort(sort_column = nil, sort_direction = DEFAULT_SORT_DIRECTION)
-        query = scoped
+        query = base_query
     
         # sanitize the sort column and direction
         sort_column     = sort_column.to_s.downcase.to_sym
@@ -114,6 +114,16 @@ module SortThis
         
         query
       end
+
+      private
+
+        def base_query
+          if Rails.version < '4.0'
+            scoped
+          else
+            all
+          end
+        end
       
     end
   end

data/lib/sort_this/version.rb

@@ -1,3 +1,3 @@
 module SortThis
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/sort_this.rb

@@ -1,3 +1,5 @@
+require 'rails'
+
 require 'sort_this/version'
 require 'sort_this/sort_this_error'
 require 'sort_this/active_record'

data/spec/active_record_spec.rb

@@ -280,10 +280,6 @@ describe SortThis::ActiveRecord do
                       :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
       it 'should sort by quote price ascending' do
         Quote.sort.should == [quote3, quote2, quote1, quote4]

data/spec/spec_helper.rb

@@ -13,4 +13,4 @@ FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sort_this
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,6 +60,7 @@ files:
 - Gemfile.rails3.0.lock
 - Gemfile.rails3.1
 - Gemfile.rails3.1.lock
+- Gemfile.rails3.2
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -92,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3994324686683044989
+      hash: 1981168485553352344
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: