activeadmin 0.4.4 → 0.5.0.pre

data/lib/active_admin/locales/{zh_cn.yml → zh-CN.yml}

@@ -1,4 +1,4 @@
-zh_cn:
+"zh-CN":
   active_admin:
     dashboard: "控制面板"
     dashboard_welcome:
@@ -9,7 +9,9 @@ zh_cn:
     delete: "删除"
     delete_confirmation: "确定删除?"
     new_model: "新建%{model}"
+    create_model: "新建%{model}"
     edit_model: "编辑%{model}"
+    update_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
     cancel: "取消"
@@ -34,7 +36,45 @@ zh_cn:
       one: "显示 <b>1</b> %{model}"
       one_page: "显示 <b>所有 %{n}</b> %{model}"
       multiple: "显示所有 <b>%{total}</b> %{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
+      entry:
+        one: "条目"
+        other: "条目"
     any: "任何"
     blank_slate:
       content: "暂时还没有%{resource_name}."
-      link: "新建一个"
+      link: "新建一个"
+    batch_actions:
+      button_label: "批处理"
+      delete_confirmation: "你确定要删除所有%{plural_model}? 如果执行，将不可恢复."
+      succesfully_destroyed:
+        one: "成功删除 1 %{model}"
+        other: "成功删除 %{count} %{plural_model}"
+      selection_toggle_explanation: "(切换选择)"
+      link: "新建一个"
+      action_label: "%{title} 被选中"
+      labels:
+        destroy: "删除"
+    comments:
+      body: "内容"
+      author: "作者"
+      title: "评论"
+      add: "添加评论"
+      resource: "资源"
+      no_comments_yet: "暂时没有评论"
+      title_content: "(%{count})条评论"
+      errors:
+        empty_text: "评论保存失败，内空不能为空."
+    devise:
+      login:
+        title: "登录"
+        remember_me: "记住我"
+        submit: "登录"
+      reset_password:
+        title: "忘记密码？"
+        submit: "重置密码"
+      change_password:
+        title: "更改您的密码"
+        submit: "更改我的密码"
+      links:
+        sign_in: "登录"
+        forgot_your_password: "忘记密码？"

data/lib/active_admin/locales/zh-TW.yml

@@ -3,7 +3,7 @@
     dashboard: 儀表板
     dashboard_welcome:
       welcome: "歡迎來到 Active Admin 這是預設的儀表板頁面。"
-      call_to_action: "To add dashboard sections, checkout 'app/admin/dashboards.rb'"
+      call_to_action: "要新增儀表板內容，請查看 'app/admin/dashboards.rb'"
     view: "檢視"
     edit: "編輯"
     delete: "刪除"
@@ -43,3 +43,38 @@
     blank_slate:
       content: "尚無 %{resource_name}"
       link: "建立一筆"
+    batch_actions:
+      button_label: "批次作業"
+      delete_confirmation: "您確定要刪除這些 %{plural_model} 嗎？此動作無法復原。"
+      succesfully_destroyed:
+        one: "成功刪除 1 %{model}"
+        other: "成功刪除 %{count} %{plural_model}"
+      selection_toggle_explanation: "(切換選取)"
+      link: "建立一個"
+      action_label: "%{title} 已選取"
+      labels:
+        destroy: "刪除"
+    comments:
+      body: "內文"
+      author: "作者"
+      title: "評論"
+      add: "新增評論"
+      resource: "資源"
+      no_comments_yet: "尚無評論"
+      title_content: "(%{count}) 則評論"
+      errors:
+        empty_text: "評論儲存失敗，不允許空白的內容。"
+    devise:
+      login:
+        title: "登錄"
+        remember_me: "記住我"
+        submit: "登錄"
+      reset_password:
+        title: "忘記密碼？"
+        submit: "重置密碼"
+      change_password:
+        title: "更改您的密碼"
+        submit: "更改我的密碼"
+      links:
+        sign_in: "登錄"
+        forgot_your_password: "忘記密碼？"

data/lib/active_admin/menu.rb

@@ -1,42 +1,67 @@
 module ActiveAdmin
+
+  # Each Namespace builds up it's own menu as the global navigation
+  #
+  # To build a new menu:
+  #
+  #   menu = Menu.new do |m|
+  #     m.add MenuItem.new(:label => "Dashboard", :url => "/")
+  #     m.add MenuItem.new(:label => "Admin", :url => "/admin")
+  #   end
+  #
+  # If you're interested in configuring a menu item, take a look at the
+  # options available in `ActiveAdmin::MenuItem`
+  #
   class Menu
-    
+
+    attr_accessor :children
+
     def initialize
-      @items = []
+      @children = Menu::ItemCollection.new
+
       yield(self) if block_given?
-    end  
-    
-    def add(*args, &block)
-      @items << MenuItem.new(*args, &block)
     end
-    
-    def [](name)
-      items.find{ |i| i.name == name }
+
+    # Add a new MenuItem to the menu
+    #
+    # Example:
+    #   menu = Menu.new
+    #   dash = MenuItem.new :label => "Dashboard"
+    #   menu.add dash
+    #
+    # Accepts as many menu items as you wish to add:
+    #
+    #   menu = Menu.new
+    #   dash = MenuItem.new :label => "Dashboard"
+    #   admin = MenuItem.new :label => "Admin"
+    #   menu.add dash, admin
+    #
+    # @param [MenuItem] menu_items Add as many menu items as you pass in
+    def add(*menu_items)
+      menu_items.each do |menu_item|
+        menu_item.parent = nil
+        @children << menu_item
+      end
     end
-    
-    def items
-      @items.sort
+
+    def [](id)
+      @children.find_by_id(id)
     end
-    
-    def find_by_url(url)
-      recursive_find_by_url(items, url)
+
+    # @return Sorted [Array] of [MenuItem]
+    def items
+      @children.sort
     end
-    
-    private
-    
-    def recursive_find_by_url(collection, url)
-      found = nil
-      collection.each do |item|
-        if item.url == url
-          found = item
-          break
-        else
-          found = recursive_find_by_url(item.children, url)
-          break if found
-        end
+
+    class ItemCollection < Array
+
+      def find_by_id(id)
+        id = MenuItem.generate_item_id(id)
+        find{ |i| i.id == id }
       end
-      found
+
     end
-    
+
   end
+
 end

data/lib/active_admin/menu_builder.rb

@@ -0,0 +1,65 @@
+module ActiveAdmin
+
+  class MenuBuilder
+
+    def self.build_for_namespace(namespace)
+      new(namespace).menu
+    end
+
+    attr_reader :menu
+
+    def initialize(namespace)
+      @namespace = namespace
+    end
+
+    def menu
+      @menu ||= build_menu
+    end
+
+    private
+
+    def namespace
+      @namespace
+    end
+
+    def build_menu
+      menu = Menu.new
+
+      Dashboards.add_to_menu(namespace, menu)
+
+      namespace.resources.each do |resource|
+        register_with_menu(menu, resource) if resource.include_in_menu?
+      end
+
+      menu
+    end
+
+    # Does all the work of registernig a config with the menu system
+    def register_with_menu(menu, resource)
+      # The menu we're going to add this resource to
+      add_to = menu
+
+      # Adding as a child
+      if resource.parent_menu_item_name
+        # Create the parent if it doesn't exist
+        unless menu[resource.parent_menu_item_name]
+          item = MenuItem.new(:label => resource.parent_menu_item_name, :url => "#", :id => resource.parent_menu_item_name)
+          add_to.add(item)
+        end
+
+        add_to = menu[resource.parent_menu_item_name]
+      end
+
+      if add_to[resource.menu_item.id]
+        existing = add_to[resource.menu_item.id]
+        add_to.children.delete(existing)
+        add_to.add(resource.menu_item)
+        resource.menu_item.add(*existing.children)
+      else
+        add_to.add resource.menu_item
+      end
+    end
+
+  end
+
+end

data/lib/active_admin/menu_item.rb

@@ -1,22 +1,63 @@
 module ActiveAdmin
+
   class MenuItem
 
-    attr_accessor :name, :url, :priority, :parent, :display_if_block
+    attr_accessor :id, :label, :url, :priority, :parent, :display_if_block, :children
 
-    def initialize(name, url, priority = 10, options = {})
-      @name, @url, @priority = name, url, priority
-      @children = []
-      @cached_url = {} # Stores the cached url in a hash to allow us to change it and still cache it
+    # Build a new menu item
+    #
+    # @param [Hash] options The options for the menu
+    #
+    # @option options [String, Proc] :label
+    #         The label to display for this menu item. It can either be a String or a 
+    #         Proc. If the option is Proc, it is called each time the label is requested.
+    #
+    # @option options [String] :id
+    #         A custom id to reference this menu item with. If empty an id is automatically 
+    #         generated for you.
+    #
+    # @option options [String, Symbol] :url
+    #         A string or symbol representing the url for this item. If it's a symbol, the
+    #         view will automatically call the method for you.
+    #
+    # @option options [Integer] :priority
+    #         MenuItems are sorted by priority then by label. The lower the priority, the 
+    #         earlier in the menu the item will be displayed.
+    #         Default: 10
+    #
+    # @option options [Proc] :if
+    #         A block for the view to call to decide if this menu item should be displayed.
+    #         The block should return true of false
+    def initialize(options = {})
+      @label    = options[:label]
+      @id       = MenuItem.generate_item_id(options[:id] || label)
+      @url      = options[:url]
+      @priority = options[:priority] || 10
+      @children = Menu::ItemCollection.new
 
-      @display_if_block = options.delete(:if)
+      @display_if_block = options[:if]
 
       yield(self) if block_given? # Builder style syntax
     end
 
-    def add(name, url, priority=10, options = {}, &block)
-      item = MenuItem.new(name, url, priority, options, &block)
-      item.parent = self
-      @children << item
+    def self.generate_item_id(id)
+      id.to_s.downcase.gsub(" ", "_")
+    end
+
+    def label
+      case @label
+      when Proc
+        @label.call
+      else
+        @label.to_s
+      end
+    end
+
+    def add(*menu_items)
+      menu_items.each do |menu_item|
+        menu_item.parent = self
+        @children << menu_item
+      end
     end
 
     def children
@@ -28,7 +69,7 @@ module ActiveAdmin
     end
 
     def dom_id
-      name.downcase.gsub( " ", '_' ).gsub( /[^a-z0-9_]/, '' )
+      id.gsub( " ", '_' ).gsub( /[^a-z0-9_]/, '' )
     end
 
     # Returns an array of the ancestory of this menu item
@@ -40,13 +81,13 @@ module ActiveAdmin
 
     # Returns the child item with the name passed in
     #    @blog_menu["Create New"] => <#MenuItem @name="Create New" >
-    def [](name)
-      @children.find{ |i| i.name == name }
+    def [](id)
+      @children.find_by_id(id)
     end
 
     def <=>(other)
       result = priority <=> other.priority
-      result = name <=> other.name if result == 0
+      result = label <=> other.label if result == 0
       result
     end
 

data/lib/active_admin/namespace.rb

@@ -1,5 +1,6 @@
 require 'active_admin/helpers/settings'
 require 'active_admin/resource_collection'
+require 'active_admin/menu_builder'
 
 module ActiveAdmin
 
@@ -38,7 +39,6 @@ module ActiveAdmin
       @application = application
       @name = name.to_s.underscore.to_sym
       @resources = ResourceCollection.new
-      @menu = Menu.new
       register_module unless root?
       generate_dashboard_controller
     end
@@ -52,7 +52,7 @@ module ActiveAdmin
       # Register the resource
       register_resource_controller(config)
       parse_registration_block(config, &block) if block_given?
-      register_with_menu(config) if config.include_in_menu?
+      reset_menu!
 
       # Ensure that the dashboard is generated
       generate_dashboard_controller
@@ -70,7 +70,7 @@ module ActiveAdmin
       # Register the resource
       register_page_controller(config)
       parse_page_registration_block(config, &block) if block_given?
-      register_with_menu(config) if config.include_in_menu?
+      reset_menu!
 
       config
     end
@@ -100,16 +100,7 @@ module ActiveAdmin
     def unload!
       unload_resources!
       unload_dashboard!
-      unload_menu!
-    end
-
-    # The menu gets built by Active Admin once all the resources have been
-    # loaded. This method gets called to register each resource with the menu system.
-    def load_menu!
-      register_dashboard
-      resources.each do |resource|
-        register_with_menu(resource) if resource.include_in_menu?
-      end
+      reset_menu!
     end
 
     # Returns the first registered ActiveAdmin::Resource instance for a given class
@@ -123,6 +114,14 @@ module ActiveAdmin
       application.send(name)
     end
 
+    def menu
+      @menu ||= MenuBuilder.build_for_namespace(self)
+    end
+
+    def reset_menu!
+      @menu = nil
+    end
+
     protected
 
     # Either returns an existing Resource instance or builds a new
@@ -135,7 +134,6 @@ module ActiveAdmin
       resources.add Page.new(self, name, options)
     end
 
-
     def register_page_controller(config)
       eval "class ::#{config.controller_name} < ActiveAdmin::PageController; end"
       config.controller.active_admin_config = config
@@ -147,6 +145,12 @@ module ActiveAdmin
         const_name = resource.controller_name.split('::').last
         # Remove the const if its been defined
         parent.send(:remove_const, const_name) if parent.const_defined?(const_name)
+
+        # Remove circular references
+        resource.controller.active_admin_config = nil
+        if resource.is_a?(Resource) && resource.dsl
+          resource.dsl.run_registration_block { @config = nil }
+        end
       end
       @resources = ResourceCollection.new
     end
@@ -156,10 +160,6 @@ module ActiveAdmin
       Dashboards.clear_all_sections!
     end
 
-    def unload_menu!
-      @menu = Menu.new
-    end
-
     # Creates a ruby module to namespace all the classes in if required
     def register_module
       eval "module ::#{module_name}; end"
@@ -170,52 +170,22 @@ module ActiveAdmin
       config.controller.active_admin_config = config
     end
 
-    def resource_dsl
-      @resource_dsl ||= ResourceDSL.new
-    end
-
     def parse_registration_block(config, &block)
-      resource_dsl.run_registration_block(config, &block)
-    end
-
-    def page_dsl
-      @page_dsl ||= PageDSL.new
+      config.dsl = ResourceDSL.new(config)
+      config.dsl.run_registration_block(&block)
     end
 
     def parse_page_registration_block(config, &block)
-      page_dsl.run_registration_block(config, &block)
+      PageDSL.new(config).run_registration_block(&block)
     end
 
     # Creates a dashboard controller for this config
     def generate_dashboard_controller
-      eval "class ::#{dashboard_controller_name} < ActiveAdmin::Dashboards::DashboardController; end"
-    end
+      return unless ActiveAdmin::Dashboards.built?
 
-    # Adds the dashboard to the menu
-    def register_dashboard
-      dashboard_path = root? ? :dashboard_path : "#{name}_dashboard_path".to_sym
-      menu.add(I18n.t("active_admin.dashboard"), dashboard_path, 1) unless menu[I18n.t("active_admin.dashboard")]
-    end
-
-    # Does all the work of registernig a config with the menu system
-    def register_with_menu(config)
-      # The menu we're going to add this resource to
-      add_to = menu
-
-      # Adding as a child
-      if config.parent_menu_item_name
-        # Create the parent if it doesn't exist
-        menu.add(config.parent_menu_item_name, '#') unless menu[config.parent_menu_item_name]
-        add_to = menu[config.parent_menu_item_name]
-      end
-
-      # Check if this menu item has already been created
-      if add_to[config.menu_item_name]
-        # Update the url if it's already been created
-        add_to[config.menu_item_name].url = config.route_collection_path
-      else
-        add_to.add(config.menu_item_name, config.route_collection_path, config.menu_item_priority, { :if => config.menu_item_display_if })
-      end
+      eval "class ::#{dashboard_controller_name} < ActiveAdmin::PageController
+              include ActiveAdmin::Dashboards::DashboardController
+            end"
     end
   end
 end