administrate 0.4.0 → 0.5.0

data/docs/customizing_page_views.md

@@ -0,0 +1,78 @@
+# Customizing page views
+
+In order to change the appearance of any page,
+you can write custom Rails views.
+
+## Customizing for all resources
+
+The easiest way to get started is by using the built-in generators.
+In order to change the appearance of views for all resource types,
+call the generators with no arguments.
+
+```bash
+rails generate administrate:views:index
+ # -> app/views/admin/application/index.html.erb
+ # -> app/views/admin/application/_table.html.erb
+
+rails generate administrate:views:show
+ # -> app/views/admin/application/show.html.erb
+
+rails generate administrate:views:edit
+ # -> app/views/admin/application/edit.html.erb
+ # -> app/views/admin/application/_form.html.erb
+
+rails generate administrate:views:new
+ # -> app/views/admin/application/new.html.erb
+ # -> app/views/admin/application/_form.html.erb
+
+rails generate administrate:views
+ # -> all of the above
+```
+
+The generators copy over the default views that Administrate uses,
+so you have a good starting point for customizations.
+Feel free to change up the file type,
+add extra sections to the page,
+or blow it all away for your own custom look.
+
+## Customizing for a specific resource
+
+In order to change a dashboard page for a single type of resource,
+pass in the resource name to the view generators.
+
+```bash
+rails generate administrate:views:index User
+ # -> app/views/admin/users/index.html.erb
+ # -> app/views/admin/users/_table.html.erb
+
+rails generate administrate:views:show User
+ # -> app/views/admin/users/show.html.erb
+
+rails generate administrate:views:edit User
+ # -> app/views/admin/users/edit.html.erb
+ # -> app/views/admin/users/_form.html.erb
+
+rails generate administrate:views:new User
+ # -> app/views/admin/users/new.html.erb
+ # -> app/views/admin/users/_form.html.erb
+
+rails generate administrate:views User
+ # -> all of the above
+```
+
+Any changes to these template files
+will *only* affect pages that display customers,
+and will leave the show pages for other resources unchanged.
+
+## Customizing layouts
+
+Many developers need to customize the layouts of their admin dashboard.
+It's so easy that pass in the "layout" key word to the view generators.
+
+```bash
+rails generate administrate:views:layout
+ # -> app/views/layouts/admin/application.html.erb
+ # -> app/views/admin/application/_sidebar.html.erb
+ # -> app/views/admin/application/_javascript.html.erb
+ # -> app/views/admin/application/_flashes.html.erb
+```

data/docs/getting_started.md

@@ -0,0 +1,60 @@
+# Getting Started
+
+Administrate is released as a Ruby gem, and can be installed on Rails
+applications version 4.2 or greater.
+
+Add the following to your Gemfile:
+
+```ruby
+# Gemfile
+gem "administrate"
+```
+
+Re-bundle, then run the installer:
+
+```bash
+$ rails generate administrate:install
+```
+
+The installer adds some new routes to your `config/routes.rb`,
+and creates a controller at `app/controllers/admin/application_controller.rb`
+
+In addition, the generator creates a `Dashboard` and a `Controller` for each of
+your ActiveRecord resources:
+
+- `app/controllers/admin/foos_controller.rb`
+- `app/dashboards/foo_dashboard.rb`
+
+The `Admin::ApplicationController` can be customized to add
+authentication logic, authorization, pagination,
+or other controller-level concerns.
+
+The routes can be customized to show or hide
+different models on the dashboard.
+
+Each `FooDashboard` specifies which attributes should be displayed
+on the admin dashboard for the `Foo` resource.
+
+Each `Admin::FooController` can be overwritten to specify custom behavior.
+
+Once you have Administrate installed,
+visit <http://localhost:3000/admin> to see your new dashboard in action.
+
+## Create Additional Dashboards
+
+In order to create additional dashboards, pass in the resource name to 
+the dashboard generator. A dashboard and controller will be created.
+
+```bash
+$ rails generate administrate:dashboard Foo
+```
+
+Add a route for the new dashboard.
+
+```ruby
+# config/routes.rb
+
+namespace :admin do
+  resources :foos
+end
+```

data/lib/administrate/field/has_many.rb

@@ -36,8 +36,8 @@ module Administrate
         self.class.permitted_attribute(attribute)
       end
 
-      def resources
-        data.limit(limit)
+      def resources(page = 1)
+        data.page(page).per(limit)
       end
 
       def more_than_limit?
@@ -47,7 +47,12 @@ module Administrate
       private
 
       def candidate_resources
-        associated_class.all
+        if options.key?(:includes)
+          includes = options.fetch(:includes)
+          associated_class.includes(*includes).all
+        else
+          associated_class.all
+        end
       end
 
       def display_candidate_resource(resource)

data/lib/administrate/field/number.rb

@@ -7,23 +7,31 @@ module Administrate
         if data.nil?
           "-"
         else
-          format_string % data
+          format_string % value
         end
       end
 
       private
 
       def format_string
-        prefix + "%.#{decimals}f"
+        prefix + "%.#{decimals}f" + suffix
       end
 
       def prefix
         options[:prefix].to_s
       end
 
+      def suffix
+        options[:suffix].to_s
+      end
+
       def decimals
         options.fetch(:decimals, 0)
       end
+
+      def value
+        data * options.fetch(:multiplier, 1)
+      end
     end
   end
 end

data/lib/administrate/namespace.rb

@@ -5,8 +5,14 @@ module Administrate
     end
 
     def resources
-      namespace_controller_paths.uniq.map do |controller|
-        controller.gsub(/^#{namespace}\//, "").to_sym
+      @resources ||= routes.map(&:first).uniq.map(&:to_sym)
+    end
+
+    def routes
+      @routes ||= all_routes.select do |controller, _action|
+        controller.starts_with?(namespace.to_s)
+      end.map do |controller, action|
+        [controller.gsub(/^#{namespace}\//, ""), action]
       end
     end
 
@@ -14,15 +20,9 @@ module Administrate
 
     attr_reader :namespace
 
-    def namespace_controller_paths
-      all_controller_paths.select do |controller|
-        controller.starts_with?(namespace.to_s)
-      end
-    end
-
-    def all_controller_paths
+    def all_routes
       Rails.application.routes.routes.map do |route|
-        route.defaults[:controller].to_s
+        route.defaults.values_at(:controller, :action).map(&:to_s)
       end
     end
   end

data/lib/administrate/resource_resolver.rb

@@ -35,7 +35,7 @@ module Administrate
     end
 
     def controller_path_parts
-      controller_path.singularize.split("/")[1..-1]
+      controller_path.split("/")[1..-1].map(&:singularize)
     end
 
     attr_reader :controller_path

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

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

@@ -1,5 +1,5 @@
 namespace :admin do
-    <% dashboard_resources.each do |resource| %>resources :<%= resource %>
-<% end %>
+<% dashboard_resources.each do |resource| %>    resources :<%= resource %>
+<%end%>
     root to: "<%= dashboard_resources.first %>#index"
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
+- Nick Charlton
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -28,16 +29,16 @@ dependencies:
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta.6
 - !ruby/object:Gem::Dependency
   name: datetime_picker_rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +57,30 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +113,14 @@ dependencies:
   name: normalize-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -184,6 +185,7 @@ description: |
   - Break up the library into core components and plugins,
     so each component stays small and easy to maintain.
 email:
+- nick@nickcharlton.net
 - grayson@thoughtbot.com
 executables: []
 extensions: []
@@ -279,9 +281,11 @@ files:
 - config/locales/administrate.fr.yml
 - config/locales/administrate.it.yml
 - config/locales/administrate.ja.yml
+- config/locales/administrate.ko.yml
 - config/locales/administrate.nl.yml
 - config/locales/administrate.pl.yml
 - config/locales/administrate.pt-BR.yml
+- config/locales/administrate.pt.yml
 - config/locales/administrate.ru.yml
 - config/locales/administrate.sv.yml
 - config/locales/administrate.uk.yml
@@ -291,6 +295,13 @@ files:
 - config/routes.rb
 - config/secrets.yml
 - config/unicorn.rb
+- docs/adding_custom_field_types.md
+- docs/authentication.md
+- docs/customizing_attribute_partials.md
+- docs/customizing_controller_actions.md
+- docs/customizing_dashboards.md
+- docs/customizing_page_views.md
+- docs/getting_started.md
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
 - lib/administrate/engine.rb