kadmin 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93f665bacdbc2c0a768cfda4c575cc8fd22e285
-  data.tar.gz: 2cae0cf0381bfc451dff4f32101da5571a36493d
+  metadata.gz: a39b7907819cab2d4460a0adacda8c2d436a4e8c
+  data.tar.gz: 0364eda91f770f22ae8d11ceb789e728b44e1242
 SHA512:
-  metadata.gz: d7bc685b2ae780f63ed879dbff8e13c1796c7995bfdacce8fe7ebcdc59daa55627b595d258a878692f4fc93a6909cc2288d58277752c29431ca9745f077b304a
-  data.tar.gz: 561fe7ece08f9fd708d446bff09a8227041d87e8baa2b779f69d1493dbb397ca3f3f987155b889b78fd4c5a3f4d20d17f763bd20f8b0ffc8f78b44567d680808
+  metadata.gz: c356d2258ff6225309275b4335774ef742f815e866462c41feed77e7ad297f7fb57c663b3d2df626db0f6b3d4b21a30139b1d1a6a0fc22909e330f4b22913382
+  data.tar.gz: 7919d7485bb1bc24b256b6ddabe4a4daae62bc127bc7a9221685e5c5d2da52b0b2a414b1af09ad4c730387b3b7d57b3245217b0006acd59dc476512b173bbb32

data/README.md

@@ -1,6 +1,6 @@
 # Kadmin
 
-[![GitHub release](https://img.shields.io/badge/release-0.2.3-blue.png)](https://github.com/barcoo/kadmin/releases/tag/0.2.3)
+[![GitHub release](https://img.shields.io/badge/release-0.2.6-blue.png)](https://github.com/barcoo/kadmin/releases/tag/0.2.6)
 
 Collection of utility, configuration, etc., for admin areas in different projects.
 

data/app/decorators/kadmin/finder_decorator.rb

@@ -9,15 +9,18 @@ module Kadmin
       @finder = finder
     end
 
+    # @return [Boolean] true if no results, false otherwise
+    def empty?
+      return finder.results.count.zero?
+    end
+
+    # @return [String] how many resources are being displayed (along with indices)
     def currently_showing
       resource = resource_name.downcase
-      currently_showing_phrase = if finder.results.count.positive?
-        phrase = "#{pager.displayed_items} #{resource}"
-        phrase = "#{phrase} (#{pager.page_start} - #{pager.page_end})" if finder.results.count > 1
-        phrase
-      else
-        "no #{resource}"
-      end
+      displayed = empty? ? 0 : pager.displayed_items
+
+      currently_showing_phrase = "#{displayed} #{resource}"
+      currently_showing_phrase = "#{currently_showing_phrase} (#{pager.page_start} - #{pager.page_end})" if finder.results.count > 1
 
       return currently_showing_phrase
     end

data/app/views/kadmin/components/finder/_form.erb

@@ -1,10 +1,10 @@
 <%= form_tag(request.path, method: 'get', class: 'form-inline') do %>
   <div class='form-group'>
-    <%= link_to('Create', url_for(action: :new), class: 'btn btn-primary') %>
+    <%= link_to(t('kadmin.components.finder.create'), url_for(action: :new), class: 'btn btn-primary') %>
     <% finder.filters.each do |name, filter| %>
       <%= text_field_tag("filter_#{name}", filter&.value, class: 'form-control', placeholder: "Filter by #{name}...") %>
     <% end %>
-    <%= submit_tag('Filter', class: 'btn btn-default form-control') %>
-    <%= link_to('Clear', request.path, class: 'btn btn-danger form-control') %>
+    <%= submit_tag(t('kadmin.components.finder.filter'), class: 'btn btn-default form-control') %>
+    <%= link_to(t('kadmin.components.finder.clear'), request.path, class: 'btn btn-danger form-control') %>
   </div>
 <% end %>

data/app/views/kadmin/components/finder/_header.html.erb

@@ -1,8 +1,11 @@
 <div class="page-header">
   <h2>
-    Showing <%= finder.currently_showing %>
-    <% if finder.results.count.positive? %>
-      <small>out of <%= finder.pager.total %> <%= finder.applied_filters %></small>
+    <%= finder.currently_showing %>
+    <% unless finder.empty? %>
+      <small>
+        <%= t('kadmin.components.finder.out_of', total: finder.pager.total) %>
+        <%= finder.applied_filters %>
+      </small>
     <% end %>
   </h2>
 </div>

data/config/locales/de.yml

@@ -8,7 +8,11 @@ de:
       unauthorized_message: Sie haben für die gewünschte Seite leider keine Zugriffsrechte; falls Sie haben sollten, bitte das Apps & Services Team kontaktieren
     components:
       finder:
+        clear: Löschen
+        create: Anlegen
         empty: Nichts zu zeigen
+        filter: Suchen
+        out_of: von %{total}
     dash_message: Schaue Dir mal die Bereiche in der Navigationsleiste oben. Wenn es irgenwelche Probleme gibt, oder es fehlt Dir Zugriffsrechte, bitte das Apps & Services Team kontaktieren.
     error: Fehler
     errors:

data/config/locales/en.yml

@@ -8,7 +8,11 @@ en:
       unauthorized_message: You are not authorized to access this resource; if you think you should be, contact the Apps & Services team
     components:
       finder:
+        clear: Clear
+        create: Create
         empty: Nothing to show
+        filter: Filter
+        out_of: out of %{total}
     dash_message: See the top navigation bar for the different admin sections. If you are missing authorizations, or if there is any issue at all, contact the Apps & Services team!
     error: Error
     errors:

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.6'.freeze
 end

data/test/dummy/config/initializers/{rails_admin.rb → kadmin.rb}

@@ -1,26 +1,20 @@
 module Dummy
   class User < Kadmin::Auth::User
-    def initialize(email, resources: [])
-      super(email)
-      @resources = resources
-    end
-
     def authorized?(_request)
       return true
     end
   end
 
   class UserStore < Kadmin::Auth::UserStore
-    def initialize
-      super
-
-      set('admin@test.com', Dummy::User.new('admin@test.com', resources: [:posts]))
+    def get(email)
+      set(email, Dummy::User.new(email)) unless exists?(email)
+      return @store[email.downcase]
     end
   end
 end
 
 Kadmin.config.logger = Rails.logger
-Kadmin.config.mount_path = '/kadmin'
+Kadmin.config.mount_path = '/admin'
 
 Kadmin::Auth.config.user_class = Dummy::User
 Kadmin::Auth.config.user_store_class = Dummy::UserStore

data/test/dummy/log/development.log

@@ -22637,3 +22637,113 @@ Processing by Admin::PeopleController#edit as HTML
   Rendered admin/people/edit.html.erb within layouts/kadmin/application (33.6ms)
   Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/helpers/_alerts.html.erb (0.1ms)
 Completed 200 OK in 90ms (Views: 59.9ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/admin/people/" for 127.0.0.1 at 2016-10-11 11:21:56 +0200
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Processing by Admin::PeopleController#index as HTML
+Redirected to http://0.0.0.0:3000/kadmin/auth/login?origin=%2Fadmin%2Fpeople
+Filter chain halted as :authorize rendered or redirected
+Completed 302 Found in 24ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/kadmin/auth/login?origin=%2Fadmin%2Fpeople" for 127.0.0.1 at 2016-10-11 11:21:57 +0200
+Processing by Kadmin::AuthController#login as HTML
+  Parameters: {"origin"=>"/admin/people"}
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/auth/login.html.erb within layouts/kadmin/application (7.1ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/helpers/_alerts.html.erb (0.6ms)
+Completed 200 OK in 227ms (Views: 227.1ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/kadmin/auth/developer?origin=%2Fadmin%2Fpeople" for 127.0.0.1 at 2016-10-11 11:21:58 +0200
+(developer) Request phase initiated.
+
+
+Started POST "/kadmin/auth/developer/callback" for 127.0.0.1 at 2016-10-11 11:22:01 +0200
+(developer) Callback phase initiated.
+Processing by Kadmin::AuthController#save as HTML
+  Parameters: {"email"=>"nicolas.pepin-perreault@offerista.com", "provider"=>"developer"}
+Redirected to http://0.0.0.0:3000/kadmin/auth/login
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/kadmin/auth/login" for 127.0.0.1 at 2016-10-11 11:22:01 +0200
+Processing by Kadmin::AuthController#login as HTML
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/auth/login.html.erb within layouts/kadmin/application (0.5ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/helpers/_alerts.html.erb (0.3ms)
+Completed 200 OK in 19ms (Views: 19.3ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/kadmin/auth/developer" for 127.0.0.1 at 2016-10-11 11:22:02 +0200
+(developer) Request phase initiated.
+
+
+Started POST "/kadmin/auth/developer/callback" for 127.0.0.1 at 2016-10-11 11:22:05 +0200
+(developer) Callback phase initiated.
+Processing by Kadmin::AuthController#save as HTML
+  Parameters: {"email"=>"admin@test.com", "provider"=>"developer"}
+Redirected to http://0.0.0.0:3000/kadmin
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/kadmin" for 127.0.0.1 at 2016-10-11 11:22:05 +0200
+Processing by Kadmin::DashController#index as HTML
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/dash/index.html.erb within layouts/kadmin/application (1.1ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/helpers/_alerts.html.erb (0.1ms)
+Completed 200 OK in 32ms (Views: 31.2ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/admin/test" for 127.0.0.1 at 2016-10-11 11:22:07 +0200
+
+ActionController::RoutingError (No route matches [GET] "/admin/test"):
+  actionpack (4.2.7.1) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (4.2.7.1) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.2.7.1) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.2.7.1) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:68:in `block in tagged'
+  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:26:in `tagged'
+  activesupport (4.2.7.1) lib/active_support/tagged_logging.rb:68:in `tagged'
+  railties (4.2.7.1) lib/rails/rack/logger.rb:20:in `call'
+  quiet_assets (1.1.0) lib/quiet_assets.rb:27:in `call_with_quiet_assets'
+  actionpack (4.2.7.1) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.6.4) lib/rack/methodoverride.rb:22:in `call'
+  rack (1.6.4) lib/rack/runtime.rb:18:in `call'
+  activesupport (4.2.7.1) lib/active_support/cache/strategy/local_cache_middleware.rb:28:in `call'
+  rack (1.6.4) lib/rack/lock.rb:17:in `call'
+  actionpack (4.2.7.1) lib/action_dispatch/middleware/static.rb:120:in `call'
+  rack (1.6.4) lib/rack/sendfile.rb:113:in `call'
+  railties (4.2.7.1) lib/rails/engine.rb:518:in `call'
+  railties (4.2.7.1) lib/rails/application.rb:165:in `call'
+  rack (1.6.4) lib/rack/content_length.rb:15:in `call'
+  puma (3.6.0) lib/puma/configuration.rb:225:in `call'
+  puma (3.6.0) lib/puma/server.rb:578:in `handle_request'
+  puma (3.6.0) lib/puma/server.rb:415:in `process_client'
+  puma (3.6.0) lib/puma/server.rb:275:in `block in run'
+  puma (3.6.0) lib/puma/thread_pool.rb:116:in `block in spawn_thread'
+
+
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.0ms)
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/routes/_route.html.erb (1.3ms)
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/routes/_route.html.erb (0.3ms)
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/routes/_table.html.erb (16.1ms)
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (18.5ms)
+  Rendered /Users/npepinpe/.rvm/gems/ruby-2.3.1/gems/actionpack-4.2.7.1/lib/action_dispatch/middleware/templates/rescues/routing_error.html.erb within rescues/layout (88.2ms)
+
+
+Started GET "/admin/people" for 127.0.0.1 at 2016-10-11 11:22:13 +0200
+Processing by Admin::PeopleController#index as HTML
+   (0.1ms)  SELECT COUNT(*) FROM "people"
+   (0.2ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "people" LIMIT 15 OFFSET 0) subquery_for_count
+  CACHE (0.0ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "people" LIMIT 15 OFFSET 0) subquery_for_count
+  CACHE (0.0ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "people" LIMIT 15 OFFSET 0) subquery_for_count
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/components/finder/_header.html.erb (7.5ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/components/finder/_form.erb (1.5ms)
+  CACHE (0.0ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "people" LIMIT 15 OFFSET 0) subquery_for_count
+  Person Load (0.2ms)  SELECT  "people".* FROM "people"  ORDER BY "people"."created_at" DESC LIMIT 15 OFFSET 0
+  GroupPerson Load (0.1ms)  SELECT "group_people".* FROM "group_people" WHERE "group_people"."person_id" IN (2, 1)
+  Group Load (0.2ms)  SELECT "groups".* FROM "groups" WHERE "groups"."owner_id" IN (2, 1)
+  Rendered admin/people/_table.html.erb (63.8ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/components/_finder.html.erb (104.5ms)
+  Rendered admin/people/index.html.erb within layouts/kadmin/application (106.3ms)
+  Rendered /Users/npepinpe/work/github/barcoo/kadmin/app/views/kadmin/helpers/_alerts.html.erb (0.1ms)
+Completed 200 OK in 149ms (Views: 137.1ms | ActiveRecord: 1.3ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,8 +193,8 @@ files:
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/kadmin.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/rails_admin.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
@@ -631,7 +631,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Collection of utility, configuration, etc., for admin areas
@@ -673,8 +673,8 @@ test_files:
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/kadmin.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/rails_admin.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml