admino 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02804bb71709b2b990d69c156f4bc6e1c1598a13
-  data.tar.gz: 1cf458d64706709d71ab562730c4b7bfff9e5db9
+  metadata.gz: ddd7bdb139e6946fb8f37eb8d0a83c19e54fe087
+  data.tar.gz: ddadd3a2b601991912cf5b599b715b7775536fb1
 SHA512:
-  metadata.gz: afe27118fbab995ae04dbd9dad10495a347259d601fb375d6c9eceb950b94cf5fcac1f46b5a240f219f556fa99cebb902f23b7832eee6c0fc930af19c171e21b
-  data.tar.gz: 62e10b186cab528cf6227415b1b1a4a374475220952c157748799efa09de2a88722927f509ba5d2a194faffcc2a0ad3b7a8a8e0dbae627ac66efda91afaa1874
+  metadata.gz: 5e30786902a7f5aca949cc5f9ef2f61bb552e54a20b6d38aa230bfb8688e5541523b895ebba7a8344871bb5a9886fb7da792e41eaa96f5d1b50d7822c93f41e3
+  data.tar.gz: 4280a8d787aa37665c98ac5cae715dff3936480f50d0a918ae9d2a001a110fedd7c5019f6a50e3c37f0b171931b6dcc20eab6ec5ee2e0a35c35e4039ca2ad76c

data/lib/admino/action_view_extension.rb

@@ -5,17 +5,22 @@ require 'admino/query/base_presenter'
 module Admino
   module ActionViewExtension
     module Internals
-      def self.present_query(query, context, options)
-        presenter_klass = options.fetch(:presenter, Admino::Query::BasePresenter)
+      def self.present_query(query, context, options, key = :presenter)
+        presenter_klass = options.fetch(key, Admino::Query::BasePresenter)
         presenter_klass.new(query, context)
       end
     end
 
     def table_for(collection, options = {}, &block)
       options.symbolize_keys!
-      options.assert_valid_keys(:presenter, :class, :html)
+      options.assert_valid_keys(:presenter, :class, :query, :html)
       presenter_klass = options.fetch(:presenter, Admino::Table::Presenter)
-      presenter = presenter_klass.new(collection, options[:class], self)
+      query = if options[:query]
+                Internals.present_query(options[:query], self, options, :query_presenter)
+              else
+                nil
+              end
+      presenter = presenter_klass.new(collection, options[:class], query, self)
       html_options = options.fetch(:html, {})
       presenter.to_html(html_options, &block)
     end

data/lib/admino/version.rb

@@ -1,4 +1,4 @@
 module Admino
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end
 

data/spec/admino/integration_spec.rb

@@ -7,16 +7,23 @@ describe 'Action View integration' do
     let(:collection) { [ first_post, second_post ] }
     let(:first_post) { Post.new('1') }
     let(:second_post) { Post.new('2') }
+    let(:params) {
+      {
+        sorting: 'by_title',
+        sort_order: 'desc'
+      }
+    }
+    let(:query) { TestQuery.new(params) }
 
     it 'produces HTML' do
-      result = context.table_for(collection) do |table, record|
-        table.column :title
+      result = context.table_for(collection, query: query) do |table, record|
+        table.column :title, sorting: :by_title
         table.actions do
           table.action :show, '/foo', 'Show'
         end
       end
       expect(result).to eq <<-HTML.strip
-        <table><thead><tr><th role=\"title\">Title</th><th role=\"actions\">Actions</th></tr></thead><tbody><tr class=\"is-even\"><td role=\"title\">Post 1</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr><tr class=\"is-odd\"><td role=\"title\">Post 2</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr></tbody></table>
+        <table><thead><tr><th role=\"title\"><a class=\"is-desc\" href=\"/?sort_order=asc&amp;sorting=by_title\">Title</a></th><th role=\"actions\">Actions</th></tr></thead><tbody><tr class=\"is-even\"><td role=\"title\" sorting=\"by_title\">Post 1</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr><tr class=\"is-odd\"><td role=\"title\" sorting=\"by_title\">Post 2</td><td role=\"actions\"><a href=\"/foo\" role=\"show\">Show</a></td></tr></tbody></table>
       HTML
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admino
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Stefano Verna