sortabl 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c8bb9d9cd7cbd2160b42329feecf0c6989069d2
-  data.tar.gz: f78351cc3a133a7ae0daaa3ac89849580e1ff32a
+  metadata.gz: e01cbbb9f3c94c956178c6621ba641bd5553b0fe
+  data.tar.gz: 6b24e29afa7582fad977af32e080a2935abd8e04
 SHA512:
-  metadata.gz: e2dddc0491636c11a14e9109aca73939ae216e69ad2c00ecb845c8d95b834878097bae7dad0a7107badb2fd273c77e887d1233887137fcdfa654ea76889d4d65
-  data.tar.gz: 71f5460fb2496b7f89a1dd3f461fddadb13ed553e342cab0fd6d92e104c24d488b36ee132f29a7cc3092363f9a6b16d7fa4e8f45e0d06c34ab1ba2d4612a4248
+  metadata.gz: 06d49735d1368a0a14ed9c6b67551c696974078fa176a8aca779116f2a11b70991e7a416824277eb58ffcaf2f1407199787225caa7c634119b1d254f9543b411
+  data.tar.gz: d84f32c0b91703ad7aece129cfbc1a73ff8496cb284d1015200062ef3ce254345bcc5fda39b56247e4838829bdff6183305248a0813902ecd70bcda44a2f291d

data/README.md

@@ -14,16 +14,26 @@ gem 'sortabl'
 
 ### Controller
 
+#### Default
+
 ```ruby
 @posts = Post.sortabl(sort_by: 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 by default, you can set another one by:
+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)
+@posts = Post.sortabl(sort_by: 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')
+```
+
+#### Limeted Attributes
+
 Permitted values can be an attribute of model class, followed by `_asc` or `_desc`. For example: `sort: :author_asc`
 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:
 
@@ -36,6 +46,8 @@ If there's an attribute permitted which doesn't exist in model, it falls back to
 
 ### View
 
+#### Link Helper
+
 There's also a link helper, which generates needed urls. It works just like you would expect from rails default link_to helper. But instead of hand over a path, just place the desired column name. The helper will do the rest for you:
 
 ```erb
@@ -66,9 +78,9 @@ There's also a link helper, which generates needed urls. It works just like you
 This link helper can be placed anywhere in the view. There is no need, that it has to be placed in table head. Furthermore you can use `sortabl_link` as block too.
 
 ```erb
-	<%= sortabl_link :author, id: 'author-column', class: 'author-column' do %>
-		<p>Author</p>
-	<% end %>
+<%= sortabl_link :author, id: 'author-column', class: 'author-column' do %>
+	<p>Author</p>
+<% end %>
 ```
 
 #### Parameter
@@ -77,7 +89,7 @@ By default, `sortabl_link` will generate `:sortabl` as parameter into the url. I
 
 ```ruby
 # In view
-<%= sortabl_link 'Author', :author, id: 'author-column', class: 'author-column', sort_param: :my_custom_sort_param %>
+<%= 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])

data/lib/sortabl/sortabl_core.rb

@@ -50,7 +50,7 @@ module Sortabl
 					end
 
 					# Order class object
-					order((sort_params[args[0][:sort_by]] or "#{order_by_default} asc"))
+					order((sort_params[args[0][:sort_by]] or order_by_default))
 				end
 
 			end

data/lib/sortabl/sortabl_helper.rb

@@ -6,6 +6,7 @@ module Sortabl
 			#
 			def sortabl_link(name = nil, attribute = nil, html_options = nil, &block)
 				html_options, attribute, name = attribute, name, block if block_given?
+				html_options = html_options || {}
 
 				# Support custom sort_param
 				# If sort_param isn't given, fall back to :sortabl as param

data/lib/sortabl/version.rb

@@ -1,3 +1,3 @@
 module Sortabl
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sortabl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Frederic Walch