godmin 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b77a64dfd0387ecd63d1b0dc2259a977cefcb664
-  data.tar.gz: a97772f66980a9d1d9def89509f1d24868337bf0
+  metadata.gz: 3bb2915931cb75703a3b3bffc12bb57a9b29cc97
+  data.tar.gz: 6c7247808002572bd0fe122615c82dde755be974
 SHA512:
-  metadata.gz: 5baf4c943138e0fc2195ca47c710ac0d4a7d4892564ae6a9c3bfedaca6fa7a650a892b12a14e7ba021d4a34db73e4b458fca4c1f5612bf84d83c3a46a48c5e32
-  data.tar.gz: 924ead99ee3ff13a41c58d10f5dc5bf5b5c2857e8144c28643461e1ff271841e2f770d56fd4b2665d1b32ed5033c243bc4c86fed7a6811dc54a544deaaef66d4
+  metadata.gz: 93690b6ab331b871865ebd7a9af79626e7bec7d4f066476c6118c42769855e10da4d83ddaf3d38bc89b10c34f2cc6798231d0c5b6b9d8769271cdc7aee9239d9
+  data.tar.gz: 9f7fe59b58bc5032c4734cf9f0e734e4b9b301c76edf9ad0b52b92e55943b98b44c427ce0ba41624a88a8e01431a56a788197744726597dd1c47e55e7ea71b15

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.12.2 - 2015-09-07
+Bug fixes
+- Fixes broken sign in page
+
 ### 0.12.1 - 2015-09-07
 Bug fixes
 - Fixes issue where column ordering on index table didn't work (https://github.com/varvet/godmin/issues/124)

data/lib/godmin/resolver.rb

@@ -30,8 +30,8 @@ module Godmin
     def template_paths(prefix)
       [
         File.join(@engine_wrapper.root, "app/views", resource_path_for_engine(prefix)),
-        File.join(Godmin::Engine.root, "app/views/godmin", resource_path_for_godmin(prefix)),
-        File.join(Godmin::Engine.root, "app/views/godmin", default_path_for_godmin(prefix))
+        File.join(Godmin::Engine.root, "app/views/godmin", default_path_for_godmin(prefix)),
+        File.join(Godmin::Engine.root, "app/views/godmin", resource_path_for_godmin(prefix))
       ]
     end
 

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

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

@@ -0,0 +1,3 @@
+class SecretArticlesController < SecretController
+  include Godmin::Resources::ResourceController
+end

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

@@ -0,0 +1,7 @@
+class SecretController < ApplicationController
+  include Godmin::Authentication
+
+  def admin_user_class
+    AdminUser
+  end
+end

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

@@ -0,0 +1,3 @@
+class SessionsController < SecretController
+  include Godmin::Authentication::SessionsController
+end

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

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

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

@@ -0,0 +1,2 @@
+class SecretArticle < Article
+end

data/test/dummy/app/services/secret_article_service.rb

@@ -0,0 +1,9 @@
+class SecretArticleService < ArticleService
+  include Godmin::Resources::ResourceService
+
+  attrs_for_index :id, :title, :published, :created_at
+  attrs_for_show :id, :title, :body, :published
+  attrs_for_form :title, :body, :published
+
+  filter :title
+end

data/test/dummy/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
   resources :articles
+  resources :secret_articles
+  resource :session, only: [:new, :create, :destroy]
   root to: "application#welcome"
   mount Admin::Engine, at: "admin"
 end

data/test/dummy/db/migrate/20150907133753_create_admin_users.rb

@@ -0,0 +1,10 @@
+class CreateAdminUsers < ActiveRecord::Migration
+  def change
+    create_table :admin_users do |t|
+      t.string :email
+      t.text :password_digest
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,14 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150717121532) do
+ActiveRecord::Schema.define(version: 20150907133753) do
+
+  create_table "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"

data/test/integration/sign_in_test.rb

@@ -0,0 +1,17 @@
+require "test_helper"
+
+class SignInTest < ActionDispatch::IntegrationTest
+  def test_sign_in_and_out
+    AdminUser.create!(email: "admin@example.com", password: "password")
+    visit secret_articles_path
+    assert_not_equal secret_articles_path, current_path
+    fill_in "Email", with: "admin@example.com"
+    fill_in "Password", with: "password"
+    click_button "Sign in"
+    visit secret_articles_path
+    assert_equal secret_articles_path, current_path
+    click_link "Sign out"
+    visit secret_articles_path
+    assert_not_equal secret_articles_path, current_path
+  end
+end

data/test/lib/godmin/resolver_test.rb

@@ -22,8 +22,8 @@ module Godmin
 
       assert_equal [
         File.join(@engine_wrapper_1.root, "app/views/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/articles")
+        File.join(Godmin::Engine.root, "app/views/godmin/articles"),
+        File.join(Godmin::Engine.root, "app/views/godmin/resource")
       ], resolver.template_paths("articles")
     end
 
@@ -32,8 +32,8 @@ module Godmin
 
       assert_equal [
         File.join(@engine_wrapper_2.root, "app/views/godmin/resolver_test/admin/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/resource"),
-        File.join(Godmin::Engine.root, "app/views/godmin/articles")
+        File.join(Godmin::Engine.root, "app/views/godmin/articles"),
+        File.join(Godmin::Engine.root, "app/views/godmin/resource")
       ], resolver.template_paths("godmin/resolver_test/admin/articles")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -361,11 +361,17 @@ files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/secret_articles_controller.rb
+- test/dummy/app/controllers/secret_controller.rb
+- test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/.keep
+- test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/models/secret_article.rb
 - test/dummy/app/services/article_service.rb
+- test/dummy/app/services/secret_article_service.rb
 - test/dummy/app/views/articles/.keep
 - test/dummy/app/views/articles/columns/.keep
 - test/dummy/app/views/articles/filters/.keep
@@ -392,6 +398,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - 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/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -405,6 +412,7 @@ files:
 - test/integration/column_overriding_test.rb
 - test/integration/filter_overriding_test.rb
 - test/integration/partial_overriding_test.rb
+- test/integration/sign_in_test.rb
 - test/integration/template_overriding_test.rb
 - test/integration/welcome_test.rb
 - test/lib/godmin/engine_wrapper_test.rb
@@ -472,11 +480,17 @@ test_files:
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/concerns/.keep
+- test/dummy/app/controllers/secret_articles_controller.rb
+- test/dummy/app/controllers/secret_controller.rb
+- test/dummy/app/controllers/sessions_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/.keep
+- test/dummy/app/models/admin_user.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/models/secret_article.rb
 - test/dummy/app/services/article_service.rb
+- test/dummy/app/services/secret_article_service.rb
 - test/dummy/app/views/articles/.keep
 - test/dummy/app/views/articles/columns/.keep
 - test/dummy/app/views/articles/filters/.keep
@@ -503,6 +517,7 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - 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/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -516,6 +531,7 @@ test_files:
 - test/integration/column_overriding_test.rb
 - test/integration/filter_overriding_test.rb
 - test/integration/partial_overriding_test.rb
+- test/integration/sign_in_test.rb
 - test/integration/template_overriding_test.rb
 - test/integration/welcome_test.rb
 - test/lib/godmin/engine_wrapper_test.rb