godmin 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 472fc51b8367e7692370d5cdf7b73277474d9995
-  data.tar.gz: 808d3cbaaa03ceea6bc8678ea5ce8686e53cb4f7
+  metadata.gz: ec0d4e9f977de0473f9c482b30fe336208e58adb
+  data.tar.gz: f266d7bfba24bdc6947934bf1df1a970dbfe433b
 SHA512:
-  metadata.gz: 7b8b7888056a7e6a1382115adda0dd4ce19010b661ddfa3e8e165fa0291f3de6f17c533a62c7416d63d824672d8facf9cbf5dd8376950c13d09516aa00554100
-  data.tar.gz: ab1ebe74ff2f8764d73dd73b95f3fc7f43bef777761fd6fa4cbb2cfc70a536325f8d711c3abbfe081c965d812e6ee70d75cd7b1d644250dde9c5a1cdb3babfd5
+  metadata.gz: 3fe30fb7f586871bea01de9696db6a9f40c5b6ce516388844f0de96a04c8f51a05444b7c178ea0176ff38bac6c9d260614be81a952f31b144f67b46496f6550a
+  data.tar.gz: 9581339c532af064381e0a56bae194919d9cfe8b52ba65e642ee309e3e7413c291eede9c2dcc0465050d967b99416bc79cc0243e2391ff0ac0fa256be746683e

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### 1.4.0 - 2017-02-15
+Features
+- Support group queries in scopes and filters (https://github.com/varvet/godmin/pull/208)
+- Change color of remove buttons, so they're not grabbing all the attention (https://github.com/varvet/godmin/pull/212)
+
+Bug fixes
+- Fix permitted params in sessions controller to work with models other than `AdminUser` (https://github.com/varvet/godmin/pull/210)
+
+Other
+- Remove authentication alert (https://github.com/varvet/godmin/pull/207)
+- Add table caption for tests (https://github.com/varvet/godmin/pull/187)
+
 ### 1.3.1 - 2016-09-27
 Bug fixes
 - Fix FileSystemResolver issue (https://github.com/varvet/godmin/pull/202)

data/README.md

@@ -47,7 +47,7 @@ Godmin supports two common admin scenarios:
 
 If you want to set up an example app that you can play around with, run the following:
 ```sh
-rails new sandbox -m https://raw.githubusercontent.com/varvet/godmin/master/template.rb
+rails new sandbox --skip-spring -m https://raw.githubusercontent.com/varvet/godmin/master/template.rb
 ```
 
 ### Standalone installation
@@ -637,6 +637,14 @@ class AdminUser < ActiveRecord::Base
 end
 ```
 
+By default the user model is called `AdminUser`. If you'd like to change this, you can pass an argument to the authentication generator:
+
+```
+$ bin/rails generate godmin:authentication SuperUser
+or for an engine:
+$ admin/bin/rails generate godmin:authentication SuperUser
+```
+
 By default the model is generated with an `email` field as the login column. This can changed in the migration prior to migrating if, for instance, a `username` column is more appropriate.
 
 The following route is generated:

data/app/views/godmin/resource/_table.html.erb

@@ -1,5 +1,8 @@
 <div id="table" class="table-responsive">
   <table class="table table-bordered table-hover">
+    <caption class="hide">
+      <%= @resource_class.model_name.human(count: 2) %>
+    </caption>
     <thead>
       <tr>
         <% if @resource_service.include_batch_actions? %>

data/app/views/godmin/resource/columns/_actions.html.erb

@@ -20,7 +20,7 @@
       translate_scoped("actions.destroy"),
       resource,
       method: :delete,
-      class: "btn btn-danger",
+      class: "btn btn-default",
       title: translate_scoped("actions.destroy_title", resource: resource),
       data: { confirm: translate_scoped("actions.confirm_message") }
     ) %>

data/lib/godmin/authentication.rb

@@ -14,7 +14,7 @@ module Godmin
 
     def authenticate_admin_user
       unless admin_user_signed_in? || controller_name == "sessions"
-        redirect_to new_session_path, alert: "Authentication needed"
+        redirect_to new_session_path
       end
     end
 

data/lib/godmin/authentication/sessions_controller.rb

@@ -34,7 +34,7 @@ module Godmin
       end
 
       def admin_user_params
-        params.require(:admin_user).permit(
+        params.require(admin_user_class.model_name.param_key.to_sym).permit(
           admin_user_class.login_column,
           :password,
           :password_confirm

data/lib/godmin/paginator.rb

@@ -1,12 +1,12 @@
 module Godmin
   class Paginator
-    WINDOW_SIZE = 7.freeze
+    WINDOW_SIZE = 7
 
     attr_reader :per_page, :current_page
 
     def initialize(resources, per_page: 25, current_page: nil)
-      @resources    = resources
-      @per_page     = per_page
+      @resources = resources
+      @per_page = per_page
       @current_page = current_page ? current_page.to_i : 1
     end
 
@@ -35,7 +35,15 @@ module Godmin
     end
 
     def total_resources
-      @total_resources ||= @resources.count
+      @total_resources ||= begin
+        count = @resources.count
+
+        if count.respond_to?(:count)
+          count.count
+        else
+          count
+        end
+      end
     end
 
     private

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/template.rb

@@ -3,7 +3,7 @@ require "active_support/all"
 def install_standalone
   set_ruby_version
 
-  gem "godmin", "1.3.0"
+  gem "godmin", "1.3.1"
 
   after_bundle do
     create_database
@@ -36,7 +36,7 @@ def install_engine
 
   inject_into_file "admin/admin.gemspec", before: /^end/ do
     <<-END.strip_heredoc.indent(2)
-      s.add_dependency "godmin", "~> 1.3.0"
+      s.add_dependency "godmin", "~> 1.3.1"
     END
   end
 

data/test/dummy/app/controllers/another_admin_sessions_controller.rb

@@ -0,0 +1,10 @@
+class AnotherAdminSessionsController < ApplicationController
+  include Godmin::Authentication::SessionsController
+  include Godmin::Authentication
+
+  skip_before_action :authenticate_admin_user
+
+  def admin_user_class
+    AnotherAdminUser
+  end
+end

data/test/dummy/app/models/another_admin_user.rb

@@ -0,0 +1,7 @@
+class AnotherAdminUser < ActiveRecord::Base
+  include Godmin::Authentication::User
+
+  def self.login_column
+    :email
+  end
+end

data/test/dummy/config/routes.rb

@@ -3,6 +3,9 @@ Rails.application.routes.draw do
   resources :authenticated_articles
   resources :authorized_articles
   resource :session, only: [:new, :create, :destroy]
+
+  resource :another_admin_session, only: [:create]
+
   root to: "application#welcome"
   mount Admin::Engine, at: "admin"
 end

data/test/dummy/db/migrate/20170207081043_create_another_admin_user.rb

@@ -0,0 +1,10 @@
+class CreateAnotherAdminUser < ActiveRecord::Migration[5.0]
+  def change
+    create_table :another_admin_users do |t|
+      t.string :email
+      t.text :password_digest
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150907133753) do
+ActiveRecord::Schema.define(version: 20170207081043) do
 
   create_table "admin_users", force: :cascade do |t|
     t.string   "email"
@@ -19,6 +19,13 @@ ActiveRecord::Schema.define(version: 20150907133753) do
     t.datetime "updated_at",      null: false
   end
 
+  create_table "another_admin_users", force: :cascade do |t|
+    t.string   "email"
+    t.text     "password_digest"
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
+  end
+
   create_table "articles", force: :cascade do |t|
     t.string   "title"
     t.text     "body"

data/test/integration/authentication_test.rb

@@ -14,4 +14,11 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
     visit authenticated_articles_path
     assert_not_equal authenticated_articles_path, current_path
   end
+
+  def test_sign_in_with_non_default_user
+    AnotherAdminUser.create!(email: "another_admin@example.com", password: "password")
+    post another_admin_session_path, another_admin_user: { email: "another_admin@example.com", password: "password" }
+
+    assert_redirected_to root_path
+  end
 end

data/test/lib/godmin/engine_wrapper_test.rb

@@ -22,7 +22,7 @@ module Godmin
 
     def test_default_namespace
       engine_wrapper = EngineWrapper.new(Controller)
-      assert_equal nil, engine_wrapper.namespace
+      assert_nil engine_wrapper.namespace
     end
 
     def test_default_namespaced?

data/test/lib/godmin/paginator_test.rb

@@ -80,5 +80,16 @@ module Godmin
       paginator = Paginator.new(@resources)
       assert_equal 50, paginator.total_resources
     end
+
+    def test_total_resource_with_grouped_count
+      resources_class = Class.new do
+        def count
+          { 1 => 1, 2 => 2 }
+        end
+      end
+
+      paginator = Paginator.new(resources_class.new)
+      assert_equal 2, paginator.total_resources
+    end
   end
 end

data/test/lib/godmin/resources/resource_service/batch_actions_test.rb

@@ -14,7 +14,7 @@ module Godmin
 
       def test_batch_action_when_it_does_not_exist
         assert_not @article_service.batch_action(:foobar, [:foo, :bar])
-        assert_equal nil, @article_service.called_methods[:batch_actions][:foobar]
+        assert_nil @article_service.called_methods[:batch_actions][:foobar]
       end
 
       def test_batch_action_exists

data/test/lib/godmin/resources/resource_service/filters_test.rb

@@ -25,7 +25,7 @@ module Godmin
 
       def test_does_not_call_filter_when_empty_multiselect
         @article_service.apply_filters({ tags: [""] }, :resources)
-        assert_equal nil, @article_service.called_methods[:filters][:tags]
+        assert_nil @article_service.called_methods[:filters][:tags]
       end
 
       def test_filter_map_with_default_options

data/test/lib/godmin/resources/resource_service/ordering_test.rb

@@ -25,7 +25,7 @@ module Godmin
       def test_apply_order_without_order
         resources = @resources_class.new
         @article_service.apply_order("", resources)
-        assert_equal nil, resources.order_param
+        assert_nil resources.order_param
       end
 
       def test_apply_order_with_custom_ordering_method

data/test/test_helper.rb

@@ -1,5 +1,8 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+# TODO: This does not work anymore. We need to update this according to:
+# https://docs.codeclimate.com/docs/ruby
+#
+# require "codeclimate-test-reporter"
+# CodeClimate::TestReporter.start
 
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -410,6 +410,7 @@ files:
 - test/dummy/admin/lib/admin/version.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/another_admin_sessions_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/authenticated_articles_controller.rb
@@ -417,6 +418,7 @@ files:
 - test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/models/.keep
 - test/dummy/app/models/admin_user.rb
+- test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
@@ -447,6 +449,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20150717121532_create_articles.rb
 - test/dummy/db/migrate/20150907133753_create_admin_users.rb
+- test/dummy/db/migrate/20170207081043_create_another_admin_user.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -502,7 +505,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Godmin is an admin framework for Rails 4+
@@ -528,6 +531,7 @@ test_files:
 - test/dummy/admin/lib/admin/version.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/another_admin_sessions_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/authenticated_articles_controller.rb
@@ -535,6 +539,7 @@ test_files:
 - test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/models/.keep
 - test/dummy/app/models/admin_user.rb
+- test/dummy/app/models/another_admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/policies/article_policy.rb
 - test/dummy/app/services/article_service.rb
@@ -565,6 +570,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20150717121532_create_articles.rb
 - test/dummy/db/migrate/20150907133753_create_admin_users.rb
+- test/dummy/db/migrate/20170207081043_create_another_admin_user.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -598,4 +604,3 @@ test_files:
 - test/lib/godmin/resources/resource_service/scopes_test.rb
 - test/lib/godmin/resources/resource_service_test.rb
 - test/test_helper.rb
-has_rdoc: