releaf-content 1.1.20 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abc61e8fe67177291cbcffa5d77ce85c5e50a030
-  data.tar.gz: 371628041df47074d2f4a4d1c597e0c517841ea4
+SHA256:
+  metadata.gz: 16cd52d23daee1ce3abda7a5357253113819df7c6a596a73065d9e5484c31543
+  data.tar.gz: 3bb29a935ac7e5c22ce32f744d84b9b52801a565209bb63dd15fe37e34d62aca
 SHA512:
-  metadata.gz: 9f89997edefded50e183b6eb40a8b2a81ddbe6d33a0d91e9f808942d69a1d49a36fb01cd75048e566036577095a223c9fc1d761dbba2a372a974989fff7832b9
-  data.tar.gz: 4b85efb4c08382b67b50056ebb32271c8fddd143c78c2fc7923dc7ad43c03bd14b9ee07b13f56f9d82b54c4cfd350bcaecb90b29fdd2d9a605b6e7a74537f0bd
+  metadata.gz: 90b1d1a9a260b4d5ba4a80e5fcbbef0a692ced52047cc3a67fbfa8a6c060a1310d12bd89ff72f8bda197dca5abd70bfcfe116a6eabe705979953a4158387f9ff
+  data.tar.gz: e26f1e01179b74f453df60f8e4ded8e6067cab9cd7443fe21f317ee94d8f1e2f6eb75a9c107339a41ecb8271dd4a3203b82534c3ed7e99fa797f1efb2c2f818b

data/app/assets/config/releaf_content_manifest.js

@@ -0,0 +1,2 @@
+//= link controllers/releaf/content/nodes.css
+//= link controllers/releaf/content/nodes.js

data/app/assets/javascripts/controllers/releaf/content/nodes.js

@@ -76,17 +76,14 @@ jQuery(function()
                 slug_input.trigger('sluggenerate');
             });
 
-            if (name_input.val() === '')
+            // bind onchange slug generation only if starting out with an empty name
+            name_input.on('change', function()
             {
-                // bind onchange slug generation only if starting out with an empty name
-                name_input.on('change', function()
+                if(slug_input.val().length === 0)
                 {
-                    if(slug_input.val().length === 0)
-                    {
-                        slug_input.trigger('sluggenerate');
-                    }
-                });
-            }
+                    slug_input.trigger('sluggenerate');
+                }
+            });
         }
 
     });

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

@@ -10,7 +10,7 @@ class Releaf::Content::NodesController < Releaf::ActionController
     tmp_resource.name = params[:name]
     tmp_resource.reasign_slug
 
-    render text: tmp_resource.slug
+    render plain: tmp_resource.slug
   end
 
   def content_type_dialog

data/lib/releaf/content/engine.rb

@@ -1,7 +1,7 @@
 module Releaf::Content
   class Engine < ::Rails::Engine
-    initializer 'precompile', group: :all do |app|
-      app.config.assets.precompile += %w(controllers/releaf/content/*)
+    initializer 'releaf_content.assets_precompile', group: :all do |app|
+      app.config.assets.precompile << "releaf_content_manifest.js"
     end
   end
 end

data/lib/releaf/content/node.rb

@@ -218,14 +218,14 @@ module Releaf::Content
       scope :active, ->() { where(active: true) }
 
       validates_presence_of :name, :slug, :content_type
-      validates_uniqueness_of :slug, scope: :parent_id
+      validates_uniqueness_of :slug, scope: :parent_id, case_sensitive: false
       validates_length_of :name, :slug, :content_type, maximum: 255
-      validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?
+      validates_uniqueness_of :locale, scope: :parent_id, if: :validate_root_locale_uniqueness?, case_sensitive: false
       validates_presence_of :parent, if: :parent_id?
       validate :validate_parent_node_is_not_self
       validate :validate_parent_is_not_descendant
       validate :validate_slug
-      belongs_to :content, polymorphic: true, dependent: :destroy
+      belongs_to :content, polymorphic: true, dependent: :destroy, required: false
       accepts_nested_attributes_for :content
 
       after_save :update_settings_timestamp, unless: :prevent_auto_update_settings_timestamp?

data/lib/releaf/content/route.rb

@@ -57,7 +57,6 @@ module Releaf::Content
     # @return [Array] array of Content::Route objects
     def self.for(node_class, node_content_class, default_controller)
       node_class = node_class.constantize if node_class.is_a? String
-
       Releaf::Content::BuildRouteObjects.call(
         node_class: node_class,
         node_content_class: node_content_class,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-content
 version: !ruby/object:Gem::Version
-  version: 1.1.20
+  version: 2.1.0
 platform: ruby
 authors:
 - CubeSystems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.20
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.20
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '3.0'
 description: Content subsystem for releaf
 email: info@cubesystems.lv
 executables: []
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- app/assets/config/releaf_content_manifest.js
 - app/assets/javascripts/controllers/releaf/content/nodes.js
 - app/assets/stylesheets/controllers/releaf/content/nodes.scss
 - app/builders/releaf/content/builders/action_dialog.rb
@@ -108,34 +109,11 @@ files:
 - lib/releaf/content/node_mapper.rb
 - lib/releaf/content/route.rb
 - lib/releaf/content/router_proxy.rb
-- spec/builders/content/nodes/action_dialog_spec.rb
-- spec/builders/content/nodes/content_form_builder_spec.rb
-- spec/builders/content/nodes/form_builder_spec.rb
-- spec/builders/content/nodes/toolbox_builder_spec.rb
-- spec/controllers/releaf/content/nodes_controller_spec.rb
-- spec/features/nodes_services_spec.rb
-- spec/features/nodes_spec.rb
-- spec/fixtures/dummy.png
-- spec/lib/releaf/content/acts_as_node_spec.rb
-- spec/lib/releaf/content/configuration_spec.rb
-- spec/lib/releaf/content/engine_spec.rb
-- spec/lib/releaf/content/node_spec.rb
-- spec/lib/releaf/content/route_spec.rb
-- spec/middleware/routes_reloader_spec.rb
-- spec/routing/node_mapper_spec.rb
-- spec/services/releaf/content/build_route_objects_spec.rb
-- spec/services/releaf/content/node/copy_spec.rb
-- spec/services/releaf/content/node/move_spec.rb
-- spec/services/releaf/content/node/save_under_parent_spec.rb
-- spec/services/releaf/content/node/service_spec.rb
-- spec/validators/content/node/parent_validator_spec.rb
-- spec/validators/content/node/root_validator_spec.rb
-- spec/validators/content/node/singleness_validator_spec.rb
 homepage: https://github.com/cubesystems/releaf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,32 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Node and content routes support for releaf
-test_files:
-- spec/builders/content/nodes/action_dialog_spec.rb
-- spec/builders/content/nodes/content_form_builder_spec.rb
-- spec/builders/content/nodes/form_builder_spec.rb
-- spec/builders/content/nodes/toolbox_builder_spec.rb
-- spec/controllers/releaf/content/nodes_controller_spec.rb
-- spec/features/nodes_services_spec.rb
-- spec/features/nodes_spec.rb
-- spec/fixtures/dummy.png
-- spec/lib/releaf/content/acts_as_node_spec.rb
-- spec/lib/releaf/content/configuration_spec.rb
-- spec/lib/releaf/content/engine_spec.rb
-- spec/lib/releaf/content/node_spec.rb
-- spec/lib/releaf/content/route_spec.rb
-- spec/middleware/routes_reloader_spec.rb
-- spec/routing/node_mapper_spec.rb
-- spec/services/releaf/content/build_route_objects_spec.rb
-- spec/services/releaf/content/node/copy_spec.rb
-- spec/services/releaf/content/node/move_spec.rb
-- spec/services/releaf/content/node/save_under_parent_spec.rb
-- spec/services/releaf/content/node/service_spec.rb
-- spec/validators/content/node/parent_validator_spec.rb
-- spec/validators/content/node/root_validator_spec.rb
-- spec/validators/content/node/singleness_validator_spec.rb
+test_files: []

data/spec/builders/content/nodes/action_dialog_spec.rb

@@ -1,39 +0,0 @@
-require "rails_helper"
-
-describe Releaf::Content::Builders::ActionDialog, type: :class do
-  class ConfirmDestroyDialogTestHelper < ActionView::Base
-    include Releaf::ApplicationHelper
-  end
-
-  class ActionDialogIncluder
-    include Releaf::Content::Builders::ActionDialog
-    def action; end
-  end
-
-  let(:template){ ConfirmDestroyDialogTestHelper.new }
-  let(:object){ Book.new }
-  let(:subject){ ActionDialogIncluder.new(template) }
-
-  describe "#confirm_button_text" do
-    it "returns translation for humanized builder action" do
-      allow(subject).to receive(:action).and_return(:move_to_the_right)
-      allow(subject).to receive(:t).with("Move to the right").and_return("to the left")
-      expect(subject.confirm_button_text).to eq("to the left")
-    end
-  end
-
-  describe "#confirm_button_attributes" do
-    it "returns hash with confirm button attributes" do
-      expect(subject.confirm_button_attributes).to be_instance_of Hash
-    end
-  end
-
-  describe "#confirm_button" do
-    it "returns confirm button" do
-      allow(subject).to receive(:confirm_button_text).and_return("Yess")
-      allow(subject).to receive(:confirm_button_attributes).and_return(a: "b")
-      allow(subject).to receive(:button).with("Yess", "check", a: "b").and_return("x")
-      expect(subject.confirm_button).to eq("x")
-    end
-  end
-end

data/spec/builders/content/nodes/content_form_builder_spec.rb

@@ -1,24 +0,0 @@
-require "rails_helper"
-
-describe Releaf::Content::Nodes::ContentFormBuilder, type: :class do
-  class FormBuilderTestHelper < ActionView::Base
-    include Releaf::ApplicationHelper
-    include Releaf::ButtonHelper
-    include FontAwesome::Rails::IconHelper
-    def controller_scope_name; end
-    def generate_url_releaf_content_nodes_path(args); end
-  end
-
-  let(:template){ FormBuilderTestHelper.new }
-  let(:node){ Node.new(content_type: "TextPage", slug: "b", id: 2,
-                         parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
-  let(:object){ node.build_content }
-  let(:subject){ described_class.new(:resource, object, template, {}) }
-
-  describe "#field_names" do
-    it "returns array of node content object fields" do
-      allow(object.class).to receive(:acts_as_node_fields).and_return(["a", "b"])
-      expect(subject.field_names).to eq(["a", "b"])
-    end
-  end
-end

data/spec/builders/content/nodes/form_builder_spec.rb

@@ -1,262 +0,0 @@
-require "rails_helper"
-
-describe Releaf::Content::Nodes::FormBuilder, type: :class do
-  class FormBuilderTestHelper < ActionView::Base
-    include Releaf::ApplicationHelper
-    include Releaf::ButtonHelper
-    include FontAwesome::Rails::IconHelper
-    def controller_scope_name; end
-    def generate_url_releaf_content_nodes_path(args); end
-  end
-
-  let(:template){ FormBuilderTestHelper.new }
-  let(:object){ Node.new(content_type: "TextPage", slug: "b", id: 2,
-                         parent: Node.new(content_type: "TextPage", slug: "a", id: 1)) }
-  let(:subject){ described_class.new(:resource, object, template, {}) }
-
-  describe "#field_names" do
-    it "returns hidden, node and content object fields" do
-      expect(subject.field_names).to eq(["node_fields_block", "content_fields_block"])
-    end
-  end
-
-  describe "#node_fields" do
-    it "returns array with renderable node fields" do
-      list = [:parent_id, :name, :content_type, :slug, :item_position, :active, :locale]
-      expect(subject.node_fields).to eq(list)
-    end
-  end
-
-  describe "#render_node_fields_block" do
-    it "renders node fields" do
-      allow(subject).to receive(:node_fields).and_return([1, 2])
-      allow(subject).to receive(:releaf_fields).with([1, 2]).and_return("x")
-      content = '<div class="section node-fields">x</div>'
-      expect(subject.render_node_fields_block).to eq(content)
-    end
-  end
-
-  describe "#render_parent_id" do
-    it "renders hidden parent if field for new object" do
-      allow(subject.object).to receive(:new_record?).and_return(true)
-      allow(subject).to receive(:hidden_field).with(:parent_id).and_return("x")
-      expect(subject.render_parent_id).to eq("x")
-    end
-
-    it "renders nothing for existing object" do
-      allow(subject.object).to receive(:new_record?).and_return(false)
-      expect(subject.render_parent_id).to eq(nil)
-    end
-  end
-
-  describe "#render_content_fields_block?" do
-    before do
-      subject.object.build_content
-    end
-
-    it "returns array of node content object fields" do
-      allow(object.content_class).to receive(:respond_to?).with(:acts_as_node_fields).and_return(true)
-      expect(subject.render_content_fields_block?).to be true
-    end
-
-    context "when object content class do not respond to `acts_as_node_fields`" do
-      it "returns nil" do
-        allow(object.content_class).to receive(:respond_to?).with(:acts_as_node_fields).and_return(false)
-        expect(subject.render_content_fields_block?).to be false
-      end
-    end
-  end
-
-  describe "#render_content_fields_block" do
-    before do
-      subject.object.build_content
-    end
-
-    it "renders content fields block" do
-      allow(subject).to receive(:content_builder_class).and_return("_b_")
-      allow(subject).to receive(:render_content_fields_block?).and_return(true)
-      subform = described_class.new(:resource, object, template, {})
-      allow(subject).to receive(:fields_for).with(:content, subject.object.content, builder: "_b_").and_yield(subform)
-      allow(subform).to receive(:field_names).and_return([1, 2])
-      allow(subform).to receive(:releaf_fields).with([1, 2]).and_return("yy")
-      content = '<div class="section content-fields">yy</div>'
-      expect(subject.render_content_fields_block).to eq(content)
-    end
-
-    it "casts form fields to array before passign to `releaf_fields`" do
-      allow(subject).to receive(:content_builder_class).and_return("_b_")
-      allow(subject).to receive(:render_content_fields_block?).and_return(true)
-      subform = described_class.new(:resource, object, template, {})
-      allow(subject).to receive(:fields_for).with(:content, subject.object.content, builder: "_b_").and_yield(subform)
-      allow(subform).to receive(:field_names).and_return({a: 1, b: 2})
-      expect(subform).to receive(:releaf_fields).with([[:a, 1], [:b, 2]])
-      subject.render_content_fields_block
-    end
-
-    context "when content have no fields" do
-      it "returns nil" do
-        allow(subject).to receive(:render_content_fields_block?).and_return(false)
-        expect(subject.render_content_fields_block).to be nil
-      end
-    end
-  end
-
-  describe "#content_builder_class" do
-    it "returns `Releaf::Content::Nodes::ContentFormBuilder`" do
-      expect(subject.content_builder_class).to eq(Releaf::Content::Nodes::ContentFormBuilder)
-    end
-  end
-
-  describe "#render_locale" do
-    context "when node node has locale select enabled" do
-      it "renders locale with #render_locale_options" do
-        allow(subject.object).to receive(:locale_selection_enabled?).and_return(true)
-        allow(subject).to receive(:render_locale_options).and_return(a: "b")
-        allow(subject).to receive(:releaf_item_field).with(:locale, options: {a: "b"}).and_return("x")
-        expect(subject.render_locale).to eq("x")
-      end
-    end
-
-    context "when node node does not have locale select enabled" do
-      it "renders locale with #render_locale_options" do
-        allow(subject.object).to receive(:locale_selection_enabled?).and_return(false)
-        expect(subject.render_locale).to be nil
-      end
-    end
-  end
-
-  describe "#render_locale_options" do
-    it "returns :select_options and :include_blank values" do
-      expect(subject.render_locale_options.keys).to eq([:select_options, :include_blank])
-    end
-
-    it ":select_options contains all available locales" do
-      allow(I18n).to receive(:available_locales).and_return([:lt, :et])
-      expect(subject.render_locale_options[:select_options]).to eq([:lt, :et])
-    end
-
-    context "when subject have defined locale" do
-      it ":include_blank is false" do
-        subject.object.locale = :lt
-        expect(subject.render_locale_options[:include_blank]).to be false
-      end
-    end
-
-    context "when subject have no locale" do
-      it ":include_blank is true" do
-        subject.object.locale = nil
-        expect(subject.render_locale_options[:include_blank]).to be true
-      end
-    end
-  end
-
-  describe "#render_content_type" do
-    it "renders disabled content type field with localized content type value" do
-      options = {disabled: true, value: "Translated content type"}
-      allow(I18n).to receive(:t).with("text_page", scope: "admin.content_types").and_return("Translated content type")
-      allow(subject).to receive(:releaf_text_field).with(:content_type, input: options).and_return("x")
-      expect(subject.render_content_type).to eq("x")
-    end
-  end
-
-  describe "#slug_base_url" do
-    before do
-      request = double(:request, protocol: "http:://", host_with_port: "somehost:8080")
-      allow(subject).to receive(:request).and_return(request)
-      allow(object).to receive(:parent).and_return(Node.new)
-    end
-
-    context "when trailing slash for path enabled" do
-      it "returns absolute url without extra slash added" do
-        allow(object).to receive(:trailing_slash_for_path?).and_return(true)
-        allow(object.parent).to receive(:path).and_return("/parent/path/")
-        expect(subject.slug_base_url).to eq("http:://somehost:8080/parent/path/")
-      end
-    end
-
-    context "when trailing slash for path disabled" do
-      it "returns absolute url with extra slash added" do
-        allow(object).to receive(:trailing_slash_for_path?).and_return(false)
-        allow(object.parent).to receive(:path).and_return("/parent/path")
-        expect(subject.slug_base_url).to eq("http:://somehost:8080/parent/path/")
-      end
-    end
-  end
-
-  describe "#slug_link" do
-    before do
-      allow(subject).to receive(:slug_base_url).and_return("http://some.host/parent/path/")
-    end
-
-    context "when trailing slash for path enabled" do
-      it "returns absolute url without extra slash added" do
-        allow(object).to receive(:trailing_slash_for_path?).and_return(true)
-        expect(subject.slug_link).to eq('<a href="/a/b/">http://some.host/parent/path/<span>b</span>/</a>')
-      end
-    end
-
-    context "when trailing slash for path disabled" do
-      it "returns absolute url with extra slash added" do
-        allow(object).to receive(:trailing_slash_for_path?).and_return(false)
-        expect(subject.slug_link).to eq('<a href="/a/b">http://some.host/parent/path/<span>b</span></a>')
-      end
-    end
-  end
-
-  describe "#render_slug" do
-    it "renders customized field" do
-      controller = Admin::NodesController.new
-      allow(subject).to receive(:controller).and_return(controller)
-      allow(subject).to receive(:slug_base_url).and_return("http://localhost/parent")
-      allow(subject).to receive(:url_for).with(controller: "admin/nodes", action: "generate_url", parent_id: 1, id: 2)
-        .and_return("http://localhost/slug-generation-url")
-
-      content = '
-          <div class="field type-text" data-name="slug">
-              <div class="label-wrap">
-                  <label for="resource_slug">Slug</label>
-              </div>
-              <div class="value">
-                  <input value="b" class="text" data-generator-url="http://localhost/slug-generation-url" type="text" name="resource[slug]" id="resource_slug" />
-                  <button class="button only-icon secondary generate" title="Suggest slug" type="button" autocomplete="off">
-                      <i class="fa fa-keyboard-o"></i>
-                  </button>
-                  <div class="link">
-                      <a href="/a/b">http://localhost/parent<span>b</span></a>
-                  </div>
-             </div>
-         </div>
-      '
-
-      expect(subject.render_slug).to match_html(content)
-    end
-  end
-
-  describe "#render_item_position" do
-    it "renders locale with #item_position_options" do
-      allow(subject).to receive(:item_position_options).and_return(a: "b")
-      allow(subject).to receive(:releaf_item_field).with(:item_position, options: {a: "b"}).and_return("x")
-      expect(subject.render_item_position).to eq("x")
-    end
-  end
-
-  describe "#item_position_options" do
-    before do
-      object.item_position = 2
-      allow(subject).to receive(:item_position_select_options).and_return([["a", 1], ["b", 2], ["c", 3]])
-    end
-
-    it "returns :select_options and :include_blank values" do
-      expect(subject.item_position_options.keys).to eq([:include_blank, :select_options])
-    end
-
-    it ":select_options correct select options" do
-      options = '<option value="1">a</option>'
-      options << "\n"
-      options << '<option selected="selected" value="2">b</option>'
-      options << "\n"
-      options << '<option value="3">c</option>'
-      expect(subject.item_position_options[:select_options]).to eq(options)
-    end
-  end
-end