RubyGems - releaf-core - Versions diffs - 0.2.1 → 1.0.3 - Mend

releaf-core 0.2.1 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (256) hide show

data/app/builders/releaf/builders/page/layout_builder.rb CHANGED Viewed

@@ -1,155 +1,165 @@
-class Releaf::Builders::Page::LayoutBuilder
-  include Releaf::Builders::Base
-  include Releaf::Builders::Template
+module Releaf::Builders::Page
+  class LayoutBuilder
+    include Releaf::Builders::Base
+    include Releaf::Builders::Template
+    def output(&block)
+      doctype.html_safe << tag(:html) do
+        head << body(&block)
+      end
+    end
-  def output(&block)
-    doctype.html_safe << tag(:html) do
-      head << body(&block)
+    def doctype
+      "<!DOCTYPE html>"
     end
-  end
-  def doctype
-    "<!DOCTYPE html>"
-  end
+    def head
+      tag(:head) do
+        head_blocks
+      end
+    end
-  def head
-    tag(:head) do
-      head_blocks
+    def body
+      tag(:body, body_atttributes) do
+        body_content{ yield } << assets(:javascripts, :javascript_include_tag)
+      end
     end
-  end
-  def body(&block)
-    tag(:body, class: body_classes) do
-      body_content(&block) << assets(:javascripts, :javascript_include_tag)
+    def body_atttributes
+      {class: body_classes, "data-settings-path" => settings_path}
+    end
+    def settings_path
+      url_for(action: "store_settings", controller: "/releaf/root", only_path: true)
     end
-  end
-  def body_content(&block)
-    if access_control.authorized?
+    def body_content(&block)
       header << menu << tag(:main, id: "main", &block) << notifications
-    else
-      yield
     end
-  end
-  def notifications
-    tag(:div, nil, class: 'notifications', 'data' => {'close-text' => t("Close")})
-  end
+    def notifications
+      tag(:div, nil, class: 'notifications', 'data' => {'close-text' => t("Close")})
+    end
-  def header
-    tag(:header, header_builder.new(template).output)
-  end
+    def header
+      tag(:header, header_builder.new(template).output)
+    end
-  def header_builder
-    Releaf::Builders::Page::HeaderBuilder
-  end
+    def header_builder
+      Releaf::Builders::Page::HeaderBuilder
+    end
-  def menu
-    tag(:aside, menu_builder.new(template).output)
-  end
+    def menu
+      tag(:aside, menu_builder.new(template).output)
+    end
-  def menu_builder
-    Releaf::Builders::Page::MenuBuilder
-  end
+    def menu_builder
+      Releaf::Builders::Page::MenuBuilder
+    end
-  def assets(type, tag_method)
-    safe_join do
-      send(type).collect do |asset|
-        template.send(tag_method, asset)
+    def assets(type, tag_method)
+      safe_join do
+        send(type).collect do |asset|
+          template.send(tag_method, asset)
+        end
       end
     end
-  end
-  def body_classes
-    list = []
-    list << "application-#{Rails.application.class.parent_name.downcase}"
-    list += controller_body_classes
-    list << "view-#{controller.active_view}"  if controller.respond_to? :active_view
-    list << "side-compact" if layout_settings("releaf.side.compact")
-    list
-  end
+    def body_classes
+      list = []
+      list << "application-#{Rails.application.class.parent_name.downcase}"
+      list += controller_body_classes
+      list << "view-#{controller.active_view}"  if controller.respond_to? :active_view
+      list << "side-compact" if layout_settings("releaf.side.compact")
+      list
+    end
-  def controller_classes
-    ancestors = controller.class.ancestors.grep(Class)
-    slice_index = ancestors.index(Releaf::BaseController) || (ancestors.index(controller.class) + 1)
-    ancestors[0, slice_index].reverse
-  end
+    def controller_classes
+      ancestors = controller.class.ancestors.grep(Class)
+      slice_index = ancestors.index(Releaf::ActionController) || (ancestors.index(controller.class) + 1)
+      ancestors[0, slice_index].reverse
+    end
-  def controller_body_classes
-    controller_classes.collect do|c_class|
-      "controller-" + c_class.name.gsub(/Controller$/, "").underscore.tr( '_/', '-' )
+    def controller_body_classes
+      controller_classes.collect do|c_class|
+        "controller-" + c_class.name.gsub(/Controller$/, "").underscore.tr( '_/', '-' )
+      end
     end
-  end
-  def head_blocks
-    [title, content_type, favicons, ms_tile, assets(:stylesheets, :stylesheet_link_tag), csrf]
-  end
+    def head_blocks
+      [title, content_type, favicons, ms_tile, assets(:stylesheets, :stylesheet_link_tag), csrf]
+    end
-  def controller_name
-    params[:controller]
-  end
+    def controller_name
+      params[:controller]
+    end
-  def stylesheets
-    Releaf.application.config.assets_resolver.controller_assets(controller_name, :stylesheets)
-  end
+    def assets_resolver
+      Releaf::AssetsResolver
+    end
-  def javascripts
-    Releaf.application.config.assets_resolver.controller_assets(controller_name, :javascripts)
-  end
+    def stylesheets
+      assets_resolver.controller_assets(controller_name, :stylesheets)
+    end
-  def csrf
-    template.csrf_meta_tags
-  end
+    def javascripts
+      assets_resolver.controller_assets(controller_name, :javascripts)
+    end
-  def content_type
-    meta(content: 'text/html; charset=utf-8', 'http-equiv': 'Content-Type')
-  end
+    def csrf
+      template.csrf_meta_tags
+    end
-  def meta(options)
-    tag(:meta, nil, options)
-  end
+    def content_type
+      meta(content: 'text/html; charset=utf-8', 'http-equiv': 'Content-Type')
+    end
-  def title
-    tag(:title) do
-      controller.page_title
+    def meta(options)
+      tag(:meta, nil, options)
     end
-  end
-  def favicon_path
-    File.join('releaf', 'icons')
-  end
+    def title
+      tag(:title) do
+        controller.page_title
+      end
+    end
-  def ms_tile_path
-    favicon_path
-  end
+    def favicon_path
+      File.join('releaf', 'icons')
+    end
-  def ms_tile_color
-    '#151515'
-  end
+    def ms_tile_path
+      favicon_path
+    end
-  def favicon(source, options = {})
-    controller.view_context.favicon_link_tag(File.join(favicon_path, source), options)
-  end
+    def ms_tile_color
+      '#151515'
+    end
-  def apple_favicon(source, options = {})
-    favicon(source, options.merge(rel: 'apple-touch-icon-precomposed', type: 'image/png'))
-  end
+    def favicon(source, options = {})
+      controller.view_context.favicon_link_tag(File.join(favicon_path, source), options)
+    end
-  def favicons
-    [
-      apple_favicon("favicon.png"),
-      apple_favicon("apple-touch-icon-152x152-precomposed.png", sizes: "152x152"),
-      apple_favicon("apple-touch-icon-114x114-precomposed.png", sizes: "114x114"),
-      apple_favicon("apple-touch-icon-72x72-precomposed.png", sizes: "72x72"),
-      favicon("favicon.png", type: 'image/png', rel: 'icon'),
-    ]
-  end
+    def apple_favicon(source, options = {})
+      favicon(source, options.merge(rel: 'apple-touch-icon-precomposed', type: 'image/png'))
+    end
-  def ms_tile
-    tile_path = ActionController::Base.helpers.image_path(File.join(ms_tile_path, 'msapplication-tile-144x144.png'))
-    [
-      meta(name: 'msapplication-TileColor', content: ms_tile_color),
-      meta(name: 'msapplication-TileImage', content: tile_path)
-    ]
+    def favicons
+      [
+        apple_favicon("favicon.png"),
+        apple_favicon("apple-touch-icon-152x152-precomposed.png", sizes: "152x152"),
+        apple_favicon("apple-touch-icon-114x114-precomposed.png", sizes: "114x114"),
+        apple_favicon("apple-touch-icon-72x72-precomposed.png", sizes: "72x72"),
+        favicon("favicon.png", type: 'image/png', rel: 'icon'),
+      ]
+    end
+    def ms_tile
+      tile_path = ActionController::Base.helpers.image_path(File.join(ms_tile_path, 'msapplication-tile-144x144.png'))
+      [
+        meta(name: 'msapplication-TileColor', content: ms_tile_color),
+        meta(name: 'msapplication-TileImage', content: tile_path)
+      ]
+    end
   end
 end

data/app/builders/releaf/builders/page/menu_builder.rb CHANGED Viewed

@@ -1,140 +1,130 @@
-class Releaf::Builders::Page::MenuBuilder
-  include Releaf::Builders::Base
-  include Releaf::Builders::Template
-  class Menu
-    mattr_accessor :access_control
-    def self.build(list, access_control)
-      self.access_control = access_control
-      build_list(list)
+module Releaf::Builders::Page
+  class MenuBuilder
+    include Releaf::InstanceCache
+    include Releaf::Builders::Base
+    include Releaf::Builders::Template
+    def output
+      compacter << tag(:nav, menu_level(Releaf.application.config.menu))
     end
-    def self.build_list(list)
-      list.collect{|item| build_item(item) }.compact
+    def active?(item)
+      instance_cache("active_#{item.class.name}_#{item.name}") do
+        if controller_group?(item)
+          item.controllers.find{|subitem| active?(subitem) }.present?
+        else
+          item.controller_name == controller.short_name
+        end
+      end
     end
-    def self.build_item(source_item)
-      item = source_item.dup
-      item[:items] = build_list(item.fetch(:items, []))
-      item.delete(:items) if item[:items].empty?
+    def menu_level(items)
+      level_content = items.map{|item| menu_item(item) }.compact
+      tag(:ul){ level_content } if level_content.present?
+    end
-      if item[:items]
-        item[:active]  = item[:items].find{|i| i[:active] == true }.present?
-        item[:url_helper] = item[:items].first[:url_helper] if item[:items].present?
-        item
-      elsif access_control.controller_permitted?(item[:controller])
-        item[:active] = active_controller?(item[:controller])
-        item
-      else
-        nil
+    def menu_item(item)
+      tag(:li, item_attributes(item)) do
+        if controller_group?(item)
+          menu_item_group(item)
+        else
+          menu_item_single(item)
+        end
       end
     end
-    def self.active_controller?(controller_name)
-      access_control.current_controller_name == controller_name
+    def controller_group?(item)
+      item.respond_to? :controllers
     end
-  end
-  def output
-    menu_items = Menu.build(Releaf.application.config.menu, access_control)
-    compacter << tag(:nav, menu_level(menu_items))
-  end
-  def menu_level(items)
-    tag(:ul) do
-      items.collect{|item| menu_item(item) }
+    def menu_item_single(item)
+      tag(:a, class: "trigger", href: item.path) do
+        item_name_content(item)
+      end
     end
-  end
-  def menu_item(item)
-    tag(:li, item_attributes(item)) do
-      if item[:items]
-        tag(:span, class: "trigger") do
-          item_name_content(item) << item_collapser(item)
-        end << menu_level(item[:items])
-      else
-        tag(:a, class: "trigger", href: url_for(item[:url_helper])) do
-          item_name_content(item)
-        end
-      end
+    def menu_item_group(item)
+      tag(:span, class: "trigger") do
+        item_name_content(item) << item_collapser(item)
+      end << menu_level(item.controllers)
     end
-  end
-  def collapsed_item?(item)
-    item[:items] && !item[:active] && layout_settings("releaf.menu.collapsed.#{item[:name]}") == true
-  end
+    def collapsed_item?(item)
+      controller_group?(item) && !active?(item) && layout_settings("releaf.menu.collapsed.#{item.name}") == true
+    end
-  def item_attributes(item)
-    attributes = {
-      class: [],
-      data: {
-        name: item[:name]
+    def item_attributes(item)
+      attributes = {
+        class: item_classes(item),
+        data: {
+          name: item.name
+        }
       }
-    }
-    attributes[:class] << "collapsed" if collapsed_item?(item)
-    attributes[:class] << "active" if item[:active]
-    attributes.delete(:class) if attributes[:class].empty?
-    attributes
-  end
+      attributes.delete(:class) if attributes[:class].empty?
+      attributes
+    end
+    def item_classes(item)
+      list = []
+      list << "collapsed" if collapsed_item?(item)
+      list << "active" if active?(item)
+      list
+    end
-  def item_name_content(item)
-    item_full_name    = t(item[:name], scope: "admin.controllers")
-    item_abbreviation = item_name_abbreviation( item_full_name )
+    def item_name_content(item)
+      item_full_name    = item.localized_name
+      item_abbreviation = item_name_abbreviation( item_full_name )
-    tag(:abbr, item_abbreviation, title: item_full_name) + tag(:span, item_full_name, class: "name")
-  end
+      tag(:abbr, item_abbreviation, title: item_full_name) + tag(:span, item_full_name, class: "name")
+    end
-  def item_name_abbreviation( item_full_name )
-    return "" if item_full_name.blank?
-    # use the first two letters after the last slash that is not preceded by a space
-    # to avoid identical abbreviations for namespaced items in case of missing translations
-    # but still use the first word in cases of user-entered slashes, e.g. "Inputs / Outputs"
-    item_full_name.split(/(?<!\s)\//).last.to_s[0..1].mb_chars.capitalize
-  end
+    def item_name_abbreviation( item_full_name )
+      return "" if item_full_name.blank?
+      # use the first two letters after the last slash that is not preceded by a space
+      # to avoid identical abbreviations for namespaced items in case of missing translations
+      # but still use the first word in cases of user-entered slashes, e.g. "Inputs / Outputs"
+      item_full_name.split(/(?<!\s)\//).last.to_s[0..1].mb_chars.capitalize
+    end
-  def item_collapser(item)
-    tag(:span, class: "collapser") do
-      tag(:button, type: "button") do
-        item_collapser_icon(item)
+    def item_collapser(item)
+      tag(:span, class: "collapser") do
+        tag(:button, type: "button") do
+          item_collapser_icon(item)
+        end
       end
     end
-  end
-  def compact_side?
-    layout_settings('releaf.side.compact')
-  end
-  def item_collapser_icon(item)
-    if compact_side?
-      icon("chevron-right")
-    else
-      icon(collapsed_item?(item) ? "chevron-down" : "chevron-up")
+    def compact_side?
+      layout_settings('releaf.side.compact')
     end
-  end
-  def compacter
-    tag(:div, class: "compacter") do
+    def item_collapser_icon(item)
       if compact_side?
-        icon_name = "angle-double-right"
-        title_attribute = 'title-expand'
+        icon("chevron-right")
       else
-        icon_name = "angle-double-left"
-        title_attribute = 'title-collapse'
+        icon(collapsed_item?(item) ? "chevron-down" : "chevron-up")
       end
-      button(nil, icon_name, title: compacter_data[title_attribute], data: compacter_data )
     end
-  end
-  def compacter_data
-    {
-      'title-expand'   => t("Expand", scope: :admin),
-      'title-collapse' => t("Collapse", scope: :admin)
-    }
-  end
+    def compacter
+      tag(:div, class: "compacter") do
+        if compact_side?
+          icon_name = "angle-double-right"
+          title_attribute = 'title-expand'
+        else
+          icon_name = "angle-double-left"
+          title_attribute = 'title-collapse'
+        end
+        button(nil, icon_name, title: compacter_data[title_attribute], data: compacter_data )
+      end
+    end
+    def compacter_data
+      {
+        'title-expand'   => t("Expand", scope: :admin),
+        'title-collapse' => t("Collapse", scope: :admin)
+      }
+    end
+  end
 end

data/app/builders/releaf/builders/refused_destroy_dialog_builder.rb CHANGED Viewed

@@ -2,10 +2,11 @@ class Releaf::Builders::RefusedDestroyDialogBuilder
   include Releaf::Builders::ResourceDialog
   def section_body
+    message = "Deletion of %{resource} restricted due to existing relations:"
     tag(:div, class: "body") do
       [
         icon("ban"),
-        tag(:div, t("Deletion of %{resource} was refused due to existing relations:", default: "Deletion of %{resource} restricted, due to existing relations:", resource: resource_to_text(resource)), class: "description"),
+        tag(:div, t(message, default: message, resource: resource_title(resource)), class: "description"),
         restricted_relations
       ]
     end
@@ -22,13 +23,7 @@ class Releaf::Builders::RefusedDestroyDialogBuilder
   end
   def relation_description(relation, key)
-      (
-        unless relation[:controller].nil?
-          I18n.t(relation[:controller], scope: 'admin.controllers')
-        else
-          I18n.t(key, scope: 'admin.controllers')
-        end
-      ) << " (#{relation[:objects].count})"
+    "#{resource.class.human_attribute_name(key)} (#{relation[:objects].count})"
   end
   def relation_objects(relation)
@@ -41,10 +36,10 @@ class Releaf::Builders::RefusedDestroyDialogBuilder
   def relation_objects_item(item, relation)
     tag(:li) do
-      unless relation[:controller].nil?
-        link_to(resource_to_text(item), controller: relation[:controller], action: "edit", id: item)
+      if relation[:controller].nil?
+        resource_title(item)
       else
-        resource_to_text(item)
+        link_to(resource_title(item), controller: relation[:controller], action: "edit", id: item)
       end
     end
   end
@@ -58,7 +53,7 @@ class Releaf::Builders::RefusedDestroyDialogBuilder
   def footer_primary_tools
     [
-      button(t("Ok"), "check", href: index_url, data: {type: 'cancel'})
+      button(t("Ok"), "check", href: index_path, data: {type: 'cancel'})
     ]
   end

data/app/builders/releaf/builders/resource_view.rb CHANGED Viewed

@@ -14,13 +14,13 @@ module Releaf::Builders::ResourceView
   end
   def section_header_text
-    resource.new_record? ? t("Create new resource") : resource_to_text(resource)
+    resource.new_record? ? t("Create new resource") : resource_title(resource)
   end
   def section_header_extras
     return unless feature_available? :toolbox
     tag(:div, class: "extras toolbox-wrap") do
-      toolbox(resource, index_url: index_url)
+      toolbox(resource, index_path: index_path)
     end
   end
@@ -45,10 +45,10 @@ module Releaf::Builders::ResourceView
   end
   def back_to_list?
-    feature_available?(:index) && params[:index_url].present?
+    feature_available?(:index) && params[:index_path].present?
   end
   def back_to_list_button
-    button(t("Back to list"), "caret-left", class: "secondary", href: index_url)
+    button(t("Back to list"), "caret-left", class: "secondary", href: index_path)
   end
 end