sort_out 0.1.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8c6115fbb064045a3b68a41344fe7ab0b31db79b
+  data.tar.gz: 6c9f7ce3109c45498739b5187b31534496afd820
+SHA512:
+  metadata.gz: 0a6a350f0c2c52f220d1e0af61b22e4f514a54eaeabc3db9c751abe6db37215507b5b8cfc62f718b731a436ab98e276017bfdc045b2a161dd4e182c51f18b3e6
+  data.tar.gz: 9aff6ac797738892b05e69142788f2e6c3f306632f9f16d089d83deec31069258b8df9b572fc4f1a52b014d6cd541cbd296a2acd3ff14379c06581c53aa8b20f

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
+
+

data/lib/sort_out.rb

@@ -2,8 +2,21 @@
 
 require 'active_record'
 
+require 'sort_out/action_controller'
 require 'sort_out/helpers'
 require 'sort_out/active_record'
 
 ActiveRecord::Base.send :extend, SortOut::ActiveRecord
-ActionView::Base.send :include, SortOut::Helpers
+ActionController::Base.send :include, SortOut::ActionController
+ActionView::Base.send :include, SortOut::Helpers
+
+module SortOut
+  mattr_accessor :action_controller_options
+  @@action_controller_options = {}
+
+  mattr_accessor :sort
+  @@sort = nil
+
+  mattr_accessor :direction
+  @@direction = nil
+end

data/lib/sort_out/action_controller.rb

@@ -0,0 +1,50 @@
+module SortOut
+  module ActionController
+    def self.included(base)
+
+      base.instance_eval do
+        extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def store_sortable(options = {})
+        SortOut.action_controller_options = options.reverse_merge get: :get_sortable, set: :set_sortable
+
+        define_method :store_sortable_before_filter do
+          if SortOut.sort.present? || SortOut.direction.present?
+            send SortOut.action_controller_options[:set], { sort: SortOut.sort, direction: SortOut.direction }
+          end
+        end
+
+        before_filter :get_sort_and_direction, only: [ :index ]
+        before_filter :store_sortable_before_filter, only: [ :index ]
+      end
+
+      def set_localize_sortable(*actions)
+        skip_before_filter :get_sort_and_direction, :store_sortable_before_filter
+        before_filter :get_sort_and_direction, only: actions.flatten
+        before_filter :store_sortable_before_filter, only: actions.flatten
+      end
+    end
+
+    def sortable_params
+      get_sortable = if SortOut.action_controller_options.any? and respond_to? SortOut.action_controller_options[:get]
+        send SortOut.action_controller_options[:get]
+      end
+
+      (get_sortable || {}).reverse_merge(sort: nil, direction: nil)
+    end
+
+    def get_sort_and_direction
+      if params[:sort].present?
+        SortOut.sort = params[:sort]
+        SortOut.direction = params[:direction]
+      else
+        SortOut.sort = sortable_params[:sort]
+        SortOut.direction = sortable_params[:direction]
+      end
+    end
+  end
+end
+

data/lib/sort_out/active_record.rb

@@ -1,15 +1,22 @@
 module SortOut
   module ActiveRecord
     def sortable(options = {})
-      default_options = { :default_column => 'name', :after => [], :by => [] }
+      default_options = { :default_column => [:name, :asc], :after => [], :by => [] }
       @sortable_options = default_options.merge(options) unless options.nil?
-      @sortable_options[:by] << [options[:default_column]]
+      @sortable_options[:default_column] = [@sortable_options[:default_column], :asc] unless @sortable_options[:default_column].is_a? Array
+      @sortable_options[:by] << @sortable_options[:default_column][0]
     end
 
-    def sort_out(column, direction)
-      sort_column = sortable_column(column)
-      sort_direction = direction.present? ? "desc" : "asc"
-      model = self.order "#{sort_column} #{sort_direction}"
+    def sort_out(column, direction = nil)
+      if column.is_a? Hash
+        direction = column[:direction]
+        column = column[:sort]
+      end
+      
+      sort_column = sortable_column(column).to_s.downcase
+      sort_column << sortable_direction(column, direction)
+
+      model = self.order(sort_column)
       @sortable_options[:after].each do |order|
         model = model.order(order.join(' ')) if order[0].to_s != sort_column
       end
@@ -24,7 +31,18 @@ module SortOut
           return column
         end
       end
-      @sortable_options[:default_column]
+      @sortable_options[:default_column][0]
+    end
+
+    def sortable_direction(column, direction)
+      if direction.present?
+        " desc"
+      elsif column.blank?
+        " #{@sortable_options[:default_column][1].to_s}"
+      else
+        ""
+      end
     end
   end
 end
+

data/lib/sort_out/helpers.rb

@@ -2,27 +2,53 @@
 module SortOut
   module Helpers
     def sortable(column, title = nil, options = {})
-      default_options = { :default => false }
-      options = default_options.merge(options) unless options.nil?
+      options.reverse_merge! default: false, direction: true, params: {}
       title ||= column.titleize
       direction = nil
-      if column.to_s == params[:sort] || (options[:default] and params[:sort].blank?)
-        if params[:direction].blank?
-          direction = "desc"
-          title << '▼'
+      if column.to_s == SortOut.sort || (options[:default] and SortOut.sort.blank?)
+        if SortOut.direction.blank?
+          if options[:default].to_s == 'desc' and SortOut.sort.blank?
+            title << '▲' if options[:direction]
+          else
+            direction = "desc"
+            title << '▼' if options[:direction]
+          end
         else
-          title << '▲'
+          title << '▲' if options[:direction]
         end
       end
       #▴ ▾ ▼ ▲
-      link_to title, params.merge({:sort => column, :direction => direction})
+      link_to title, params.merge({ sort: column, direction: direction }.merge(options[:params]))
     end
 
     def sortable_fields
       html = "".html_safe
-      html << hidden_field_tag(:sort, params[:sort]) if params[:sort].present?
-      html << hidden_field_tag(:direction, params[:direction]) if params[:direction].present?
+      html << hidden_field_tag(:sort, SortOut.sort) if SortOut.sort.present?
+      html << hidden_field_tag(:direction, SortOut.direction) if SortOut.direction.present?
       html
     end
+
+    def sortable_current(columns, default, options)
+      options.reverse_merge! model_name: controller_name.singularize
+
+      column = if SortOut.sort.present? and columns.include? SortOut.sort.to_sym
+        SortOut.sort.to_sym
+      else
+        default.first
+      end
+
+      title = tl("#{options[:model_name]}.#{column.to_s}")
+
+      if SortOut.direction.blank?
+        if default[1].to_s == 'desc' and SortOut.sort.blank?
+          title << '▲'
+        else
+          title << '▼'
+        end
+      else
+        title << '▲'
+      end
+    end
   end
 end
+

data/lib/sort_out/version.rb

@@ -1,3 +1,3 @@
 module SortOut
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,65 +1,53 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sort_out
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Felipe Diesel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-01 00:00:00 -03:00
-default_executable: 
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies: []
-
 description: ActiveRecord extension that makes easy to order fields.
-email: 
+email:
 - felipediesel@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.markdown
 - Rakefile
 - lib/sort_out.rb
+- lib/sort_out/action_controller.rb
 - lib/sort_out/active_record.rb
 - lib/sort_out/helpers.rb
 - lib/sort_out/version.rb
 - sort_out.gemspec
-has_rdoc: true
 homepage: http://felipediesel.com
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sort_out
-rubygems_version: 1.6.2
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord extension that makes easy to order fields.
 test_files: []
-