administrate 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdb61f2f894654954ec8030160c5d818c507705
-  data.tar.gz: 8bd69bc151425100e99aca7c7c6ba078d6ef111a
+  metadata.gz: 110c076246ab6939cc37da4ede75207b571adf4b
+  data.tar.gz: 78aa661a2b45c16533009ad19fe820b3bb2cd767
 SHA512:
-  metadata.gz: 94c1e82a6b692e385becac51fb290345d0b6289c002a5b4cb614591e2321f22917b9deae54be351f49ac1ddc280b0701fc8b7285afda0199da004518291d7586
-  data.tar.gz: 8ea136a55f97172c648d9e69d03fa924dd449f238be33cc45a4d76174f65b3770bb2fd8bbbd952fa2b41cf6481de45cd52c8b1d3b6d8785bb5078f6b94f74def
+  metadata.gz: 388dc4bfd5a7a92bb8f027790625ca6286afedf90ef37309dac57f735abc7176ff9c394a23f191a79d08442c31a134eaf00bb8226813dc74b438c7ceb4ff373f
+  data.tar.gz: 92b2e3901c5e94ce0597a60ca518fc45f0814bc95ee6d0222839b39e34aad28aad14e96d17ee39270ba7f20304267b10d23b96d9f65a03721543b214920ed1a5

data/app/assets/stylesheets/administrate/base/_typography.scss

@@ -55,11 +55,6 @@ a {
   &:hover {
     color: $hover-link-color;
   }
-
-  &:active, &:focus {
-    color: $hover-link-color;
-    outline: none;
-  }
 }
 
 hr {

data/app/controllers/administrate/application_controller.rb

@@ -1,7 +1,8 @@
 require "administrate/namespace"
-require "administrate/pages/form"
-require "administrate/pages/table"
-require "administrate/pages/show"
+require "administrate/page/form"
+require "administrate/page/table"
+require "administrate/page/show"
+require "administrate/resource_resolver"
 
 module Administrate
   class ApplicationController < ActionController::Base
@@ -32,7 +33,7 @@ module Administrate
       if resource.save
         redirect_to(
           [Administrate::NAMESPACE, resource],
-          notice: notices[:created],
+          notice: translate("create.success"),
         )
       else
         @page = Administrate::Page::Form.new(dashboard, resource)
@@ -46,7 +47,7 @@ module Administrate
       if resource.update(resource_params)
         redirect_to(
           [Administrate::NAMESPACE, resource],
-          notice: notices[:updated],
+          notice: translate("update.success"),
         )
       else
         @page = Administrate::Page::Form.new(dashboard, resource)
@@ -58,7 +59,7 @@ module Administrate
       set_resource
 
       resource.destroy
-      flash[:notice] = notices[:destroyed]
+      flash[:notice] = translate("destroy.success")
       redirect_to action: :index
     end
 
@@ -71,12 +72,8 @@ module Administrate
       end
     end
 
-    def resource_class
-      Object.const_get(resource_class_name)
-    end
-
     def dashboard
-      @dashboard ||= dashboard_class.new
+      @dashboard ||= resource_resolver.dashboard_class.new
     end
 
     def set_resource(resource = nil)
@@ -89,39 +86,29 @@ module Administrate
     end
 
     def resource_params
-      params.require(:"#{resource_name}").permit(*permitted_attributes)
+      params.require(resource_name).permit(*permitted_attributes)
     end
 
     def permitted_attributes
       dashboard.permitted_attributes
     end
 
-    def dashboard_class
-      Object.const_get("#{resource_class_name}Dashboard")
-    end
-
-    def resource_class_name
-      resource_name.to_s.camelcase
-    end
-
     def instance_variable
       "@#{resource_name}"
     end
 
-    def resource_title
-      resource_class_name.titleize
-    end
+    delegate :resource_class, :resource_name, to: :resource_resolver
 
-    def notices
-      {
-        created: "#{resource_title} was successfully created.",
-        updated: "#{resource_title} was successfully updated.",
-        destroyed: "#{resource_title} was successfully destroyed.",
-      }
+    def resource_resolver
+      @resource_resolver ||=
+        Administrate::ResourceResolver.new(controller_path)
     end
 
-    def resource_name
-      controller_name.singularize.to_sym
+    def translate(key)
+      t(
+        "administrate.controller.#{key}",
+        resource: resource_resolver.resource_title,
+      )
     end
   end
 end

data/app/views/fields/show/_has_many.html.erb

@@ -1,5 +1,9 @@
-<%= render(
-  "table",
-  table_presenter: has_many.associated_table,
-  resources: has_many.data
-) %>
+<% if has_many.data.any? %>
+  <%= render(
+    "table",
+    table_presenter: has_many.associated_table,
+    resources: has_many.data
+  ) %>
+<% else %>
+  <%= t("administrate.fields.has_many.none") %>
+<% end %>

data/config/locales/administrate.en.yml

@@ -5,3 +5,13 @@ en:
       edit: Edit
       destroy: Destroy
       confirm: Are you sure?
+    fields:
+      has_many:
+        none: None
+    controller:
+      create:
+        success: "%{resource} was successfully created."
+      update:
+        success: "%{resource} was successfully updated."
+      destroy:
+        success: "%{resource} was successfully destroyed."

data/lib/administrate/fields/has_many.rb

@@ -1,5 +1,5 @@
 require_relative "base"
-require "administrate/pages/table"
+require "administrate/page/table"
 
 module Administrate
   module Field

data/lib/administrate/page.rb

@@ -0,0 +1,4 @@
+module Administrate
+  module Page
+  end
+end

data/lib/administrate/resource_resolver.rb

@@ -0,0 +1,41 @@
+require "administrate/namespace"
+
+module Administrate
+  class ResourceResolver
+    def initialize(controller_path)
+      @controller_path = controller_path
+    end
+
+    def dashboard_class
+      Object.const_get(resource_class_name + "Dashboard")
+    end
+
+    def resource_class
+      Object.const_get(resource_class_name)
+    end
+
+    def resource_name
+      model_path_parts.map(&:underscore).join("__").to_sym
+    end
+
+    def resource_title
+      model_path_parts.join(" ")
+    end
+
+    private
+
+    def resource_class_name
+      model_path_parts.join("::")
+    end
+
+    def model_path_parts
+      controller_path_parts.map(&:camelize)
+    end
+
+    def controller_path_parts
+      controller_path.singularize.split("/") - [Administrate::NAMESPACE.to_s]
+    end
+
+    attr_reader :controller_path
+  end
+end

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/generators/administrate/dashboard/dashboard_generator.rb

@@ -3,6 +3,8 @@ require "rails/generators/named_base"
 module Administrate
   module Generators
     class DashboardGenerator < Rails::Generators::NamedBase
+      TABLE_ATTRIBUTE_LIMIT = 4
+
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_definition

data/lib/generators/administrate/dashboard/templates/dashboard.rb.erb

@@ -16,8 +16,11 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
 
   # This method returns an array of attributes
   # that will be displayed on the model's index page.
+  #
+  # By default, it's limited to four items to reduce clutter on index pages.
+  # Feel free to remove the limit or customize the returned array.
   def table_attributes
-    attributes
+    attributes.first(<%= TABLE_ATTRIBUTE_LIMIT %>)
   end
 
   # This method returns an array of attributes

data/lib/generators/administrate/install/templates/application_controller.rb

@@ -10,4 +10,14 @@ class Admin::ApplicationController < Administrate::ApplicationController
   def authenticate_admin
     # TODO Add authentication logic here.
   end
+
+  def index
+    super
+
+    flash[:alert] =
+      "For performance, Administrate limits the index page to show 20 items.
+      Customize this action to update/remove the limit,
+      or implement the pagination library of your choice."
+    @resources = @resources.limit(20)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neat
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: normalize-rails
   requirement: !ruby/object:Gem::Requirement
@@ -152,10 +166,12 @@ files:
 - lib/administrate/fields/image.rb
 - lib/administrate/fields/string.rb
 - lib/administrate/namespace.rb
-- lib/administrate/pages/base.rb
-- lib/administrate/pages/form.rb
-- lib/administrate/pages/show.rb
-- lib/administrate/pages/table.rb
+- lib/administrate/page.rb
+- lib/administrate/page/base.rb
+- lib/administrate/page/form.rb
+- lib/administrate/page/show.rb
+- lib/administrate/page/table.rb
+- lib/administrate/resource_resolver.rb
 - lib/administrate/version.rb
 - lib/generators/administrate/dashboard/USAGE
 - lib/generators/administrate/dashboard/dashboard_generator.rb