releaf-content 0.2.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a8d9437be334b0617ec00d8c8e3e4ea14b35dc6
-  data.tar.gz: 095e4645884b45c38afb81fa0157b80454e14027
+  metadata.gz: a92a25dd1de2d98500cd222715e05dd21e94cb18
+  data.tar.gz: a7848332149b045a748fc54c0902b196bdd5fa78
 SHA512:
-  metadata.gz: ce189035ffd84c6abdea56c57ad9d3a5d55b7074ab458d746b4faa7374b67b1e37739db42d71609b449fd1ae34c85d072cf1eeeb73c8c4da627ceb48e41980d9
-  data.tar.gz: 65a20465658ed0a1edef3723b909fe6d5522e46546dfbb321176a888428b7ed6956ee97d9ebb5141ff75cf306d938949be98f0da0057a77d725f93cfe507dca6
+  metadata.gz: 88f2a678dd20c27235a12788e5b35df3472afc85770592b60f89fed4b4ce1986351b7ed1309228e02eeac60cd56cefe4b02c21dd4c20fe9e22d6baa9cdf8012b
+  data.tar.gz: c80f6a024ac41fccc540b88259485ddc7afd94dc40bba9e640aed34ce62926629156e19ab8225b18280b0c1c21984249ad44ce768c7b07e4cf5c7ce3cded7152

data/LICENSE

@@ -1,24 +1,22 @@
 Copyright (c) 2012, CubeSystems <info@cubesystems.lv>
-All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the CubeSystems nor the names of its contributors may
-      be used to endorse or promote products derived from this software without
-      specific prior written permission.
+MIT License
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL CubeSystems BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/builders/releaf/content/builders/action_dialog.rb

@@ -53,8 +53,16 @@ module Releaf::Content::Builders
       super << confirm_button
     end
 
+    def confirm_button_text
+      t(action.to_s.humanize)
+    end
+
+    def confirm_button_attributes
+      {class: "primary", type: "submit", data: { type: 'ok', disable: true}}
+    end
+
     def confirm_button
-      button(t(action), "check", class: "primary", type: "submit", data: { type: 'ok', disable: true })
+      button(confirm_button_text, "check", confirm_button_attributes)
     end
   end
 end

data/app/builders/releaf/content/builders/tree.rb

@@ -56,7 +56,7 @@ module Releaf::Content::Builders
     def tree_resource_collapser(resource, expanded)
       return if resource.children.empty?
       tag(:div, class: "collapser-cell") do
-        button(nil, (expanded ? 'chevron-down' : 'chevron-right'), class: %w(secondary collapser trigger), title: t(expanded ? "collapse" : "expand"))
+        button(nil, (expanded ? 'chevron-down' : 'chevron-right'), class: %w(secondary collapser trigger), title: t(expanded ? "Collapse" : "Expand"))
       end
     end
 

data/app/builders/releaf/content/content_type_dialog_builder.rb

@@ -54,7 +54,7 @@ module Releaf::Content
     end
 
     def content_type_item(content_type)
-      url = url_for(controller: "/releaf/content/nodes", action: "new", parent_id: params[:parent_id], content_type: content_type.name)
+      url = url_for(controller: controller.controller_path, action: "new", parent_id: params[:parent_id], content_type: content_type.name)
       tag(:li) do
         link_to(I18n.t(content_type.name.underscore, scope: 'admin.content_types'), url)
       end
@@ -68,7 +68,7 @@ module Releaf::Content
     end
 
     def section_header_text
-      t("Add new node")
+      t("Create new resource")
     end
   end
 end

data/app/builders/releaf/content/nodes/form_builder.rb

@@ -54,7 +54,7 @@ module Releaf::Content::Nodes
     end
 
     def render_slug
-      url = url_for(controller: "/releaf/content/nodes", action: "generate_url", parent_id: object.parent_id, id: object.id)
+      url = url_for(controller: controller.controller_path, action: "generate_url", parent_id: object.parent_id, id: object.id)
       input = {
         data: {'generator-url' => url}
       }
@@ -90,13 +90,13 @@ module Releaf::Content::Nodes
     end
 
     def slug_base_url
-      "#{request.protocol}#{request.host_with_port}#{object.parent.try(:path)}/"
+      "#{request.protocol}#{request.host_with_port}#{object.parent.try(:path)}" + (object.trailing_slash_for_path? ? "" : "/")
     end
 
     def slug_link
       link_to(object.path) do
         safe_join do
-          [slug_base_url, tag(:span, object.slug), '/']
+          [slug_base_url, tag(:span, object.slug), (object.trailing_slash_for_path? ? "/" : "")]
         end
       end
     end

data/app/builders/releaf/content/nodes/index_builder.rb

@@ -9,7 +9,7 @@ module Releaf::Content::Nodes
 
     def tree_resource_toolbox(resource)
       tag(:div, class: "only-icon toolbox-cell") do
-        toolbox(resource, index_url: index_url)
+        toolbox(resource, index_path: index_path)
       end
     end
 

data/app/builders/releaf/content/nodes/toolbox_builder.rb

@@ -5,7 +5,6 @@ module Releaf::Content::Nodes
 
       unless resource.new_record?
         list << add_child_button
-        list << go_to_button unless params[:context] == "index"
         list << copy_button
         list << move_button
       end
@@ -17,10 +16,6 @@ module Releaf::Content::Nodes
       button(t('Add child'), nil, class: "ajaxbox", href: url_for(action: "content_type_dialog", parent_id: resource.id))
     end
 
-    def go_to_button
-      button(t('Go to'), nil, class: "ajaxbox", href: url_for(action: "go_to_dialog"))
-    end
-
     def copy_button
       button(t('Copy'), nil, class: "ajaxbox", href: url_for(action: "copy_dialog", id: resource.id))
     end

data/app/controllers/releaf/content/nodes_controller.rb

@@ -1,166 +1,146 @@
-module Releaf::Content
-  class NodesController < Releaf::BaseController
-    respond_to :json, only: [:create, :update, :copy, :move]
+class Releaf::Content::NodesController < Releaf::ActionController
+  respond_to :json, only: [:create, :update, :copy, :move]
 
-    def setup
-      super
-      @features[:create_another] = false
-    end
-
-    def generate_url
-      tmp_resource = prepare_resource
-      tmp_resource.name = params[:name]
-      tmp_resource.reasign_slug
-
-      respond_to do |format|
-        format.js { render text: tmp_resource.slug }
-      end
-    end
+  def features
+    super - [:create_another, :search]
+  end
 
-    def content_type_dialog
-      @content_types = resource_class.valid_node_content_classes(params[:parent_id]).sort do |a, b|
-        I18n.t(a.name.underscore, scope: 'admin.content_types') <=> I18n.t(b.name.underscore, scope: 'admin.content_types')
-      end
-    end
+  def generate_url
+    tmp_resource = prepare_resource
+    tmp_resource.name = params[:name]
+    tmp_resource.reasign_slug
 
-    def builder_scopes
-      [node_builder_scope] + super
+    respond_to do |format|
+      format.js { render text: tmp_resource.slug }
     end
+  end
 
-    def node_builder_scope
-      [application_scope, "Nodes"].reject(&:blank?).join("::")
+  def content_type_dialog
+    @content_types = resource_class.valid_node_content_classes(params[:parent_id]).sort do |a, b|
+      I18n.t(a.name.underscore, scope: 'admin.content_types') <=> I18n.t(b.name.underscore, scope: 'admin.content_types')
     end
+  end
 
-    def copy_dialog
-      copy_move_dialog_common
-    end
+  def copy_dialog
+    copy_move_dialog_common
+  end
 
-    def move_dialog
-      copy_move_dialog_common
-    end
+  def move_dialog
+    copy_move_dialog_common
+  end
 
-    def copy
-      copy_move_common do |resource|
-        resource.copy params[:new_parent_id]
-      end
+  def copy
+    copy_move_common do |resource|
+      resource.copy params[:new_parent_id]
     end
+  end
 
-    def move
-      copy_move_common do |resource|
-        resource.move params[:new_parent_id]
-      end
+  def move
+    copy_move_common do |resource|
+      resource.move params[:new_parent_id]
     end
+  end
 
-    def go_to_dialog
-      @collection = resource_class.roots
-
-      respond_to do |format|
-        format.html do
-          render layout: nil
-        end
-      end
+  # override base_controller method for adding content tree ancestors
+  # to breadcrumbs
+  def add_resource_breadcrumb(resource)
+    ancestor_nodes(resource).each do |node|
+      @breadcrumbs << { name: node, url: url_for( action: :edit, id: node.id ) }
     end
+    super
+  end
 
-    # override base_controller method for adding content tree ancestors
-    # to breadcrumbs
-    def add_resource_breadcrumb(resource)
-      ancestors = []
-      if resource.new_record?
-        if resource.parent_id
-          ancestors = resource.parent.ancestors
-          ancestors += [resource.parent]
-        end
-      else
-        ancestors = resource.ancestors
-      end
-
-      ancestors.each do |ancestor|
-        @breadcrumbs << { name: ancestor, url: url_for( action: :edit, id: ancestor.id ) }
-      end
-
-      super
+  def ancestor_nodes(resource)
+    if resource.persisted?
+      resource.ancestors.reorder(:depth)
+    elsif resource.new_record? && resource.parent
+      resource.parent.ancestors.reorder(:depth) + [resource.parent]
+    else
+      []
     end
+  end
 
-    def self.resource_class
-      ::Node
-    end
+  def self.resource_class
+    # find first key in content resources config that has this class as controller
+    model_class_name = Releaf::Content.resources.find{|_model_name, options| options[:controller] == name }.first
+    model_class_name.constantize
+  end
 
-    protected
+  protected
 
-    def prepare_index
-      @collection = resource_class.roots
-    end
+  def prepare_index
+    @collection = resource_class.roots
+  end
 
-    private
+  private
 
-    def copy_move_common(&block)
-      @resource = resource_class.find(params[:id])
+  def copy_move_common
+    @resource = resource_class.find(params[:id])
 
-      if params[:new_parent_id].nil?
-        @resource.errors.add(:base, 'parent not selected')
-        respond_with(@resource)
+    if params[:new_parent_id].nil?
+      @resource.errors.add(:base, 'parent not selected')
+      respond_with(@resource)
+    else
+      begin
+        @resource = yield(@resource)
+      rescue ActiveRecord::RecordInvalid => e
+        respond_with(e.record)
       else
-        begin
-          @resource = yield(@resource)
-        rescue ActiveRecord::RecordInvalid => e
-          respond_with(e.record)
-        else
-          resource_class.updated
-          respond_with(@resource, redirect: true, location: url_for(action: :index))
-        end
+        resource_class.updated
+        respond_with(@resource, redirect: true, location: url_for(action: :index))
       end
     end
+  end
 
-    def action_responders
-      super.merge(
-        copy: Releaf::Core::Responders::AfterSaveResponder,
-        move: Releaf::Core::Responders::AfterSaveResponder
-      )
-    end
+  def action_responders
+    super.merge(
+      copy: Releaf::Responders::AfterSaveResponder,
+      move: Releaf::Responders::AfterSaveResponder
+    )
+  end
 
-    def copy_move_dialog_common
-      @resource = resource_class.find params[:id]
-      @collection = resource_class.roots
-    end
+  def copy_move_dialog_common
+    @resource = resource_class.find params[:id]
+    @collection = resource_class.roots
+  end
 
-    def prepare_resource
-      if params[:id]
-        resource_class.find(params[:id])
-      elsif params[:parent_id].present?
-        parent = resource_class.find(params[:parent_id])
-        parent.children.new
-      else
-        resource_class.new
-      end
+  def prepare_resource
+    if params[:id]
+      resource_class.find(params[:id])
+    elsif params[:parent_id].present?
+      parent = resource_class.find(params[:parent_id])
+      parent.children.new
+    else
+      resource_class.new
     end
+  end
 
-    def new_resource
-      super
-      @resource.content_type = node_content_class.name
-      @resource.parent_id = params[:parent_id]
-      @resource.item_position ||= resource_class.children_max_item_position(@resource.parent) + 1
+  def new_resource
+    super
+    @resource.content_type = node_content_class.name
+    @resource.parent_id = params[:parent_id]
+    @resource.item_position ||= resource_class.children_max_item_position(@resource.parent) + 1
 
-      if node_content_class < ActiveRecord::Base
-        @resource.build_content
-        @resource.content_id_will_change!
-      end
+    if node_content_class < ActiveRecord::Base
+      @resource.build_content
+      @resource.content_id_will_change!
     end
+  end
 
-    # Returns valid content type class
-    def node_content_class
-      raise ArgumentError, "invalid content_type" unless ActsAsNode.classes.include? params[:content_type]
-      params[:content_type].constantize
-    end
+  # Returns valid content type class
+  def node_content_class
+    raise ArgumentError, "invalid content_type" unless ActsAsNode.classes.include? params[:content_type]
+    params[:content_type].constantize
+  end
 
-    def permitted_params
-      list = super
-      list += [{content_attributes: permitted_content_attributes}]
-      list -= %w[content_type]
-      list
-    end
+  def permitted_params
+    list = super
+    list += [{content_attributes: permitted_content_attributes}]
+    list -= %w[content_type]
+    list
+  end
 
-    def permitted_content_attributes
-      @resource.content_class.acts_as_node_params if @resource.content_class.respond_to? :acts_as_node_params
-    end
+  def permitted_content_attributes
+    @resource.content_class.acts_as_node_params if @resource.content_class.respond_to? :acts_as_node_params
   end
 end

data/app/middleware/releaf/content/routes_reloader.rb

@@ -6,20 +6,28 @@ module Releaf::Content
     end
 
     def call(env)
-      self.class.reload_if_expired
+      self.class.reload_if_needed
       @app.call(env)
     end
 
+    def self.reset!
+      @updated_at = nil
+    end
+
     def self.routes_loaded
       @updated_at = Time.now
     end
 
-    def self.reload_if_expired
-      # TODO Node class should be configurable
-      return unless ::Node.updated_at.present? && @updated_at && @updated_at < ::Node.updated_at
+    def self.reload_if_needed
+      return unless needs_reload?
       Rails.application.reload_routes!
       routes_loaded
     end
 
+    def self.needs_reload?
+      Releaf::Content.models.any? do | node_class |
+        node_class.updated_at.present? && (@updated_at.nil? || @updated_at < node_class.updated_at)
+      end
+    end
   end
 end