releaf-content 0.2.1 → 1.0.3

data/app/services/releaf/content/node/copy.rb

@@ -0,0 +1,90 @@
+module Releaf
+  module Content::Node
+    class Copy
+      include Releaf::Content::Node::Service
+      attribute :parent_id, Integer, strict: false
+
+      def call
+        prevent_infinite_copy_loop
+        begin
+          new_node = nil
+          node.class.transaction do
+            new_node = make_copy
+          end
+          new_node
+        rescue ActiveRecord::RecordInvalid
+          add_error_and_raise 'descendant invalid'
+        else
+          node.update_settings_timestamp
+        end
+      end
+
+      def prevent_infinite_copy_loop
+        return if node.self_and_descendants.find_by_id(parent_id).blank?
+        add_error_and_raise("source or descendant node can't be parent of new node")
+      end
+
+      def duplicate_under
+        new_node = nil
+        node.class.transaction do
+          new_node = node.class.new
+          new_node.assign_attributes_from(node)
+          new_node.content_id = duplicate_content.try(:id)
+          new_node.prevent_auto_update_settings_timestamp do
+            Releaf::Content::Node::SaveUnderParent.call(node: new_node, parent_id: parent_id)
+          end
+        end
+        new_node
+      end
+
+      def duplicate_content
+        return if node.content_id.blank?
+
+        new_content = node.content.class.new(cloned_content_attributes)
+        duplicate_content_dragonfly_attributes(new_content)
+
+        new_content.save!
+        new_content
+      end
+
+      def cloned_content_attributes
+        skippable_attribute_names = ["id"] + content_dragonfly_attributes
+        node.content.attributes.except(*skippable_attribute_names)
+      end
+
+      def duplicate_content_dragonfly_attributes(new_content)
+        content_dragonfly_attributes.each do |attribute_name|
+          accessor_name = attribute_name.gsub("_uid", "")
+          dragonfly_attachment = node.content.send(accessor_name)
+
+          if dragonfly_attachment.present?
+            begin
+              dragonfly_attachment.path  # verify that the file exists
+            rescue Dragonfly::Job::Fetch::NotFound
+              dragonfly_attachment = nil
+            end
+          end
+
+          new_content.send("#{attribute_name}=", nil)
+          new_content.send("#{accessor_name}=", dragonfly_attachment)
+        end
+      end
+
+      def content_dragonfly_attributes
+        node.content.class.attribute_names.select do |attribute_name|
+          Releaf::Builders::Utilities::ResolveAttributeFieldMethodName.new(object: node.content, attribute_name: attribute_name).file?
+        end
+      end
+
+      def make_copy
+        new_node = duplicate_under
+
+        node.children.each do |child|
+          self.class.new(node: child, parent_id: new_node.id).make_copy
+        end
+
+        new_node
+      end
+    end
+  end
+end

data/app/services/releaf/content/node/move.rb

@@ -0,0 +1,21 @@
+module Releaf
+  module Content::Node
+    class Move
+      include Releaf::Content::Node::Service
+      attribute :parent_id, Integer, strict: false
+
+      def call
+        return if node.parent_id.to_i == parent_id
+
+        node.class.transaction do
+          Releaf::Content::Node::SaveUnderParent.call(node: node, parent_id: parent_id)
+
+          node.descendants.each do |descendant_node|
+            next if descendant_node.valid?
+            add_error_and_raise("descendant invalid")
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/releaf/content/node/save_under_parent.rb

@@ -0,0 +1,22 @@
+module Releaf
+  module Content::Node
+    class SaveUnderParent
+      include Releaf::Content::Node::Service
+      attribute :parent_id, Integer, strict: false
+
+      def call
+        node.parent_id = parent_id
+        if node.validate_root_locale_uniqueness?
+          # When copying root nodes it is important to reset locale to nil.
+          # Later user should fill in locale. This is needed to prevent
+          # Rails errors about conflicting routes.
+          node.locale = nil
+        end
+
+        node.maintain_name
+        node.reasign_slug
+        node.save!
+      end
+    end
+  end
+end

data/app/services/releaf/content/node/service.rb

@@ -0,0 +1,17 @@
+module Releaf
+  module Content::Node
+    module Service
+      extend ActiveSupport::Concern
+      include Releaf::Service
+
+      included do
+        attribute :node, Releaf::Content::Node
+      end
+
+      def add_error_and_raise(error)
+        node.errors.add(:base, error)
+        raise ActiveRecord::RecordInvalid.new(node)
+      end
+    end
+  end
+end

data/app/validators/releaf/content/node/singleness_validator.rb

@@ -1,28 +1,5 @@
 module Releaf
   module Content::Node
-    # Validator to test if node is valid, when created under given parrent node
-    #
-    # validator needs :for and :under options, both can be either array of classes
-    # or single class.
-    #
-    # :for option specifies for which nodes validation should be applied
-    #
-    # :under option specifies under which nodes only single node of given type
-    # should be valid.
-    # If under is unspecified, then only single node with given class can be
-    # created under entrie content tree.
-    #
-    # @example
-    #
-    #   class Node < ActiveRecord::Base
-    #     includes Releaf::Content::Node
-    #     validates_with Releaf::Content::Node::ParentValidator, for: [Text, Book], under: Store
-    #   end
-    #
-    # In the example above, Text node or book node can be added in any leve
-    # under Store node, but only once.
-    # However they can be added to any other node as many times as needed, as
-    # long as none of ancestors are Store node.
     class SinglenessValidator < ActiveModel::Validator
 
       def validate node
@@ -67,7 +44,7 @@ module Releaf
         # return some other parent, than @node.parent.ancestors, even though
         # both return same node.
         # Seams like a bug in AwesomeNestedSet (in case of @node.parent.ancestors).
-        parent_node = Node.find(@node.parent_id)
+        parent_node = @node.class.find(@node.parent_id)
 
         ancestor_node = parent_node.self_and_ancestors.where(content_type: ancestor_class_names).reorder(:depth).last
         if ancestor_node.nil?

data/lib/releaf-content.rb

@@ -1,6 +1,85 @@
-require 'releaf/content/router_proxy'
-require 'releaf/content/node_mapper'
-require 'releaf/content/engine'
-require 'releaf/content/acts_as_node'
-require 'releaf/content/node'
-require 'releaf/content/route'
+require 'awesome_nested_set'
+require 'stringex'
+
+module Releaf::Content
+  require 'releaf/content/engine'
+  require 'releaf/content/configuration'
+  require 'releaf/content/router_proxy'
+  require 'releaf/content/node_mapper'
+  require 'releaf/content/acts_as_node'
+  require 'releaf/content/node'
+  require 'releaf/content/route'
+
+  # expose configuration wrapper methods as class methods for easier access
+  # so that, for example,
+  # Releaf::Content.models
+  # can be used instead of
+  # Releaf::Content.configuration.models
+  class << self
+    delegate :resources, :models, :default_model, :controllers, :routing, to: :configuration
+  end
+
+  def self.configuration
+    Releaf.application.config.content
+  end
+
+  def self.configure_component
+    Releaf.application.config.add_configuration(
+      Releaf::Content::Configuration.new(
+        resources: { 'Node' => { controller: 'Releaf::Content::NodesController' } }
+      )
+    )
+  end
+
+  def self.initialize_component
+    Rails.application.config.middleware.use Releaf::Content::RoutesReloader
+
+    ActiveSupport.on_load :action_controller do
+      ActionDispatch::Routing::Mapper.send(:include, Releaf::Content::NodeMapper)
+    end
+  end
+
+  def self.draw_component_routes(router)
+    resources.each do |_model_name, options|
+      draw_resource_routes(router, options)
+    end
+  end
+
+  def self.draw_resource_routes router, options
+    route_params = resource_route_params options
+
+    router.releaf_resources(*route_params) do
+      router.collection do
+        router.get :content_type_dialog
+        router.get :generate_url
+      end
+
+      router.member do
+        router.get :copy_dialog
+        router.post :copy
+        router.get :move_dialog
+        router.post :move
+      end
+    end
+  end
+
+  def self.resource_route_params options
+    # Releaf::Content::NodesController -> releaf/content/nodes
+    controller_path = options[:controller].constantize.controller_path
+    controller_path_parts = controller_path.split('/')
+
+    resources_name = controller_path_parts.last
+
+    route_options = {
+      # releaf/content/nodes -> releaf/content
+      module: controller_path_parts.slice(0...-1).join('/'),
+
+      # releaf/content/nodes -> releaf_content_nodes
+      as: controller_path.gsub(/\//, '_'),
+
+      except: [:show]
+    }
+
+    [ resources_name, route_options ]
+  end
+end

data/lib/releaf/content/acts_as_node.rb

@@ -10,11 +10,6 @@ module ActsAsNode
 
   module ClassMethods
 
-    # Load all nodes for class
-    def nodes
-      ::Node.where(content_type: self.name)
-    end
-
     # There are no configuration options yet.
     #
     def acts_as_node(params: nil, fields: nil)

data/lib/releaf/content/acts_as_node/active_record/acts/node.rb

@@ -22,7 +22,7 @@ module ActiveRecord
 
         def acts_as_node_params
           if acts_as_node_configuration[:params].nil?
-            Releaf::Core::ResourceParams.new(self).values << :id
+            Releaf::ResourceParams.new(self).values << :id
           else
             acts_as_node_configuration[:params] << :id
           end
@@ -33,7 +33,7 @@ module ActiveRecord
         # @return [Array] list of fields to display
         def acts_as_node_fields
           if acts_as_node_configuration[:fields].nil?
-            Releaf::Core::ResourceFields.new(self).values
+            Releaf::ResourceFields.new(self).values
           else
             acts_as_node_configuration[:fields]
           end
@@ -43,12 +43,6 @@ module ActiveRecord
       # All the methods available to a record that has had <tt>acts_as_node</tt> specified.
       module InstanceMethods
 
-        # Return object corresponding node object
-        # @return [::Node]
-        def node
-          ::Node.find_by(content_type: self.class.name, content_id: id)
-        end
-
       end
     end
   end

data/lib/releaf/content/configuration.rb

@@ -0,0 +1,61 @@
+module Releaf::Content
+  class Configuration
+    include Virtus.model(strict: true)
+    attribute :resources, Hash
+
+    def resources=(value)
+      verify_resources_config(value)
+      super
+    end
+
+    def verify_resources_config(resource_config)
+      # perform some basic config structure validation
+      unless resource_config.is_a? Hash
+        raise Releaf::Error, "Releaf.application.config.content.resources must be a Hash"
+      end
+
+      resource_config.each do | key, values |
+        unless key.is_a? String
+          raise Releaf::Error, "Releaf.application.config.content.resources must have string keys"
+        end
+        unless values.is_a? Hash
+          raise Releaf::Error, "#{key} in Releaf.application.config.content.resources must have a hash value"
+        end
+        unless values[:controller].is_a? String
+          raise Releaf::Error, "#{key} in Releaf.application.config.content.resources must have controller class specified as a string"
+        end
+      end
+    end
+
+    def models
+      model_names.map(&:constantize)
+    end
+
+    def model_names
+      @model_names ||= resources.keys
+    end
+
+    def default_model
+      models.first
+    end
+
+    def controllers
+      controller_names.map(&:constantize)
+    end
+
+    def controller_names
+      @controller_names ||=  resources.values.map { |options| options[:controller] }
+    end
+
+    def routing
+      @routing ||= resources.map do | node_class_name, options |
+        routing = options[:routing] || {}
+        routing[:site]        ||= nil
+        routing[:constraints] ||= nil
+        [ node_class_name, routing ]
+      end.to_h
+    end
+
+  end
+
+end

data/lib/releaf/content/engine.rb

@@ -1,40 +1,7 @@
-require 'awesome_nested_set'
-require 'stringex'
-
 module Releaf::Content
-  require 'releaf/content/builders_autoload'
   class Engine < ::Rails::Engine
     initializer 'precompile', group: :all do |app|
-      app.config.assets.precompile += %w(releaf/controllers/releaf/content/*)
+      app.config.assets.precompile += %w(controllers/releaf/content/*)
     end
   end
-
-  def self.initialize_component
-    Rails.application.config.middleware.use Releaf::Content::RoutesReloader
-  end
-
-  def self.draw_component_routes router
-    router.namespace :releaf, path: nil do
-      router.namespace :content, path: nil do
-        router.releaf_resources :nodes, except: [:show] do
-          router.collection do
-            router.get :content_type_dialog
-            router.get :generate_url
-            router.get :go_to_dialog
-          end
-
-          router.member do
-            router.get :copy_dialog
-            router.post :copy
-            router.get :move_dialog
-            router.post :move
-          end
-        end
-      end
-    end
-  end
-
-  ActiveSupport.on_load :action_controller do
-    ActionDispatch::Routing::Mapper.send(:include, Releaf::Content::NodeMapper)
-  end
 end

data/lib/releaf/content/node.rb

@@ -1,13 +1,12 @@
 module Releaf::Content
   module Node
     extend ActiveSupport::Concern
-    # TODO Node should be configurable
 
       def locale_selection_enabled?
         false
       end
 
-      def build_content(params = {}, assignment_options = nil)
+      def build_content(params = {})
         self.content = content_class.new(params)
       end
 
@@ -17,11 +16,18 @@ module Releaf::Content
 
       # Return node public path
       def path
-        if parent
-          parent.path + "/" + slug.to_s
-        else
-          "/" + slug.to_s
-        end
+        "/" + path_parts.join("/") + (trailing_slash_for_path? ? "/" : "")
+      end
+
+      def path_parts
+        list = []
+        list += parent.path_parts if parent
+        list << slug.to_s
+        list
+      end
+
+      def trailing_slash_for_path?
+        Rails.application.routes.default_url_options[:trailing_slash] == true
       end
 
       def to_s
@@ -45,40 +51,21 @@ module Releaf::Content
       end
 
       def attributes_to_not_copy
-        %w[content_id depth id item_position lft rgt slug created_at updated_at]
+        list = %w[content_id depth id item_position lft rgt slug created_at updated_at]
+        list << "locale" if locale_before_type_cast.blank?
+        list
       end
 
       def attributes_to_copy
         self.class.column_names - attributes_to_not_copy
       end
 
-      def copy parent_id
-        prevent_infinite_copy_loop(parent_id)
-        begin
-          new_node = nil
-          self.class.transaction do
-            new_node = _copy!(parent_id)
-          end
-          new_node
-        rescue ActiveRecord::RecordInvalid
-          add_error_and_raise 'descendant invalid'
-        else
-          update_settings_timestamp
-        end
+      def copy(parent_id)
+        Releaf::Content::Node::Copy.call(node: self, parent_id: parent_id)
       end
 
-      def move parent_id
-        return if parent_id.to_i == self.parent_id
-
-        self.class.transaction do
-          save_under(parent_id)
-          descendants.each do |node|
-            next if node.valid?
-            add_error_and_raise 'descendant invalid'
-          end
-        end
-
-        self
+      def move(parent_id)
+        Releaf::Content::Node::Move.call(node: self, parent_id: parent_id)
       end
 
       # Maintain unique name within parent_id scope.
@@ -118,59 +105,18 @@ module Releaf::Content
         self_and_ancestors.where(active: false).any? == false
       end
 
-      def add_error_and_raise error
-        errors.add(:base, error)
-        raise ActiveRecord::RecordInvalid.new(self)
-      end
-
-      def duplicate_content
-        return nil if content_id.blank?
-
-        new_content = content.dup
-        new_content.save!
-        new_content
-      end
-
-      def copy_attributes_from node
-        node.attributes_to_copy.each do |attribute|
-          send("#{attribute}=", node.send(attribute))
-        end
-      end
-
-      def duplicate_under! parent_id
-        new_node = nil
-        self.class.transaction do
-          new_node = self.class.new
-          new_node.copy_attributes_from self
-          new_node.content_id = duplicate_content.try(:id)
-          new_node.prevent_auto_update_settings_timestamp do
-            new_node.save_under(parent_id)
-          end
-        end
-        new_node
-      end
-
       def reasign_slug
         self.slug = nil
         ensure_unique_url
       end
 
-      def save_under target_parent_node_id
-        self.parent_id = target_parent_node_id
-        if validate_root_locale_uniqueness?
-          # When copying root nodes it is important to reset locale to nil.
-          # Later user should fill in locale. This is needed to prevent
-          # Rails errors about conflicting routes.
-          self.locale = nil
+      def assign_attributes_from(source_node)
+        source_node.attributes_to_copy.each do |attribute|
+          send("#{attribute}=", source_node.send(attribute))
         end
-
-        self.item_position = self.class.children_max_item_position(self.parent) + 1
-        maintain_name
-        reasign_slug
-        save!
       end
 
-      def prevent_auto_update_settings_timestamp &block
+      def prevent_auto_update_settings_timestamp
         original = @prevent_auto_update_settings_timestamp
         @prevent_auto_update_settings_timestamp = true
         yield
@@ -178,12 +124,16 @@ module Releaf::Content
         @prevent_auto_update_settings_timestamp = original
       end
 
-      protected
+      def update_settings_timestamp
+        self.class.updated
+      end
 
       def validate_root_locale_uniqueness?
         locale_selection_enabled? && root?
       end
 
+      protected
+
       def validate_parent_node_is_not_self
         return if parent_id.nil?
         return if parent_id.to_i != id
@@ -198,28 +148,10 @@ module Releaf::Content
 
       private
 
-      def _copy! parent_id
-        new_node = duplicate_under! parent_id
-
-        children.each do |child|
-          child.send(:_copy!, new_node.id)
-        end
-        new_node
-      end
-
-      def prevent_infinite_copy_loop(parent_id)
-        return if self_and_descendants.find_by_id(parent_id).blank?
-        add_error_and_raise("source or descendant node can't be parent of new node")
-      end
-
       def prevent_auto_update_settings_timestamp?
         @prevent_auto_update_settings_timestamp == true
       end
 
-      def update_settings_timestamp
-        self.class.updated
-      end
-
     module ClassMethods
       def updated_at
         Releaf::Settings['releaf.content.nodes.updated_at']
@@ -254,7 +186,7 @@ module Releaf::Content
 
     included do
       acts_as_nested_set order_column: :item_position
-      acts_as_list scope: :parent_id, column: :item_position
+      acts_as_list scope: :parent_id, column: :item_position, add_new_at: :bottom
 
       default_scope { order(:item_position) }
       scope :active, ->() { where(active: true) }
@@ -266,9 +198,6 @@ module Releaf::Content
       validates_presence_of :parent, if: :parent_id?
       validate :validate_parent_node_is_not_self
       validate :validate_parent_is_not_descendant
-
-      alias_attribute :to_text, :name
-
       belongs_to :content, polymorphic: true, dependent: :destroy
       accepts_nested_attributes_for :content