administrate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be86082070f80aad91eef0098bfd4eeabdc19e72
-  data.tar.gz: 974b398b126fa3a2a013037ca7fc8edebc2bb698
+  metadata.gz: cd6b7e88304b6a4b6255696bd3e09757f8dc9fa1
+  data.tar.gz: 46632cb11d7f960f33f89177d41e6be93407c200
 SHA512:
-  metadata.gz: b3dad40ff964f01b2e7f1bdcbca7344729d80697b9b9626b8d312909292606cc2ec5464c0dc6bc29d3cf2891493b1f7032f26fac0674aa7ea02f02f4e970b1b4
-  data.tar.gz: 5f631a841cc0212d8f0f693b257f69462768c5c53baeb4730d378b51d2fc4fdd2c76291624b191f8482f5f13b8c6b70fb3fa064938ffdf663081ad1148d494c0
+  metadata.gz: 0fd234605bdad1d95b25a2bd494df96ec9450d15c31500349edc4045daaea79da1acf394627a0930e3b487ffd5d9b9a43e30c27da6df07b674973e026adce839
+  data.tar.gz: aca5e1ea7517a2eca432c8edd9394cbf9be95e630c8de24f86eb2c9d63405bca2a8c7f28a4f29033a99dfaad0b385d70c7c16ad2a0416432f63a1b4d6afdb2c0

data/app/views/administrate/application/_sidebar.html.erb

@@ -4,11 +4,11 @@
 This partial is used to display the sidebar in Administrate.
 By default, the sidebar contains navigation links
 for all resources in the admin dashboard,
-as defined by the DashboardManifest.
+as defined by the routes in the `admin/` namespace
 %>
 
 <ul class="sidebar__list">
-  <% DashboardManifest::DASHBOARDS.each do |resource| %>
+  <% Administrate::Namespace.new(namespace).resources.each do |resource| %>
     <li>
       <%= link_to(
         display_resource_name(resource),

data/lib/administrate/base_dashboard.rb

@@ -1,14 +1,14 @@
-require "administrate/fields/belongs_to"
-require "administrate/fields/boolean"
-require "administrate/fields/date_time"
-require "administrate/fields/email"
-require "administrate/fields/has_many"
-require "administrate/fields/has_one"
-require "administrate/fields/image"
-require "administrate/fields/number"
-require "administrate/fields/polymorphic"
-require "administrate/fields/string"
-require "administrate/fields/text"
+require "administrate/field/belongs_to"
+require "administrate/field/boolean"
+require "administrate/field/date_time"
+require "administrate/field/email"
+require "administrate/field/has_many"
+require "administrate/field/has_one"
+require "administrate/field/image"
+require "administrate/field/number"
+require "administrate/field/polymorphic"
+require "administrate/field/string"
+require "administrate/field/text"
 
 module Administrate
   class BaseDashboard

data/lib/administrate/engine.rb

@@ -14,6 +14,7 @@ require "administrate/page/collection"
 require "administrate/order"
 require "administrate/resource_resolver"
 require "administrate/search"
+require "administrate/namespace"
 
 module Administrate
   class Engine < ::Rails::Engine

data/lib/administrate/namespace.rb

@@ -0,0 +1,29 @@
+module Administrate
+  class Namespace
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def resources
+      namespace_controller_paths.uniq.map do |controller|
+        controller.gsub(/^#{namespace}\//, "").to_sym
+      end
+    end
+
+    private
+
+    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
+      Rails.application.routes.routes.map do |route|
+        route.defaults[:controller].to_s
+      end
+    end
+  end
+end

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.1.3"
+  VERSION = "0.1.4".freeze
 end

data/lib/generators/administrate/field/templates/field_object.rb.erb

@@ -1,4 +1,4 @@
-require "administrate/fields/base"
+require "administrate/field/base"
 
 class <%= class_name %>Field < Administrate::Field::Base
   def to_s

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

@@ -1,5 +1,6 @@
 require "rails/generators/base"
 require "administrate/generator_helpers"
+require "administrate/namespace"
 
 module Administrate
   module Generators
@@ -7,6 +8,13 @@ module Administrate
       include Administrate::GeneratorHelpers
       source_root File.expand_path("../templates", __FILE__)
 
+      def run_routes_generator
+        if dashboard_resources.none?
+          call_generator("administrate:routes")
+          load Rails.root.join("config/routes.rb")
+        end
+      end
+
       def create_dashboard_controller
         copy_file(
           "application_controller.rb",
@@ -14,12 +22,6 @@ module Administrate
         )
       end
 
-      def insert_dashboard_routes
-        unless File.read(rails_routes_file_path).include?(dashboard_routes)
-          route(dashboard_routes)
-        end
-      end
-
       def run_dashboard_generators
         singular_dashboard_resources.each do |resource|
           call_generator("administrate:dashboard", resource)
@@ -33,27 +35,7 @@ module Administrate
       end
 
       def dashboard_resources
-        manifest::DASHBOARDS
-      end
-
-      def manifest
-        unless defined?(DashboardManifest)
-          call_generator("administrate:manifest")
-        end
-
-        DashboardManifest
-      end
-
-      def dashboard_routes
-        File.read(routes_file_path)
-      end
-
-      def rails_routes_file_path
-        Rails.root.join("config/routes.rb")
-      end
-
-      def routes_file_path
-        File.expand_path(find_in_source_paths("routes.rb"))
+        Administrate::Namespace.new(:admin).resources
       end
     end
   end

data/lib/generators/administrate/{manifest/manifest_generator.rb → routes/routes_generator.rb}

@@ -1,16 +1,16 @@
 Rails.application.eager_load!
 require "rails/generators/base"
+require "administrate/namespace"
 
 module Administrate
   module Generators
-    class ManifestGenerator < Rails::Generators::Base
+    class RoutesGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
 
-      def create_dashboard_manifest
-        template(
-          "dashboard_manifest.rb.erb",
-          Rails.root.join("app/dashboards/dashboard_manifest.rb"),
-        )
+      def insert_dashboard_routes
+        unless File.read(rails_routes_file_path).include?(dashboard_routes)
+          route(dashboard_routes)
+        end
       end
 
       def warn_about_invalid_models
@@ -22,6 +22,7 @@ module Administrate
         models_without_tables.each do |invalid_model|
           puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
           puts "         It is not connected to a database table."
+          puts "         Make sure your database migrations are up to date."
         end
 
         unnamed_constants.each do |invalid_model|
@@ -60,6 +61,18 @@ module Administrate
       def unnamed_constants
         ActiveRecord::Base.descendants.reject { |d| d.name == d.to_s }
       end
+
+      def dashboard_routes
+        ERB.new(File.read(routes_file_path)).result(binding)
+      end
+
+      def rails_routes_file_path
+        Rails.root.join("config/routes.rb")
+      end
+
+      def routes_file_path
+        File.expand_path(find_in_source_paths("routes.rb.erb"))
+      end
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Grayson Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
@@ -268,21 +268,22 @@ files:
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
 - lib/administrate/engine.rb
-- lib/administrate/fields/associative.rb
-- lib/administrate/fields/base.rb
-- lib/administrate/fields/belongs_to.rb
-- lib/administrate/fields/boolean.rb
-- lib/administrate/fields/date_time.rb
-- lib/administrate/fields/deferred.rb
-- lib/administrate/fields/email.rb
-- lib/administrate/fields/has_many.rb
-- lib/administrate/fields/has_one.rb
-- lib/administrate/fields/image.rb
-- lib/administrate/fields/number.rb
-- lib/administrate/fields/polymorphic.rb
-- lib/administrate/fields/string.rb
-- lib/administrate/fields/text.rb
+- lib/administrate/field/associative.rb
+- lib/administrate/field/base.rb
+- lib/administrate/field/belongs_to.rb
+- lib/administrate/field/boolean.rb
+- lib/administrate/field/date_time.rb
+- lib/administrate/field/deferred.rb
+- lib/administrate/field/email.rb
+- lib/administrate/field/has_many.rb
+- lib/administrate/field/has_one.rb
+- lib/administrate/field/image.rb
+- lib/administrate/field/number.rb
+- lib/administrate/field/polymorphic.rb
+- lib/administrate/field/string.rb
+- lib/administrate/field/text.rb
 - lib/administrate/generator_helpers.rb
+- lib/administrate/namespace.rb
 - lib/administrate/order.rb
 - lib/administrate/page.rb
 - lib/administrate/page/base.rb
@@ -308,9 +309,8 @@ files:
 - lib/generators/administrate/field/templates/field_object.rb.erb
 - lib/generators/administrate/install/install_generator.rb
 - lib/generators/administrate/install/templates/application_controller.rb
-- lib/generators/administrate/install/templates/routes.rb
-- lib/generators/administrate/manifest/manifest_generator.rb
-- lib/generators/administrate/manifest/templates/dashboard_manifest.rb.erb
+- lib/generators/administrate/routes/routes_generator.rb
+- lib/generators/administrate/routes/templates/routes.rb.erb
 - lib/generators/administrate/views/edit_generator.rb
 - lib/generators/administrate/views/field_generator.rb
 - lib/generators/administrate/views/form_generator.rb

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

@@ -1,7 +0,0 @@
-namespace :admin do
-    DashboardManifest::DASHBOARDS.each do |dashboard_resource|
-      resources dashboard_resource
-    end
-
-    root controller: DashboardManifest::ROOT_DASHBOARD, action: :index
-  end

data/lib/generators/administrate/manifest/templates/dashboard_manifest.rb.erb

@@ -1,25 +0,0 @@
-# DashboardManifest tells Administrate which dashboards to display
-class DashboardManifest
-  # `DASHBOARDS`
-  # a list of dashboards to display in the side navigation menu
-  #
-  # These are all of the rails models that we found in your database
-  # at the time you installed Administrate.
-  #
-  # To show or hide dashboards, add or remove the model name from this list.
-  # Dashboards returned from this method must be Rails models for Administrate
-  # to work correctly.
-  DASHBOARDS = [
-<% dashboard_resources.each do |model| -%>
-    :<%= model %>,
-<% end -%>
-  ]
-
-  # `ROOT_DASHBOARD`
-  # the name of the dashboard that will be displayed
-  # at "http://your_site.com/admin"
-  #
-  # This dashboard will likely be the first page that admins see
-  # when they log into the dashboard.
-  ROOT_DASHBOARD = DASHBOARDS.first
-end