kadmin 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efabe35025636546f2808580039dda4b4644cc6
-  data.tar.gz: a17851a34c29e7b9fcf54032837636870b10ce11
+  metadata.gz: f112f1afb1fdfd0920d171ec9d30f9602342f4b7
+  data.tar.gz: 45ab04024f531460e5498935e1eb13b4672be321
 SHA512:
-  metadata.gz: 9e3dfa3064c02e13c4c8f90de06863c4ecffaaaf9b3770a2187e43fde85d5411330e5bffbc15418fb29d9b895c9e3f7ec13a15c39885ddb8e3fdf710fe75e223
-  data.tar.gz: 9b772293e19afd36b3d2d3042b6d6135f1953ec7771d56b273ce1c5732dad371edc6b2a3a1459c2caebe42fa0782000fd77d3aafecd3c9b9e410f8b2c69bc457
+  metadata.gz: 232c17376f61b7318cc9101a32ffce845b58d578738cf4901e7e0ddf12a434dc46ddecccaf634e4396ac33bef721c134df5a43df71b8c09a62b0dc776a34d8c9
+  data.tar.gz: c26902440d7d17c7203e66de180950098f4ba34a7484d01cfd0108475e7c8a68d79365c792d7e50cbed3e4129bb0c5c7fea94c6e884eece904f216b25269f8fa

data/app/components/kadmin/finder/presenter.rb

@@ -36,8 +36,23 @@ module Kadmin
         return applied_filters.html_safe
       end
 
+      # @return [Array] an array of optionally presented models
+      def results
+        return @results ||= __getobj__.results.map do |object|
+          if object.class < Kadmin::Presentable
+            object.present(@view)
+          else
+            object
+          end
+        end
+      end
+
       # @!group Pager properties
 
+      def pager
+        return @pager ||= __getobj__.pager.present(@view)
+      end
+
       # @return [Integer] the current number of items displayed for this page
       def displayed_items
         return offset_end - self.pager.offset

data/app/controllers/kadmin/application_controller.rb

@@ -46,7 +46,6 @@ module Kadmin
         status: :internal_server_error,
         error: error
       }.merge(options)
-      binding.pry
       render 'kadmin/error', status: options[:status], locals: options
     end
 

data/app/controllers/kadmin/concerns/resources.rb

@@ -25,7 +25,7 @@ module Kadmin
           finder.filter(name: filter[:name], column: filter[:column], value: permitted[filter[:param]])
         end
 
-        return finder.present
+        return finder
       end
     end
   end

data/app/views/kadmin/components/_finder.html.erb

@@ -1,3 +1,4 @@
+<% finder = finder.present(self) unless finder.class < Kadmin::Presenter %>
 <div class='card finder'>
   <div class='card-block'>
     <%= render partial: 'kadmin/components/finder/header', locals: local_assigns %>
@@ -5,7 +6,7 @@
       <div class='row' style='padding-top: 15px'>
         <%= yield(finder.results) %>
         <% if finder.pager.pages > 1 %>
-          <%= finder.pager.present(self).render %>
+          <%= finder.pager.render %>
         <% end %>
       </div>
     </div>

data/lib/kadmin/presenter.rb

@@ -30,12 +30,13 @@ module Kadmin
       return rendered
     end
 
+    protected
+
     # Generates the representation of the wrapped object.
     # Should be overloaded and implemented by a concrete class.
     def generate(captured, **)
       return "<div>#{__getobj__.inspect}#{captured}</div>".html_safe
     end
-    protected :generate
 
     class NoViewContext < Kadmin::Error
       def initialize(message = nil)

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault