releaf-core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c757f3eee233bfaf9a11014357ba53e9f0248277
-  data.tar.gz: 3a3d4269cfd11385c2dbf5ccc1ca16efc01bf684
+  metadata.gz: a5ef038649618995ad1209f4a69a9f07dcc563e0
+  data.tar.gz: 1c0d5ffc66e4b4245775fcc2b83d5cabed419384
 SHA512:
-  metadata.gz: 31efbd050fbb7bda871a605e2e1d4d6b9ab3c8bb838f3c2db914d901d87c7b1d38653043b92058c73e193c316dfefd5fc168828515c7f4e8b7a27335b3a27d82
-  data.tar.gz: 1cb0c9c7500a4b534b9de135b7ff813d122b9af8fcc1ddbdf42f910947f8cebdc33c02b6f175df7b9c0c43fcb95d8c717b19bead95ef63d2ece36c2d034869c6
+  metadata.gz: 71a59ef4a453d8c06295572feb9937184cf899f87f6ad362e61063873ced9632dd5790dd9c2d5f29845c98262ee7463e0fb661e88352b3777867451531399fee
+  data.tar.gz: 7e0c50a17a024c48b342e8781087d9fee73cdfee8e6e68f2cba0b97684e1e6ddeb65e0614ea34e72df5a484b87f8b8e98598627f023448a03f15baaa5e5cb697

data/app/controllers/releaf/action_controller.rb

@@ -14,10 +14,10 @@ class Releaf::ActionController < ActionController::Base
   include Releaf::ActionController::RichtextAttachments
   include Releaf::ActionController::Views
   include Releaf::ActionController::Layout
+  include Releaf::ActionController::Exceptions
   include Releaf::Responders
 
   helper_method :controller_scope_name, :page_title
-  rescue_from Releaf::AccessDenied, with: :access_denied
 
   respond_to :html
   respond_to :json, only: [:create, :update]
@@ -138,10 +138,6 @@ class Releaf::ActionController < ActionController::Base
     params[:after_save] == "create_another" && feature_available?(:create_another)
   end
 
-  def access_denied
-    respond_with(nil, responder: action_responder(:access_denied))
-  end
-
   # Check if @resource has existing restrict relation and it can be deleted
   #
   # @return boolean true or false

data/app/lib/releaf/action_controller/exceptions.rb

@@ -0,0 +1,16 @@
+module Releaf::ActionController::Exceptions
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from Releaf::AccessDenied, with: :access_denied
+    rescue_from Releaf::RecordNotFound, with: :page_not_found
+  end
+
+  def page_not_found
+    respond_with(nil, responder: action_responder(:page_not_found))
+  end
+
+  def access_denied
+    respond_with(nil, responder: action_responder(:access_denied))
+  end
+end

data/app/lib/releaf/action_controller/resources.rb

@@ -37,7 +37,11 @@ module Releaf::ActionController::Resources
   end
 
   def load_resource
-    @resource = resource_class.find(params[:id])
+    begin
+      @resource = resource_class.find(params[:id])
+    rescue ActiveRecord::RecordNotFound
+      raise Releaf::RecordNotFound
+    end
   end
 
   # Returns true if @resource is assigned (even if it's nil)

data/app/views/releaf/error_pages/_error.html.haml

@@ -5,6 +5,3 @@
   .body
     - if defined? description
       %div.description= description
-    %a.return{href: releaf_root_path }
-      = t("Go home")
-      %i.fa.fa-chevron-right

data/app/views/releaf/error_pages/page_not_found.html.haml

@@ -1,2 +1 @@
-= render 'releaf/error_pages/error', message: t('Page not found', scope: controller_scope_name), description: t('Something went wrong.', scope: controller_scope_name)
-
+= render 'releaf/error_pages/error', message: t('Page not found', scope: controller_scope_name), description: t('You may have mistyped the address or the page may have moved.', scope: controller_scope_name)

data/lib/releaf/exceptions.rb

@@ -2,4 +2,5 @@ module Releaf
   class Error < StandardError; end
   class AccessDenied < Error; end
   class FeatureDisabled < Error; end
+  class RecordNotFound < Error; end
 end

data/lib/releaf/route_mapper.rb

@@ -37,7 +37,7 @@ module Releaf::RouteMapper
       end
 
       namespace :releaf, path: nil do
-        get '/*path' => 'errors#page_not_found'
+        get '/*path' => 'root#page_not_found'
       end
     end
   end

data/spec/features/errors_spec.rb

@@ -4,11 +4,24 @@ describe "Errors feature" do
     auth_as_user
   end
 
-  it "returns 404 status code and generic error page for nonexistent rotues" do
+  it "returns 404 status code and generic error page for nonexistent records" do
+    visit "/admin/users/712323/edit"
+
+    expect(page.status_code).to eq(404)
+    within "main" do
+      expect(page).to have_text("Page not found")
+      expect(page).to have_text("You may have mistyped the address or the page may have moved")
+    end
+  end
+
+  it "returns 404 status code and generic error page for nonexistent routes" do
     visit(releaf_root_path + "/asdassd")
 
     expect(page.status_code).to eq(404)
-    expect(page.body).to match(/not found/)
+    within "main" do
+      expect(page).to have_text("Page not found")
+      expect(page).to have_text("You may have mistyped the address or the page may have moved")
+    end
   end
 
   it "returns 403 status code and generic error page for disabled feature" do
@@ -17,7 +30,9 @@ describe "Errors feature" do
     visit releaf_permissions_roles_path
 
     expect(page.status_code).to eq(403)
-    expect(page.body).to match(/edit feature disabled for roles/i)
+    within "main" do
+      expect(page).to have_text("edit feature disabled for roles")
+    end
   end
 
   it "returns 403 status code and generic error page for restricted content" do
@@ -25,6 +40,8 @@ describe "Errors feature" do
     visit releaf_permissions_roles_path
 
     expect(page.status_code).to eq(403)
-    expect(page.body).to match(/you are not authorized to access roles/i)
+    within "main" do
+      expect(page).to have_text("You are not authorized to access roles")
+    end
   end
 end

data/spec/routing/route_mapper_spec.rb

@@ -111,7 +111,7 @@ describe Releaf::RouteMapper do
 
       it "route to page not found" do
         expect(get: "/admin/books/1/toolbox")
-          .to route_to(controller: "releaf/errors", action: "page_not_found", path: "books/1/toolbox")
+          .to route_to(controller: "releaf/root", action: "page_not_found", path: "books/1/toolbox")
       end
     end
 
@@ -126,7 +126,7 @@ describe Releaf::RouteMapper do
 
       it "route to page not found" do
         expect(get: "/admin/books/1/toolbox")
-          .to route_to(controller: "releaf/errors", action: "page_not_found", path: "books/1/toolbox")
+          .to route_to(controller: "releaf/root", action: "page_not_found", path: "books/1/toolbox")
       end
     end
 
@@ -141,7 +141,7 @@ describe Releaf::RouteMapper do
 
       it "does not mount destroy confirm route" do
         expect(get: "/admin/books/1/confirm_destroy")
-          .to route_to(controller: "releaf/errors", action: "page_not_found", path: "books/1/confirm_destroy")
+          .to route_to(controller: "releaf/root", action: "page_not_found", path: "books/1/confirm_destroy")
       end
     end
 
@@ -156,7 +156,7 @@ describe Releaf::RouteMapper do
 
       it "does not mount destroy confirm route" do
         expect(get: "/admin/books/1/confirm_destroy")
-          .to route_to(controller: "releaf/errors", action: "page_not_found", path: "books/1/confirm_destroy")
+          .to route_to(controller: "releaf/root", action: "page_not_found", path: "books/1/confirm_destroy")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -386,7 +386,6 @@ files:
 - app/builders/releaf/settings/form_builder.rb
 - app/builders/releaf/settings/table_builder.rb
 - app/controllers/releaf/action_controller.rb
-- app/controllers/releaf/errors_controller.rb
 - app/controllers/releaf/root_controller.rb
 - app/controllers/releaf/settings_controller.rb
 - app/helpers/releaf/application_helper.rb
@@ -394,6 +393,7 @@ files:
 - app/lib/releaf/action_controller/ajax.rb
 - app/lib/releaf/action_controller/breadcrumbs.rb
 - app/lib/releaf/action_controller/builders.rb
+- app/lib/releaf/action_controller/exceptions.rb
 - app/lib/releaf/action_controller/features.rb
 - app/lib/releaf/action_controller/layout.rb
 - app/lib/releaf/action_controller/notifications.rb

data/app/controllers/releaf/errors_controller.rb

@@ -1,5 +0,0 @@
-class Releaf::ErrorsController < Releaf::ActionController
-  def page_not_found
-    respond_with(nil, responder: action_responder(:page_not_found))
-  end
-end