administrate 0.1.2 → 0.1.3

data/config/locales/administrate.uk.yml

@@ -0,0 +1,23 @@
+---
+uk:
+  administrate:
+    actions:
+      confirm: Ви впевнені?
+      destroy: Видалити
+      edit: Редагувати
+      show: Показати
+    controller:
+      create:
+        success: "%{resource} було успішно створено."
+      destroy:
+        success: "%{resource} було успішно видалено."
+      update:
+        success: "%{resource} було успішно оновлено."
+    fields:
+      has_many:
+        more: "%{count} із %{total_count}"
+        none: Немає
+      polymorphic:
+        not_supported: Поліморфні відношення у формах не підтримуються.
+      has_one:
+        not_supported: HasOne відношення у формах не підтримуються.

data/lib/administrate/engine.rb

@@ -1,5 +1,4 @@
 require "datetime_picker_rails"
-require "inline_svg"
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
@@ -9,7 +8,6 @@ require "sass-rails"
 require "selectize-rails"
 require "sprockets/railtie"
 
-require "administrate/namespace"
 require "administrate/page/form"
 require "administrate/page/show"
 require "administrate/page/collection"
@@ -20,5 +18,7 @@ require "administrate/search"
 module Administrate
   class Engine < ::Rails::Engine
     isolate_namespace Administrate
+
+    Engine.config.assets.precompile << /\.(?:svg)\z/
   end
 end

data/lib/administrate/fields/deferred.rb

@@ -15,7 +15,9 @@ module Administrate
       end
 
       def ==(other)
-        deferred_class == other.deferred_class && options == other.options
+        other.respond_to?(:deferred_class) &&
+          deferred_class == other.deferred_class &&
+          options == other.options
       end
 
       def searchable?

data/lib/administrate/generator_helpers.rb

@@ -0,0 +1,13 @@
+module Administrate
+  module GeneratorHelpers
+    def call_generator(generator, *args)
+      Rails::Generators.invoke(generator, args, generator_options)
+    end
+
+    private
+
+    def generator_options
+      { behavior: behavior }
+    end
+  end
+end

data/lib/administrate/resource_resolver.rb

@@ -1,5 +1,3 @@
-require "administrate/namespace"
-
 module Administrate
   class ResourceResolver
     def initialize(controller_path)
@@ -10,6 +8,10 @@ module Administrate
       Object.const_get(resource_class_name + "Dashboard")
     end
 
+    def namespace
+      controller_path.split("/").first
+    end
+
     def resource_class
       Object.const_get(resource_class_name)
     end
@@ -33,7 +35,7 @@ module Administrate
     end
 
     def controller_path_parts
-      controller_path.singularize.split("/") - [Administrate::NAMESPACE.to_s]
+      controller_path.singularize.split("/")[1..-1]
     end
 
     attr_reader :controller_path

data/lib/administrate/search.rb

@@ -1,3 +1,6 @@
+require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/object/blank"
+
 module Administrate
   class Search
     def initialize(resolver, term)

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/administrate/view_generator.rb

@@ -1,7 +1,10 @@
 require "rails/generators/base"
+require "administrate/generator_helpers"
 
 module Administrate
   class ViewGenerator < Rails::Generators::Base
+    include Administrate::GeneratorHelpers
+
     private
 
     def self.template_source_path

data/lib/generators/administrate/assets/assets_generator.rb

@@ -0,0 +1,13 @@
+require "administrate/view_generator"
+
+module Administrate
+  module Generators
+    class AssetsGenerator < Administrate::ViewGenerator
+      def copy_assets
+        call_generator("administrate:assets:images")
+        call_generator("administrate:assets:javascripts")
+        call_generator("administrate:assets:stylesheets")
+      end
+    end
+  end
+end

data/lib/generators/administrate/assets/images_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators/base"
+
+module Administrate
+  module Generators
+    module Assets
+      class ImagesGenerator < Rails::Generators::Base
+        IMAGES_PATH = "app/assets/images/administrate"
+
+        source_root File.expand_path("../../../../../", __FILE__)
+
+        def copy_images
+          directory IMAGES_PATH, IMAGES_PATH
+        end
+      end
+    end
+  end
+end

data/lib/generators/administrate/assets/javascripts_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators/base"
+
+module Administrate
+  module Generators
+    module Assets
+      class JavascriptsGenerator < Rails::Generators::Base
+        JAVASCRIPTS_PATH = "app/assets/javascripts/administrate"
+
+        source_root File.expand_path("../../../../../", __FILE__)
+
+        def copy_javascripts
+          directory JAVASCRIPTS_PATH, JAVASCRIPTS_PATH
+        end
+      end
+    end
+  end
+end

data/lib/generators/administrate/assets/stylesheets_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators/base"
+
+module Administrate
+  module Generators
+    module Assets
+      class StylesheetsGenerator < Rails::Generators::Base
+        STYLESHEETS_PATH = "app/assets/stylesheets/administrate"
+
+        source_root File.expand_path("../../../../../", __FILE__)
+
+        def copy_stylesheets
+          directory STYLESHEETS_PATH, STYLESHEETS_PATH
+        end
+      end
+    end
+  end
+end

data/lib/generators/administrate/dashboard/USAGE

@@ -3,7 +3,7 @@ Description:
     pulling the attributes from database columns.
 
 Example:
-    rails generate dashboard FooBar
+    rails generate administrate:dashboard FooBar
 
     This will create:
         app/dashboards/foo_bar_dashboard.rb

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

@@ -7,6 +7,7 @@ module Administrate
         boolean: "Field::Boolean",
         date: "Field::DateTime",
         datetime: "Field::DateTime",
+        enum: "Field::String",
         float: "Field::Number",
         integer: "Field::Number",
         time: "Field::DateTime",
@@ -15,6 +16,7 @@ module Administrate
       }
 
       ATTRIBUTE_OPTIONS_MAPPING = {
+        enum: { searchable: false },
         float: { decimals: 2 },
       }
 
@@ -25,14 +27,18 @@ module Administrate
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_definition
-        template "dashboard.rb.erb", "app/dashboards/#{file_name}_dashboard.rb"
+        template(
+          "dashboard.rb.erb",
+          Rails.root.join("app/dashboards/#{file_name}_dashboard.rb"),
+        )
       end
 
       def create_resource_controller
-        template(
-          "controller.rb.erb",
+        destination = Rails.root.join(
           "app/controllers/admin/#{file_name.pluralize}_controller.rb",
         )
+
+        template("controller.rb.erb", destination)
       end
 
       private
@@ -61,7 +67,7 @@ module Administrate
       end
 
       def field_type(attribute)
-        type = klass.column_types[attribute.to_s].type
+        type = column_type_for_attribute(attribute.to_s)
 
         if type
           ATTRIBUTE_TYPE_MAPPING.fetch(type, DEFAULT_FIELD_TYPE) +
@@ -71,6 +77,19 @@ module Administrate
         end
       end
 
+      def column_type_for_attribute(attr)
+        if enum_column?(attr)
+          :enum
+        else
+          klass.column_types[attr].type
+        end
+      end
+
+      def enum_column?(attr)
+        klass.respond_to?(:defined_enums) &&
+          klass.defined_enums.keys.include?(attr)
+      end
+
       def association_type(attribute)
         relationship = klass.reflections[attribute.to_s]
         if relationship.has_one?

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

@@ -28,7 +28,13 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
 
   # SHOW_PAGE_ATTRIBUTES
   # an array of attributes that will be displayed on the model's show page.
-  SHOW_PAGE_ATTRIBUTES = ATTRIBUTE_TYPES.keys
+  SHOW_PAGE_ATTRIBUTES = [
+<%=
+  attributes.map do |attr|
+    "    :#{attr},"
+  end.join("\n")
+%>
+  ]
 
   # FORM_ATTRIBUTES
   # an array of attributes that will be displayed

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

@@ -1,9 +1,10 @@
-Rails.application.eager_load!
 require "rails/generators/base"
+require "administrate/generator_helpers"
 
 module Administrate
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      include Administrate::GeneratorHelpers
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_controller
@@ -13,79 +14,44 @@ module Administrate
         )
       end
 
-      def create_dashboard_manifest
-        template(
-          "dashboard_manifest.rb.erb",
-          "app/dashboards/dashboard_manifest.rb"
-        )
-      end
-
       def insert_dashboard_routes
-        route(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|
-          Rails::Generators.invoke("administrate:dashboard", [resource])
-        end
-      end
-
-      def warn_about_invalid_models
-        namespaced_models.each do |invalid_model|
-          puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
-          puts "         Administrate does not yet support namespaced models."
-        end
-
-        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."
-        end
-
-        unnamed_constants.each do |invalid_model|
-          puts "NOTICE: Skipping dynamically generated model #{invalid_model}."
+          call_generator("administrate:dashboard", resource)
         end
       end
 
       private
 
       def singular_dashboard_resources
-        dashboard_resources.map(&:singularize)
+        dashboard_resources.map(&:to_s).map(&:singularize)
       end
 
       def dashboard_resources
-        valid_dashboard_models.map do |model|
-          model.to_s.pluralize.underscore
-        end
+        manifest::DASHBOARDS
       end
 
-      def valid_dashboard_models
-        database_models - invalid_database_models
-      end
-
-      def database_models
-        ActiveRecord::Base.descendants
-      end
-
-      def invalid_database_models
-        models_without_tables + namespaced_models + unnamed_constants
-      end
-
-      def models_without_tables
-        database_models.reject(&:table_exists?)
-      end
-
-      def namespaced_models
-        database_models.select { |model| model.to_s.include?("::") }
-      end
+      def manifest
+        unless defined?(DashboardManifest)
+          call_generator("administrate:manifest")
+        end
 
-      def unnamed_constants
-        ActiveRecord::Base.descendants.reject { |d| d.name == d.to_s }
+        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"))
       end

data/lib/generators/administrate/manifest/manifest_generator.rb

@@ -0,0 +1,65 @@
+Rails.application.eager_load!
+require "rails/generators/base"
+
+module Administrate
+  module Generators
+    class ManifestGenerator < 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"),
+        )
+      end
+
+      def warn_about_invalid_models
+        namespaced_models.each do |invalid_model|
+          puts "WARNING: Unable to generate a dashboard for #{invalid_model}."
+          puts "         Administrate does not yet support namespaced models."
+        end
+
+        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."
+        end
+
+        unnamed_constants.each do |invalid_model|
+          puts "NOTICE: Skipping dynamically generated model #{invalid_model}."
+        end
+      end
+
+      private
+
+      def dashboard_resources
+        valid_dashboard_models.map do |model|
+          model.to_s.pluralize.underscore
+        end
+      end
+
+      def valid_dashboard_models
+        database_models - invalid_database_models
+      end
+
+      def database_models
+        ActiveRecord::Base.descendants
+      end
+
+      def invalid_database_models
+        models_without_tables + namespaced_models + unnamed_constants
+      end
+
+      def models_without_tables
+        database_models.reject(&:table_exists?)
+      end
+
+      def namespaced_models
+        database_models.select { |model| model.to_s.include?("::") }
+      end
+
+      def unnamed_constants
+        ActiveRecord::Base.descendants.reject { |d| d.name == d.to_s }
+      end
+    end
+  end
+end