sorted 0.3.4 → 0.3.5

data/README.rdoc

@@ -4,6 +4,8 @@ Sorted is a simple object that will take an sql order string and a url sort stri
 
 Using Rails master it will create a `sorted` scope and a two view helpers
 
+  gem install sorted
+
 == Example
 
 === The view:
@@ -29,7 +31,8 @@ This will initially sort by email ascending:
 You might want to roll your own link_to_sorted method to use jQuery ui css classes for example, all you need is the sorted object.
 
   def link_to_sorted(name, order)
-    sorter = sorted(order)
+    sorter    = sorted(order)
+    name      = name.nil? ? "" : name.to_s
     css_class = case sorter.to_css
                 when "sorted asc"
                   "ui-icon ui-icon-triangle-1-n"
@@ -38,7 +41,7 @@ You might want to roll your own link_to_sorted method to use jQuery ui css class
                 when "sorted"
                   "ui-icon ui-icon-carat-2-n-s"
                 end
-    link_to(name, sorter.params) + content_tag(:span, nil, {:class => css_class}) 
+    link_to(content_tag(:span, nil, {:class => css_class}) + name, sorter.params)
   end
 
 == Rails 2.3.x
@@ -48,7 +51,7 @@ This gem works with rails 2.3.x but you will have to roll your own scope and vie
 Here is the named scope for your model(s):
 
   named_scope :sorted, lambda { |params|
-    params.merge(:order => Sorted::Sorter.new(params[:order], {:sort => params.delete(:sort)}).to_sql)
+    { :order =>  Sorted::Sorter.new(params[:order], {:sort => params[:sort]}).to_sql }
   }
 
 and the the application helper methods:

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/sorted.rb

@@ -1,137 +1,7 @@
-module Sorted
-  class Sorter
-    def initialize(*args)
-      parse_order(args[0])
-      unless args[1].nil?
-        @params = args[1]
-        unless @params[:sort].nil?
-          parse_sort(@params[:sort])
-        end
-      end
-      self
-    end
-    
-    def parse_sort(sort)
-      sort.split(/!/).each do |s|
-        if ps = parse_query(s)
-          sort_queue << ps
-        end 
-      end
-    end
-
-    def parse_order(order)
-      order.to_s.split(/,/).each do |o|
-        if po = parse_sql(o)
-          order_queue << po
-        end
-      end
-    end
-    
-    def parse_query(sort)
-      if m = sort.match(/([a-zA-Z0-9._]+)_(asc|desc)$/)
-        [m[1],m[2]]
-      end
-    end
-
-    def parse_sql(sql)
-      if m = sql.match(/(([a-zA-Z._:]+)\s([asc|ASC|desc|DESC]+)|[a-zA-Z._:]+)/)
-        [(m[2].nil? ? m[1] : m[2]),(m[3].nil? ? "asc" : m[3].downcase)]
-      end
-    end
-    
-    def toggle
-      @_array = []
-      sorts  = sort_queue.transpose.first
-      orders = order_queue.transpose.first
-      unless sorts.nil?
-        if orders == sorts.take(orders.size)
-          orders.select do |order|
-            sorts.include?(order)
-          end.each do |order|
-            @_array << [order, (case sort_queue.assoc(order).last; when "asc"; "desc"; when "desc"; "asc" end)]
-          end
-        else
-          orders.select do |order|
-            sorts.include?(order)
-          end.each do |order|
-            @_array << [order, sort_queue.assoc(order).last]
-          end
-        end
-        sorts.select do |sort|
-          orders.include?(sort) && !@_array.flatten.include?(sort)
-        end.each do |sort|
-          @_array << [sort, sort_queue.assoc(sort).last]
-        end
-      end
-      order_queue.select do |order|
-        !@_array.flatten.include?(order[0])
-      end.each do |order|
-        @_array << order
-      end
-      sort_queue.select do |sort|
-        !@_array.flatten.include?(sort[0])
-      end.each do |sort|
-        @_array << sort
-      end
-      self
-    end
-
-    def reset
-      @_array = default
-      self
-    end
-
-    def to_hash
-      _array.inject({}){|h,a| h.merge(Hash[a[0],a[1]]) }
-    end
-    
-    def to_sql
-      _array.map{|a| "#{a[0]} #{a[1].upcase}"}.join(', ')
-    end
+require 'sorted/sorter'
+require 'sorted/toggler'
 
-    def to_s
-      _array.map{|a| a.join('_')}.join('!')
-    end
-
-    def to_a
-      _array
-    end
-    
-    def to_css
-      if sort_queue.flatten.include?(order_queue.first.first)
-        "sorted #{sort_queue.assoc(order_queue.first.first).last}"
-      else
-        "sorted"
-      end
-    end
-
-    def params
-      @params ||= {}
-      @params[:sort] = to_s
-      @params
-    end
-
-    def order_queue
-      @order_queue ||= []
-    end
-
-    def sort_queue
-      @sort_queue ||= []
-    end
-    
-    private
-    def default
-      sq = sort_queue.dup
-      order_queue.each do |o|
-          sq << o unless sq.flatten.include?(o[0])
-      end
-      sq
-    end
-    
-    def _array
-      @_array ||= default
-    end
-  end
+module Sorted
 end
 
 if defined?(::Rails::Railtie)

data/lib/sorted/finders/active_record.rb

@@ -0,0 +1,16 @@
+require 'active_record'
+require 'sorted'
+
+module Sorted
+  module Finders
+    module ActiveRecord
+      def self.enable!
+        ::ActiveRecord::Base.class_eval do
+          def self.sorted(params)
+            order(::Sorted::Sorter.new(params[:order], :sort => params[:sort]).to_sql)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sorted/railtie.rb

@@ -3,13 +3,15 @@ require 'sorted'
 module Sorted
   class Railtie < Rails::Railtie
     initializer "sorted.active_record" do |app|
-      require 'sorted/active_record'
-      Sorted::ActiveRecord.enable!
+      if defined? ::ActiveRecord
+        require 'sorted/finders/active_record'
+        Sorted::Finders::ActiveRecord.enable!
+      end
     end
     
     initializer "sorted.action_view" do |app|
-      require 'sorted/action_view'
-      ::ActionView::Base.send(:include, Sorted::ActionView)
+      require 'sorted/view_helpers/action_view'
+      ::ActionView::Base.send(:include, Sorted::ViewHelpers::ActionView)
     end
   end
 end

data/lib/sorted/sorter.rb

@@ -0,0 +1,103 @@
+module Sorted
+  class Sorter
+    def initialize(*args)
+      parse_order(args[0])
+      if args[1].is_a?(Hash)
+        @params = args[1]
+        unless @params[:sort].nil?
+          parse_sort @params[:sort]
+        end
+      end
+      self
+    end
+    
+    def parse_sort(sort_string)
+      sort_string.split(/!/).each do |sort|
+        if parsed = parse_query(sort)
+          sorts << parsed
+        end 
+      end
+    end
+
+    def parse_order(order_string_or_symbol)
+      order_string_or_symbol.to_s.split(/,/).each do |order|
+        if parsed = parse_sql(order)
+          orders << parsed
+        end
+      end
+    end
+    
+    def parse_query(sort)
+      if m = sort.match(/([a-zA-Z0-9._]+)_(asc|desc)$/)
+        [m[1],m[2]]
+      end
+    end
+
+    def parse_sql(order)
+      if m = order.match(/(([a-zA-Z._:]+)\s([asc|ASC|desc|DESC]+)|[a-zA-Z._:]+)/)
+        [(m[2].nil? ? m[1] : m[2]),(m[3].nil? ? "asc" : m[3].downcase)]
+      end
+    end
+
+    def toggle
+      @array = Toggler.new(orders, sorts).to_a
+      self
+    end
+
+    def reset
+      @array = default
+      self
+    end
+
+    def to_hash
+      array.inject({}){|h,a| h.merge(Hash[a[0],a[1]])}
+    end
+    
+    def to_sql
+      array.map{|a| "#{a[0]} #{a[1].upcase}"}.join(', ')
+    end
+
+    def to_s
+      array.map{|a| a.join('_')}.join('!')
+    end
+
+    def to_a
+      array
+    end
+    
+    def to_css
+      if sorts.flatten.include?(orders[0][0])
+        "sorted #{sorts.assoc(orders[0][0]).last}"
+      else
+        "sorted"
+      end
+    end
+
+    def params
+      @params ||= {}
+      @params[:sort] = to_s
+      @params
+    end
+
+    def orders
+      @orders ||= []
+    end
+
+    def sorts
+      @sorts ||= []
+    end
+    
+    private
+      def default
+        sorts_new = sorts.dup
+        orders.each do |order|
+            sorts_new << order unless sorts_new.flatten.include?(order[0])
+        end
+        sorts_new
+      end
+      
+      def array
+        @array ||= default
+      end
+  end
+end

data/lib/sorted/toggler.rb

@@ -0,0 +1,55 @@
+module Sorted
+  class Toggler
+    def initialize(orders, sorts)
+      @array = []
+      @sorts      = sorts
+      @orders     = orders
+      @sort_keys  = sorts.transpose.first
+      @order_keys = orders.transpose.first
+      toggle_sorts unless @sort_keys.nil?
+      add_remaining_orders
+      add_remaining_sorts
+    end
+
+    def to_a
+      @array
+    end
+    
+    def toggle_sorts
+      if @order_keys == @sort_keys.take(@order_keys.size)
+        @order_keys.select do |order|
+          @sort_keys.include?(order)
+        end.each do |order|
+          @array << [order, (case @sorts.assoc(order).last; when "asc"; "desc"; when "desc"; "asc" end)]
+        end
+      else
+        @order_keys.select do |order|
+          @sort_keys.include?(order)
+        end.each do |order|
+          @array << [order, @sorts.assoc(order).last]
+        end
+      end
+      @sort_keys.select do |sort|
+        @order_keys.include?(sort) && !@array.flatten.include?(sort)
+      end.each do |sort|
+        @array << [sort, @sorts.assoc(sort).last]
+      end
+    end
+
+    def add_remaining_orders
+      @orders.select do |order|
+        !@array.flatten.include?(order[0])
+      end.each do |order|
+        @array << order
+      end
+    end
+
+    def add_remaining_sorts
+      @sorts.select do |sort|
+        !@array.flatten.include?(sort[0])
+      end.each do |sort|
+        @array << sort
+      end
+    end
+  end
+end

data/lib/sorted/view_helpers/action_view.rb

@@ -0,0 +1,19 @@
+require 'action_view'
+require 'sorted'
+
+module Sorted
+  module ViewHelpers
+    module ActionView
+      def sorted(order)
+        ::Sorted::Sorter.new(order, (request.get? && !params.nil?) ? params.dup : nil).toggle
+      end
+
+      def link_to_sorted(name, order, options = {})
+        sorter          = sorted(order)
+        name            = name.nil? ? "" : name.to_s
+        options[:class] = options[:class].nil? ? sorter.to_css : "#{options[:class]} #{sorter.to_css}"
+        link_to(name, sorter.params, options)
+      end
+    end
+  end
+end

data/sorted.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorted}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rufus Post"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-09-10}
   s.description = %q{lets you sort large data sets using view helpers and a scope}
   s.email = %q{rufuspost@gmail.com}
   s.extra_rdoc_files = [
@@ -24,12 +24,16 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/sorted.rb",
-     "lib/sorted/action_view.rb",
-     "lib/sorted/active_record.rb",
+     "lib/sorted/finders/active_record.rb",
      "lib/sorted/railtie.rb",
+     "lib/sorted/sorter.rb",
+     "lib/sorted/toggler.rb",
+     "lib/sorted/view_helpers/action_view.rb",
      "sorted.gemspec",
      "spec/sorted_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/sorter_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/toggler_spec.rb"
   ]
   s.homepage = %q{http://github.com/mynameisrufus/sorted}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -38,6 +42,8 @@ Gem::Specification.new do |s|
   s.summary = %q{sort a table}
   s.test_files = [
     "spec/spec_helper.rb",
+     "spec/sorter_spec.rb",
+     "spec/toggler_spec.rb",
      "spec/sorted_spec.rb"
   ]
 

data/spec/sorted_spec.rb

@@ -2,85 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'action_controller'
 require 'sorted'
 
-describe Sorted::Sorter, "parse methods" do
-  it "should return a nice array from the order sql" do
-    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.order_queue.should == [["email", "asc"], ["phone", "asc"], ["name", "desc"]]
-  end
-
-  it "should return a nice array from the sort params" do
-    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.sort_queue.should == [["email", "desc"], ["name", "desc"]]
-  end
-
-  it "should allow underscores, full stops and colons in" do
-    sorter = Sorted::Sorter.new('users.email ASC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt', {:sort => "users.email_desc!users.first_name_desc"})
-    sorter.to_sql.should == "users.email DESC, users.first_name DESC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt ASC"
-  end
-end
-
-describe Sorted::Sorter, "logic:" do
-  it "should not toggle the sort order and include any sql orders not in sort params" do
-    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.to_a.should == [["email", "desc"], ["name", "desc"], ["phone", "asc"]]
-  end
-
-  it "should toggle the sort order and include any sql orders not in sort params" do
-    sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
-    sorter.toggle.to_a.should == [["email", "desc"], ["name", "desc"], ["phone", "asc"]]
-  end
-
-  it "should toggle the sort order and include any sql orders not in sort params" do
-    sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "mobile_asc!email_desc!phone_asc!name_desc"})
-    sorter.toggle.to_a.should == [["email", "desc"], ["phone", "asc"], ["name", "desc"], ["mobile", "asc"]]
-  end
-
-  it "should return an sql sort string" do
-    Sorted::Sorter.new(:email).to_sql.should == "email ASC"
-    Sorted::Sorter.new(:email, {:sort => "name_desc!email_desc"}).to_sql.should == "name DESC, email DESC"
-  end
-
-  it "should handle a large initial order string" do
-    sorter = Sorted::Sorter.new('email ASC, name DESC, phone ASC', {:sort => "email_desc!name_desc"})
-    sorter.to_sql.should == "email DESC, name DESC, phone ASC"
-  end
-
-  it "should handle a large initial order string" do
-    sorter = Sorted::Sorter.new('email ASC, phone DESC, name ASC', {:sort => "email_desc!name_desc"})
-    sorter.to_sql.should == "email DESC, name DESC, phone DESC"
-  end
-
-  it "should should fail becasue the sort order is incorect" do
-    sorter = Sorted::Sorter.new(:jsci_complete, {:sort => "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"})
-    sorter.toggle
-    sorter.to_s.should_not == "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"
-  end
-
-  it "should return css base class for to_css if not in sort params" do
-    sorter = Sorted::Sorter.new(:email)
-    sorter.toggle
-    sorter.to_css.should == "sorted"
-  end
-
-  it "should return css class for to_css" do
-    sorter = Sorted::Sorter.new(:email, {:sort => "email_desc"})
-    sorter.toggle
-    sorter.to_css.should == "sorted desc"
-  end
-
-  it "should toggle two order params at once" do
-    first = Sorted::Sorter.new("email ASC, phone ASC")
-    first.toggle.to_a.should == [["email", "asc"],["phone", "asc"]]
-    second = Sorted::Sorter.new(:name, {:sort => first.to_s})
-    second.toggle.to_a.should == [["name", "asc"], ["email", "asc"],["phone", "asc"]]
-    third = Sorted::Sorter.new("email ASC, phone ASC", {:sort => second.to_s})
-    third.toggle.to_a.should == [["email", "asc"],["phone", "asc"], ["name", "asc"]]
-  end
-end
-
-describe Sorted::ActiveRecord do
+describe Sorted::Finders::ActiveRecord do
   before(:each) do
-    Sorted::ActiveRecord.enable!
+    Sorted::Finders::ActiveRecord.enable!
   end
 
   it "should integrate with ActiveRecord::Base" do
@@ -88,7 +12,7 @@ describe Sorted::ActiveRecord do
   end
 end
 
-describe Sorted::ActionView do
+describe Sorted::ViewHelpers::ActionView do
   before(:each) do
     class TestController
       def params
@@ -107,13 +31,17 @@ describe Sorted::ActionView do
       def get?; true end
     end
     @controller = TestController.new
-    ActionView::Base.send(:include, Sorted::ActionView)
+    ActionView::Base.send(:include, Sorted::ViewHelpers::ActionView)
   end
   
   it "should integrate with ActionView::Base" do
     ActionView::Base.new.should respond_to(:sorted)
   end
 
+  it "should integrate with ActionView::Base" do
+    ActionView::Base.new.should respond_to(:link_to_sorted)
+  end
+
   it "should not change the direction of name using view helper" do
     @controller.params = {:sort => "name_desc!email_asc"}
     sorter = ActionView::Base.new([], {}, @controller).sorted(:email)

data/spec/sorter_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'action_controller'
+require 'sorted'
+
+describe Sorted::Sorter, "parse methods" do
+  it "should not die if pased dumb things" do
+    lambda { Sorted::Sorter.new(false, Time.now).should_not }.should_not raise_error
+  end
+
+  it "should return a nice array from the order sql" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.orders.should == [["email", "asc"], ["phone", "asc"], ["name", "desc"]]
+  end
+
+  it "should return a nice array from the sort params" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.sorts.should == [["email", "desc"], ["name", "desc"]]
+  end
+
+  it "should allow underscores, full stops and colons in" do
+    sorter = Sorted::Sorter.new('users.email ASC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt', {:sort => "users.email_desc!users.first_name_desc"})
+    sorter.to_sql.should == "users.email DESC, users.first_name DESC, users.phone_number DESC, assessments.name ASC, assessments.number_as_string::BigInt ASC"
+  end
+end
+
+describe Sorted::Sorter, "logic:" do
+  it "should not toggle the sort order and include any sql orders not in sort params" do
+    sorter = Sorted::Sorter.new("email ASC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.to_a.should == [["email", "desc"], ["name", "desc"], ["phone", "asc"]]
+  end
+
+  it "should return an sql sort string" do
+    Sorted::Sorter.new(:email).to_sql.should == "email ASC"
+    Sorted::Sorter.new(:email, {:sort => "name_desc!email_desc"}).to_sql.should == "name DESC, email DESC"
+  end
+
+  it "should handle a large initial order string" do
+    sorter = Sorted::Sorter.new('email ASC, name DESC, phone ASC', {:sort => "email_desc!name_desc"})
+    sorter.to_sql.should == "email DESC, name DESC, phone ASC"
+  end
+
+  it "should handle a large initial order string" do
+    sorter = Sorted::Sorter.new('email ASC, phone DESC, name ASC', {:sort => "email_desc!name_desc"})
+    sorter.to_sql.should == "email DESC, name DESC, phone DESC"
+  end
+end
+
+describe Sorted::Sorter, "to_css" do
+  it "should return css base class for to_css if not in sort params" do
+    sorter = Sorted::Sorter.new(:email)
+    sorter.to_css.should == "sorted"
+  end
+
+  it "should return css class for to_css" do
+    sorter = Sorted::Sorter.new(:email, {:sort => "email_desc"})
+    sorter.to_css.should == "sorted desc"
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'sorted/active_record'
-require 'sorted/action_view'
+require 'sorted/finders/active_record'
+require 'sorted/view_helpers/action_view'
 require 'rspec'
 require 'rspec/autorun'

data/spec/toggler_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'action_controller'
+require 'sorted'
+
+describe Sorted::Toggler, "toggle sorts" do
+  it "should should fail becasue the sort order is incorect" do
+    sorter = Sorted::Sorter.new(:jsci_complete, {:sort => "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"})
+    sorter.toggle
+    sorter.to_s.should_not == "parent_id_desc!non_vocational_complete_desc!jsci_complete_desc"
+  end
+
+  it "should toggle two order params at once" do
+    first = Sorted::Sorter.new("email ASC, phone ASC")
+    first.toggle.to_a.should == [["email", "asc"],["phone", "asc"]]
+    second = Sorted::Sorter.new(:name, {:sort => first.to_s})
+    second.toggle.to_a.should == [["name", "asc"], ["email", "asc"],["phone", "asc"]]
+    third = Sorted::Sorter.new("email ASC, phone ASC", {:sort => second.to_s})
+    third.toggle.to_a.should == [["email", "asc"],["phone", "asc"], ["name", "asc"]]
+  end
+end
+
+describe Sorted::Toggler, "add remaining orders" do
+  it "should toggle the sort order and include any sql orders not in sort params" do
+    sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "email_desc!name_desc"})
+    sorter.toggle.to_a.should == [["email", "desc"], ["name", "desc"], ["phone", "asc"]]
+  end
+
+  it "should toggle the sort order and include any sql orders not in sort params" do
+    sorter = Sorted::Sorter.new("email DESC, phone ASC, name DESC", {:sort => "mobile_asc!email_desc!phone_asc!name_desc"})
+    sorter.toggle.to_a.should == [["email", "desc"], ["phone", "asc"], ["name", "desc"], ["mobile", "asc"]]
+  end
+end
+
+describe Sorted::Toggler, "add remaining sorts" do
+  it "should toggle the sort order and include any sort orders not in order params" do
+    sorter = Sorted::Sorter.new("email DESC", {:sort => "email_desc!name_desc"})
+    sorter.toggle.to_a.should == [["email", "asc"], ["name", "desc"]]
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sorted
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Rufus Post
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +10:00
+date: 2010-09-10 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -35,12 +36,16 @@ files:
 - Rakefile
 - VERSION
 - lib/sorted.rb
-- lib/sorted/action_view.rb
-- lib/sorted/active_record.rb
+- lib/sorted/finders/active_record.rb
 - lib/sorted/railtie.rb
+- lib/sorted/sorter.rb
+- lib/sorted/toggler.rb
+- lib/sorted/view_helpers/action_view.rb
 - sorted.gemspec
 - spec/sorted_spec.rb
+- spec/sorter_spec.rb
 - spec/spec_helper.rb
+- spec/toggler_spec.rb
 has_rdoc: true
 homepage: http://github.com/mynameisrufus/sorted
 licenses: []
@@ -55,6 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -63,6 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -75,4 +82,6 @@ specification_version: 3
 summary: sort a table
 test_files: 
 - spec/spec_helper.rb
+- spec/sorter_spec.rb
+- spec/toggler_spec.rb
 - spec/sorted_spec.rb

data/lib/sorted/action_view.rb

@@ -1,16 +0,0 @@
-require 'action_view'
-require 'sorted'
-
-module Sorted
-  module ActionView
-    def sorted(order)
-      ::Sorted::Sorter.new(order, (request.get? && !params.nil?) ? params.dup : nil).toggle
-    end
-
-    def link_to_sorted(name, order, options = {})
-      sorter          = sorted(order)
-      options[:class] = options[:class].nil? ? sorter.to_css : "#{options[:class]} #{sorter.to_css}"
-      link_to(name, sorter.params, options)
-    end
-  end
-end

data/lib/sorted/active_record.rb

@@ -1,14 +0,0 @@
-require 'active_record'
-require 'sorted'
-
-module Sorted
-  module ActiveRecord
-    def self.enable!
-      ::ActiveRecord::Base.class_eval do
-        scope :sorted, lambda { |params|
-          params.merge(:order => ::Sorted::Sorter.new(params[:order], {:sort => params.delete(:sort)}).to_sql)
-        }
-      end
-    end
-  end
-end