godmin 0.9.9 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db8432a519eafbc75e576858f5dc03c395d205f
-  data.tar.gz: 14102d5be211e5ce235f02253d74b6d998720202
+  metadata.gz: 6dbff158f032a8e37f8d7d7dca27f42ad9ab6b6e
+  data.tar.gz: d9bbc151f8db24f624988ff92a96e623f749bcd7
 SHA512:
-  metadata.gz: d921e069ef6d045e746c3fc144247712caf0a96fa91e7276c66c26b292274400e4dfeb4299fac5e5bb4aa9a36963453dcfb6fb5d0b0355a735d417b1b6077dba
-  data.tar.gz: 3bf7c1fb9d173572327622e398d27185e5d1ad968c8667be9104379043fa1db594b1340ca7629629c644145f7fd125334daba01b91990f38dd5af29f406cb2c3
+  metadata.gz: de2cacda564c1f6dfde799848520ee3dacd25446c0bc6583b80c9b8214e606fd771fc63d9609026aeb6da5442c6b2fa1a3adacbded07a9a58581e5dca278038d
+  data.tar.gz: ac09d53249d52b5f2b7459889409f910316178dca90505102db6cb346b7eb6602a206d0b07d0096d874e38ff470c2b12107913bbf04f4a346c9ebd3268cc525f

data/.gitignore

@@ -22,3 +22,4 @@ config/initializers/secret_token.rb
 *.swp
 /test/dummy/log/*
 Gemfile.lock
+tags

data/.rubocop.yml

@@ -1,7 +1,17 @@
-LineLength:
-  Description: Limit lines to 120 characters.
+AllCops:
+  RunRailsCops: true
+
+Documentation:
+  Enabled: false
+
+Metrics/LineLength:
   Max: 120
 
-StringLiterals:
-  EnforcedStyle: double_quotes
+Metrics/ClassLength:
+  Max: 300
 
+Metrics/MethodLength:
+  Max: 25
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+### 0.10.0 - 2015-02-11
+Features
+- Shows the number of items in each scope in the scope tab (https://github.com/varvet/godmin/issues/16)
+- Two new overridable methods for resources: `build_resource` and `find_resource`
+- Translatable title (https://github.com/varvet/godmin/issues/17)
+
+Bug fixes
+- Fixes a bug where the wrong template would be picked (https://github.com/varvet/godmin/issues/39)
+- Fixes a bug so the resolver works with namespaces templates.
+- Fixes an autoloading issue (https://github.com/varvet/godmin/issues/60)
+- Godmin rescues `NotAuthorizedError` and returns a 403 Forbidden HTTP status.
+
+Other
+- Cleaned up generators (https://github.com/varvet/godmin/issues/28)
+- Restructured the locale files a bit
+
 ### 0.9.9 - 2015-01-23
 Features
 - Bump bootstrap to 3.3.3

data/README.md

@@ -46,8 +46,9 @@ Add the gem to the application's `Gemfile`:
 gem "godmin"
 ```
 
-Run the install generator:
+Bundle then run the install generator:
 ```sh
+$ bundle install
 $ bin/rails generate godmin:install
 ```
 
@@ -76,8 +77,9 @@ Add the gem to the engine's gemspec, `admin/admin.gemspec`:
 s.add_dependency "godmin", "~> x.x.x"
 ```
 
-Run the install generator within the scope of the engine, i.e. note the leading `admin/`:
+Bundle then run the install generator within the scope of the engine, i.e. note the leading `admin/`:
 ```sh
+$ bundle install
 $ admin/bin/rails generate godmin:install
 ```
 
@@ -261,11 +263,13 @@ end
 
 Resources are made available to the views through instance variables. The index view can access the resources using `@resources` while show, new and edit can access the single resource using `@resource`.
 
-In order to modify what resources to fetch, there are three methods that can be overridden per resource controller:
+In order to modify what resources to fetch, there are some methods that can be overridden per resource controller:
 
 - `resource_class`
-- `resource_relation`
+- `resources_relation`
 - `resources`
+- `build_resource`
+- `find_resource`
 
 To change the class name of the resource from the default based on the controller name:
 
@@ -303,6 +307,32 @@ class ArticlesController
 end
 ```
 
+To change the way a resource is constructed for `new` and `create` actions:
+
+```ruby
+class ArticlesController
+  include Godmin::Resource
+
+  def build_resource(params)
+    article = resources_relation.new(params)
+    article.setup_more_things
+    article
+  end
+end
+```
+
+To change the way a resource is fetched for `show`, `edit`, `update` and `destroy` actions:
+
+```ruby
+class ArticlesController
+  include Godmin::Resource
+
+  def find_resource(id)
+    resources_relation.find_by(slug: id)
+  end
+end
+```
+
 ### Redirecting
 
 By default the user is redirected to the resource show page after create and update, and to the index page after destroy. To change this, there are four controller methods that can be overridden: `redirect_after_create`, `redirect_after_update`, `redirect_after_save`, and `redirect_after_destroy`.
@@ -552,18 +582,37 @@ end
 
 That is, everyone can list and view articles, only editors can create them, and only unpublished articles can be updated and destroyed.
 
+When a user is not authorized to access a resource, `NotAuthorizedError` is raised. By default this error is rescued in Godmin and it renders some text and returns status code `403 Forbidden`.
+If you want to change this behaviour you can rescue the error yourself in the appropriate `ApplicationController`.
+
+```ruby
+module Admin
+  class ApplicationController < ActionController::Base
+    include Godmin::Application
+    include Godmin::Authentication
+    include Godmin::Authorization
+
+    # Renders 404 page and returns status code 404.
+    rescue_from NotAuthorizedError do
+      render file: "#{Rails.root}/public/404.html", status: 404, layout: false
+    end
+  end
+end
+```
+
 ## Localization
 
 Godmin supports localization out of the box. Strings can be translated both globally and per resource, similar to how views work.
 
 For a list of translatable strings, [look here](https://github.com/varvet/godmin/blob/master/config/locales/en.yml).
 
-For instance, to translate the `godmin.batch_actions.select_all` string globally:
+For instance, to translate the `godmin.batch_actions.buttons.select_all` string globally:
 
 ```yml
 godmin:
   batch_actions:
-    select_all: {translation}
+    buttons:
+      select_all: {translation}
 ```
 
 Or, translate for a specific resource:
@@ -572,7 +621,8 @@ Or, translate for a specific resource:
 godmin:
   articles:
     batch_actions:
-      select_all: {translation}
+      buttons:
+        select_all: {translation}
 ```
 
 In addition, all scopes, filters and batch actions that are added, can be localized:
@@ -581,14 +631,16 @@ In addition, all scopes, filters and batch actions that are added, can be locali
 godmin:
   articles:
     batch_actions:
-      publish: {translation}
-      unpublish: {translation}
+      labels:
+        publish: {translation}
+        unpublish: {translation}
     filters:
       labels:
         title: {translation}
     scopes:
-      unpublished: {translation}
-      published: {translation}
+      labels:
+        unpublished: {translation}
+        published: {translation}
 ```
 
 Godmin comes with built in support for English and Swedish.
@@ -661,6 +713,7 @@ Godmin.SelectBoxes.initializeSelectBox($el, {
 Some additional features are available as plugins:
 
 - [Godmin Uploads](https://github.com/varvet/godmin-uploads)
+- [Godmin Tagger](https://github.com/varvet/godmin-tagger)
 
 ## Contributors
 

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

@@ -1,7 +1,7 @@
 <% if batch_action_map.present? %>
-  <%= link_to translate_scoped("batch_actions.select_all"), "#", class: "btn btn-default",
+  <%= link_to translate_scoped("batch_actions.buttons.select_all"), "#", class: "btn btn-default",
     data: { behavior: "batch-actions-select batch-actions-select-all" } %>
-  <%= link_to translate_scoped("batch_actions.deselect_all"), "#", class: "btn btn-default hidden",
+  <%= link_to translate_scoped("batch_actions.buttons.deselect_all"), "#", class: "btn btn-default hidden",
     data: { behavior: "batch-actions-select batch-actions-select-none" } %>
 
   <div class="btn-group">

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

@@ -3,7 +3,10 @@
     <ul class="nav nav-tabs">
       <% scope_map.each do |name, options| %>
         <li class="<%= "active" if params[:scope] == name.to_s %>">
-          <%= link_to translate_scoped("scopes.#{name.to_s.underscore}", default: name.to_s.titleize), url_for(params.merge(scope: name, only_path: true).except(:page)) %>
+          <%= link_to url_for(params.merge(scope: name, only_path: true).except(:page)) do %>
+            <%= translate_scoped("scopes.labels.#{name.to_s.underscore}", default: name.to_s.titleize) %>
+            <span class="text-muted"> (<%= scope_count(name) %>)</span>
+          <% end %>
         </li>
       <% end %>
     </ul>

data/app/views/layouts/godmin/_layout.html.erb

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
   <head>
-    <title>Godmin</title>
+    <title><%= t("godmin.title") %></title>
     <%= stylesheet_link_tag [Godmin.namespace, "application"].compact.join("/"), media: "all" %>
     <%= javascript_include_tag [Godmin.namespace, "application"].compact.join("/") %>
     <%= csrf_meta_tags %>

data/app/views/layouts/godmin/application.html.erb

@@ -2,7 +2,7 @@
   <nav class="navbar navbar-default navbar-static-top" role="navigation">
     <div class="container">
       <div class="navbar-header">
-        <%= link_to "Godmin", root_path, class: "navbar-brand" %>
+        <%= link_to t("godmin.title"), root_path, class: "navbar-brand" %>
       </div>
       <div class="collapse navbar-collapse navbar-ex1-collapse">
         <%= render partial: "shared/navigation" %>

data/config/locales/en.yml

@@ -1,8 +1,10 @@
 en:
   godmin:
+    title: Godmin
     batch_actions:
-      select_all: Select all
-      deselect_all: Deselect all
+      buttons:
+        select_all: Select all
+        deselect_all: Deselect all
       confirm_message: Are you sure?
     filters:
       select:

data/config/locales/sv.yml

@@ -1,8 +1,10 @@
 sv:
   godmin:
+    title: Godmin
     batch_actions:
-      select_all: Markera alla
-      deselect_all: Avmarkera alla
+      buttons:
+        select_all: Markera alla
+        deselect_all: Avmarkera alla
       confirm_message: Är du säker?
     filters:
       select:

data/lib/generators/godmin/authentication/authentication_generator.rb

@@ -1,15 +1,15 @@
-require "godmin/generators/base"
+require "godmin/generators/named_base"
 
-class Godmin::AuthenticationGenerator < Godmin::Generators::Base
-  argument :model, type: :string, default: "admin_user"
+class Godmin::AuthenticationGenerator < Godmin::Generators::NamedBase
+  argument :name, type: :string, default: "admin_user"
 
   def create_model
-    generate "model", "#{@model} email:string password_digest:text --no-test-framework"
+    generate "model", "#{name} email:string password_digest:text --no-test-framework"
   end
 
   def modify_model
-    inject_into_file ["app/models", namespace, "#{@model.underscore}.rb"].compact.join("/"), after: "ActiveRecord::Base\n" do
-      <<-END.strip_heredoc.indent(namespace.nil? ? 2 : 4)
+    inject_into_file File.join("app/models", class_path, "#{file_name}.rb"), after: "ActiveRecord::Base\n" do
+      <<-END.strip_heredoc.indent(namespace ? 4 : 2)
         include Godmin::Authentication::User
 
         def self.login_column
@@ -20,40 +20,20 @@ class Godmin::AuthenticationGenerator < Godmin::Generators::Base
   end
 
   def create_route
-    inject_into_file "config/routes.rb", after: "godmin do\n" do
-      <<-END.strip_heredoc.indent(4)
-        resource :session, only: [:new, :create, :destroy]
-      END
-    end
+    route "resource :session, only: [:new, :create, :destroy]"
   end
 
   def create_sessions_controller
-    create_file ["app/controllers", namespace, "sessions_controller.rb"].compact.join("/") do
-      if namespace
-        <<-END.strip_heredoc
-          module #{namespace.camelize}
-            class SessionsController < ApplicationController
-              include Godmin::Authentication::Sessions
-            end
-          end
-        END
-      else
-        <<-END.strip_heredoc
-          class SessionsController < ApplicationController
-            include Godmin::Authentication::Sessions
-          end
-        END
-      end
-    end
+    template "sessions_controller.rb", File.join("app/controllers", namespaced_path, "sessions_controller.rb")
   end
 
   def modify_application_controller
-    inject_into_file ["app/controllers", namespace, "application_controller.rb"].compact.join("/"), after: "Godmin::Application\n" do
-      <<-END.strip_heredoc.indent(namespace.nil? ? 2 : 4)
+    inject_into_file File.join("app/controllers", namespaced_path, "application_controller.rb"), after: "Godmin::Application\n" do
+      <<-END.strip_heredoc.indent(namespace ? 4 : 2)
         include Godmin::Authentication
 
         def admin_user_class
-          #{[namespace, @model.underscore].compact.join("/").camelize}
+          #{class_name}
         end
       END
     end

data/lib/generators/godmin/authentication/templates/sessions_controller.rb

@@ -0,0 +1,9 @@
+<% if namespaced? -%>
+require_dependency "<%= File.join(namespaced_path, "application_controller") %>"
+
+<% end -%>
+<% module_namespacing do -%>
+class SessionsController < ApplicationController
+  include Godmin::Authentication::Sessions
+end
+<% end -%>

data/lib/generators/godmin/install/install_generator.rb

@@ -5,7 +5,7 @@ class Godmin::InstallGenerator < Godmin::Generators::Base
     create_file "config/initializers/godmin.rb" do
       <<-END.strip_heredoc
         Godmin.configure do |config|
-          config.namespace = #{namespace ? "\"#{namespace}\"" : "nil"}
+          config.namespace = #{namespace ? "\"#{namespaced_path.join("/")}\"" : "nil"}
         end
       END
     end
@@ -21,29 +21,29 @@ class Godmin::InstallGenerator < Godmin::Generators::Base
   end
 
   def modify_application_controller
-    inject_into_file ["app/controllers", namespace, "application_controller.rb"].compact.join("/"), after: "ActionController::Base\n" do
-      <<-END.strip_heredoc.indent(namespace == nil ? 2 : 4)
+    inject_into_file File.join("app/controllers", namespaced_path, "application_controller.rb"), after: "ActionController::Base\n" do
+      <<-END.strip_heredoc.indent(namespace ? 4 : 2)
         include Godmin::Application
       END
     end
   end
 
   def modify_application_js
-    inject_into_file ["app/assets/javascripts", namespace, "application.js"].compact.join("/"), before: "//= require_tree ." do
+    inject_into_file File.join("app/assets/javascripts", namespaced_path, "application.js"), before: "//= require_tree ." do
       "//= require godmin\n"
     end
   end
 
   def modify_application_css
-    inject_into_file ["app/assets/stylesheets", namespace, "application.css"].compact.join("/"), before: " *= require_tree ." do
+    inject_into_file File.join("app/assets/stylesheets", namespaced_path, "application.css"), before: " *= require_tree ." do
       " *= require godmin\n"
     end
   end
 
   def require_library_if_namespaced
-    return unless namespace
+    return unless namespaced?
 
-    inject_into_file "lib/#{namespace}.rb", before: "require" do
+    inject_into_file File.join("lib", namespaced_path) + ".rb", before: "require" do
       <<-END.strip_heredoc
         require "godmin"
       END

data/lib/generators/godmin/policy/policy_generator.rb

@@ -1,29 +1,7 @@
-require "godmin/generators/base"
+require "godmin/generators/named_base"
 
-class Godmin::PolicyGenerator < Godmin::Generators::Base
-  argument :resource, type: :string
-
-  def create_controller
-    create_file ["app/policies", "#{policy_name}.rb"].compact.join("/") do
-      if namespace
-        <<-END.strip_heredoc
-          module #{namespace.camelize}
-            class #{@resource.underscore.camelize}Policy < Godmin::Authorization::Policy
-            end
-          end
-        END
-      else
-        <<-END.strip_heredoc
-          class #{@resource.underscore.camelize}Policy < Godmin::Authorization::Policy
-          end
-        END
-      end
-    end
-  end
-
-  private
-
-  def policy_name
-    [namespace, "#{@resource.underscore}_policy"].compact.join("/")
+class Godmin::PolicyGenerator < Godmin::Generators::NamedBase
+  def create_policy
+    template "policy.rb", File.join("app/policies", class_path, "#{file_name}_policy.rb")
   end
 end

data/lib/generators/godmin/policy/templates/policy.rb

@@ -0,0 +1,23 @@
+<% module_namespacing do -%>
+class <%= class_name %>Policy < Godmin::Authorization::Policy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true
+  end
+
+  def update?
+    true
+  end
+
+  def destroy?
+    true
+  end
+end
+<% end -%>

data/lib/generators/godmin/resource/resource_generator.rb

@@ -1,56 +1,17 @@
-require "godmin/generators/base"
+require "godmin/generators/named_base"
 
-class Godmin::ResourceGenerator < Godmin::Generators::Base
-  argument :resource, type: :string
+class Godmin::ResourceGenerator < Godmin::Generators::NamedBase
   argument :attributes, type: :array, default: [], banner: "attribute attribute"
 
-  def create_route
+  def add_route
     inject_into_file "config/routes.rb", after: "godmin do\n" do
       <<-END.strip_heredoc.indent(4)
-        resources :#{@resource.tableize}
+        resources :#{file_name.pluralize}
       END
     end
   end
 
   def create_controller
-    create_file ["app/controllers", "#{controller_name}.rb"].compact.join("/") do
-      if namespace
-        <<-END.strip_heredoc
-          module #{namespace.camelize}
-            class #{@resource.tableize.camelize}Controller < ApplicationController
-              include Godmin::Resource
-
-              def attrs_for_index
-                #{attributes.map(&:to_sym)}
-              end
-
-              def attrs_for_form
-                #{attributes.map(&:to_sym)}
-              end
-            end
-          end
-        END
-      else
-        <<-END.strip_heredoc
-          class #{@resource.tableize.camelize}Controller < ApplicationController
-            include Godmin::Resource
-
-            def attrs_for_index
-              #{attributes.map(&:to_sym)}
-            end
-
-            def attrs_for_form
-              #{attributes.map(&:to_sym)}
-            end
-          end
-        END
-      end
-    end
-  end
-
-  private
-
-  def controller_name
-    [namespace, "#{@resource.tableize}_controller"].compact.join("/")
+    template "resource_controller.rb", File.join("app/controllers", class_path, "#{file_name.pluralize}_controller.rb")
   end
 end

data/lib/generators/godmin/resource/templates/resource_controller.rb

@@ -0,0 +1,17 @@
+<% if namespaced? -%>
+require_dependency "<%= File.join(namespaced_path, "application_controller") %>"
+
+<% end -%>
+<% module_namespacing do -%>
+class <%= class_name.pluralize %>Controller < ApplicationController
+  include Godmin::Resource
+
+  def attrs_for_index
+    <%= @attributes.map(&:to_sym) %>
+  end
+
+  def attrs_for_form
+    <%= @attributes.map(&:to_sym) %>
+  end
+end
+<% end -%>

data/lib/godmin/application.rb

@@ -16,7 +16,7 @@ module Godmin
       helper_method :authentication_enabled?
       helper_method :authorization_enabled?
 
-      before_action :append_view_paths
+      before_action :prepend_view_paths
 
       layout "godmin/application"
     end
@@ -25,9 +25,9 @@ module Godmin
 
     private
 
-    def append_view_paths
-      append_view_path Godmin::EngineResolver.new(controller_name)
-      append_view_path Godmin::GodminResolver.new(controller_name)
+    def prepend_view_paths
+      prepend_view_path Godmin::GodminResolver.new(controller_name)
+      prepend_view_path Godmin::EngineResolver.new(controller_name)
     end
 
     def authentication_enabled?

data/lib/godmin/authorization.rb

@@ -7,6 +7,10 @@ module Godmin
 
     included do
       helper_method :policy
+
+      rescue_from NotAuthorizedError do
+        render text: "You are not authorized to do this", status: 403, layout: "godmin/login"
+      end
     end
 
     def authorize(record)

data/lib/godmin/generators/base.rb

@@ -3,10 +3,46 @@ require "active_support/all"
 module Godmin
   module Generators
     class Base < Rails::Generators::Base
+      def self.source_paths
+        %w(authentication install policy resource).map do |path|
+          File.expand_path("../../../generators/godmin/#{path}/templates", __FILE__)
+        end
+      end
+
       private
 
       def namespace
-        Rails::Generators.namespace.to_s.underscore.presence
+        @namespace ||= Rails::Generators.namespace
+      end
+
+      def namespaced?
+        @namespaced ||= namespace.present?
+      end
+
+      def namespaced_path
+        @namespaced_path ||= begin
+          if namespaced?
+            namespace.name.classify.split("::").map(&:underscore)
+          else
+            []
+          end
+        end
+      end
+
+      def module_namespacing(&block)
+        content = capture(&block)
+        content = wrap_with_namespace(content) if namespaced?
+        concat(content)
+      end
+
+      def indent(content, multiplier = 2)
+        spaces = " " * multiplier
+        content.each_line.map { |line| line.blank? ? line : "#{spaces}#{line}" }.join
+      end
+
+      def wrap_with_namespace(content)
+        content = indent(content).chomp
+        "module #{namespace.name}\n#{content}\nend\n"
       end
     end
   end

data/lib/godmin/generators/named_base.rb

@@ -0,0 +1,23 @@
+require "godmin/generators/base"
+
+module Godmin
+  module Generators
+    class NamedBase < Base
+      argument :name, type: :string
+
+      private
+
+      def class_name
+        @class_name ||= name.classify
+      end
+
+      def class_path
+        @class_path ||= namespaced_path + name.classify.deconstantize.split("::").map(&:underscore)
+      end
+
+      def file_name
+        @file_name ||= class_name.demodulize.underscore
+      end
+    end
+  end
+end

data/lib/godmin/helpers/batch_actions.rb

@@ -2,16 +2,24 @@ module Godmin
   module Helpers
     module BatchActions
       def batch_action_link(name, options)
-        if (options[:only].nil? && options[:except].nil?) ||
-           (options[:only] && options[:only].include?(params[:scope].to_sym)) ||
-           (options[:except] && !options[:except].include?(params[:scope].to_sym))
+        return unless include_batch_action_link?(options)
 
-          link_to(translate_scoped("batch_actions.#{name}", default: name.to_s.titleize), "#", class: "btn btn-default hidden", data: {
+        link_to(
+          translate_scoped("batch_actions.labels.#{name}", default: name.to_s.titleize), "#",
+          class: "btn btn-default hidden", data: {
             behavior: "batch-actions-action-link",
             confirm: options[:confirm] ? translate_scoped("batch_actions.confirm_message") : false,
             value: name
-          })
-        end
+          }
+        )
+      end
+
+      private
+
+      def include_batch_action_link?(options)
+        (options[:only].nil? && options[:except].nil?) ||
+          (options[:only] && options[:only].include?(params[:scope].to_sym)) ||
+          (options[:except] && !options[:except].include?(params[:scope].to_sym))
       end
     end
   end

data/lib/godmin/resolver.rb

@@ -8,15 +8,14 @@ module Godmin
       template_paths(prefix, partial).each do |path|
         template = super(name, path, partial, details)
 
-        if template.present?
-          break
-        end
+        break if template.present?
       end
 
       template
     end
 
     def template_paths(prefix, _partial)
+      prefix = clean_prefix(prefix)
       [
         [namespace, controller_name, prefix],
         [namespace, controller_name],
@@ -26,6 +25,12 @@ module Godmin
         [namespace]
       ].map { |path| path.compact.join("/") }.compact
     end
+
+    private
+
+    def clean_prefix(prefix)
+      prefix.gsub(/^#{namespace}\//, "")
+    end
   end
 
   class EngineResolver < Resolver

data/lib/godmin/resource.rb

@@ -24,40 +24,12 @@ module Godmin
 
       before_action :set_resource_class
       before_action :set_resources, only: :index
-      before_action :set_resource, only: [:show, :new, :edit, :update, :destroy]
+      before_action :set_resource, only: [:show, :new, :edit, :create, :update, :destroy]
 
       helper_method :attrs_for_index
       helper_method :attrs_for_form
     end
 
-    def resource_class
-      controller_name.classify.constantize
-    end
-
-    def resources_relation
-      resource_class.all
-    end
-
-    def resources
-      apply_pagination(
-        apply_order(
-          apply_filters(
-            apply_scope(
-              resources_relation
-            )
-          )
-        )
-      )
-    end
-
-    def resource
-      if params[:id]
-        resources_relation.find(params[:id])
-      else
-        resources_relation.new
-      end
-    end
-
     def index
       respond_to do |format|
         format.html
@@ -72,15 +44,11 @@ module Godmin
       end
     end
 
-    def new
-    end
+    def new; end
 
-    def edit
-    end
+    def edit; end
 
     def create
-      @resource = resources_relation.new(resource_params)
-
       respond_to do |format|
         if @resource.save
           format.html { redirect_to redirect_after_create, notice: redirect_flash_message }
@@ -141,6 +109,51 @@ module Godmin
       authorize(@resource) if authorization_enabled?
     end
 
+    def resource_class
+      controller_name.classify.constantize
+    end
+
+    def resources_relation
+      resource_class.all
+    end
+
+    def resources
+      apply_pagination(
+        apply_order(
+          apply_filters(
+            apply_scope(
+              resources_relation
+            )
+          )
+        )
+      )
+    end
+
+    def resource
+      if params[:id]
+        find_resource(params[:id])
+      else
+        case action_name
+        when "create"
+          build_resource(resource_params)
+        when "new"
+          build_resource(nil)
+        end
+      end
+    end
+
+    def build_resource(params)
+      resources_relation.new(params)
+    end
+
+    def find_resource(id)
+      resources_relation.find(id)
+    end
+
+    def resource_params
+      params.require(resource_class.name.parameterize("_").to_sym).permit(attrs_for_form)
+    end
+
     def redirect_after_create
       redirect_after_save
     end
@@ -160,9 +173,5 @@ module Godmin
     def redirect_flash_message
       translate_scoped("flash.#{action_name}", resource: @resource.class.model_name.human)
     end
-
-    def resource_params
-      params.require(resource_class.name.underscore.to_sym).permit(attrs_for_form)
-    end
   end
 end

data/lib/godmin/resource/pagination.rb

@@ -31,30 +31,32 @@ module Godmin
       end
 
       def pages
-        pages = (1..total_pages).to_a
+        @pages ||= begin
+          pages = (1..total_pages).to_a
 
-        return pages unless total_pages > WINDOW_SIZE
+          return pages unless total_pages > WINDOW_SIZE
 
-        if current_page < WINDOW_SIZE
-          pages.slice(0, WINDOW_SIZE)
-        elsif current_page > (total_pages - WINDOW_SIZE)
-          pages.slice(-WINDOW_SIZE, WINDOW_SIZE)
-        else
-          pages.slice(pages.index(current_page) - (WINDOW_SIZE / 2), WINDOW_SIZE)
+          if current_page < WINDOW_SIZE
+            pages.slice(0, WINDOW_SIZE)
+          elsif current_page > (total_pages - WINDOW_SIZE)
+            pages.slice(-WINDOW_SIZE, WINDOW_SIZE)
+          else
+            pages.slice(pages.index(current_page) - (WINDOW_SIZE / 2), WINDOW_SIZE)
+          end
         end
       end
 
       def total_pages
-        (total_resources.to_f / self.class.per_page).ceil
+        @total_pages ||= (total_resources.to_f / self.class.per_page).ceil
       end
 
       def total_resources
-        resources.limit(nil).offset(nil).count
+        @total_resource ||= resources.limit(nil).offset(nil).count
       end
 
       module ClassMethods
         def per_page
-          10
+          25
         end
       end
     end

data/lib/godmin/resource/scopes.rb

@@ -5,16 +5,21 @@ module Godmin
 
       included do
         helper_method :scope_map
+        helper_method :scope_count
       end
 
       def scope_map
         self.class.scope_map
       end
 
+      def scope_count(scope)
+        apply_filters(
+          send("scope_#{scope}", resources_relation)
+        ).count
+      end
+
       def apply_scope(resources)
-        if params[:scope].blank?
-          params[:scope] = default_scope
-        end
+        params[:scope] = default_scope if params[:scope].blank?
 
         if params[:scope] && scope_map.key?(params[:scope].to_sym)
           send("scope_#{params[:scope]}", resources)

data/lib/godmin/version.rb

@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "0.9.9"
+  VERSION = "0.10.0"
 end

data/test/lib/godmin/resolver_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 module Godmin
   class ResolverTest < ActiveSupport::TestCase
-    def test_foo_resolver_template_paths
+    def test_engine_resolver_template_paths
       namespaced_as "namespace" do
         assert_equal [
           "namespace/controller_name/prefix",
@@ -15,7 +15,20 @@ module Godmin
       end
     end
 
-    def test_bar_resolver_template_paths
+    def test_engine_resolver_template_paths_when_namespace_is_in_prefix
+      namespaced_as "namespace" do
+        assert_equal [
+          "namespace/controller_name/prefix",
+          "namespace/controller_name",
+          "namespace/prefix",
+          "namespace/resource/prefix",
+          "namespace/resource",
+          "namespace"
+        ], EngineResolver.new("controller_name").template_paths("namespace/prefix", false)
+      end
+    end
+
+    def test_godmin_resolver_template_paths
       namespaced_as "namespace" do
         assert_equal [
           "godmin/controller_name/prefix",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: godmin
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.10.0
 platform: ruby
 authors:
 - Jens Ljungblad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -194,9 +194,12 @@ files:
 - config/routes.rb
 - godmin.gemspec
 - lib/generators/godmin/authentication/authentication_generator.rb
+- lib/generators/godmin/authentication/templates/sessions_controller.rb
 - lib/generators/godmin/install/install_generator.rb
 - lib/generators/godmin/policy/policy_generator.rb
+- lib/generators/godmin/policy/templates/policy.rb
 - lib/generators/godmin/resource/resource_generator.rb
+- lib/generators/godmin/resource/templates/resource_controller.rb
 - lib/godmin.rb
 - lib/godmin/application.rb
 - lib/godmin/authentication.rb
@@ -207,6 +210,7 @@ files:
 - lib/godmin/authorization/policy_finder.rb
 - lib/godmin/engine.rb
 - lib/godmin/generators/base.rb
+- lib/godmin/generators/named_base.rb
 - lib/godmin/helpers/application.rb
 - lib/godmin/helpers/batch_actions.rb
 - lib/godmin/helpers/filters.rb