sortabl 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3163242a1ee21d16b4f2d609b1182db106d3e9cf
-  data.tar.gz: 7999c7735d164568cc38ef9232910ce1b06e7d00
+  metadata.gz: a6c4af3f0e56418608ff656d0f7b6ab202a36ef5
+  data.tar.gz: a33bedac5421960f53ee0f27b8dc75bac744592d
 SHA512:
-  metadata.gz: 687800544182c04f1ec55eb4d0f8e5049b93948b567abaaf2e63baf5279862624b0c5e55cae3df7a479b19fc1c3466460550583267fc3e9575d7b1e0247df96c
-  data.tar.gz: 1518453eda7a21079422cac19d96246e172bf61405a91d46a787a1ef0890c3385b59b46960b2ecc8b3e492897de251e45c4b35829c418d1ee511f1802972d671
+  metadata.gz: 67ce18ed70f06f3b3469245e7e080439005d667dbc5fbeea7358e46fb8341ae0570252203761646734622662d7ecd39d3a10cbf5522dd0a40f7cd3c56bd72d12
+  data.tar.gz: 4d8334f0ce2a0ac8bd694a6c5bfaf9dcef4d60e3f241eef3087f53cf64f82254f68ae1bad46b7993417bd57c9795a73eca5ef4e119b7166607a43a495027888e

data/README.md

@@ -17,19 +17,19 @@ gem 'sortabl'
 #### Default
 
 ```ruby
-@posts = Post.sortabl(sort_by: params[:sortabl])
+@posts = Post.sortabl(params[:sortabl])
 ```
 
 And that's it! Records will be sorted by permitted parameter `:sortabl`. If parameter `:sortabl` isn't permitted, records will be sorted by primary key. If you don't want to sort by primary key as default, you can set another one by:
 
 ```ruby
-@posts = Post.sortabl(sort_by: params[:sortabl], default: 'author asc')
+@posts = Post.sortabl(params[:sortabl], default: [author: :asc])
 ```
 
 Even default multiple columns sort is possible:
 
 ```ruby
-@posts = Post.sortabl(sort_by: params[:sortabl], default: [author: :asc, created_at: :desc])
+@posts = Post.sortabl(params[:sortabl], default: [author: :asc, created_at: :desc])
 ```
 
 #### Limeted Attributes
@@ -38,9 +38,9 @@ Permitted values can be an attribute of model class, followed by `_asc` or `_des
 If there's an attribute permitted which doesn't exist in model, it falls back to sort by `default` key. Attributes can be limited with `only` and `except`. For example:
 
 ```ruby
-@posts = Post.sortabl(sort_by: params[:sortabl], only: [:title, :author])
+@posts = Post.sortabl(params[:sortabl], only: [:title, :author])
 # or
-@posts = Post.sortabl(sort_by: params[:sortabl], except: [:text])
+@posts = Post.sortabl(params[:sortabl], except: [:text])
 ```
 
 
@@ -92,7 +92,7 @@ By default, `sortabl_link` will generate `:sortabl` as parameter into the url. I
 <%= sortabl_link 'Author', :author, sort_param: :my_custom_sort_param %>
 
 # In controller
-@posts = Post.sortabl(sort_by: params[:my_custom_sort_param], only: [:title, :author])
+@posts = Post.sortabl(params[:my_custom_sort_param], only: [:title, :author])
 ```
 
 Which hyperlink will be rendered, depends on permitted values.

data/lib/sortabl/sortabl_core.rb

@@ -4,37 +4,34 @@ module Sortabl
 
       extend ActiveSupport::Concern
 
-      # class Base
       module ClassMethods
 
-        def sortabl *args
+        def sortabl parameter, *args
+
           # Init
-          default = args[0][:default]
-          only = args[0][:only]
-          except = args[0][:except]
-          parameter = args[0][:sort_by]
+          unless args.empty?
+            default = args[0][:default]
+            only = args[0][:only]
+            except = args[0][:except]
+          end
 
-          raise "Invalid Parameters: Do not use 'only' and 'except' together!" if only.present? and except.present?
+          raise ArgumentError.new("Invalid Parameters: Do not use 'only' and 'except' together!") if only.present? and except.present?
 
           # Set default order attribute
           # default:
-          #
           order_by_default = default.present? ? default : self.primary_key
 
           # Extract column name and direction from parameter
-          #
           if parameter.present?
-            column_name = parameter.gsub(/(_asc$|_desc$)/, '')
-            direction = parameter.gsub(/^((?!desc$|asc$).)*/, '')
+            column_name = parameter.to_s.gsub(/(_asc$|_desc$)/, '')
+            direction = parameter.to_s.gsub(/^((?!desc$|asc$).)*/, '')
 
             # Sort by default if column_name is not included in only or column_name is included in except
-            #
             return order((order_by_default)) if only.present? and !only.include? column_name.to_sym
             return order((order_by_default)) if except.present? and except.include? column_name.to_sym
           end
 
           # Convert param_value to symbol
-          #
           sort_column = { column_name.to_sym => direction.to_sym } if column_name.present? and direction.present?
 
           # Order class object
@@ -45,4 +42,4 @@ module Sortabl
 
     end
   end
-end
+end

data/lib/sortabl/version.rb

@@ -1,3 +1,3 @@
 module Sortabl
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortabl
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Frederic Walch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement